Add isSemantic check to getDiagnosticsWorker

jramsay · jramsay · commit b71e8a21679d · 2016-10-17T13:11:13.000-07:00
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -389,9 +389,9 @@ namespace ts.server {
             });
         }
 
-        private getDiagnosticsWorker(args: protocol.FileRequestArgs, selector: (project: Project, file: string) => Diagnostic[], includeLinePosition: boolean) {
+        private getDiagnosticsWorker(args: protocol.FileRequestArgs, isSemantic: boolean, selector: (project: Project, file: string) => Diagnostic[], includeLinePosition: boolean) {
             const { project, file } = this.getFileAndProject(args);
-            if (shouldSkipSematicCheck(project)) {
+            if (isSemantic && shouldSkipSematicCheck(project)) {
                 return [];
             }
             const scriptInfo = project.getScriptInfoForNormalizedPath(file);
@@ -492,11 +492,11 @@ namespace ts.server {
         }
 
         private getSyntacticDiagnosticsSync(args: protocol.SyntacticDiagnosticsSyncRequestArgs): protocol.Diagnostic[] | protocol.DiagnosticWithLinePosition[] {
-            return this.getDiagnosticsWorker(args, (project, file) => project.getLanguageService().getSyntacticDiagnostics(file), args.includeLinePosition);
+            return this.getDiagnosticsWorker(args, /*isSemantic*/ false, (project, file) => project.getLanguageService().getSyntacticDiagnostics(file), args.includeLinePosition);
         }
 
         private getSemanticDiagnosticsSync(args: protocol.SemanticDiagnosticsSyncRequestArgs): protocol.Diagnostic[] | protocol.DiagnosticWithLinePosition[] {
-            return this.getDiagnosticsWorker(args, (project, file) => project.getLanguageService().getSemanticDiagnostics(file), args.includeLinePosition);
+            return this.getDiagnosticsWorker(args, /*isSemantic*/ true, (project, file) => project.getLanguageService().getSemanticDiagnostics(file), args.includeLinePosition);
         }
 
         private getDocumentHighlights(args: protocol.DocumentHighlightsRequestArgs, simplifiedResult: boolean): protocol.DocumentHighlightsItem[] | DocumentHighlights[] {

Original file line number	Diff line number	Diff line change
`@@ -389,9 +389,9 @@ namespace ts.server {`
`389`	`389`	`});`
`390`	`390`	`}`
`391`	`391`
`392`		`- private getDiagnosticsWorker(args: protocol.FileRequestArgs, selector: (project: Project, file: string) => Diagnostic[], includeLinePosition: boolean) {`
	`392`	`+ private getDiagnosticsWorker(args: protocol.FileRequestArgs, isSemantic: boolean, selector: (project: Project, file: string) => Diagnostic[], includeLinePosition: boolean) {`
`393`	`393`	`const { project, file } = this.getFileAndProject(args);`
`394`		`- if (shouldSkipSematicCheck(project)) {`
	`394`	`+ if (isSemantic && shouldSkipSematicCheck(project)) {`
`395`	`395`	`return [];`
`396`	`396`	`}`
`397`	`397`	`const scriptInfo = project.getScriptInfoForNormalizedPath(file);`
`@@ -492,11 +492,11 @@ namespace ts.server {`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`private getSyntacticDiagnosticsSync(args: protocol.SyntacticDiagnosticsSyncRequestArgs): protocol.Diagnostic[] \| protocol.DiagnosticWithLinePosition[] {`
`495`		`- return this.getDiagnosticsWorker(args, (project, file) => project.getLanguageService().getSyntacticDiagnostics(file), args.includeLinePosition);`
	`495`	`+ return this.getDiagnosticsWorker(args, /isSemantic/ false, (project, file) => project.getLanguageService().getSyntacticDiagnostics(file), args.includeLinePosition);`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`private getSemanticDiagnosticsSync(args: protocol.SemanticDiagnosticsSyncRequestArgs): protocol.Diagnostic[] \| protocol.DiagnosticWithLinePosition[] {`
`499`		`- return this.getDiagnosticsWorker(args, (project, file) => project.getLanguageService().getSemanticDiagnostics(file), args.includeLinePosition);`
	`499`	`+ return this.getDiagnosticsWorker(args, /isSemantic/ true, (project, file) => project.getLanguageService().getSemanticDiagnostics(file), args.includeLinePosition);`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`private getDocumentHighlights(args: protocol.DocumentHighlightsRequestArgs, simplifiedResult: boolean): protocol.DocumentHighlightsItem[] \| DocumentHighlights[] {`