Merge pull request #13461 from flekmatik/getDefaultTypeRoots-fix

mhegazy · web-flow · commit e4d7dc44b719 · 2017-02-15T14:32:36.000-08:00
Fixing default typeRoots on Windows
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -135,7 +135,7 @@ namespace ts {
         }
 
         let typeRoots: string[];
-        forEachAncestorDirectory(currentDirectory, directory => {
+        forEachAncestorDirectory(ts.normalizePath(currentDirectory), directory => {
             const atTypes = combinePaths(directory, nodeModulesAtTypes);
             if (host.directoryExists(atTypes)) {
                 (typeRoots || (typeRoots = [])).push(atTypes);
@@ -1060,4 +1060,4 @@ namespace ts {
             directory = parentPath;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ namespace ts {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`let typeRoots: string[];`
`138`		`- forEachAncestorDirectory(currentDirectory, directory => {`
	`138`	`+ forEachAncestorDirectory(ts.normalizePath(currentDirectory), directory => {`
`139`	`139`	`const atTypes = combinePaths(directory, nodeModulesAtTypes);`
`140`	`140`	`if (host.directoryExists(atTypes)) {`
`141`	`141`	`(typeRoots \|\| (typeRoots = [])).push(atTypes);`
`@@ -1060,4 +1060,4 @@ namespace ts {`
`1060`	`1060`	`directory = parentPath;`
`1061`	`1061`	`}`
`1062`	`1062`	`}`
`1063`		`-}`
	`1063`	`+}`