Fix the relative path reference resolution

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

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);
         }
@@ -3414,11 +3414,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
@@ -3445,7 +3440,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
@@ -3470,7 +3465,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) &&

src/compiler/parser.ts

@@ -643,6 +643,14 @@ module ts {
         return false;
     }
 
+    export function tryResolveScriptReference(program: Program, sourceFile: SourceFile, reference: FileReference) {
+        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);
+        }
+    }
+
     export function getAncestor(node: Node, kind: SyntaxKind): Node {
         switch (kind) {
             // special-cases that can be come first
@@ -4416,20 +4424,26 @@ 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 {
+                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,
                         Diagnostics.Cannot_read_file_0_Colon_1, filename, hostErrorMessage));
                 });
                 if (file) {
                     seenNoDefaultLib = seenNoDefaultLib || file.hasNoDefaultLib;
+
+                    // Set the source file for normalized absolute path
+                    filesByName[canonicalAbsolutePath] = file;
+
                     if (!options.noResolve) {
                         var basePath = getDirectoryPath(filename);
                         processReferencedFiles(file, basePath);
@@ -4447,6 +4461,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) {

src/harness/harness.ts

@@ -866,7 +866,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);
                                     }

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
                 };
             }
 
@@ -272,16 +274,40 @@ 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);
+                    }
+                }
+            });
 
-            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);
             }

src/services/services.ts

@@ -3326,11 +3326,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: TextSpan.fromBounds(0, 0),
                         kind: ScriptElementKind.scriptElement,
                         name: comment.filename,

tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js

@@ -0,0 +1,7 @@
+/// <reference path="../src/ts/foo/foo.ts" />
+// This is bar.ts
+var bar = (function () {
+    function bar() {
+    }
+    return bar;
+})();

tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile1.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../src/ts/foo/foo.d.ts" />
+declare class bar {
+}

tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../../../bar/bar.d.ts" />
+declare class foo {
+}

tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js

@@ -0,0 +1,6 @@
+/// <reference path="../../../bar/bar.ts" />
+var foo = (function () {
+    function foo() {
+    }
+    return foo;
+})();

tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json

@@ -0,0 +1,20 @@
+{
+    "scenario": "referenceResolution1_FromFooFolder",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo",
+    "inputFiles": [
+        "foo.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "../../../bar/bar.ts",
+        "foo.ts"
+    ],
+    "emittedFiles": [
+        "../../../bar/bar.js",
+        "../../../bar/bar.d.ts",
+        "foo.js",
+        "foo.d.ts"
+    ]
+}

tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js

@@ -0,0 +1,7 @@
+/// <reference path="../src/ts/foo/foo.ts" />
+// This is bar.ts
+var bar = (function () {
+    function bar() {
+    }
+    return bar;
+})();

tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile1.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../src/ts/foo/foo.d.ts" />
+declare class bar {
+}

tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../../../bar/bar.d.ts" />
+declare class foo {
+}

tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js

@@ -0,0 +1,6 @@
+/// <reference path="../../../bar/bar.ts" />
+var foo = (function () {
+    function foo() {
+    }
+    return foo;
+})();

tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json

@@ -0,0 +1,20 @@
+{
+    "scenario": "referenceResolution1_FromFooFolder",
+    "projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/foo",
+    "inputFiles": [
+        "foo.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "../../../bar/bar.ts",
+        "foo.ts"
+    ],
+    "emittedFiles": [
+        "../../../bar/bar.js",
+        "../../../bar/bar.d.ts",
+        "foo.js",
+        "foo.d.ts"
+    ]
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../src/ts/foo/foo.d.ts" />
+declare class bar {
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js

@@ -0,0 +1,7 @@
+/// <reference path="../src/ts/foo/foo.ts" />
+// This is bar.ts
+var bar = (function () {
+    function bar() {
+    }
+    return bar;
+})();

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json

@@ -0,0 +1,20 @@
+{
+    "scenario": "referenceResolution1_FromRootDirectory",
+    "projectRoot": "tests/cases/projects/ReferenceResolution",
+    "inputFiles": [
+        "src/ts/foo/foo.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "bar/bar.ts",
+        "src/ts/foo/foo.ts"
+    ],
+    "emittedFiles": [
+        "bar/bar.js",
+        "bar/bar.d.ts",
+        "src/ts/foo/foo.js",
+        "src/ts/foo/foo.d.ts"
+    ]
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../../../bar/bar.d.ts" />
+declare class foo {
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js

@@ -0,0 +1,6 @@
+/// <reference path="../../../bar/bar.ts" />
+var foo = (function () {
+    function foo() {
+    }
+    return foo;
+})();

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../src/ts/foo/foo.d.ts" />
+declare class bar {
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js

@@ -0,0 +1,7 @@
+/// <reference path="../src/ts/foo/foo.ts" />
+// This is bar.ts
+var bar = (function () {
+    function bar() {
+    }
+    return bar;
+})();

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json

@@ -0,0 +1,20 @@
+{
+    "scenario": "referenceResolution1_FromRootDirectory",
+    "projectRoot": "tests/cases/projects/ReferenceResolution",
+    "inputFiles": [
+        "src/ts/foo/foo.ts"
+    ],
+    "declaration": true,
+    "baselineCheck": true,
+    "resolvedInputFiles": [
+        "lib.d.ts",
+        "bar/bar.ts",
+        "src/ts/foo/foo.ts"
+    ],
+    "emittedFiles": [
+        "bar/bar.js",
+        "bar/bar.d.ts",
+        "src/ts/foo/foo.js",
+        "src/ts/foo/foo.d.ts"
+    ]
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="../../../bar/bar.d.ts" />
+declare class foo {
+}

tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js

@@ -0,0 +1,6 @@
+/// <reference path="../../../bar/bar.ts" />
+var foo = (function () {
+    function foo() {
+    }
+    return foo;
+})();

tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js

@@ -0,0 +1,7 @@
+/// <reference path="../src/ts/foo/foo.ts" />
+// This is bar.ts
+var bar = (function () {
+    function bar() {
+    }
+    return bar;
+})();

tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile1.d.ts

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

tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.d.ts

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