microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 11:24:29 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

update regex for filename

Browse Source
This commit is contained in:
SaschaNaz
2015-09-22 18:09:54 +09:00
parent 04d73ba504
commit 00a373a5ef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/diagnosticMessages.json
View File

@@ -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
},

4
src/compiler/tsc.ts
View File

@@ -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);
}