-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Fixing range for primary edit #59369
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
Merged
navya9singh
merged 4 commits into
microsoft:main
from
navya9singh:fixRangeForPrimaryEdit
Jul 23, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
328 changes: 328 additions & 0 deletions
328
tests/baselines/reference/tsserver/fourslashServer/pasteEdits_addInNextLine.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,328 @@ | ||
| currentDirectory:: / useCaseSensitiveFileNames: false | ||
| Info seq [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist | ||
| //// [/a.ts] | ||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
|
|
||
| //// [/b.ts] | ||
| export interface Foo { } | ||
| export const a = 1; | ||
| export const t = 1; | ||
|
|
||
| export const foo: Foo = { }; | ||
| export const k = a+ t; | ||
|
|
||
| //// [/lib.d.ts] | ||
| lib.d.ts-Text | ||
|
|
||
| //// [/lib.decorators.d.ts] | ||
| lib.decorators.d.ts-Text | ||
|
|
||
| //// [/lib.decorators.legacy.d.ts] | ||
| lib.decorators.legacy.d.ts-Text | ||
|
|
||
| //// [/tsconfig.json] | ||
| { "files": ["a.ts", "b.ts"] } | ||
|
|
||
|
|
||
| Info seq [hh:mm:ss:mss] request: | ||
| { | ||
| "seq": 0, | ||
| "type": "request", | ||
| "arguments": { | ||
| "file": "/a.ts" | ||
| }, | ||
| "command": "open" | ||
| } | ||
| Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /a.ts ProjectRootPath: undefined:: Result: /tsconfig.json | ||
| Info seq [hh:mm:ss:mss] Creating configuration project /tsconfig.json | ||
| Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file | ||
| Info seq [hh:mm:ss:mss] event: | ||
| { | ||
| "seq": 0, | ||
| "type": "event", | ||
| "event": "projectLoadingStart", | ||
| "body": { | ||
| "projectName": "/tsconfig.json", | ||
| "reason": "Creating possible configured project for /a.ts to open" | ||
| } | ||
| } | ||
| Info seq [hh:mm:ss:mss] Config: /tsconfig.json : { | ||
| "rootNames": [ | ||
| "/a.ts", | ||
| "/b.ts" | ||
| ], | ||
| "options": { | ||
| "configFilePath": "/tsconfig.json" | ||
| } | ||
| } | ||
| Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /b.ts 500 undefined WatchType: Closed Script info | ||
| Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tsconfig.json | ||
| Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.d.ts 500 undefined WatchType: Closed Script info | ||
| Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.d.ts 500 undefined WatchType: Closed Script info | ||
| Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info | ||
| Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms | ||
| Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured) | ||
| Info seq [hh:mm:ss:mss] Files (5) | ||
| /lib.d.ts Text-1 lib.d.ts-Text | ||
| /lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text | ||
| /lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text | ||
| /a.ts SVC-1-0 "\n\n\n\n" | ||
| /b.ts Text-1 "export interface Foo { }\nexport const a = 1;\nexport const t = 1;\n\nexport const foo: Foo = { };\nexport const k = a+ t;" | ||
|
|
||
|
|
||
| lib.d.ts | ||
| Default library for target 'es5' | ||
| lib.decorators.d.ts | ||
| Library referenced via 'decorators' from file 'lib.d.ts' | ||
| lib.decorators.legacy.d.ts | ||
| Library referenced via 'decorators.legacy' from file 'lib.d.ts' | ||
| a.ts | ||
| Part of 'files' list in tsconfig.json | ||
| b.ts | ||
| Part of 'files' list in tsconfig.json | ||
|
|
||
| Info seq [hh:mm:ss:mss] ----------------------------------------------- | ||
| Info seq [hh:mm:ss:mss] event: | ||
| { | ||
| "seq": 0, | ||
| "type": "event", | ||
| "event": "projectLoadingFinish", | ||
| "body": { | ||
| "projectName": "/tsconfig.json" | ||
| } | ||
| } | ||
| Info seq [hh:mm:ss:mss] event: | ||
| { | ||
| "seq": 0, | ||
| "type": "event", | ||
| "event": "configFileDiag", | ||
| "body": { | ||
| "triggerFile": "/a.ts", | ||
| "configFile": "/tsconfig.json", | ||
| "diagnostics": [] | ||
| } | ||
| } | ||
| Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured) | ||
| Info seq [hh:mm:ss:mss] Files (5) | ||
|
|
||
| Info seq [hh:mm:ss:mss] ----------------------------------------------- | ||
| Info seq [hh:mm:ss:mss] Open files: | ||
| Info seq [hh:mm:ss:mss] FileName: /a.ts ProjectRootPath: undefined | ||
| Info seq [hh:mm:ss:mss] Projects: /tsconfig.json | ||
| Info seq [hh:mm:ss:mss] response: | ||
| { | ||
| "seq": 0, | ||
| "type": "response", | ||
| "command": "open", | ||
| "request_seq": 0, | ||
| "success": true, | ||
| "performanceData": { | ||
| "updateGraphDurationMs": * | ||
| } | ||
| } | ||
| After Request | ||
| watchedFiles:: | ||
| /b.ts: *new* | ||
| {"pollingInterval":500} | ||
| /lib.d.ts: *new* | ||
| {"pollingInterval":500} | ||
| /lib.decorators.d.ts: *new* | ||
| {"pollingInterval":500} | ||
| /lib.decorators.legacy.d.ts: *new* | ||
| {"pollingInterval":500} | ||
| /tsconfig.json: *new* | ||
| {"pollingInterval":2000} | ||
|
|
||
| Projects:: | ||
| /tsconfig.json (Configured) *new* | ||
| projectStateVersion: 1 | ||
| projectProgramVersion: 1 | ||
|
|
||
| ScriptInfos:: | ||
| /a.ts (Open) *new* | ||
| version: SVC-1-0 | ||
| containingProjects: 1 | ||
| /tsconfig.json *default* | ||
| /b.ts *new* | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.d.ts *new* | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.decorators.d.ts *new* | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.decorators.legacy.d.ts *new* | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
|
|
||
| Info seq [hh:mm:ss:mss] request: | ||
| { | ||
| "seq": 1, | ||
| "type": "request", | ||
| "arguments": { | ||
| "formatOptions": { | ||
| "indentSize": 4, | ||
| "tabSize": 4, | ||
| "newLineCharacter": "\n", | ||
| "convertTabsToSpaces": true, | ||
| "indentStyle": 2, | ||
| "insertSpaceAfterConstructor": false, | ||
| "insertSpaceAfterCommaDelimiter": true, | ||
| "insertSpaceAfterSemicolonInForStatements": true, | ||
| "insertSpaceBeforeAndAfterBinaryOperators": true, | ||
| "insertSpaceAfterKeywordsInControlFlowStatements": true, | ||
| "insertSpaceAfterFunctionKeywordForAnonymousFunctions": false, | ||
| "insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false, | ||
| "insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false, | ||
| "insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": true, | ||
| "insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false, | ||
| "insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false, | ||
| "insertSpaceBeforeFunctionParenthesis": false, | ||
| "placeOpenBraceOnNewLineForFunctions": false, | ||
| "placeOpenBraceOnNewLineForControlBlocks": false, | ||
| "semicolons": "ignore", | ||
| "trimTrailingWhitespace": true, | ||
| "indentSwitchCase": true | ||
| } | ||
| }, | ||
| "command": "configure" | ||
| } | ||
| Info seq [hh:mm:ss:mss] Format host information updated | ||
| Info seq [hh:mm:ss:mss] response: | ||
| { | ||
| "seq": 0, | ||
| "type": "response", | ||
| "command": "configure", | ||
| "request_seq": 1, | ||
| "success": true | ||
| } | ||
| Info seq [hh:mm:ss:mss] request: | ||
| { | ||
| "seq": 2, | ||
| "type": "request", | ||
| "arguments": { | ||
| "file": "/a.ts", | ||
| "pastedText": [ | ||
| "export const foo: Foo = {};" | ||
| ], | ||
| "pasteLocations": [ | ||
| { | ||
| "start": { | ||
| "line": 4, | ||
| "offset": 1 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "offset": 1 | ||
| } | ||
| } | ||
| ], | ||
| "copiedFrom": { | ||
| "file": "b.ts", | ||
| "spans": [ | ||
| { | ||
| "start": { | ||
| "line": 5, | ||
| "offset": 1 | ||
| }, | ||
| "end": { | ||
| "line": 5, | ||
| "offset": 29 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "command": "getPasteEdits" | ||
| } | ||
| Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tsconfig.json | ||
| Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tsconfig.json projectStateVersion: 2 projectProgramVersion: 1 structureChanged: false structureIsReused:: Completely Elapsed:: *ms | ||
| Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured) | ||
| Info seq [hh:mm:ss:mss] Files (5) | ||
| /lib.d.ts Text-1 lib.d.ts-Text | ||
| /lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text | ||
| /lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text | ||
| /a.ts SVC-1-1 "\n\n\nexport const foo: Foo = {};\n" | ||
| /b.ts Text-1 "export interface Foo { }\nexport const a = 1;\nexport const t = 1;\n\nexport const foo: Foo = { };\nexport const k = a+ t;" | ||
|
|
||
| Info seq [hh:mm:ss:mss] ----------------------------------------------- | ||
| Info seq [hh:mm:ss:mss] response: | ||
| { | ||
| "seq": 0, | ||
| "type": "response", | ||
| "command": "getPasteEdits", | ||
| "request_seq": 2, | ||
| "success": true, | ||
| "performanceData": { | ||
| "updateGraphDurationMs": * | ||
| }, | ||
| "body": { | ||
| "edits": [ | ||
| { | ||
| "fileName": "/a.ts", | ||
| "textChanges": [ | ||
| { | ||
| "start": { | ||
| "line": 1, | ||
| "offset": 1 | ||
| }, | ||
| "end": { | ||
| "line": 1, | ||
| "offset": 1 | ||
| }, | ||
| "newText": "import { Foo } from \"./b\";\n" | ||
| }, | ||
| { | ||
| "start": { | ||
| "line": 4, | ||
| "offset": 1 | ||
| }, | ||
| "end": { | ||
| "line": 4, | ||
| "offset": 1 | ||
| }, | ||
| "newText": "export const foo: Foo = {};" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "fixId": "providePostPasteEdits" | ||
| } | ||
| } | ||
| After Request | ||
| Projects:: | ||
| /tsconfig.json (Configured) *changed* | ||
| projectStateVersion: 3 *changed* | ||
| projectProgramVersion: 1 | ||
| dirty: true *changed* | ||
|
|
||
| ScriptInfos:: | ||
| /a.ts (Open) *changed* | ||
| version: SVC-1-2 *changed* | ||
| containingProjects: 1 | ||
| /tsconfig.json *default* | ||
| /b.ts | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.d.ts | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.decorators.d.ts | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json | ||
| /lib.decorators.legacy.d.ts | ||
| version: Text-1 | ||
| containingProjects: 1 | ||
| /tsconfig.json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /// <reference path="../fourslash.ts" /> | ||
|
|
||
| // @Filename: /a.ts | ||
| //// | ||
| //// | ||
| //// | ||
| //// [||] | ||
| //// | ||
|
|
||
| // @Filename: /b.ts | ||
| //// export interface Foo { } | ||
| //// export const a = 1; | ||
| //// export const t = 1; | ||
| //// | ||
| //// [|export const foo: Foo = { };|] | ||
| //// [|export const k = a+ t;|] | ||
|
|
||
| // @Filename: /tsconfig.json | ||
| ////{ "files": ["a.ts", "b.ts"] } | ||
|
|
||
| const range = test.ranges(); | ||
| verify.pasteEdits({ | ||
| args: { | ||
| pastedText: [`export const foo: Foo = {};`], | ||
| pasteLocations: [range[0]], | ||
| copiedFrom: { file: "b.ts", range: [range[1]] }, | ||
| }, | ||
| newFileContents: { | ||
| "/a.ts": | ||
| `import { Foo } from "./b"; | ||
|
|
||
|
|
||
|
|
||
| export const foo: Foo = {}; | ||
| ` | ||
| } | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm... looking at it again, is it really safe to assume that
cbdoesn't itself change the contents of the file? I'm sure the way we use this function is used in our codebase, it's fine, but I just want to check. What do you think @sheetalkamat?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes we should assume cb doesnt change the contents of file since file is never "muted" without change in script info
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(assuming you mean mutated)
What I meant was that
cbcould itself runeditContentsomehow. If that happens, theScriptInfoobject may not actually contain the same text anymore.I'm okay with assuming that will never happen for now, I just wanted to run it by you.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The alternative is just to replace the text contents with the script info's own text contents. It should all be available anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I did mean mutated☺️ Currently editing script info from callback is not possible as it’s just trying to calculate import fixes.. when that changes we can revisit this ..