Remove the --noResolve check when finding the file.

sheetalkamat · sheetalkamat · commit 7d103a1a4526 · 2014-11-20T15:43:07.000-08:00
--noResolve is only for ///reference and import file resolution to resolve files from disk
but the file identity is always determined before creating duplicate source file for same file paths
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4427,13 +4427,10 @@ module ts {
                 return getSourceFileFromCache(filename, canonicalName, /*useAbsolutePath*/ false);
             }
             else {
-                // if --noResolve is not specified check if we have file for absolute path
-                if (!options.noResolve) {
-                    var normalizedAbsolutePath = getNormalizedAbsolutePath(filename, host.getCurrentDirectory());
-                    var canonicalAbsolutePath = host.getCanonicalFileName(normalizedAbsolutePath);
-                    if (hasProperty(filesByName, canonicalAbsolutePath)) {
-                        return getSourceFileFromCache(normalizedAbsolutePath, canonicalAbsolutePath, /*useAbsolutePath*/ true);
-                    }
+                var normalizedAbsolutePath = getNormalizedAbsolutePath(filename, host.getCurrentDirectory());
+                var canonicalAbsolutePath = host.getCanonicalFileName(normalizedAbsolutePath);
+                if (hasProperty(filesByName, canonicalAbsolutePath)) {
+                    return getSourceFileFromCache(normalizedAbsolutePath, canonicalAbsolutePath, /*useAbsolutePath*/ true);
                 }
 
                 // We haven't looked for this file, do so now and cache result
@@ -4443,10 +4440,11 @@ module ts {
                 });
                 if (file) {
                     seenNoDefaultLib = seenNoDefaultLib || file.hasNoDefaultLib;
-                    if (!options.noResolve) {
-                        // Set the source file for normalized absolute path
-                        filesByName[canonicalAbsolutePath] = file;
 
+                    // Set the source file for normalized absolute path
+                    filesByName[canonicalAbsolutePath] = file;
+
+                    if (!options.noResolve) {
                         var basePath = getDirectoryPath(filename);
                         processReferencedFiles(file, basePath);
                         processImportedModules(file, basePath);
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js
@@ -0,0 +1,5 @@
+var test = (function () {
+    function test() {
+    }
+    return test;
+})();
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts
@@ -0,0 +1,2 @@
+declare class test {
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.json b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "referenceResolutionSameFileTwice",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "test.ts"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js
@@ -0,0 +1,5 @@
+var test = (function () {
+    function test() {
+    }
+    return test;
+})();
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts
@@ -0,0 +1,2 @@
+declare class test {
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.json b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "referenceResolutionSameFileTwice",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "test.ts"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js
@@ -0,0 +1,5 @@
+var test = (function () {
+    function test() {
+    }
+    return test;
+})();
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts
@@ -0,0 +1,2 @@
+declare class test {
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "referenceResolutionSameFileTwice_NoResolve",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "test.ts"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js
@@ -0,0 +1,5 @@
+var test = (function () {
+    function test() {
+    }
+    return test;
+})();
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts
@@ -0,0 +1,2 @@
+declare class test {
+}
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json
@@ -0,0 +1,18 @@
+{
+    "scenario": "referenceResolutionSameFileTwice_NoResolve",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "test.ts"
+    ],
+    "emittedFiles": [
+        "test.js",
+        "test.d.ts"
+    ]
+}
diff --git a/tests/cases/project/referenceResolutionSameFileTwice.json b/tests/cases/project/referenceResolutionSameFileTwice.json
@@ -0,0 +1,10 @@
+{
+    "scenario": "referenceResolutionSameFileTwice",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true
+}
diff --git a/tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json b/tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json
@@ -0,0 +1,11 @@
+{
+    "scenario": "referenceResolutionSameFileTwice_NoResolve",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/",
+    "inputFiles": [
+        "test.ts",
+        "../ReferenceResolution/test.ts"
+    ],
+    "noResolve":  true,
+    "declaration": true,
+    "baselineCheck": true
+}
diff --git a/tests/cases/projects/ReferenceResolution/test.ts b/tests/cases/projects/ReferenceResolution/test.ts
@@ -0,0 +1,2 @@
+class test {
+}
