Merge pull request microsoft#10813 from microsoftsam/master

mhegazy · web-flow · commit 3facc3ed33ba · 2016-09-09T15:32:20.000-07:00
Surfacing method to get Completion Symbol
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -408,6 +408,9 @@ namespace Harness.LanguageService {
         getCompletionEntryDetails(fileName: string, position: number, entryName: string): ts.CompletionEntryDetails {
             return unwrapJSONCallResult(this.shim.getCompletionEntryDetails(fileName, position, entryName));
         }
+        getCompletionEntrySymbol(fileName: string, position: number, entryName: string): ts.Symbol {
+            throw new Error("getCompletionEntrySymbol not implemented across the shim layer.");
+        }
         getQuickInfoAtPosition(fileName: string, position: number): ts.QuickInfo {
             return unwrapJSONCallResult(this.shim.getQuickInfoAtPosition(fileName, position));
         }
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -246,6 +246,10 @@ namespace ts.server {
             return response.body[0];
         }
 
+        getCompletionEntrySymbol(fileName: string, position: number, entryName: string): Symbol {
+            throw new Error("Not Implemented Yet.");
+        }
+
         getNavigateToItems(searchValue: string): NavigateToItem[] {
             const args: protocol.NavtoRequestArgs = {
                 searchValue,
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -736,6 +736,22 @@ namespace ts.Completions {
         return undefined;
     }
 
+    export function getCompletionEntrySymbol(typeChecker: TypeChecker, log: (message: string) => void, compilerOptions: CompilerOptions, sourceFile: SourceFile, position: number, entryName: string): Symbol {
+        // Compute all the completion symbols again.
+        const completionData = getCompletionData(typeChecker, log, sourceFile, position);
+        if (completionData) {
+            const { symbols, location } = completionData;
+
+            // Find the symbol with the matching entry name.
+            // We don't need to perform character checks here because we're only comparing the
+            // name against 'entryName' (which is known to be good), not building a new
+            // completion entry.
+            return forEach(symbols, s => getCompletionEntryDisplayNameForSymbol(typeChecker, s, compilerOptions.target, /*performCharacterChecks*/ false, location) === entryName ? s : undefined);
+        }
+
+        return undefined;
+    }
+
     function getCompletionData(typeChecker: TypeChecker, log: (message: string) => void, sourceFile: SourceFile, position: number) {
         const isJavaScriptFile = isSourceFileJavaScript(sourceFile);
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1206,6 +1206,11 @@ namespace ts {
             return Completions.getCompletionEntryDetails(program.getTypeChecker(), log, program.getCompilerOptions(), getValidSourceFile(fileName), position, entryName);
         }
 
+        function getCompletionEntrySymbol(fileName: string, position: number, entryName: string): Symbol {
+            synchronizeHostData();
+            return Completions.getCompletionEntrySymbol(program.getTypeChecker(), log, program.getCompilerOptions(), getValidSourceFile(fileName), position, entryName);
+        }
+
         function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo {
             synchronizeHostData();
 
@@ -1768,6 +1773,7 @@ namespace ts {
             getEncodedSemanticClassifications,
             getCompletionsAtPosition,
             getCompletionEntryDetails,
+            getCompletionEntrySymbol,
             getSignatureHelpItems,
             getQuickInfoAtPosition,
             getDefinitionAtPosition,
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -194,6 +194,7 @@ namespace ts {
 
         getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;
         getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;
+        getCompletionEntrySymbol(fileName: string, position: number, entryName: string): Symbol;
 
         getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;
 

Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,9 @@ namespace Harness.LanguageService {`
`408`	`408`	`getCompletionEntryDetails(fileName: string, position: number, entryName: string): ts.CompletionEntryDetails {`
`409`	`409`	`return unwrapJSONCallResult(this.shim.getCompletionEntryDetails(fileName, position, entryName));`
`410`	`410`	`}`
	`411`	`+ getCompletionEntrySymbol(fileName: string, position: number, entryName: string): ts.Symbol {`
	`412`	`+ throw new Error("getCompletionEntrySymbol not implemented across the shim layer.");`
	`413`	`+ }`
`411`	`414`	`getQuickInfoAtPosition(fileName: string, position: number): ts.QuickInfo {`
`412`	`415`	`return unwrapJSONCallResult(this.shim.getQuickInfoAtPosition(fileName, position));`
`413`	`416`	`}`