Verify and fix scenario when .js and .ts files with same name are present and tsconfig doesnt specify any filenames

sheetalkamat · sheetalkamat · commit 9daf635e5e61 · 2015-09-16T11:50:12.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -474,7 +474,7 @@ namespace ts {
             }
             else {
                 let exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
-                let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
+                let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)).concat(host.readDirectory(basePath, ".js", exclude));
                 for (let i = 0; i < sysFiles.length; i++) {
                     let name = sysFiles[i];
                     if (fileExtensionIs(name, ".js")) {
diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts
@@ -263,7 +263,13 @@ class ProjectRunner extends RunnerBase {
             }
 
             function readDirectory(rootDir: string, extension: string, exclude: string[]): string[] {
-                return Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude);
+                let harnessReadDirectoryResult = Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude);
+                let result: string[] = [];
+                for (let i = 0; i < harnessReadDirectoryResult.length; i++) {
+                    result[i] = ts.getRelativePathToDirectoryOrUrl(testCase.projectRoot, harnessReadDirectoryResult[i],
+                        getCurrentDirectory(), Harness.Compiler.getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+                }
+                return result;
             }
 
             function fileExists(fileName: string): boolean {
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/SameNameFilesNotSpecified/a.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.json
@@ -0,0 +1,15 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameFilesNotSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameFilesNotSpecified/a.ts"
+    ],
+    "emittedFiles": [
+        "SameNameFilesNotSpecified/a.js",
+        "SameNameFilesNotSpecified/a.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.d.ts
@@ -0,0 +1 @@
+declare var test: number;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/SameNameFilesNotSpecified/a.js
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.json
@@ -0,0 +1,15 @@
+{
+    "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json",
+    "projectRoot": "tests/cases/projects/jsFileCompilation",
+    "baselineCheck": true,
+    "declaration": true,
+    "project": "SameNameFilesNotSpecified",
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "SameNameFilesNotSpecified/a.ts"
+    ],
+    "emittedFiles": [
+        "SameNameFilesNotSpecified/a.js",
+        "SameNameFilesNotSpecified/a.d.ts"
+    ]
+}
diff --git a/tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json b/tests/cases/project/jsFileCompilationSameNameFilesNotSpecified.json
@@ -0,0 +1,7 @@
+{
+  "scenario": "Verify when same named .ts and .js file exists in the folder but no file is specified in tsconfig.json",
+  "projectRoot": "tests/cases/projects/jsFileCompilation",
+  "baselineCheck": true,
+  "declaration": true,
+  "project": "SameNameFilesNotSpecified"
+}
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.js
@@ -0,0 +1 @@
+var test1 = 10; // Shouldnt get compiled
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/a.ts
@@ -0,0 +1 @@
+var test = 10;
diff --git a/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/SameNameFilesNotSpecified/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ namespace ts {`
`474`	`474`	`}`
`475`	`475`	`else {`
`476`	`476`	`let exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;`
`477`		`- let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));`
	`477`	`+ let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude)).concat(host.readDirectory(basePath, ".js", exclude));`
`478`	`478`	`for (let i = 0; i < sysFiles.length; i++) {`
`479`	`479`	`let name = sysFiles[i];`
`480`	`480`	`if (fileExtensionIs(name, ".js")) {`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,13 @@ class ProjectRunner extends RunnerBase {`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`function readDirectory(rootDir: string, extension: string, exclude: string[]): string[] {`
`266`		`- return Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude);`
	`266`	`+ let harnessReadDirectoryResult = Harness.IO.readDirectory(getFileNameInTheProjectTest(rootDir), extension, exclude);`
	`267`	`+ let result: string[] = [];`
	`268`	`+ for (let i = 0; i < harnessReadDirectoryResult.length; i++) {`
	`269`	`+ result[i] = ts.getRelativePathToDirectoryOrUrl(testCase.projectRoot, harnessReadDirectoryResult[i],`
	`270`	`+ getCurrentDirectory(), Harness.Compiler.getCanonicalFileName, /isAbsolutePathAnUrl/ false);`
	`271`	`+ }`
	`272`	`+ return result;`
`267`	`273`	`}`
`268`	`274`
`269`	`275`	`function fileExists(fileName: string): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+var test1 = 10; // Shouldnt get compiled`