Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(47597): preProcessFile incorrectly identifies imports in comments after a template literal type #47657

Merged
merged 1 commit into from Mar 15, 2022
Merged

fix(47597): preProcessFile incorrectly identifies imports in comments after a template literal type #47657

merged 1 commit into from Mar 15, 2022

Conversation

a-tarasyuk
Copy link
Contributor

Fixes #47597
Fixes #30878

@typescript-bot typescript-bot added the For Backlog Bug PRs that fix a backlog bug label Jan 29, 2022
@sandersn sandersn added this to Not started in PR Backlog via automation Feb 7, 2022
@sandersn sandersn moved this from Not started to Waiting on reviewers in PR Backlog Feb 16, 2022
DanielRosenwasser
DanielRosenwasser requested changes Feb 18, 2022
View reviewed changes
src/services/preProcess.ts Outdated Show resolved Hide resolved
PR Backlog automation moved this from Waiting on reviewers to Waiting on author Feb 18, 2022
@typescript-bot typescript-bot added For Milestone Bug PRs that fix a bug with a specific milestone and removed For Backlog Bug PRs that fix a backlog bug labels Feb 19, 2022
@a-tarasyuk a-tarasyuk closed this Feb 22, 2022
PR Backlog automation moved this from Waiting on author to Done Feb 22, 2022
@a-tarasyuk a-tarasyuk reopened this Feb 23, 2022
PR Backlog automation moved this from Done to Not started Feb 23, 2022
@sandersn sandersn moved this from Not started to Waiting on reviewers in PR Backlog Feb 24, 2022
PR Backlog automation moved this from Waiting on reviewers to Needs merge Mar 11, 2022
@DanielRosenwasser
Copy link
Member

@typescript-bot cherry-pick this to release-4.6

@typescript-bot
Copy link
Collaborator

typescript-bot commented Mar 11, 2022 •
edited

Heya @DanielRosenwasser, I've started to run the task to cherry-pick this into release-4.6 on this PR at 4516fa8. You can monitor the build here.

@DanielRosenwasser
Copy link
Member

@typescript-bot pack this

@typescript-bot
Copy link
Collaborator

typescript-bot commented Mar 11, 2022 •
edited

Heya @DanielRosenwasser, I've started to run the tarball bundle task on this PR at 4516fa8. You can monitor the build here.

@typescript-bot typescript-bot mentioned this pull request Mar 11, 2022
Merged
@typescript-bot
Copy link
Collaborator

Hey @DanielRosenwasser, I've opened #48223 for you.

typescript-bot pushed a commit to typescript-bot/TypeScript that referenced this pull request Mar 11, 2022
@a-tarasyuk
Cherry-pick PR microsoft#47657 into release-4.6
09eb974 
Component commits:
4516fa8 fix(47597): ignore commented imports following template expression
@typescript-bot
Copy link
Collaborator

Hey @DanielRosenwasser, I've packed this into an installable tgz. You can install it for testing by referencing it in your package.json like so:

{
    "devDependencies": {
        "typescript": "https://typescript.visualstudio.com/cf7ac146-d525-443c-b23c-0d58337efebc/_apis/build/builds/121706/artifacts?artifactName=tgz&fileId=FED8D6B9AF71583AC05071AA11ECE85A2D500E9AFF6B5B4BE5829AFCA4F0B22002&fileName=/typescript-4.7.0-insiders.20220311.tgz"
    }
}

and then running npm install.

@andrewbranch andrewbranch merged commit c981c9b into microsoft:main Mar 15, 2022
PR Backlog automation moved this from Needs merge to Done Mar 15, 2022
DanielRosenwasser pushed a commit that referenced this pull request Mar 16, 2022
@typescript-bot @a-tarasyuk
Cherry-pick PR #47657 into release-4.6 (#48223)
cfdef9d 
Component commits:
4516fa8 fix(47597): ignore commented imports following template expression

Co-authored-by: Oleksandr T <oleksandr.tarasiuk@outlook.com>
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Mar 27, 2022
Update dependency typescript to v4.6.3 (#1242)
6acff0d 
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [typescript](https://www.typescriptlang.org/) ([source](https://github.com/Microsoft/TypeScript)) | devDependencies | minor | [`4.5.5` -> `4.6.3`](https://renovatebot.com/diffs/npm/typescript/4.5.5/4.6.3) |

---

### Release Notes

<details>
<summary>Microsoft/TypeScript</summary>

### [`v4.6.3`](https://github.com/Microsoft/TypeScript/releases/v4.6.3)

[Compare Source](microsoft/TypeScript@v4.6.2...v4.6.3)

This release includes fixes for

-   [an incremental parsing bug caused by faulty error recovery logic](microsoft/TypeScript#47895)
-   [improved results from the TypeScript API's `preProcessFile` function](microsoft/TypeScript#47657)

For the complete list of fixed issues, check out the

-   [fixed issues query for Typescript 4.6.0 (Beta)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.0%22+).
-   [fixed issues query for Typescript 4.6.1 (RC)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.1%22+).
-   [fixed issues query for Typescript 4.6.2 (Stable)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.2%22+).
-   [fixed issues query for Typescript 4.6.3 (Stable)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.3%22+).

Downloads are available on:

-   [npm](https://www.npmjs.com/package/typescript)

### [`v4.6.2`](https://github.com/Microsoft/TypeScript/releases/v4.6.2)

[Compare Source](microsoft/TypeScript@v4.5.5...v4.6.2)

For release notes, check out the [release announcement](https://devblogs.microsoft.com/typescript/announcing-typescript-4-6/).

For the complete list of fixed issues, check out the

-   [fixed issues query for Typescript 4.6.0 (Beta)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.0%22+).
-   [fixed issues query for Typescript 4.6.1 (RC)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.1%22+).
-   [fixed issues query for Typescript 4.6.2 (Stable)](https://github.com/microsoft/TypeScript/issues?q=milestone%3A%22TypeScript+4.6.2%22+).

Downloads are available on:

-   [npm](https://www.npmjs.com/package/typescript)
-   [Visual Studio 2022/2019](https://marketplace.visualstudio.com/items?itemName=TypeScriptTeam.TypeScript-46) ([Select new version in project options](https://github.com/Microsoft/TypeScript/wiki/Updating-TypeScript-in-Visual-Studio-2017))
-   [NuGet package](https://www.nuget.org/packages/Microsoft.TypeScript.MSBuild)

</details>

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1242
Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org>
Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielRosenwasser DanielRosenwasser DanielRosenwasser approved these changes

@andrewbranch andrewbranch andrewbranch approved these changes

@sandersn sandersn Awaiting requested review from sandersn

Assignees

@andrewbranch andrewbranch

Labels
For Milestone Bug PRs that fix a bug with a specific milestone
Projects
PR Backlog
  
Done
Milestone
No milestone
4 participants
@a-tarasyuk @DanielRosenwasser @typescript-bot @andrewbranch