From 8c2091bca52c8240fd277116620b7503f122abc3 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 11 Nov 2014 21:39:06 -0800 Subject: [PATCH 1/6] Add tests to cover scenarios for relative path reference resolution --- src/harness/projectsRunner.ts | 4 +++- .../amd/FieldManager.js | 6 +++++ .../amd/diskFile0.js | 7 ++++++ ...eferenceResolutionRelativePaths.errors.txt | 23 +++++++++++++++++++ .../amd/referenceResolutionRelativePaths.json | 20 ++++++++++++++++ .../node/FieldManager.js | 6 +++++ .../node/diskFile0.js | 7 ++++++ ...eferenceResolutionRelativePaths.errors.txt | 23 +++++++++++++++++++ .../referenceResolutionRelativePaths.json | 20 ++++++++++++++++ ...olutionRelativePathsFromRootDirectory.json | 20 ++++++++++++++++ .../amd/src/ts/Manager/FieldManager.d.ts | 3 +++ .../amd/src/ts/Manager/FieldManager.js | 6 +++++ .../amd/typings/tsd.d.ts | 3 +++ .../amd/typings/tsd.js | 7 ++++++ ...olutionRelativePathsFromRootDirectory.json | 20 ++++++++++++++++ .../node/src/ts/Manager/FieldManager.d.ts | 3 +++ .../node/src/ts/Manager/FieldManager.js | 6 +++++ .../node/typings/tsd.d.ts | 3 +++ .../node/typings/tsd.js | 7 ++++++ ...renceResolutionRelativePathsNoResolve.json | 17 ++++++++++++++ ...renceResolutionRelativePathsNoResolve.json | 17 ++++++++++++++ .../amd/FieldManager.d.ts | 3 +++ .../amd/FieldManager.js | 6 +++++ .../amd/diskFile0.js | 7 ++++++ .../amd/diskFile1.d.ts | 3 +++ ...nRelativePathsRelativeToRootDirectory.json | 20 ++++++++++++++++ .../node/FieldManager.d.ts | 3 +++ .../node/FieldManager.js | 6 +++++ .../node/diskFile0.js | 7 ++++++ .../node/diskFile1.d.ts | 3 +++ ...nRelativePathsRelativeToRootDirectory.json | 20 ++++++++++++++++ .../referenceResolutionRelativePaths.json | 9 ++++++++ ...olutionRelativePathsFromRootDirectory.json | 9 ++++++++ ...renceResolutionRelativePathsNoResolve.json | 9 ++++++++ ...nRelativePathsRelativeToRootDirectory.json | 9 ++++++++ .../src/ts/Manager/FieldManager.ts | 4 ++++ .../ReferenceResolution/typings/tsd.ts | 4 ++++ 37 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json create mode 100644 tests/cases/project/referenceResolutionRelativePaths.json create mode 100644 tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json create mode 100644 tests/cases/project/referenceResolutionRelativePathsNoResolve.json create mode 100644 tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json create mode 100644 tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts create mode 100644 tests/cases/projects/ReferenceResolution/typings/tsd.ts diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 797bc12a42..d0972ac59b 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -17,6 +17,7 @@ interface ProjectRunnerTestCase { baselineCheck?: boolean; // Verify the baselines of output files, if this is false, we will write to output to the disk but there is no verification of baselines runTest?: boolean; // Run the resulting test bug?: string; // If there is any bug associated with this test case + noResolve?: boolean; } interface ProjectRunnerTestCaseResolutionInfo extends ProjectRunnerTestCase { @@ -162,7 +163,8 @@ class ProjectRunner extends RunnerBase { outDir: testCase.outDir, mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? sys.resolvePath(testCase.mapRoot) : testCase.mapRoot, sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? sys.resolvePath(testCase.sourceRoot) : testCase.sourceRoot, - module: moduleKind + module: moduleKind, + noResolve: testCase.noResolve }; } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt new file mode 100644 index 0000000000..3cca49932b --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt @@ -0,0 +1,23 @@ +../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. +FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. + + +==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ==== + /// + + class FieldManager { + ~~~~~~~~~~~~ +!!! error TS2300: Duplicate identifier 'FieldManager'. + } +==== ../../../typings/tsd.ts (0 errors) ==== + /// + // This is tsd.ts + class tsd { + } +==== FieldManager.ts (1 errors) ==== + /// + + class FieldManager { + ~~~~~~~~~~~~ +!!! error TS2300: Duplicate identifier 'FieldManager'. + } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json new file mode 100644 index 0000000000..3d5aadcd5b --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "../../../src/ts/Manager/FieldManager.ts", + "../../../typings/tsd.ts", + "FieldManager.ts" + ], + "emittedFiles": [ + "../../../src/ts/Manager/FieldManager.js", + "../../../typings/tsd.js", + "FieldManager.js" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt new file mode 100644 index 0000000000..3cca49932b --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt @@ -0,0 +1,23 @@ +../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. +FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. + + +==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ==== + /// + + class FieldManager { + ~~~~~~~~~~~~ +!!! error TS2300: Duplicate identifier 'FieldManager'. + } +==== ../../../typings/tsd.ts (0 errors) ==== + /// + // This is tsd.ts + class tsd { + } +==== FieldManager.ts (1 errors) ==== + /// + + class FieldManager { + ~~~~~~~~~~~~ +!!! error TS2300: Duplicate identifier 'FieldManager'. + } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json new file mode 100644 index 0000000000..3d5aadcd5b --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "../../../src/ts/Manager/FieldManager.ts", + "../../../typings/tsd.ts", + "FieldManager.ts" + ], + "emittedFiles": [ + "../../../src/ts/Manager/FieldManager.js", + "../../../typings/tsd.js", + "FieldManager.js" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json new file mode 100644 index 0000000000..328d1ae7cc --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "projectRoot": "tests/cases/projects/ReferenceResolution", + "inputFiles": [ + "src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "typings/tsd.ts", + "src/ts/Manager/FieldManager.ts" + ], + "emittedFiles": [ + "typings/tsd.js", + "typings/tsd.d.ts", + "src/ts/Manager/FieldManager.js", + "src/ts/Manager/FieldManager.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json new file mode 100644 index 0000000000..328d1ae7cc --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "projectRoot": "tests/cases/projects/ReferenceResolution", + "inputFiles": [ + "src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "typings/tsd.ts", + "src/ts/Manager/FieldManager.ts" + ], + "emittedFiles": [ + "typings/tsd.js", + "typings/tsd.d.ts", + "src/ts/Manager/FieldManager.js", + "src/ts/Manager/FieldManager.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json new file mode 100644 index 0000000000..ff05ee05b5 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json @@ -0,0 +1,17 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts", + "../../../typings/tsd.ts" + ], + "resolvedInputFiles": [ + "lib.d.ts", + "FieldManager.ts", + "../../../typings/tsd.ts" + ], + "emittedFiles": [ + "FieldManager.js", + "../../../typings/tsd.js" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json new file mode 100644 index 0000000000..ff05ee05b5 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json @@ -0,0 +1,17 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts", + "../../../typings/tsd.ts" + ], + "resolvedInputFiles": [ + "lib.d.ts", + "FieldManager.ts", + "../../../typings/tsd.ts" + ], + "emittedFiles": [ + "FieldManager.js", + "../../../typings/tsd.js" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json new file mode 100644 index 0000000000..8e07c4a02e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "../../../src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "../../../typings/tsd.ts", + "../../../src/ts/Manager/FieldManager.ts" + ], + "emittedFiles": [ + "../../../typings/tsd.js", + "../../../typings/tsd.d.ts", + "../../../src/ts/Manager/FieldManager.js", + "../../../src/ts/Manager/FieldManager.d.ts" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js new file mode 100644 index 0000000000..91cbe5f761 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js @@ -0,0 +1,6 @@ +/// +var FieldManager = (function () { + function FieldManager() { + } + return FieldManager; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js new file mode 100644 index 0000000000..3d740c6159 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is tsd.ts +var tsd = (function () { + function tsd() { + } + return tsd; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json new file mode 100644 index 0000000000..8e07c4a02e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -0,0 +1,20 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "../../../src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true, + "resolvedInputFiles": [ + "lib.d.ts", + "../../../typings/tsd.ts", + "../../../src/ts/Manager/FieldManager.ts" + ], + "emittedFiles": [ + "../../../typings/tsd.js", + "../../../typings/tsd.d.ts", + "../../../src/ts/Manager/FieldManager.js", + "../../../src/ts/Manager/FieldManager.d.ts" + ] +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePaths.json b/tests/cases/project/referenceResolutionRelativePaths.json new file mode 100644 index 0000000000..2b6539ce48 --- /dev/null +++ b/tests/cases/project/referenceResolutionRelativePaths.json @@ -0,0 +1,9 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json b/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json new file mode 100644 index 0000000000..faf4a23b91 --- /dev/null +++ b/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json @@ -0,0 +1,9 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "projectRoot": "tests/cases/projects/ReferenceResolution", + "inputFiles": [ + "src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePathsNoResolve.json b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json new file mode 100644 index 0000000000..f9ba5b047f --- /dev/null +++ b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json @@ -0,0 +1,9 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "FieldManager.ts", + "../../../typings/tsd.ts" + ], + "noResolve": true +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json new file mode 100644 index 0000000000..a522596e81 --- /dev/null +++ b/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -0,0 +1,9 @@ +{ + "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "inputFiles": [ + "../../../src/ts/Manager/FieldManager.ts" + ], + "declaration": true, + "baselineCheck": true +} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts b/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts new file mode 100644 index 0000000000..c45efd43c8 --- /dev/null +++ b/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts @@ -0,0 +1,4 @@ +/// + +class FieldManager { +} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/typings/tsd.ts b/tests/cases/projects/ReferenceResolution/typings/tsd.ts new file mode 100644 index 0000000000..2d9e3be13c --- /dev/null +++ b/tests/cases/projects/ReferenceResolution/typings/tsd.ts @@ -0,0 +1,4 @@ +/// +// This is tsd.ts +class tsd { +} \ No newline at end of file From 63a20863c1de137b9c97d86199de6a802ee184d9 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 11 Nov 2014 22:58:47 -0800 Subject: [PATCH 2/6] Fix the relative path reference resolution Fixes #1039 --- src/compiler/core.ts | 4 ++ src/compiler/emitter.ts | 11 ++--- src/compiler/parser.ts | 39 +++++++++++++--- src/harness/harness.ts | 2 +- src/harness/projectsRunner.ts | 44 ++++++++++++++++--- src/services/services.ts | 7 ++- .../amd/FieldManager.d.ts | 3 ++ .../amd/diskFile1.d.ts | 3 ++ ...eferenceResolutionRelativePaths.errors.txt | 23 ---------- .../amd/referenceResolutionRelativePaths.json | 6 +-- .../node/FieldManager.d.ts | 3 ++ .../node/diskFile1.d.ts | 3 ++ ...eferenceResolutionRelativePaths.errors.txt | 23 ---------- .../referenceResolutionRelativePaths.json | 6 +-- 14 files changed, 100 insertions(+), 77 deletions(-) create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt diff --git a/src/compiler/core.ts b/src/compiler/core.ts index e512688fee..4b412d051d 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -459,6 +459,10 @@ module ts { return normalizedPathComponents(path, rootLength); } + export function getNormalizedAbsolutePath(filename: string, currentDirectory: string) { + return getNormalizedPathFromPathComponents(getNormalizedPathComponents(filename, currentDirectory)); + } + export function getNormalizedPathFromPathComponents(pathComponents: string[]) { if (pathComponents && pathComponents.length) { return pathComponents[0] + pathComponents.slice(1).join(directorySeparator); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f61d4403ee..eb423e214a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -57,7 +57,7 @@ module ts { var newLine = program.getCompilerHost().getNewLine(); function getSourceFilePathInNewDir(newDirPath: string, sourceFile: SourceFile) { - var sourceFilePath = getNormalizedPathFromPathComponents(getNormalizedPathComponents(sourceFile.filename, compilerHost.getCurrentDirectory())); + var sourceFilePath = getNormalizedAbsolutePath(sourceFile.filename, compilerHost.getCurrentDirectory()); sourceFilePath = sourceFilePath.replace(program.getCommonSourceDirectory(), ""); return combinePaths(newDirPath, sourceFilePath); } @@ -3370,11 +3370,6 @@ module ts { } } - function tryResolveScriptReference(sourceFile: SourceFile, reference: FileReference) { - var referenceFileName = normalizePath(combinePaths(getDirectoryPath(sourceFile.filename), reference.filename)); - return program.getSourceFile(referenceFileName); - } - // Contains the reference paths that needs to go in the declaration file. // Collecting this separately because reference paths need to be first thing in the declaration file // and we could be collecting these paths from multiple files into single one with --out option @@ -3401,7 +3396,7 @@ module ts { if (!compilerOptions.noResolve) { var addedGlobalFileReference = false; forEach(root.referencedFiles, fileReference => { - var referencedFile = tryResolveScriptReference(root, fileReference); + var referencedFile = tryResolveScriptReference(program, root, fileReference); // All the references that are not going to be part of same file if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference @@ -3426,7 +3421,7 @@ module ts { // Check what references need to be added if (!compilerOptions.noResolve) { forEach(sourceFile.referencedFiles, fileReference => { - var referencedFile = tryResolveScriptReference(sourceFile, fileReference); + var referencedFile = tryResolveScriptReference(program, sourceFile, fileReference); // If the reference file is a declaration file or an external module, emit that reference if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 4849cb8c89..df557cef59 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -634,6 +634,15 @@ module ts { return false; } + export function tryResolveScriptReference(program: Program, sourceFile: SourceFile, reference: FileReference) { + var referenceFileName = isRootedDiskPath(reference.filename) ? reference.filename : combinePaths(getDirectoryPath(sourceFile.filename), reference.filename); + referenceFileName = normalizePath(referenceFileName); + if (!program.getCompilerOptions().noResolve) { + referenceFileName = getNormalizedAbsolutePath(referenceFileName, program.getCompilerHost().getCurrentDirectory()); + } + return program.getSourceFile(referenceFileName); + } + export function getAncestor(node: Node, kind: SyntaxKind): Node { switch (kind) { // special-cases that can be come first @@ -4373,13 +4382,18 @@ module ts { var canonicalName = host.getCanonicalFileName(filename); if (hasProperty(filesByName, canonicalName)) { // We've already looked for this file, use cached result - var file = filesByName[canonicalName]; - if (file && host.useCaseSensitiveFileNames() && canonicalName !== file.filename) { - errors.push(createFileDiagnostic(refFile, refStart, refLength, - Diagnostics.Filename_0_differs_from_already_included_filename_1_only_in_casing, filename, file.filename)); - } + 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); + } + } + // We haven't looked for this file, do so now and cache result var file = filesByName[canonicalName] = host.getSourceFile(filename, options.target, hostErrorMessage => { errors.push(createFileDiagnostic(refFile, refStart, refLength, @@ -4388,6 +4402,9 @@ module ts { if (file) { seenNoDefaultLib = seenNoDefaultLib || file.hasNoDefaultLib; if (!options.noResolve) { + // Set the source file for normalized absolute path + filesByName[canonicalAbsolutePath] = file; + var basePath = getDirectoryPath(filename); processReferencedFiles(file, basePath); processImportedModules(file, basePath); @@ -4404,6 +4421,18 @@ module ts { } } return file; + + function getSourceFileFromCache(filename: string, canonicalName: string, useAbsolutePath: boolean): SourceFile { + var file = filesByName[canonicalName]; + if (file && host.useCaseSensitiveFileNames()) { + var sourceFileName = useAbsolutePath ? getNormalizedAbsolutePath(file.filename, host.getCurrentDirectory()) : file.filename; + if (canonicalName !== sourceFileName) { + errors.push(createFileDiagnostic(refFile, refStart, refLength, + Diagnostics.Filename_0_differs_from_already_included_filename_1_only_in_casing, filename, sourceFileName)); + } + } + return file; + } } function processReferencedFiles(file: SourceFile, basePath: string) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index d385dd2afc..bbfc2f5678 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -863,7 +863,7 @@ module Harness { var sourceFileName: string; if (ts.isExternalModule(sourceFile) || !options.out) { if (options.outDir) { - var sourceFilePath = ts.getNormalizedPathFromPathComponents(ts.getNormalizedPathComponents(sourceFile.filename, result.currentDirectoryForProgram)); + var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.filename, result.currentDirectoryForProgram); sourceFilePath = sourceFilePath.replace(result.program.getCommonSourceDirectory(), ""); sourceFileName = ts.combinePaths(options.outDir, sourceFilePath); } diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index d0972ac59b..35f71ccd5a 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -274,20 +274,50 @@ class ProjectRunner extends RunnerBase { } function compileCompileDTsFiles(compilerResult: BatchCompileProjectTestCaseResult) { - var inputDtsSourceFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(), - sourceFile => Harness.Compiler.isDTS(sourceFile.filename)), - sourceFile => { - return { emittedFileName: sourceFile.filename, code: sourceFile.text }; - }); + var allInputFiles: { emittedFileName: string; code: string; }[] = []; + var compilerOptions = compilerResult.program.getCompilerOptions(); + var compilerHost = compilerResult.program.getCompilerHost(); + ts.forEach(compilerResult.program.getSourceFiles(), sourceFile => { + if (Harness.Compiler.isDTS(sourceFile.filename)) { + allInputFiles.unshift({ emittedFileName: sourceFile.filename, code: sourceFile.text }); + } + else if (ts.shouldEmitToOwnFile(sourceFile, compilerResult.program.getCompilerOptions())) { + if (compilerOptions.outDir) { + var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.filename, compilerHost.getCurrentDirectory()); + sourceFilePath = sourceFilePath.replace(compilerResult.program.getCommonSourceDirectory(), ""); + var emitOutputFilePathWithoutExtension = ts.removeFileExtension(ts.combinePaths(compilerOptions.outDir, sourceFilePath)); + } + else { + var emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.filename); + } + + var outputDtsFileName = emitOutputFilePathWithoutExtension + ".d.ts"; + allInputFiles.unshift(findOutpuDtsFile(outputDtsFileName)); + } + else { + var outputDtsFileName = ts.removeFileExtension(compilerOptions.out) + ".d.ts"; + var outputDtsFile = findOutpuDtsFile(outputDtsFileName); + if (!ts.contains(allInputFiles, outputDtsFile)) { + allInputFiles.unshift(outputDtsFile); + } + } + }); + + console.log("inputFiles"); + ts.forEach(allInputFiles, inputFile => { + console.log(inputFile.emittedFileName); + }); - var ouputDtsFiles = ts.filter(compilerResult.outputFiles, ouputFile => Harness.Compiler.isDTS(ouputFile.emittedFileName)); - var allInputFiles = inputDtsSourceFiles.concat(ouputDtsFiles); return compileProjectFiles(compilerResult.moduleKind,getInputFiles, getSourceFileText, writeFile); + function findOutpuDtsFile(fileName: string) { + return ts.forEach(compilerResult.outputFiles, outputFile => outputFile.emittedFileName === fileName ? outputFile : undefined); + } function getInputFiles() { return ts.map(allInputFiles, outputFile => outputFile.emittedFileName); } function getSourceFileText(filename: string): string { + console.log("Reading: " + filename + ": " + (ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === filename ? inputFile.code : undefined) !== undefined)); return ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === filename ? inputFile.code : undefined); } diff --git a/src/services/services.ts b/src/services/services.ts index 800d63738f..0c1ffff3e7 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3383,11 +3383,10 @@ module ts { /// Triple slash reference comments var comment = forEach(sourceFile.referencedFiles, r => (r.pos <= position && position < r.end) ? r : undefined); if (comment) { - var targetFilename = isRootedDiskPath(comment.filename) ? comment.filename : combinePaths(getDirectoryPath(filename), comment.filename); - targetFilename = normalizePath(targetFilename); - if (program.getSourceFile(targetFilename)) { + var referenceFile = tryResolveScriptReference(program, sourceFile, comment); + if (referenceFile) { return [{ - fileName: targetFilename, + fileName: referenceFile.filename, textSpan: TypeScript.TextSpan.fromBounds(0, 0), kind: ScriptElementKind.scriptElement, name: comment.filename, diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt deleted file mode 100644 index 3cca49932b..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt +++ /dev/null @@ -1,23 +0,0 @@ -../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. -FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. - - -==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ==== - /// - - class FieldManager { - ~~~~~~~~~~~~ -!!! error TS2300: Duplicate identifier 'FieldManager'. - } -==== ../../../typings/tsd.ts (0 errors) ==== - /// - // This is tsd.ts - class tsd { - } -==== FieldManager.ts (1 errors) ==== - /// - - class FieldManager { - ~~~~~~~~~~~~ -!!! error TS2300: Duplicate identifier 'FieldManager'. - } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json index 3d5aadcd5b..c757106757 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json @@ -8,13 +8,13 @@ "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../src/ts/Manager/FieldManager.ts", "../../../typings/tsd.ts", "FieldManager.ts" ], "emittedFiles": [ - "../../../src/ts/Manager/FieldManager.js", "../../../typings/tsd.js", - "FieldManager.js" + "../../../typings/tsd.d.ts", + "FieldManager.js", + "FieldManager.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts new file mode 100644 index 0000000000..aee3544dd2 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts @@ -0,0 +1,3 @@ +/// +declare class FieldManager { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts new file mode 100644 index 0000000000..d2cfdf658e --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts @@ -0,0 +1,3 @@ +/// +declare class tsd { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt deleted file mode 100644 index 3cca49932b..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt +++ /dev/null @@ -1,23 +0,0 @@ -../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. -FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'. - - -==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ==== - /// - - class FieldManager { - ~~~~~~~~~~~~ -!!! error TS2300: Duplicate identifier 'FieldManager'. - } -==== ../../../typings/tsd.ts (0 errors) ==== - /// - // This is tsd.ts - class tsd { - } -==== FieldManager.ts (1 errors) ==== - /// - - class FieldManager { - ~~~~~~~~~~~~ -!!! error TS2300: Duplicate identifier 'FieldManager'. - } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json index 3d5aadcd5b..c757106757 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json @@ -8,13 +8,13 @@ "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../src/ts/Manager/FieldManager.ts", "../../../typings/tsd.ts", "FieldManager.ts" ], "emittedFiles": [ - "../../../src/ts/Manager/FieldManager.js", "../../../typings/tsd.js", - "FieldManager.js" + "../../../typings/tsd.d.ts", + "FieldManager.js", + "FieldManager.d.ts" ] } \ No newline at end of file From 25abab83e0a428b1d84843523ed1c1741501b108 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Nov 2014 12:58:22 -0800 Subject: [PATCH 3/6] Fixed the api for resolving script reference and getting source file as per review feedback --- src/compiler/parser.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index df557cef59..6d6c2d4db6 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -635,12 +635,11 @@ module ts { } export function tryResolveScriptReference(program: Program, sourceFile: SourceFile, reference: FileReference) { - var referenceFileName = isRootedDiskPath(reference.filename) ? reference.filename : combinePaths(getDirectoryPath(sourceFile.filename), reference.filename); - referenceFileName = normalizePath(referenceFileName); if (!program.getCompilerOptions().noResolve) { + var referenceFileName = isRootedDiskPath(reference.filename) ? reference.filename : combinePaths(getDirectoryPath(sourceFile.filename), reference.filename); referenceFileName = getNormalizedAbsolutePath(referenceFileName, program.getCompilerHost().getCurrentDirectory()); + return program.getSourceFile(referenceFileName); } - return program.getSourceFile(referenceFileName); } export function getAncestor(node: Node, kind: SyntaxKind): Node { From e5b004899cf8846a0f3fadc531d240ac26db3528 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Nov 2014 13:06:07 -0800 Subject: [PATCH 4/6] Renamed the tests files to more generic names --- src/harness/projectsRunner.ts | 6 ------ .../amd/FieldManager.d.ts | 3 --- .../amd/FieldManager.js | 6 ------ .../amd/diskFile0.js | 10 +++++----- .../amd/diskFile1.d.ts | 4 ++-- .../amd/foo.d.ts | 3 +++ .../amd/foo.js | 6 ++++++ .../amd/referenceResolutionRelativePaths.json | 18 +++++++++--------- .../node/FieldManager.d.ts | 3 --- .../node/FieldManager.js | 6 ------ .../node/diskFile0.js | 10 +++++----- .../node/diskFile1.d.ts | 4 ++-- .../node/foo.d.ts | 3 +++ .../node/foo.js | 6 ++++++ .../node/referenceResolutionRelativePaths.json | 18 +++++++++--------- .../amd/bar/bar.d.ts | 3 +++ .../amd/bar/bar.js | 7 +++++++ ...solutionRelativePathsFromRootDirectory.json | 16 ++++++++-------- .../amd/src/ts/Manager/FieldManager.d.ts | 3 --- .../amd/src/ts/Manager/FieldManager.js | 6 ------ .../amd/src/ts/foo/foo.d.ts | 3 +++ .../amd/src/ts/foo/foo.js | 6 ++++++ .../amd/typings/tsd.d.ts | 3 --- .../amd/typings/tsd.js | 7 ------- .../node/bar/bar.d.ts | 3 +++ .../node/bar/bar.js | 7 +++++++ ...solutionRelativePathsFromRootDirectory.json | 16 ++++++++-------- .../node/src/ts/Manager/FieldManager.d.ts | 3 --- .../node/src/ts/Manager/FieldManager.js | 6 ------ .../node/src/ts/foo/foo.d.ts | 3 +++ .../node/src/ts/foo/foo.js | 6 ++++++ .../node/typings/tsd.d.ts | 3 --- .../node/typings/tsd.js | 7 ------- ...erenceResolutionRelativePathsNoResolve.json | 16 ++++++++-------- ...erenceResolutionRelativePathsNoResolve.json | 16 ++++++++-------- .../amd/FieldManager.d.ts | 3 --- .../amd/FieldManager.js | 6 ------ .../amd/diskFile0.js | 10 +++++----- .../amd/diskFile1.d.ts | 4 ++-- .../amd/foo.d.ts | 3 +++ .../amd/foo.js | 6 ++++++ ...onRelativePathsRelativeToRootDirectory.json | 18 +++++++++--------- .../node/FieldManager.d.ts | 3 --- .../node/FieldManager.js | 6 ------ .../node/diskFile0.js | 10 +++++----- .../node/diskFile1.d.ts | 4 ++-- .../node/foo.d.ts | 3 +++ .../node/foo.js | 6 ++++++ ...onRelativePathsRelativeToRootDirectory.json | 18 +++++++++--------- .../referenceResolutionRelativePaths.json | 6 +++--- ...solutionRelativePathsFromRootDirectory.json | 4 ++-- ...erenceResolutionRelativePathsNoResolve.json | 8 ++++---- ...onRelativePathsRelativeToRootDirectory.json | 6 +++--- .../projects/ReferenceResolution/bar/bar.ts | 4 ++++ .../src/ts/Manager/FieldManager.ts | 4 ---- .../ReferenceResolution/src/ts/foo/foo.ts | 4 ++++ .../ReferenceResolution/typings/tsd.ts | 4 ---- 57 files changed, 190 insertions(+), 196 deletions(-) delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts delete mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js create mode 100644 tests/cases/projects/ReferenceResolution/bar/bar.ts delete mode 100644 tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts create mode 100644 tests/cases/projects/ReferenceResolution/src/ts/foo/foo.ts delete mode 100644 tests/cases/projects/ReferenceResolution/typings/tsd.ts diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 35f71ccd5a..292e945107 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -303,11 +303,6 @@ class ProjectRunner extends RunnerBase { } }); - console.log("inputFiles"); - ts.forEach(allInputFiles, inputFile => { - console.log(inputFile.emittedFileName); - }); - return compileProjectFiles(compilerResult.moduleKind,getInputFiles, getSourceFileText, writeFile); function findOutpuDtsFile(fileName: string) { @@ -317,7 +312,6 @@ class ProjectRunner extends RunnerBase { return ts.map(allInputFiles, outputFile => outputFile.emittedFileName); } function getSourceFileText(filename: string): string { - console.log("Reading: " + filename + ": " + (ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === filename ? inputFile.code : undefined) !== undefined)); return ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === filename ? inputFile.code : undefined); } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js index 3d740c6159..ae9742b492 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js @@ -1,7 +1,7 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { +/// +// This is bar.ts +var bar = (function () { + function bar() { } - return tsd; + return bar; })(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts index d2cfdf658e..a21b762e1f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts @@ -1,3 +1,3 @@ -/// -declare class tsd { +/// +declare class bar { } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json index c757106757..fe07bb38b9 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts" + "foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../typings/tsd.ts", - "FieldManager.ts" + "../../../bar/bar.ts", + "foo.ts" ], "emittedFiles": [ - "../../../typings/tsd.js", - "../../../typings/tsd.d.ts", - "FieldManager.js", - "FieldManager.d.ts" + "../../../bar/bar.js", + "../../../bar/bar.d.ts", + "foo.js", + "foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js index 3d740c6159..ae9742b492 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js @@ -1,7 +1,7 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { +/// +// This is bar.ts +var bar = (function () { + function bar() { } - return tsd; + return bar; })(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts index d2cfdf658e..a21b762e1f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts @@ -1,3 +1,3 @@ -/// -declare class tsd { +/// +declare class bar { } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json index c757106757..fe07bb38b9 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts" + "foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../typings/tsd.ts", - "FieldManager.ts" + "../../../bar/bar.ts", + "foo.ts" ], "emittedFiles": [ - "../../../typings/tsd.js", - "../../../typings/tsd.d.ts", - "FieldManager.js", - "FieldManager.d.ts" + "../../../bar/bar.js", + "../../../bar/bar.d.ts", + "foo.js", + "foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.d.ts new file mode 100644 index 0000000000..a21b762e1f --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.d.ts @@ -0,0 +1,3 @@ +/// +declare class bar { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js new file mode 100644 index 0000000000..ae9742b492 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js @@ -0,0 +1,7 @@ +/// +// This is bar.ts +var bar = (function () { + function bar() { + } + return bar; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json index 328d1ae7cc..b24993bcf8 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "scenario": "referenceResolution1_FromRootDirectory", "projectRoot": "tests/cases/projects/ReferenceResolution", "inputFiles": [ - "src/ts/Manager/FieldManager.ts" + "src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "typings/tsd.ts", - "src/ts/Manager/FieldManager.ts" + "bar/bar.ts", + "src/ts/foo/foo.ts" ], "emittedFiles": [ - "typings/tsd.js", - "typings/tsd.d.ts", - "src/ts/Manager/FieldManager.js", - "src/ts/Manager/FieldManager.d.ts" + "bar/bar.js", + "bar/bar.d.ts", + "src/ts/foo/foo.js", + "src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts deleted file mode 100644 index d2cfdf658e..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class tsd { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js deleted file mode 100644 index 3d740c6159..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js +++ /dev/null @@ -1,7 +0,0 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { - } - return tsd; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.d.ts new file mode 100644 index 0000000000..a21b762e1f --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.d.ts @@ -0,0 +1,3 @@ +/// +declare class bar { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js new file mode 100644 index 0000000000..ae9742b492 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js @@ -0,0 +1,7 @@ +/// +// This is bar.ts +var bar = (function () { + function bar() { + } + return bar; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json index 328d1ae7cc..b24993bcf8 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "scenario": "referenceResolution1_FromRootDirectory", "projectRoot": "tests/cases/projects/ReferenceResolution", "inputFiles": [ - "src/ts/Manager/FieldManager.ts" + "src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "typings/tsd.ts", - "src/ts/Manager/FieldManager.ts" + "bar/bar.ts", + "src/ts/foo/foo.ts" ], "emittedFiles": [ - "typings/tsd.js", - "typings/tsd.d.ts", - "src/ts/Manager/FieldManager.js", - "src/ts/Manager/FieldManager.d.ts" + "bar/bar.js", + "bar/bar.d.ts", + "src/ts/foo/foo.js", + "src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts deleted file mode 100644 index d2cfdf658e..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class tsd { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js deleted file mode 100644 index 3d740c6159..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js +++ /dev/null @@ -1,7 +0,0 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { - } - return tsd; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json index ff05ee05b5..db63a7fd0b 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json @@ -1,17 +1,17 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts", - "../../../typings/tsd.ts" + "foo.ts", + "../../../bar/bar.ts" ], "resolvedInputFiles": [ "lib.d.ts", - "FieldManager.ts", - "../../../typings/tsd.ts" + "foo.ts", + "../../../bar/bar.ts" ], "emittedFiles": [ - "FieldManager.js", - "../../../typings/tsd.js" + "foo.js", + "../../../bar/bar.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json index ff05ee05b5..db63a7fd0b 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json @@ -1,17 +1,17 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts", - "../../../typings/tsd.ts" + "foo.ts", + "../../../bar/bar.ts" ], "resolvedInputFiles": [ "lib.d.ts", - "FieldManager.ts", - "../../../typings/tsd.ts" + "foo.ts", + "../../../bar/bar.ts" ], "emittedFiles": [ - "FieldManager.js", - "../../../typings/tsd.js" + "foo.js", + "../../../bar/bar.js" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js index 3d740c6159..ae9742b492 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js @@ -1,7 +1,7 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { +/// +// This is bar.ts +var bar = (function () { + function bar() { } - return tsd; + return bar; })(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts index d2cfdf658e..a21b762e1f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts @@ -1,3 +1,3 @@ -/// -declare class tsd { +/// +declare class bar { } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json index 8e07c4a02e..79b73ec775 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_RelativepathToFoo", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "../../../src/ts/Manager/FieldManager.ts" + "../../../src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../typings/tsd.ts", - "../../../src/ts/Manager/FieldManager.ts" + "../../../bar/bar.ts", + "../../../src/ts/foo/foo.ts" ], "emittedFiles": [ - "../../../typings/tsd.js", - "../../../typings/tsd.d.ts", - "../../../src/ts/Manager/FieldManager.js", - "../../../src/ts/Manager/FieldManager.d.ts" + "../../../bar/bar.js", + "../../../bar/bar.d.ts", + "../../../src/ts/foo/foo.js", + "../../../src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts deleted file mode 100644 index aee3544dd2..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -declare class FieldManager { -} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js deleted file mode 100644 index 91cbe5f761..0000000000 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js +++ /dev/null @@ -1,6 +0,0 @@ -/// -var FieldManager = (function () { - function FieldManager() { - } - return FieldManager; -})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js index 3d740c6159..ae9742b492 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js @@ -1,7 +1,7 @@ -/// -// This is tsd.ts -var tsd = (function () { - function tsd() { +/// +// This is bar.ts +var bar = (function () { + function bar() { } - return tsd; + return bar; })(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts index d2cfdf658e..a21b762e1f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts @@ -1,3 +1,3 @@ -/// -declare class tsd { +/// +declare class bar { } diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.d.ts new file mode 100644 index 0000000000..7f80d14325 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.d.ts @@ -0,0 +1,3 @@ +/// +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json index 8e07c4a02e..79b73ec775 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -1,20 +1,20 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_RelativepathToFoo", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "../../../src/ts/Manager/FieldManager.ts" + "../../../src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", - "../../../typings/tsd.ts", - "../../../src/ts/Manager/FieldManager.ts" + "../../../bar/bar.ts", + "../../../src/ts/foo/foo.ts" ], "emittedFiles": [ - "../../../typings/tsd.js", - "../../../typings/tsd.d.ts", - "../../../src/ts/Manager/FieldManager.js", - "../../../src/ts/Manager/FieldManager.d.ts" + "../../../bar/bar.js", + "../../../bar/bar.d.ts", + "../../../src/ts/foo/foo.js", + "../../../src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePaths.json b/tests/cases/project/referenceResolutionRelativePaths.json index 2b6539ce48..f49fd03b22 100644 --- a/tests/cases/project/referenceResolutionRelativePaths.json +++ b/tests/cases/project/referenceResolutionRelativePaths.json @@ -1,8 +1,8 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts" + "foo.ts" ], "declaration": true, "baselineCheck": true diff --git a/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json b/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json index faf4a23b91..392d34a67a 100644 --- a/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json +++ b/tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json @@ -1,8 +1,8 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory", + "scenario": "referenceResolution1_FromRootDirectory", "projectRoot": "tests/cases/projects/ReferenceResolution", "inputFiles": [ - "src/ts/Manager/FieldManager.ts" + "src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true diff --git a/tests/cases/project/referenceResolutionRelativePathsNoResolve.json b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json index f9ba5b047f..022a910383 100644 --- a/tests/cases/project/referenceResolutionRelativePathsNoResolve.json +++ b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json @@ -1,9 +1,9 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_NoResolve", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "FieldManager.ts", - "../../../typings/tsd.ts" + "foo.ts", + "../../../bar/bar.ts" ], "noResolve": true } \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json index a522596e81..ba8f2da83e 100644 --- a/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json +++ b/tests/cases/project/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -1,8 +1,8 @@ { - "scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager", - "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager", + "scenario": "referenceResolution1_FromFooFolder_RelativepathToFoo", + "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo", "inputFiles": [ - "../../../src/ts/Manager/FieldManager.ts" + "../../../src/ts/foo/foo.ts" ], "declaration": true, "baselineCheck": true diff --git a/tests/cases/projects/ReferenceResolution/bar/bar.ts b/tests/cases/projects/ReferenceResolution/bar/bar.ts new file mode 100644 index 0000000000..9fd38a32d6 --- /dev/null +++ b/tests/cases/projects/ReferenceResolution/bar/bar.ts @@ -0,0 +1,4 @@ +/// +// This is bar.ts +class bar { +} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts b/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts deleted file mode 100644 index c45efd43c8..0000000000 --- a/tests/cases/projects/ReferenceResolution/src/ts/Manager/FieldManager.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// - -class FieldManager { -} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/src/ts/foo/foo.ts b/tests/cases/projects/ReferenceResolution/src/ts/foo/foo.ts new file mode 100644 index 0000000000..2ea78e70fa --- /dev/null +++ b/tests/cases/projects/ReferenceResolution/src/ts/foo/foo.ts @@ -0,0 +1,4 @@ +/// + +class foo { +} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/typings/tsd.ts b/tests/cases/projects/ReferenceResolution/typings/tsd.ts deleted file mode 100644 index 2d9e3be13c..0000000000 --- a/tests/cases/projects/ReferenceResolution/typings/tsd.ts +++ /dev/null @@ -1,4 +0,0 @@ -/// -// This is tsd.ts -class tsd { -} \ No newline at end of file From 6d4e670c185fb371eaa10c2bcccd6b1c1bdfb20b Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Nov 2014 13:08:57 -0800 Subject: [PATCH 5/6] Enable baseline check and declaration emit for --noResolve case of files --- .../amd/diskFile0.js | 7 +++++++ .../amd/diskFile1.d.ts | 2 ++ .../referenceResolutionRelativePathsNoResolve/amd/foo.d.ts | 2 ++ .../referenceResolutionRelativePathsNoResolve/amd/foo.js | 6 ++++++ .../amd/referenceResolutionRelativePathsNoResolve.json | 6 +++++- .../node/diskFile0.js | 7 +++++++ .../node/diskFile1.d.ts | 2 ++ .../node/foo.d.ts | 2 ++ .../referenceResolutionRelativePathsNoResolve/node/foo.js | 6 ++++++ .../node/referenceResolutionRelativePathsNoResolve.json | 6 +++++- .../project/referenceResolutionRelativePathsNoResolve.json | 4 +++- 11 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js new file mode 100644 index 0000000000..ae9742b492 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is bar.ts +var bar = (function () { + function bar() { + } + return bar; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile1.d.ts new file mode 100644 index 0000000000..1e341d9785 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile1.d.ts @@ -0,0 +1,2 @@ +declare class bar { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.d.ts new file mode 100644 index 0000000000..0e91525d82 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.d.ts @@ -0,0 +1,2 @@ +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json index db63a7fd0b..16831b328e 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json @@ -5,6 +5,8 @@ "foo.ts", "../../../bar/bar.ts" ], + "declaration": true, + "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", "foo.ts", @@ -12,6 +14,8 @@ ], "emittedFiles": [ "foo.js", - "../../../bar/bar.js" + "foo.d.ts", + "../../../bar/bar.js", + "../../../bar/bar.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js new file mode 100644 index 0000000000..ae9742b492 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js @@ -0,0 +1,7 @@ +/// +// This is bar.ts +var bar = (function () { + function bar() { + } + return bar; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile1.d.ts new file mode 100644 index 0000000000..1e341d9785 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile1.d.ts @@ -0,0 +1,2 @@ +declare class bar { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.d.ts b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.d.ts new file mode 100644 index 0000000000..0e91525d82 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.d.ts @@ -0,0 +1,2 @@ +declare class foo { +} diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js new file mode 100644 index 0000000000..20440d5c62 --- /dev/null +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js @@ -0,0 +1,6 @@ +/// +var foo = (function () { + function foo() { + } + return foo; +})(); diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json index db63a7fd0b..16831b328e 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json @@ -5,6 +5,8 @@ "foo.ts", "../../../bar/bar.ts" ], + "declaration": true, + "baselineCheck": true, "resolvedInputFiles": [ "lib.d.ts", "foo.ts", @@ -12,6 +14,8 @@ ], "emittedFiles": [ "foo.js", - "../../../bar/bar.js" + "foo.d.ts", + "../../../bar/bar.js", + "../../../bar/bar.d.ts" ] } \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionRelativePathsNoResolve.json b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json index 022a910383..962f9d1a09 100644 --- a/tests/cases/project/referenceResolutionRelativePathsNoResolve.json +++ b/tests/cases/project/referenceResolutionRelativePathsNoResolve.json @@ -5,5 +5,7 @@ "foo.ts", "../../../bar/bar.ts" ], - "noResolve": true + "noResolve": true, + "declaration": true, + "baselineCheck": true } \ No newline at end of file From 7d103a1a4526240031c9a2bd9eeb33dbb1b7ecab Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 20 Nov 2014 15:43:07 -0800 Subject: [PATCH 6/6] Remove the --noResolve check when finding the file. --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 --- src/compiler/parser.ts | 18 ++++++++---------- .../amd/diskFile0.js | 5 +++++ .../amd/diskFile1.d.ts | 2 ++ .../amd/referenceResolutionSameFileTwice.json | 18 ++++++++++++++++++ .../node/diskFile0.js | 5 +++++ .../node/diskFile1.d.ts | 2 ++ .../node/referenceResolutionSameFileTwice.json | 18 ++++++++++++++++++ .../amd/diskFile0.js | 5 +++++ .../amd/diskFile1.d.ts | 2 ++ ...erenceResolutionSameFileTwiceNoResolve.json | 18 ++++++++++++++++++ .../node/diskFile0.js | 5 +++++ .../node/diskFile1.d.ts | 2 ++ ...erenceResolutionSameFileTwiceNoResolve.json | 18 ++++++++++++++++++ .../referenceResolutionSameFileTwice.json | 10 ++++++++++ ...erenceResolutionSameFileTwiceNoResolve.json | 11 +++++++++++ .../cases/projects/ReferenceResolution/test.ts | 2 ++ 16 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.json create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.json create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.json create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.json create mode 100644 tests/cases/project/referenceResolutionSameFileTwice.json create mode 100644 tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json create mode 100644 tests/cases/projects/ReferenceResolution/test.ts diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 3939270a96..b8f3623ee4 100644 --- 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 new file mode 100644 index 0000000000..c82f04ec51 --- /dev/null +++ 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 new file mode 100644 index 0000000000..be748d27cf --- /dev/null +++ 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 new file mode 100644 index 0000000000..9334271f8e --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js new file mode 100644 index 0000000000..c82f04ec51 --- /dev/null +++ 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 new file mode 100644 index 0000000000..be748d27cf --- /dev/null +++ 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 new file mode 100644 index 0000000000..9334271f8e --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js new file mode 100644 index 0000000000..c82f04ec51 --- /dev/null +++ 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 new file mode 100644 index 0000000000..be748d27cf --- /dev/null +++ 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 new file mode 100644 index 0000000000..b22aefac3e --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js new file mode 100644 index 0000000000..c82f04ec51 --- /dev/null +++ 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 new file mode 100644 index 0000000000..be748d27cf --- /dev/null +++ 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 new file mode 100644 index 0000000000..b22aefac3e --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionSameFileTwice.json b/tests/cases/project/referenceResolutionSameFileTwice.json new file mode 100644 index 0000000000..00a8f6e103 --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json b/tests/cases/project/referenceResolutionSameFileTwiceNoResolve.json new file mode 100644 index 0000000000..8c77bd038c --- /dev/null +++ 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 +} \ No newline at end of file diff --git a/tests/cases/projects/ReferenceResolution/test.ts b/tests/cases/projects/ReferenceResolution/test.ts new file mode 100644 index 0000000000..212b620415 --- /dev/null +++ b/tests/cases/projects/ReferenceResolution/test.ts @@ -0,0 +1,2 @@ +class test { +} \ No newline at end of file