Merge pull request microsoft#14716 from Microsoft/fix14565

mhegazy · web-flow · commit 238edf08b79f · 2017-03-20T10:45:46.000-07:00
Do not report semantic diagnostics for infered and external projects with only .js files
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -3006,6 +3006,42 @@ namespace ts.projectSystem {
             const errorResult = <protocol.Diagnostic[]>session.executeCommand(dTsFileGetErrRequest).response;
             assert.isTrue(errorResult.length === 0);
         });
+
+        it("should be turned on for js-only external projects with skipLibCheck=false", () => {
+            const jsFile = {
+                path: "/a/b/file1.js",
+                content: "let x =1;"
+            };
+            const dTsFile = {
+                path: "/a/b/file2.d.ts",
+                content: `
+                interface T {
+                    name: string;
+                };
+                interface T {
+                    name: number;
+                };`
+            };
+            const host = createServerHost([jsFile, dTsFile]);
+            const session = createSession(host);
+
+            const openExternalProjectRequest = makeSessionRequest<protocol.OpenExternalProjectArgs>(
+                CommandNames.OpenExternalProject,
+                {
+                    projectFileName: "project1",
+                    rootFiles: toExternalFiles([jsFile.path, dTsFile.path]),
+                    options: { skipLibCheck: false }
+                }
+            );
+            session.executeCommand(openExternalProjectRequest);
+
+            const dTsFileGetErrRequest = makeSessionRequest<protocol.SemanticDiagnosticsSyncRequestArgs>(
+                CommandNames.SemanticDiagnosticsSync,
+                { file: dTsFile.path }
+            );
+            const errorResult = <protocol.Diagnostic[]>session.executeCommand(dTsFileGetErrRequest).response;
+            assert.isTrue(errorResult.length === 0);
+        });
     });
 
     describe("non-existing directories listed in config file input array", () => {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -26,14 +26,7 @@ namespace ts.server {
     }
 
     function shouldSkipSematicCheck(project: Project) {
-        if (project.getCompilerOptions().skipLibCheck !== undefined) {
-            return false;
-        }
-
-        if ((project.projectKind === ProjectKind.Inferred || project.projectKind === ProjectKind.External) && project.isJsOnlyProject()) {
-            return true;
-        }
-        return false;
+        return (project.projectKind === ProjectKind.Inferred || project.projectKind === ProjectKind.External) && project.isJsOnlyProject();
     }
 
     interface FileStart {

Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,7 @@ namespace ts.server {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function shouldSkipSematicCheck(project: Project) {`
`29`		`- if (project.getCompilerOptions().skipLibCheck !== undefined) {`
`30`		`- return false;`
`31`		`- }`
`32`		`-`
`33`		`- if ((project.projectKind === ProjectKind.Inferred \|\| project.projectKind === ProjectKind.External) && project.isJsOnlyProject()) {`
`34`		`- return true;`
`35`		`- }`
`36`		`- return false;`
	`29`	`+ return (project.projectKind === ProjectKind.Inferred \|\| project.projectKind === ProjectKind.External) && project.isJsOnlyProject();`
`37`	`30`	`}`
`38`	`31`
`39`	`32`	`interface FileStart {`