Skip to content

Fix incorrect line text computation to stop comment directive searching#38296

Merged
sheetalkamat merged 1 commit intomasterfrom
expectError
May 4, 2020
Merged

Fix incorrect line text computation to stop comment directive searching#38296
sheetalkamat merged 1 commit intomasterfrom
expectError

Conversation

@sheetalkamat
Copy link
Copy Markdown
Member

@sheetalkamat sheetalkamat commented May 1, 2020

Fixes #38289

@sheetalkamat
Copy link
Copy Markdown
Member Author

sheetalkamat commented May 1, 2020

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

@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 1, 2020 •
edited
Loading

Heya @sheetalkamat, I've started to run the task to cherry-pick this into release-3.9 on this PR at 168be30. You can monitor the build here.

typescript-bot pushed a commit to typescript-bot/TypeScript that referenced this pull request May 1, 2020
@sheetalkamat @typescript-bot
Cherry-pick PR microsoft#38296 into release-3.9
e0ba4ba 
Component commits:
168be30 Fix incorrect line text computation to stop comment directive searching Fixes microsoft#38289
@typescript-bot typescript-bot mentioned this pull request May 1, 2020
Merged
@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 1, 2020

Hey @sheetalkamat, I've opened #38297 for you.

@sheetalkamat
Copy link
Copy Markdown
Member Author

sheetalkamat commented May 1, 2020

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

@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 1, 2020 •
edited
Loading

Heya @sheetalkamat, I've started to run the task to cherry-pick this into release-3.9 on this PR at e860d48. You can monitor the build here.

@sheetalkamat sheetalkamat mentioned this pull request May 1, 2020
Merged
@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 1, 2020

Hey @sheetalkamat, I couldn't open a PR with the cherry-pick. (You can check the log here). You may need to squash and pick this PR into release-3.9 manually.

typescript-bot pushed a commit to typescript-bot/TypeScript that referenced this pull request May 1, 2020
@sheetalkamat @typescript-bot
Cherry-pick PR microsoft#38296 into release-3.9
f9d2753 
Component commits:
168be30 Fix incorrect line text computation to stop comment directive searching Fixes microsoft#38289

e860d48 Stop searching for comment directive if the previous line is not empty
@sheetalkamat
Copy link
Copy Markdown
Member Author

sheetalkamat commented May 4, 2020

Reverting e860d48 since tests/cases/compiler/checkJsFiles_skipDiagnostics fails with that change

@sheetalkamat
Copy link
Copy Markdown
Member Author

sheetalkamat commented May 4, 2020

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

@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 4, 2020 •
edited
Loading

Heya @sheetalkamat, I've started to run the task to cherry-pick this into release-3.9 on this PR at 168be30. You can monitor the build here.

@typescript-bot
Copy link
Copy Markdown
Collaborator

typescript-bot commented May 4, 2020

Hey @sheetalkamat, I couldn't open a PR with the cherry-pick. (You can check the log here). You may need to squash and pick this PR into release-3.9 manually.

typescript-bot pushed a commit to typescript-bot/TypeScript that referenced this pull request May 4, 2020
@sheetalkamat @typescript-bot
Cherry-pick PR microsoft#38296 into release-3.9
af8a3d0 
Component commits:
168be30 Fix incorrect line text computation to stop comment directive searching Fixes microsoft#38289
@sheetalkamat sheetalkamat merged commit aa37b28 into master May 4, 2020
@sheetalkamat sheetalkamat deleted the expectError branch May 4, 2020 20:03
sheetalkamat added a commit that referenced this pull request May 4, 2020
@sheetalkamat
Cherry-pick PR #38296 into release-3.9 (#38297)
67ca514 
Component commits:
168be30 Fix incorrect line text computation to stop comment directive searching Fixes #38289

Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
@sheetalkamat sheetalkamat mentioned this pull request May 6, 2020
Open
@microsoft microsoft locked as resolved and limited conversation to collaborators Oct 21, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@RyanCavanaugh RyanCavanaugh RyanCavanaugh approved these changes

@DanielRosenwasser DanielRosenwasser Awaiting requested review from DanielRosenwasser

@orta orta Awaiting requested review from orta

Assignees

@sheetalkamat sheetalkamat

Labels

Author: Team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ts-expect-error comment expects more than one error

3 participants

@sheetalkamat @typescript-bot @RyanCavanaugh