microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove the --noResolve check when finding the file.

Browse Source 
--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
This commit is contained in:
Sheetal Nandi 2014-11-20 15:43:07 -08:00
parent 264bd5db7c
commit 7d103a1a45
16 changed files with 131 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/parser.ts
View File

@ -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);

5
tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js Normal file
View File

@ -0,0 +1,5 @@
var test = (function () {
function test() {
}
return test;
})();

2
tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
declare class test {
}

18
tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.json Normal file
View File

@ -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"
]
}

5
tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js Normal file
View File

@ -0,0 +1,5 @@
var test = (function () {
function test() {
}
return test;
})();

2
tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
declare class test {
}

18
tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.json Normal file
View File

@ -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"
]
}

5
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js Normal file
View File

@ -0,0 +1,5 @@
var test = (function () {
function test() {
}
return test;
})();

2
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
declare class test {
}

18
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json Normal file
View File

@ -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"
]
}

5
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js Normal file
View File

@ -0,0 +1,5 @@
var test = (function () {
function test() {
}
return test;
})();

2
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts vendored Normal file
View File

@ -0,0 +1,2 @@
declare class test {
}

18
tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json Normal file
View File

@ -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"
]
}

10
tests/cases/project/referenceResolutionSameFileTwice.json Normal file
View File

@ -0,0 +1,10 @@
{
"scenario": "referenceResolutionSameFileTwice",
"projectRoot": "tests/cases/projects/ReferenceResolution/",
"inputFiles": [
"test.ts",
"../ReferenceResolution/test.ts"
],
"declaration": true,
"baselineCheck": true
}

11
tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json Normal file
View File

@ -0,0 +1,11 @@
{
"scenario": "referenceResolutionSameFileTwice_NoResolve",
"projectRoot": "tests/cases/projects/ReferenceResolution/",
"inputFiles": [
"test.ts",
"../ReferenceResolution/test.ts"
],
"noResolve": true,
"declaration": true,
"baselineCheck": true
}

2
tests/cases/projects/ReferenceResolution/test.ts Normal file
View File

@ -0,0 +1,2 @@
class test {
}