Recombining import completions and regular completion APIs

Author: riknoll

src/harness/fourslash.ts

@@ -780,10 +780,10 @@ namespace FourSlash {
                     if (ranges && ranges.length > rangeIndex) {
                         const range = ranges[rangeIndex];
 
-                        const start = completions.textSpan.start;
-                        const end = start + completions.textSpan.length;
+                        const start = completion.replacementSpan.start;
+                        const end = start + completion.replacementSpan.length;
                         if (range.start !== start || range.end !== end) {
-                            this.raiseError(`Expected completion span for '${symbol}', ${stringify(completions.textSpan)}, to cover range ${stringify(range)}`);
+                            this.raiseError(`Expected completion span for '${symbol}', ${stringify(completion.replacementSpan)}, to cover range ${stringify(range)}`);
                         }
                     }
                     else {
@@ -892,7 +892,7 @@ namespace FourSlash {
         }
 
         private getImportModuleCompletionListAtCaret() {
-            return this.languageService.getImportModuleCompletionsAtPosition(this.activeFile.fileName, this.currentCaretPosition);
+            return this.languageService.getCompletionsAtPosition(this.activeFile.fileName, this.currentCaretPosition);
         }
 
         private getCompletionEntryDetails(entryName: string) {

src/harness/harnessLanguageService.ts

@@ -405,9 +405,6 @@ namespace Harness.LanguageService {
         getCompletionsAtPosition(fileName: string, position: number): ts.CompletionInfo {
             return unwrapJSONCallResult(this.shim.getCompletionsAtPosition(fileName, position));
         }
-        getImportModuleCompletionsAtPosition(fileName: string, position: number): ts.ImportCompletionInfo {
-            return unwrapJSONCallResult(this.shim.getImportModuleCompletionsAtPosition(fileName, position));
-        }
         getCompletionEntryDetails(fileName: string, position: number, entryName: string): ts.CompletionEntryDetails {
             return unwrapJSONCallResult(this.shim.getCompletionEntryDetails(fileName, position, entryName));
         }

src/server/client.ts

@@ -216,28 +216,16 @@ namespace ts.server {
             return {
                 isMemberCompletion: false,
                 isNewIdentifierLocation: false,
-                entries: response.body
-            };
-        }
+                entries: response.body.map(({ name, kind, kindModifiers, sortText, replacementSpan }) => {
 
-        getImportModuleCompletionsAtPosition(fileName: string, position: number): ImportCompletionInfo {
-            const lineOffset = this.positionToOneBasedLineOffset(fileName, position);
-            const args: protocol.CompletionsRequestArgs = {
-                file: fileName,
-                line: lineOffset.line,
-                offset: lineOffset.offset,
-                prefix: undefined
-            };
-
-            const request = this.processRequest<protocol.ImportModuleCompletionsRequest>(CommandNames.ImportModuleCompletions, args);
-            const response = this.processResponse<protocol.ImportModuleCompletionsResponse>(request);
-
-            const startPosition = this.lineOffsetToPosition(fileName, response.span.start);
-            const endPosition = this.lineOffsetToPosition(fileName, response.span.end);
+                    let convertedSpan: TextSpan;
+                    if (replacementSpan) {
+                        convertedSpan = createTextSpanFromBounds(this.lineOffsetToPosition(fileName, replacementSpan.start),
+                            this.lineOffsetToPosition(fileName, replacementSpan.end));
+                    }
 
-            return {
-                textSpan: ts.createTextSpanFromBounds(startPosition, endPosition),
-                entries: response.body
+                    return { name, kind, kindModifiers, sortText, replacementSpan: convertedSpan };
+                })
             };
         }
 

src/server/protocol.d.ts

@@ -717,16 +717,6 @@ declare namespace ts.server.protocol {
         arguments: CompletionsRequestArgs;
     }
 
-    /**
-      * Import Module Completions request; value of command field is
-      * "importModuleCompletions". Given a file location (file, line,
-      * col) return the possible completions for external module
-      * specifiers or paths given that position refers to a module
-      * import declaration, require call, or triple slash reference.
-      */
-    export interface ImportModuleCompletionsRequest extends FileLocationRequest {
-    }
-
     /**
       * Arguments for completion details request.
       */
@@ -783,6 +773,11 @@ declare namespace ts.server.protocol {
          * is often the same as the name but may be different in certain circumstances.
          */
         sortText: 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.
+         */
+        replacementSpan?: TextSpan;
     }
 
     /**
@@ -816,11 +811,6 @@ declare namespace ts.server.protocol {
         body?: CompletionEntry[];
     }
 
-    export interface ImportModuleCompletionsResponse extends Response {
-        span: TextSpan;
-        body?: ImportCompletionEntry[];
-    }
-
     export interface CompletionDetailsResponse extends Response {
         body?: CompletionEntryDetails[];
     }

src/server/session.ts

@@ -103,7 +103,6 @@ namespace ts.server {
         export const Change = "change";
         export const Close = "close";
         export const Completions = "completions";
-        export const ImportModuleCompletions = "importModuleCompletions";
         export const CompletionDetails = "completionEntryDetails";
         export const Configure = "configure";
         export const Definition = "definition";
@@ -773,7 +772,17 @@ namespace ts.server {
 
             return completions.entries.reduce((result: protocol.CompletionEntry[], entry: ts.CompletionEntry) => {
                 if (completions.isMemberCompletion || (entry.name.toLowerCase().indexOf(prefix.toLowerCase()) === 0)) {
-                    result.push(entry);
+                    const { name, kind, kindModifiers, sortText, replacementSpan } = entry;
+
+                    let convertedSpan: protocol.TextSpan = undefined;
+                    if (replacementSpan) {
+                        convertedSpan = {
+                            start: compilerService.host.positionToLineOffset(fileName, replacementSpan.start),
+                            end: compilerService.host.positionToLineOffset(fileName, replacementSpan.start + replacementSpan.length)
+                        };
+                    }
+
+                    result.push({ name, kind, kindModifiers, sortText, replacementSpan: convertedSpan });
                 }
                 return result;
             }, []).sort((a, b) => a.name.localeCompare(b.name));