From ee912ee1cd1f7d83f07d1e6a06ef94f5a06791c1 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 5 Mar 2015 22:57:11 -0800 Subject: [PATCH 1/2] Fix path normalization for patterns such as './/tsconfig.json' --- src/compiler/core.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 2518b95d37e..1fb73c90698 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -430,7 +430,11 @@ module ts { normalized.pop(); } else { - normalized.push(part); + // A part may be an empty string (which is 'falsy') if the path had consecutive slashes, + // e.g. "path//file.ts". Drop these before re-joining the parts. + if(part) { + normalized.push(part); + } } } } From 0ba3a04c5492b011fb265b6d69d602aa15fa46bb Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Fri, 6 Mar 2015 13:37:12 -0800 Subject: [PATCH 2/2] Fixed baselines to account for correct path normalization --- .../amd/{diskFile1.d.ts => test.d.ts} | 0 .../amd/{diskFile0.js => test.js} | 0 .../node/{diskFile1.d.ts => test.d.ts} | 0 .../node/{diskFile0.js => test.js} | 0 .../amd/{diskFile1.d.ts => test.d.ts} | 0 .../amd/{diskFile0.js => test.js} | 0 .../node/{diskFile1.d.ts => test.d.ts} | 0 .../node/{diskFile0.js => test.js} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/node/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwice/node/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/{diskFile0.js => test.js} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/{diskFile1.d.ts => test.d.ts} (100%) rename tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/{diskFile0.js => test.js} (100%) diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwice/node/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.d.ts similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile1.d.ts rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.d.ts diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js similarity index 100% rename from tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/diskFile0.js rename to tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js