microsoft
diff --git a/‎src/harness/fourslash.ts
Copy file name to clipboard
+25-9Lines changed: 25 additions & 9 deletions b/‎src/harness/fourslash.ts
Copy file name to clipboard
+25-9Lines changed: 25 additions & 9 deletions
diff --git a/‎src/harness/unittests/tsserverProjectSystem.ts
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎src/harness/unittests/tsserverProjectSystem.ts
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎src/server/protocol.ts
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎src/server/protocol.ts
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎src/server/session.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/server/session.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -511,7 +511,7 @@ namespace FourSlash {
             }
         }
 
-        private raiseError(message: string) {
+        private raiseError(message: string): never {
             throw new Error(this.messageAtLastKnownMarker(message));
         }
 
@@ -848,10 +848,10 @@ namespace FourSlash {
             }
         }
 
-        public verifyCompletionsAt(markerName: string, expected: string[], options?: FourSlashInterface.CompletionsAtOptions) {
+        public verifyCompletionsAt(markerName: string, expected: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry>, options?: FourSlashInterface.CompletionsAtOptions) {
             this.goToMarker(markerName);
 
-            const actualCompletions = this.getCompletionListAtCaret();
+            const actualCompletions = this.getCompletionListAtCaret(options);
             if (!actualCompletions) {
                 this.raiseError(`No completions at position '${this.currentCaretPosition}'.`);
             }
@@ -867,9 +867,20 @@ namespace FourSlash {
             }
 
             ts.zipWith(actual, expected, (completion, expectedCompletion, index) => {
-                if (completion.name !== expectedCompletion) {
+                const { name, insertText, replacementSpan } = typeof expectedCompletion === "string" ? { name: expectedCompletion, insertText: undefined, replacementSpan: undefined } : expectedCompletion;
+                if (completion.name !== name) {
                     this.raiseError(`Expected completion at index ${index} to be ${expectedCompletion}, got ${completion.name}`);
                 }
+                if (completion.insertText !== insertText) {
+                    this.raiseError(`Expected completion insert text at index ${index} to be ${insertText}, got ${completion.insertText}`);
+                }
+                const convertedReplacementSpan = replacementSpan && textSpanFromRange(replacementSpan);
+                try {
+                    assert.deepEqual(completion.replacementSpan, convertedReplacementSpan);
+                }
+                catch {
+                    this.raiseError(`Expected completion replacementSpan at index ${index} to be ${stringify(convertedReplacementSpan)}, got ${stringify(completion.replacementSpan)}`);
+                }
             });
         }
 
@@ -1808,7 +1819,7 @@ Actual: ${stringify(fullActual)}`);
                     }
                     else if (prevChar === " " && /A-Za-z_/.test(ch)) {
                         /* Completions */
-                        this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, { includeExternalModuleExports: false });
+                        this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
                     }
 
                     if (i % checkCadence === 0) {
@@ -2383,7 +2394,8 @@ Actual: ${stringify(fullActual)}`);
         public applyCodeActionFromCompletion(markerName: string, options: FourSlashInterface.VerifyCompletionActionOptions) {
             this.goToMarker(markerName);
 
-            const actualCompletion = this.getCompletionListAtCaret({ includeExternalModuleExports: true }).entries.find(e => e.name === options.name && e.source === options.source);
+            const actualCompletion = this.getCompletionListAtCaret({ includeExternalModuleExports: true, includeInsertTextCompletions: false }).entries.find(e =>
+                e.name === options.name && e.source === options.source);
 
             if (!actualCompletion.hasAction) {
                 this.raiseError(`Completion for ${options.name} does not have an associated action.`);
@@ -3195,8 +3207,7 @@ Actual: ${stringify(fullActual)}`);
         private getTextSpanForRangeAtIndex(index: number): ts.TextSpan {
             const ranges = this.getRanges();
             if (ranges && ranges.length > index) {
-                const range = ranges[index];
-                return { start: range.start, length: range.end - range.start };
+                return textSpanFromRange(ranges[index]);
             }
             else {
                 this.raiseError("Supplied span index: " + index + " does not exist in range list of size: " + (ranges ? 0 : ranges.length));
@@ -3226,6 +3237,10 @@ Actual: ${stringify(fullActual)}`);
         }
     }
 
