Merge pull request #1594 from Microsoft/allowNonTsExtensionsVsNoExten…

…sions fixes #1593
microsoft · Jan 13, 2015 · d8468f7 · d8468f7
2 parents 1ebf905 + b399ce8
commit d8468f7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -5231,7 +5231,10 @@ module ts {
                 }
             }
             else {
-                if (!(findSourceFile(filename + ".ts", isDefaultLib, refFile, refPos, refEnd) || findSourceFile(filename + ".d.ts", isDefaultLib, refFile, refPos, refEnd))) {
+                if(options.allowNonTsExtensions && !findSourceFile(filename, isDefaultLib, refFile, refPos, refEnd)) {
+                    diagnostic = Diagnostics.File_0_not_found;
+                }
+                else if (!findSourceFile(filename + ".ts", isDefaultLib, refFile, refPos, refEnd) && !findSourceFile(filename + ".d.ts", isDefaultLib, refFile, refPos, refEnd)) {
                     diagnostic = Diagnostics.File_0_not_found;
                     filename += ".ts";
                 }