add tests

a-tarasyuk · a-tarasyuk · commit 60d39d7f18d8 · 2018-05-11T21:27:40.000+03:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -1610,10 +1610,9 @@ namespace ts {
             else if (raw.compilerOptions) {
                 const outDir = raw.compilerOptions.outDir;
                 const declarationDir = raw.compilerOptions.declarationDir;
-                const excludeDirs = [outDir, declarationDir].filter(dir => dir);
 
-                if (excludeDirs.length) {
-                    excludeSpecs = excludeDirs;
+                if (outDir || declarationDir) {
+                    excludeSpecs = [outDir, declarationDir].filter(d => !!d);
                 }
             }
 
diff --git a/src/harness/unittests/tsconfigParsing.ts b/src/harness/unittests/tsconfigParsing.ts
@@ -217,6 +217,29 @@ namespace ts {
             assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, allFiles);
         });
 
+        it("exclude declarationDir unless overridden", () => {
+            const tsconfigWithoutExclude =
+            `{
+                "compilerOptions": {
+                    "declarationDir": "declarations"
+                }
+            }`;
+            const tsconfigWithExclude =
+            `{
+                "compilerOptions": {
+                    "declarationDir": "declarations"
+                },
+                "exclude": [ "types" ]
+            }`;
+
+            const rootDir = "/";
+            const allFiles = ["/declarations/a.d.ts", "/a.ts"];
+            const expectedFiles = ["/a.ts"];
+
+            assertParseFileList(tsconfigWithoutExclude, "tsconfig.json", rootDir, allFiles, expectedFiles);
+            assertParseFileList(tsconfigWithExclude, "tsconfig.json", rootDir, allFiles, allFiles);
+        });
+
         it("implicitly exclude common package folders", () => {
             assertParseFileList(
                 `{}`,

Original file line number	Diff line number	Diff line change
`@@ -1610,10 +1610,9 @@ namespace ts {`
`1610`	`1610`	`else if (raw.compilerOptions) {`
`1611`	`1611`	`const outDir = raw.compilerOptions.outDir;`
`1612`	`1612`	`const declarationDir = raw.compilerOptions.declarationDir;`
`1613`		`- const excludeDirs = [outDir, declarationDir].filter(dir => dir);`
`1614`	`1613`
`1615`		`- if (excludeDirs.length) {`
`1616`		`- excludeSpecs = excludeDirs;`
	`1614`	`+ if (outDir \|\| declarationDir) {`
	`1615`	`+ excludeSpecs = [outDir, declarationDir].filter(d => !!d);`
`1617`	`1616`	`}`
`1618`	`1617`	`}`
`1619`	`1618`