+    function textSpanFromRange(range: FourSlash.Range): ts.TextSpan {
+        return ts.createTextSpanFromBounds(range.start, range.end);
+    }
+
     export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {
         const content = Harness.IO.readFile(fileName);
         runFourSlashTestContent(basePath, testType, content, fileName);
@@ -3967,7 +3982,7 @@ namespace FourSlashInterface {
             super(state);
         }
 
-        public completionsAt(markerName: string, completions: string[], options?: CompletionsAtOptions) {
+        public completionsAt(markerName: string, completions: ReadonlyArray<ExpectedCompletionEntry>, options?: CompletionsAtOptions) {
             this.state.verifyCompletionsAt(markerName, completions, options);
         }
 
@@ -4591,6 +4606,7 @@ namespace FourSlashInterface {
         newContent: string;
     }
 
+    export type ExpectedCompletionEntry = string | { name: string, insertText?: string, replacementSpan?: FourSlash.Range };
     export interface CompletionsAtOptions extends ts.GetCompletionsAtPositionOptions {
         isNewIdentifierLocation?: boolean;
     }
 
@@ -1302,13 +1302,13 @@ namespace ts.projectSystem {
             service.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(service.externalProjects[0], [f1.path, f2.path, libFile.path]);
 
-            const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, { includeExternalModuleExports: false });
+            const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             // should contain completions for string
             assert.isTrue(completions1.entries.some(e => e.name === "charAt"), "should contain 'charAt'");
             assert.isFalse(completions1.entries.some(e => e.name === "toExponential"), "should not contain 'toExponential'");
 
             service.closeClientFile(f2.path);
-            const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, { includeExternalModuleExports: false });
+            const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             // should contain completions for string
             assert.isFalse(completions2.entries.some(e => e.name === "charAt"), "should not contain 'charAt'");
             assert.isTrue(completions2.entries.some(e => e.name === "toExponential"), "should contain 'toExponential'");
@@ -1334,11 +1334,11 @@ namespace ts.projectSystem {
             service.checkNumberOfProjects({ externalProjects: 1 });
             checkProjectActualFiles(service.externalProjects[0], [f1.path, f2.path, libFile.path]);
 
-            const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, { includeExternalModuleExports: false });
+            const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             assert.isTrue(completions1.entries.some(e => e.name === "somelongname"), "should contain 'somelongname'");
 
             service.closeClientFile(f2.path);
-            const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, { includeExternalModuleExports: false });
+            const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             assert.isFalse(completions2.entries.some(e => e.name === "somelongname"), "should not contain 'somelongname'");
             const sf2 = service.externalProjects[0].getLanguageService().getProgram().getSourceFile(f2.path);
             assert.equal(sf2.text, "");
@@ -1943,7 +1943,7 @@ namespace ts.projectSystem {
 
             // Check identifiers defined in HTML content are available in .ts file
             const project = configuredProjectAt(projectService, 0);
-            let completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 1, { includeExternalModuleExports: false });
+            let completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 1, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             assert(completions && completions.entries[0].name === "hello", `expected entry hello to be in completion list`);
 
             // Close HTML file
@@ -1957,7 +1957,7 @@ namespace ts.projectSystem {
             checkProjectActualFiles(configuredProjectAt(projectService, 0), [file1.path, file2.path, config.path]);
 
             // Check identifiers defined in HTML content are not available in .ts file
-            completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 5, { includeExternalModuleExports: false });
+            completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 5, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
             assert(completions && completions.entries[0].name !== "hello", `unexpected hello entry in completion list`);
         });
 
 
@@ -1693,6 +1693,11 @@ namespace ts.server.protocol {
          * This affects lone identifier completions but not completions on the right hand side of `obj.`.
          */
         includeExternalModuleExports: boolean;
+        /**
+         * If enabled, the completion list will include completions with invalid identifier names.
+         * For those entries, The `insertText` and `replacementSpan` properties will be set to change from `.x` property access to `["x"]`.
+         */
+        includeInsertTextCompletions: boolean;
     }
 
     /**
@@ -1768,6 +1773,12 @@ namespace ts.server.protocol {
          * is often the same as the name but may be different in certain circumstances.
          */
         sortText: string;
