Merge pull request microsoft#11404 from Microsoft/vladima/suppress-semantic-classifier-js

vladima · web-flow · commit 7a67a3e724b1 · 2016-10-05T16:13:17.000-07:00
do not run semantic classification on non-ts-or-tsx files
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1109,7 +1109,7 @@ namespace ts.server {
 
         private getNavigationBarItems(args: protocol.FileRequestArgs, simplifiedResult: boolean): protocol.NavigationBarItem[] | NavigationBarItem[] {
             const { file, project } = this.getFileAndProject(args);
-            const items = project.getLanguageService().getNavigationBarItems(file);
+            const items = project.getLanguageService(/*ensureSynchronized*/ false).getNavigationBarItems(file);
             if (!items) {
                 return undefined;
             }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1512,12 +1512,25 @@ namespace ts {
             return NavigationBar.getNavigationBarItems(sourceFile);
         }
 
+        function isTsOrTsxFile(fileName: string): boolean {
+            const kind = getScriptKind(fileName, host);
+            return kind === ScriptKind.TS || kind === ScriptKind.TSX;
+        }
+
         function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return [];
+            }
             synchronizeHostData();
             return ts.getSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
         }
 
         function getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return { spans: [], endOfLineState: EndOfLineState.None };
+            }
             synchronizeHostData();
             return ts.getEncodedSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
         }
diff --git a/tests/cases/fourslash/semanticClassificationJs.ts b/tests/cases/fourslash/semanticClassificationJs.ts
@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts"/>
+
+// @Filename: app.js
+//// function foo() {
+//// }
+//// let x = 1;
+
+// no semantic classification in js file
+verify.semanticClassificationsAre();

Original file line number	Diff line number	Diff line change
`@@ -1109,7 +1109,7 @@ namespace ts.server {`
`1109`	`1109`
`1110`	`1110`	`private getNavigationBarItems(args: protocol.FileRequestArgs, simplifiedResult: boolean): protocol.NavigationBarItem[] \| NavigationBarItem[] {`
`1111`	`1111`	`const { file, project } = this.getFileAndProject(args);`
`1112`		`- const items = project.getLanguageService().getNavigationBarItems(file);`
	`1112`	`+ const items = project.getLanguageService(/ensureSynchronized/ false).getNavigationBarItems(file);`
`1113`	`1113`	`if (!items) {`
`1114`	`1114`	`return undefined;`
`1115`	`1115`	`}`