Rename function and use directorySeparator variables

Andy Hanson · Andy Hanson · commit 0f51bdbb4ff7 · 2016-09-14T06:21:07.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1018,7 +1018,8 @@ namespace ts {
         return 0;
     }
 
-    export let directorySeparator = "/";
+    export const directorySeparator = "/";
+    const directorySeparatorCharCode = CharacterCodes.slash;
     function getNormalizedParts(normalizedSlashedPath: string, rootLength: number) {
         const parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
         const normalized: string[] = [];
@@ -1047,16 +1048,16 @@ namespace ts {
         const normalized = getNormalizedParts(path, rootLength);
         if (normalized.length) {
             const joinedParts = root + normalized.join(directorySeparator);
-            return isPathToDirectory(path) ? joinedParts + "/" : joinedParts;
+            return pathEndsWithDirectorySeparator(path) ? joinedParts + directorySeparator : joinedParts;
         }
         else {
             return root;
         }
     }
 
     /** A path ending with '/' refers to a directory only, never a file. */
-    export function isPathToDirectory(path: string): boolean {
-        return path.charCodeAt(path.length - 1) === CharacterCodes.slash;
+    export function pathEndsWithDirectorySeparator(path: string): boolean {
+        return path.charCodeAt(path.length - 1) === directorySeparatorCharCode;
     }
 
     export function getDirectoryPath(path: Path): Path;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -670,7 +670,7 @@ namespace ts {
             trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
         }
 
-        const resolvedFileName = !isPathToDirectory(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
+        const resolvedFileName = !pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
 
         return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
     }

Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,8 @@ namespace ts {`
`1018`	`1018`	`return 0;`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`		`- export let directorySeparator = "/";`
	`1021`	`+ export const directorySeparator = "/";`
	`1022`	`+ const directorySeparatorCharCode = CharacterCodes.slash;`
`1022`	`1023`	`function getNormalizedParts(normalizedSlashedPath: string, rootLength: number) {`
`1023`	`1024`	`const parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);`
`1024`	`1025`	`const normalized: string[] = [];`
`@@ -1047,16 +1048,16 @@ namespace ts {`
`1047`	`1048`	`const normalized = getNormalizedParts(path, rootLength);`
`1048`	`1049`	`if (normalized.length) {`
`1049`	`1050`	`const joinedParts = root + normalized.join(directorySeparator);`
`1050`		`- return isPathToDirectory(path) ? joinedParts + "/" : joinedParts;`
	`1051`	`+ return pathEndsWithDirectorySeparator(path) ? joinedParts + directorySeparator : joinedParts;`
`1051`	`1052`	`}`
`1052`	`1053`	`else {`
`1053`	`1054`	`return root;`
`1054`	`1055`	`}`
`1055`	`1056`	`}`
`1056`	`1057`
`1057`	`1058`	`/** A path ending with '/' refers to a directory only, never a file. */`
`1058`		`- export function isPathToDirectory(path: string): boolean {`
`1059`		`- return path.charCodeAt(path.length - 1) === CharacterCodes.slash;`
	`1059`	`+ export function pathEndsWithDirectorySeparator(path: string): boolean {`
	`1060`	`+ return path.charCodeAt(path.length - 1) === directorySeparatorCharCode;`
`1060`	`1061`	`}`
`1061`	`1062`
`1062`	`1063`	`export function getDirectoryPath(path: Path): Path;`
Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ namespace ts {`
`670`	`670`	`trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);`
`671`	`671`	`}`
`672`	`672`
`673`		`- const resolvedFileName = !isPathToDirectory(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);`
	`673`	`+ const resolvedFileName = !pathEndsWithDirectorySeparator(candidate) && loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);`
`674`	`674`
`675`	`675`	`return resolvedFileName \|\| loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);`
`676`	`676`	`}`