+        /**
+         * Text to insert instead of `name`.
+         * This is used to support bracketed completions; If `name` might be "a-b" but `insertText` would be `["a-b"]`,
+         * coupled with `replacementSpan` to replace a dotted access with a bracket access.
+         */
+        insertText?: string;
         /**
          * An optional span that indicates the text to be replaced by this completion item.
          * If present, this span should be used instead of the default one.
 
@@ -1207,10 +1207,10 @@ namespace ts.server {
             if (simplifiedResult) {
                 return mapDefined<CompletionEntry, protocol.CompletionEntry>(completions && completions.entries, entry => {
                     if (completions.isMemberCompletion || startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
-                        const { name, kind, kindModifiers, sortText, replacementSpan, hasAction, source, isRecommended } = entry;
+                        const { name, kind, kindModifiers, sortText, insertText, replacementSpan, hasAction, source, isRecommended } = entry;
                         const convertedSpan = replacementSpan ? this.toLocationTextSpan(replacementSpan, scriptInfo) : undefined;
                         // Use `hasAction || undefined` to avoid serializing `false`.
-                        return { name, kind, kindModifiers, sortText, replacementSpan: convertedSpan, hasAction: hasAction || undefined, source, isRecommended };
+                        return { name, kind, kindModifiers, sortText, insertText, replacementSpan: convertedSpan, hasAction: hasAction || undefined, source, isRecommended };
                     }
                 }).sort((a, b) => compareStringsCaseSensitiveUI(a.name, b.name));
             }
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ namespace FourSlash {`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`
`514`		`- private raiseError(message: string) {`
	`514`	`+ private raiseError(message: string): never {`
`515`	`515`	`throw new Error(this.messageAtLastKnownMarker(message));`
`516`	`516`	`}`
`517`	`517`
`@@ -848,10 +848,10 @@ namespace FourSlash {`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`
`851`		`- public verifyCompletionsAt(markerName: string, expected: string[], options?: FourSlashInterface.CompletionsAtOptions) {`
	`851`	`+ public verifyCompletionsAt(markerName: string, expected: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry>, options?: FourSlashInterface.CompletionsAtOptions) {`
`852`	`852`	`this.goToMarker(markerName);`
`853`	`853`
`854`		`- const actualCompletions = this.getCompletionListAtCaret();`
	`854`	`+ const actualCompletions = this.getCompletionListAtCaret(options);`
`855`	`855`	`if (!actualCompletions) {`
`856`	`856`	this.raiseError(`No completions at position '${this.currentCaretPosition}'.`);
`857`	`857`	`}`
`@@ -867,9 +867,20 @@ namespace FourSlash {`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`ts.zipWith(actual, expected, (completion, expectedCompletion, index) => {`
`870`		`- if (completion.name !== expectedCompletion) {`
	`870`	`+ const { name, insertText, replacementSpan } = typeof expectedCompletion === "string" ? { name: expectedCompletion, insertText: undefined, replacementSpan: undefined } : expectedCompletion;`
	`871`	`+ if (completion.name !== name) {`
`871`	`872`	this.raiseError(`Expected completion at index ${index} to be ${expectedCompletion}, got ${completion.name}`);
`872`	`873`	`}`
	`874`	`+ if (completion.insertText !== insertText) {`
	`875`	+ this.raiseError(`Expected completion insert text at index ${index} to be ${insertText}, got ${completion.insertText}`);
	`876`	`+ }`
	`877`	`+ const convertedReplacementSpan = replacementSpan && textSpanFromRange(replacementSpan);`
	`878`	`+ try {`
	`879`	`+ assert.deepEqual(completion.replacementSpan, convertedReplacementSpan);`
	`880`	`+ }`
	`881`	`+ catch {`
	`882`	+ this.raiseError(`Expected completion replacementSpan at index ${index} to be ${stringify(convertedReplacementSpan)}, got ${stringify(completion.replacementSpan)}`);
	`883`	`+ }`
`873`	`884`	`});`
`874`	`885`	`}`
`875`	`886`
@@ -1808,7 +1819,7 @@ Actual: ${stringify(fullActual)}`);
`1808`	`1819`	`}`
`1809`	`1820`	`else if (prevChar === " " && /A-Za-z_/.test(ch)) {`
`1810`	`1821`	`/* Completions */`
`1811`		`- this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, { includeExternalModuleExports: false });`
	`1822`	`+ this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, { includeExternalModuleExports: false, includeInsertTextCompletions: false });`
`1812`	`1823`	`}`
`1813`	`1824`
`1814`	`1825`	`if (i % checkCadence === 0) {`
@@ -2383,7 +2394,8 @@ Actual: ${stringify(fullActual)}`);
`2383`	`2394`	`public applyCodeActionFromCompletion(markerName: string, options: FourSlashInterface.VerifyCompletionActionOptions) {`
`2384`	`2395`	`this.goToMarker(markerName);`
`2385`	`2396`
`2386`		`- const actualCompletion = this.getCompletionListAtCaret({ includeExternalModuleExports: true }).entries.find(e => e.name === options.name && e.source === options.source);`
	`2397`	`+ const actualCompletion = this.getCompletionListAtCaret({ includeExternalModuleExports: true, includeInsertTextCompletions: false }).entries.find(e =>`
	`2398`	`+ e.name === options.name && e.source === options.source);`
