removing filename requirement

saschanaz · saschanaz · commit 880db386a43e · 2015-11-24T23:39:12.000+09:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2068,11 +2068,11 @@
         "category": "Error",
         "code": 5056
     },
-    "The project file name is not in 'tsconfig(-*).json' format: '{0}'": {
+    "Cannot find a tsconfig.json file at the specified directory: '{0}'": {
         "category": "Error",
         "code": 5057
     },
-    "Cannot find any project file in specified path: '{0}'": {
+    "The specified path does not exist: '{0}'": {
         "category": "Error",
         "code": 5058
     },
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -301,19 +301,19 @@ namespace ts {
             }
 
             const fileOrDirectory = normalizePath(commandLine.options.project);
-            if (!fileOrDirectory /* current directory */ || sys.directoryExists(fileOrDirectory)) {
+            if (!fileOrDirectory /* current directory "." */ || sys.directoryExists(fileOrDirectory)) {
                 configFileName = combinePaths(fileOrDirectory, "tsconfig.json");
+                if (!sys.fileExists(configFileName)) {
+                    reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0, commandLine.options.project), /* compilerHost */ undefined);
+                    return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
+                }
             }
             else {
-                if (!/^tsconfig(?:-.*)?\.json$/.test(getBaseFileName(fileOrDirectory))) {
-                    reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project), /* compilerHost */ undefined);
+                configFileName = fileOrDirectory;
+                if (!sys.fileExists(configFileName)) {
+                    reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_specified_path_does_not_exist_Colon_0, commandLine.options.project), /* compilerHost */ undefined);
                     return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 }
-                configFileName = fileOrDirectory;
-            }
-            if (!sys.fileExists(configFileName)) {
-                reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project), /* compilerHost */ undefined);
-                return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
         }
         else if (commandLine.fileNames.length === 0 && isJSONSupported()) {

Original file line number	Diff line number	Diff line change
`@@ -301,19 +301,19 @@ namespace ts {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`const fileOrDirectory = normalizePath(commandLine.options.project);`
`304`		`- if (!fileOrDirectory /* current directory */ \|\| sys.directoryExists(fileOrDirectory)) {`
	`304`	`+ if (!fileOrDirectory /* current directory "." */ \|\| sys.directoryExists(fileOrDirectory)) {`
`305`	`305`	`configFileName = combinePaths(fileOrDirectory, "tsconfig.json");`
	`306`	`+ if (!sys.fileExists(configFileName)) {`
	`307`	`+ reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0, commandLine.options.project), /* compilerHost */ undefined);`
	`308`	`+ return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
	`309`	`+ }`
`306`	`310`	`}`
`307`	`311`	`else {`
`308`		`- if (!/^tsconfig(?:-.*)?\.json$/.test(getBaseFileName(fileOrDirectory))) {`
`309`		`- reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project), /* compilerHost */ undefined);`
	`312`	`+ configFileName = fileOrDirectory;`
	`313`	`+ if (!sys.fileExists(configFileName)) {`
	`314`	`+ reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_specified_path_does_not_exist_Colon_0, commandLine.options.project), /* compilerHost */ undefined);`
`310`	`315`	`return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
`311`	`316`	`}`
`312`		`- configFileName = fileOrDirectory;`
`313`		`- }`
`314`		`- if (!sys.fileExists(configFileName)) {`
`315`		`- reportDiagnostic(createCompilerDiagnostic(Diagnostics.Cannot_find_any_project_file_in_specified_path_Colon_0, commandLine.options.project), /* compilerHost */ undefined);`
`316`		`- return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`	`else if (commandLine.fileNames.length === 0 && isJSONSupported()) {`