Merge pull request microsoft#3032 from Microsoft/supportedExtensions

mhegazy · mhegazy · commit 5129d7cf9c88 · 2015-05-07T14:27:43.000-07:00
unify file extension resolution logic
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -857,10 +857,11 @@ module ts {
                     return symbol;
                 }
             }
+            let fileName: string;
             let sourceFile: SourceFile;
             while (true) {
-                let fileName = normalizePath(combinePaths(searchPath, moduleName));
-                sourceFile = host.getSourceFile(fileName + ".ts") || host.getSourceFile(fileName + ".d.ts");
+                fileName = normalizePath(combinePaths(searchPath, moduleName));
+                sourceFile = forEach(supportedExtensions, extension => host.getSourceFile(fileName + extension));
                 if (sourceFile || isRelative) {
                     break;
                 }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -640,16 +640,18 @@ module ts {
         return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
     }
 
-    let supportedExtensions = [".d.ts", ".ts", ".js"];
+    /**
+     *  List of supported extensions in order of file resolution precedence.
+     */
+    export const supportedExtensions = [".ts", ".d.ts"];
 
+    const extensionsToRemove = [".d.ts", ".ts", ".js"];
     export function removeFileExtension(path: string): string {
-        for (let ext of supportedExtensions) {
-
+        for (let ext of extensionsToRemove) {
             if (fileExtensionIs(path, ext)) {
                 return path.substr(0, path.length - ext.length);
             }
         }
-
         return path;
     }
 
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
@@ -498,7 +498,7 @@ module ts {
         Corrupted_locale_file_0: { code: 6051, category: DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
         Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: DiagnosticCategory.Message, key: "Raise error on expressions and declarations with an implied 'any' type." },
         File_0_not_found: { code: 6053, category: DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: DiagnosticCategory.Error, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: DiagnosticCategory.Error, key: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
         Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: DiagnosticCategory.Message, key: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
         Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: DiagnosticCategory.Message, key: "Do not emit declarations for code that has an '@internal' annotation." },
         Preserve_new_lines_when_emitting_code: { code: 6057, category: DiagnosticCategory.Message, key: "Preserve new-lines when emitting code." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1982,7 +1982,7 @@
         "category": "Error",
         "code": 6053
     },
-    "File '{0}' must have extension '.ts' or '.d.ts'.": {
+    "File '{0}' has unsupported extension. The only supported extensions are {1}.": {
         "category": "Error",
         "code": 6054
     },
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -307,38 +307,45 @@ module ts {
         function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) {
             let start: number;
             let length: number;
+            let extensions: string;
+            let diagnosticArgument: string[];
             if (refEnd !== undefined && refPos !== undefined) {
                 start = refPos;
                 length = refEnd - refPos;
             }
             let diagnostic: DiagnosticMessage;
             if (hasExtension(fileName)) {
-                if (!options.allowNonTsExtensions && !fileExtensionIs(host.getCanonicalFileName(fileName), ".ts")) {
-                    diagnostic = Diagnostics.File_0_must_have_extension_ts_or_d_ts;
+                if (!options.allowNonTsExtensions && !forEach(supportedExtensions, extension => fileExtensionIs(host.getCanonicalFileName(fileName), extension))) {
+                    diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
+                    diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
                 }
                 else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = Diagnostics.File_0_not_found;
+                    diagnosticArgument = [fileName];
                 }
                 else if (refFile && host.getCanonicalFileName(fileName) === host.getCanonicalFileName(refFile.fileName)) {
                     diagnostic = Diagnostics.A_file_cannot_have_a_reference_to_itself;
+                    diagnosticArgument = [fileName];
                 }
             }
             else {
                 if (options.allowNonTsExtensions && !findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = Diagnostics.File_0_not_found;
+                    diagnosticArgument = [fileName];
                 }
-                else if (!findSourceFile(fileName + ".ts", isDefaultLib, refFile, refPos, refEnd) && !findSourceFile(fileName + ".d.ts", isDefaultLib, refFile, refPos, refEnd)) {
+                else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd))) {
                     diagnostic = Diagnostics.File_0_not_found;
                     fileName += ".ts";
+                    diagnosticArgument = [fileName];
                 }
             }
 
             if (diagnostic) {
                 if (refFile) {
-                    diagnostics.add(createFileDiagnostic(refFile, start, length, diagnostic, fileName));
+                    diagnostics.add(createFileDiagnostic(refFile, start, length, diagnostic, ...diagnosticArgument));
                 }
                 else {
-                    diagnostics.add(createCompilerDiagnostic(diagnostic, fileName));
+                    diagnostics.add(createCompilerDiagnostic(diagnostic, ...diagnosticArgument));
                 }
             }
         }
@@ -417,9 +424,10 @@ module ts {
                         let moduleNameText = (<LiteralExpression>moduleNameExpr).text;
                         if (moduleNameText) {
                             let searchPath = basePath;
+                            let searchName: string; 
                             while (true) {
-                                let searchName = normalizePath(combinePaths(searchPath, moduleNameText));
-                                if (findModuleSourceFile(searchName + ".ts", moduleNameExpr) || findModuleSourceFile(searchName + ".d.ts", moduleNameExpr)) {
+                                searchName = normalizePath(combinePaths(searchPath, moduleNameText));
+                                if (forEach(supportedExtensions, extension => findModuleSourceFile(searchName + extension, moduleNameExpr))) {
                                     break;
                                 }
                                 let parentPath = getDirectoryPath(searchPath);
@@ -448,10 +456,7 @@ module ts {
                                 // An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules 
                                 // only through top - level external module names. Relative external module names are not permitted.
                                 let searchName = normalizePath(combinePaths(basePath, moduleName));
-                                let tsFile = findModuleSourceFile(searchName + ".ts", nameLiteral);
-                                if (!tsFile) {
-                                    findModuleSourceFile(searchName + ".d.ts", nameLiteral);
-                                }
+                                forEach(supportedExtensions, extension => findModuleSourceFile(searchName + extension, nameLiteral));
                             }
                         }
                     });
diff --git a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
@@ -1,6 +1,6 @@
-error TS6054: File 'a.t' must have extension '.ts' or '.d.ts'.
+error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.d.ts'.
 error TS6053: File 'a.ts' not found.
 
 
-!!! error TS6054: File 'a.t' must have extension '.ts' or '.d.ts'.
+!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.d.ts'.
 !!! error TS6053: File 'a.ts' not found.
diff --git a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
@@ -1,6 +1,6 @@
-error TS6054: File 'a.t' must have extension '.ts' or '.d.ts'.
+error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.d.ts'.
 error TS6053: File 'a.ts' not found.
 
 
-!!! error TS6054: File 'a.t' must have extension '.ts' or '.d.ts'.
+!!! error TS6054: File 'a.t' has unsupported extension. The only supported extensions are '.ts', '.d.ts'.
 !!! error TS6053: File 'a.ts' not found.

Original file line number	Diff line number	Diff line change
`@@ -857,10 +857,11 @@ module ts {`
`857`	`857`	`return symbol;`
`858`	`858`	`}`
`859`	`859`	`}`
	`860`	`+ let fileName: string;`
`860`	`861`	`let sourceFile: SourceFile;`
`861`	`862`	`while (true) {`
`862`		`- let fileName = normalizePath(combinePaths(searchPath, moduleName));`
`863`		`- sourceFile = host.getSourceFile(fileName + ".ts") \|\| host.getSourceFile(fileName + ".d.ts");`
	`863`	`+ fileName = normalizePath(combinePaths(searchPath, moduleName));`
	`864`	`+ sourceFile = forEach(supportedExtensions, extension => host.getSourceFile(fileName + extension));`
`864`	`865`	`if (sourceFile \|\| isRelative) {`
`865`	`866`	`break;`
`866`	`867`	`}`
Original file line number	Diff line number	Diff line change
`@@ -640,16 +640,18 @@ module ts {`
`640`	`640`	`return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;`
`641`	`641`	`}`
`642`	`642`
`643`		`- let supportedExtensions = [".d.ts", ".ts", ".js"];`
	`643`	`+ /**`
	`644`	`+ * List of supported extensions in order of file resolution precedence.`
	`645`	`+ */`
	`646`	`+ export const supportedExtensions = [".ts", ".d.ts"];`
`644`	`647`
	`648`	`+ const extensionsToRemove = [".d.ts", ".ts", ".js"];`
`645`	`649`	`export function removeFileExtension(path: string): string {`
`646`		`- for (let ext of supportedExtensions) {`
`647`		`-`
	`650`	`+ for (let ext of extensionsToRemove) {`
`648`	`651`	`if (fileExtensionIs(path, ext)) {`
`649`	`652`	`return path.substr(0, path.length - ext.length);`
`650`	`653`	`}`
`651`	`654`	`}`
`652`		`-`
`653`	`655`	`return path;`
`654`	`656`	`}`
`655`	`657`
Original file line number	Diff line number	Diff line change
`@@ -307,38 +307,45 @@ module ts {`
`307`	`307`	`function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) {`
`308`	`308`	`let start: number;`
`309`	`309`	`let length: number;`
	`310`	`+ let extensions: string;`
	`311`	`+ let diagnosticArgument: string[];`
`310`	`312`	`if (refEnd !== undefined && refPos !== undefined) {`
`311`	`313`	`start = refPos;`
`312`	`314`	`length = refEnd - refPos;`
`313`	`315`	`}`
`314`	`316`	`let diagnostic: DiagnosticMessage;`
`315`	`317`	`if (hasExtension(fileName)) {`
`316`		`- if (!options.allowNonTsExtensions && !fileExtensionIs(host.getCanonicalFileName(fileName), ".ts")) {`
`317`		`- diagnostic = Diagnostics.File_0_must_have_extension_ts_or_d_ts;`
	`318`	`+ if (!options.allowNonTsExtensions && !forEach(supportedExtensions, extension => fileExtensionIs(host.getCanonicalFileName(fileName), extension))) {`
	`319`	`+ diagnostic = Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;`
	`320`	`+ diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];`
`318`	`321`	`}`
`319`	`322`	`else if (!findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {`
`320`	`323`	`diagnostic = Diagnostics.File_0_not_found;`
	`324`	`+ diagnosticArgument = [fileName];`
`321`	`325`	`}`
`322`	`326`	`else if (refFile && host.getCanonicalFileName(fileName) === host.getCanonicalFileName(refFile.fileName)) {`
`323`	`327`	`diagnostic = Diagnostics.A_file_cannot_have_a_reference_to_itself;`
	`328`	`+ diagnosticArgument = [fileName];`
`324`	`329`	`}`
`325`	`330`	`}`
`326`	`331`	`else {`
`327`	`332`	`if (options.allowNonTsExtensions && !findSourceFile(fileName, isDefaultLib, refFile, refPos, refEnd)) {`
`328`	`333`	`diagnostic = Diagnostics.File_0_not_found;`
	`334`	`+ diagnosticArgument = [fileName];`
`329`	`335`	`}`
`330`		`- else if (!findSourceFile(fileName + ".ts", isDefaultLib, refFile, refPos, refEnd) && !findSourceFile(fileName + ".d.ts", isDefaultLib, refFile, refPos, refEnd)) {`
	`336`	`+ else if (!forEach(supportedExtensions, extension => findSourceFile(fileName + extension, isDefaultLib, refFile, refPos, refEnd))) {`
`331`	`337`	`diagnostic = Diagnostics.File_0_not_found;`
`332`	`338`	`fileName += ".ts";`
	`339`	`+ diagnosticArgument = [fileName];`
`333`	`340`	`}`
`334`	`341`	`}`
`335`	`342`
`336`	`343`	`if (diagnostic) {`
`337`	`344`	`if (refFile) {`
`338`		`- diagnostics.add(createFileDiagnostic(refFile, start, length, diagnostic, fileName));`
	`345`	`+ diagnostics.add(createFileDiagnostic(refFile, start, length, diagnostic, ...diagnosticArgument));`
`339`	`346`	`}`
`340`	`347`	`else {`
`341`		`- diagnostics.add(createCompilerDiagnostic(diagnostic, fileName));`
	`348`	`+ diagnostics.add(createCompilerDiagnostic(diagnostic, ...diagnosticArgument));`
`342`	`349`	`}`
`343`	`350`	`}`
`344`	`351`	`}`
`@@ -417,9 +424,10 @@ module ts {`
`417`	`424`	`let moduleNameText = (<LiteralExpression>moduleNameExpr).text;`
`418`	`425`	`if (moduleNameText) {`
`419`	`426`	`let searchPath = basePath;`
	`427`	`+ let searchName: string;`
`420`	`428`	`while (true) {`
`421`		`- let searchName = normalizePath(combinePaths(searchPath, moduleNameText));`
`422`		`- if (findModuleSourceFile(searchName + ".ts", moduleNameExpr) \|\| findModuleSourceFile(searchName + ".d.ts", moduleNameExpr)) {`
	`429`	`+ searchName = normalizePath(combinePaths(searchPath, moduleNameText));`
	`430`	`+ if (forEach(supportedExtensions, extension => findModuleSourceFile(searchName + extension, moduleNameExpr))) {`
`423`	`431`	`break;`
`424`	`432`	`}`
`425`	`433`	`let parentPath = getDirectoryPath(searchPath);`
`@@ -448,10 +456,7 @@ module ts {`
`448`	`456`	`// An ExternalImportDeclaration in anAmbientExternalModuleDeclaration may reference other external modules`
`449`	`457`	`// only through top - level external module names. Relative external module names are not permitted.`
`450`	`458`	`let searchName = normalizePath(combinePaths(basePath, moduleName));`
`451`		`- let tsFile = findModuleSourceFile(searchName + ".ts", nameLiteral);`
`452`		`- if (!tsFile) {`
`453`		`- findModuleSourceFile(searchName + ".d.ts", nameLiteral);`
`454`		`- }`
	`459`	`+ forEach(supportedExtensions, extension => findModuleSourceFile(searchName + extension, nameLiteral));`
`455`	`460`	`}`
`456`	`461`	`}`
`457`	`462`	`});`