`2387`	`2399`
`2388`	`2400`	`if (!actualCompletion.hasAction) {`
`2389`	`2401`	this.raiseError(`Completion for ${options.name} does not have an associated action.`);
@@ -3195,8 +3207,7 @@ Actual: ${stringify(fullActual)}`);
`3195`	`3207`	`private getTextSpanForRangeAtIndex(index: number): ts.TextSpan {`
`3196`	`3208`	`const ranges = this.getRanges();`
`3197`	`3209`	`if (ranges && ranges.length > index) {`
`3198`		`- const range = ranges[index];`
`3199`		`- return { start: range.start, length: range.end - range.start };`
	`3210`	`+ return textSpanFromRange(ranges[index]);`
`3200`	`3211`	`}`
`3201`	`3212`	`else {`
`3202`	`3213`	`this.raiseError("Supplied span index: " + index + " does not exist in range list of size: " + (ranges ? 0 : ranges.length));`
@@ -3226,6 +3237,10 @@ Actual: ${stringify(fullActual)}`);
`3226`	`3237`	`}`
`3227`	`3238`	`}`
`3228`	`3239`
	`3240`	`+ function textSpanFromRange(range: FourSlash.Range): ts.TextSpan {`
	`3241`	`+ return ts.createTextSpanFromBounds(range.start, range.end);`
	`3242`	`+ }`
	`3243`	`+`
`3229`	`3244`	`export function runFourSlashTest(basePath: string, testType: FourSlashTestType, fileName: string) {`
`3230`	`3245`	`const content = Harness.IO.readFile(fileName);`
`3231`	`3246`	`runFourSlashTestContent(basePath, testType, content, fileName);`
`@@ -3967,7 +3982,7 @@ namespace FourSlashInterface {`
`3967`	`3982`	`super(state);`
`3968`	`3983`	`}`
`3969`	`3984`
`3970`		`- public completionsAt(markerName: string, completions: string[], options?: CompletionsAtOptions) {`
	`3985`	`+ public completionsAt(markerName: string, completions: ReadonlyArray<ExpectedCompletionEntry>, options?: CompletionsAtOptions) {`
`3971`	`3986`	`this.state.verifyCompletionsAt(markerName, completions, options);`
`3972`	`3987`	`}`
`3973`	`3988`
`@@ -4591,6 +4606,7 @@ namespace FourSlashInterface {`
`4591`	`4606`	`newContent: string;`
`4592`	`4607`	`}`
`4593`	`4608`
	`4609`	`+ export type ExpectedCompletionEntry = string \| { name: string, insertText?: string, replacementSpan?: FourSlash.Range };`
`4594`	`4610`	`export interface CompletionsAtOptions extends ts.GetCompletionsAtPositionOptions {`
`4595`	`4611`	`isNewIdentifierLocation?: boolean;`
`4596`	`4612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1207,10 +1207,10 @@ namespace ts.server {`
`1207`	`1207`	`if (simplifiedResult) {`
`1208`	`1208`	`return mapDefined<CompletionEntry, protocol.CompletionEntry>(completions && completions.entries, entry => {`
`1209`	`1209`	`if (completions.isMemberCompletion \|\| startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {`
`1210`		`- const { name, kind, kindModifiers, sortText, replacementSpan, hasAction, source, isRecommended } = entry;`
	`1210`	`+ const { name, kind, kindModifiers, sortText, insertText, replacementSpan, hasAction, source, isRecommended } = entry;`
`1211`	`1211`	`const convertedSpan = replacementSpan ? this.toLocationTextSpan(replacementSpan, scriptInfo) : undefined;`
`1212`	`1212`	// Use `hasAction \|\| undefined` to avoid serializing `false`.
`1213`		`- return { name, kind, kindModifiers, sortText, replacementSpan: convertedSpan, hasAction: hasAction \|\| undefined, source, isRecommended };`
	`1213`	`+ return { name, kind, kindModifiers, sortText, insertText, replacementSpan: convertedSpan, hasAction: hasAction \|\| undefined, source, isRecommended };`
`1214`	`1214`	`}`
`1215`	`1215`	`}).sort((a, b) => compareStringsCaseSensitiveUI(a.name, b.name));`
`1216`	`1216`	`}`