update regex for filename

saschanaz · saschanaz · commit 00a373a5ef29 · 2015-09-22T18:09:54.000+09:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2056,7 +2056,7 @@
         "category": "Error",
         "code": 5054
     },
-    "The project file name is not in 'tsconfig-*.json' format: '{0}'": {
+    "The project file name is not in 'tsconfig(-*).json' format: '{0}'": {
         "category": "Error",
         "code": 5055
     },
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -186,11 +186,11 @@ namespace ts {
             }
 
             let fileOrDirectory = normalizePath(commandLine.options.project);
-            if (!fileOrDirectory || sys.directoryExists(fileOrDirectory)) {
+            if (!fileOrDirectory /* current directory */ || sys.directoryExists(fileOrDirectory)) {
                 configFileName = combinePaths(fileOrDirectory, "tsconfig.json");
             }
             else {
-                if (!/^tsconfig.*\.json$/.test(getBaseFileName(fileOrDirectory))) {
+                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));
                     return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
                 }

Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,11 @@ namespace ts {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`let fileOrDirectory = normalizePath(commandLine.options.project);`
`189`		`- if (!fileOrDirectory \|\| sys.directoryExists(fileOrDirectory)) {`
	`189`	`+ if (!fileOrDirectory /* current directory */ \|\| sys.directoryExists(fileOrDirectory)) {`
`190`	`190`	`configFileName = combinePaths(fileOrDirectory, "tsconfig.json");`
`191`	`191`	`}`
`192`	`192`	`else {`
`193`		`- if (!/^tsconfig.*\.json$/.test(getBaseFileName(fileOrDirectory))) {`
	`193`	`+ if (!/^tsconfig(?:-.*)?.json$/.test(getBaseFileName(fileOrDirectory))) {`
`194`	`194`	`reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_project_file_name_is_not_in_tsconfig_Asterisk_json_format_Colon_0, commandLine.options.project));`
`195`	`195`	`return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);`
`196`	`196`	`}`