Move supportedTypescriptExtensionsWithDtsFirst next to supportedTypeScriptExtensions and rename

Andy Hanson · Andy Hanson · commit 8fc17afa003d · 2016-08-18T14:11:30.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1243,6 +1243,8 @@ namespace ts {
      *  List of supported extensions in order of file resolution precedence.
      */
     export const supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"];
+    /** Must have ".d.ts" first because if ".ts" goes first, that will be detected as the extension instead of ".d.ts". */
+    export const supportedTypescriptExtensionsForExtractExtension = [".d.ts", ".ts", ".tsx"];
     export const supportedJavascriptExtensions = [".js", ".jsx"];
     const allSupportedExtensions  = supportedTypeScriptExtensions.concat(supportedJavascriptExtensions);
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2713,12 +2713,10 @@ namespace ts {
         return forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension));
     }
 
-    /** Return ".ts" or ".tsx" if that is the extension. */
+    /** Return ".ts", ".d.ts", or ".tsx", if that is the extension. */
     export function tryExtractTypeScriptExtension(fileName: string): string | undefined {
-        return find(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));
+        return find(supportedTypescriptExtensionsForExtractExtension, extension => fileExtensionIs(fileName, extension));
     }
-    // Must have '.d.ts' first because if '.ts' goes first, that will be detected as the extension instead of '.d.ts'.
-    const supportedTypescriptExtensionsWithDtsFirst = supportedTypeScriptExtensions.slice().reverse();
 
     /**
      * Replace each instance of non-ascii characters by one, two, three, or four escape sequences

Original file line number	Diff line number	Diff line change
`@@ -2713,12 +2713,10 @@ namespace ts {`
`2713`	`2713`	`return forEach(supportedTypeScriptExtensions, extension => fileExtensionIs(fileName, extension));`
`2714`	`2714`	`}`
`2715`	`2715`
`2716`		`- /** Return ".ts" or ".tsx" if that is the extension. */`
	`2716`	`+ /** Return ".ts", ".d.ts", or ".tsx", if that is the extension. */`
`2717`	`2717`	`export function tryExtractTypeScriptExtension(fileName: string): string \| undefined {`
`2718`		`- return find(supportedTypescriptExtensionsWithDtsFirst, extension => fileExtensionIs(fileName, extension));`
	`2718`	`+ return find(supportedTypescriptExtensionsForExtractExtension, extension => fileExtensionIs(fileName, extension));`
`2719`	`2719`	`}`
`2720`		`- // Must have '.d.ts' first because if '.ts' goes first, that will be detected as the extension instead of '.d.ts'.`
`2721`		`- const supportedTypescriptExtensionsWithDtsFirst = supportedTypeScriptExtensions.slice().reverse();`
`2722`	`2720`
`2723`	`2721`	`/**`
`2724`	`2722`	`* Replace each instance of non-ascii characters by one, two, three, or four escape sequences`