microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-21 13:14:43 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address CR

Browse Source
This commit is contained in:
Ryan Cavanaugh 2016-03-23 11:41:34 -07:00 committed by Vladimir Matveev
parent 05444eaabb
commit 75922c4056
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/commandLineParser.ts
View File

@ -311,6 +311,16 @@ namespace ts {
isFilePath: true
}
},
{
name: "librarySearchPaths",
type: "list",
isTSConfigOnly: true,
element: {
name: "librarySearchPaths",
type: "string",
isFilePath: true
}
},
{
name: "traceModuleResolution",
type: "boolean",
@ -638,6 +648,7 @@ namespace ts {
const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
const options = extend(existingOptions, compilerOptions);
const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
options.configFilePath = configFileName;
const fileNames = getFileNames(errors);

2
src/compiler/diagnosticMessages.json
View File

@ -2159,7 +2159,7 @@
"category": "Error",
"code": 4082
},
"Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to a local typings folder to resolve this conflict.": {
"Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict.": {
"category": "Message",
"code": 4090
},

4
src/compiler/program.ts
View File

@ -15,7 +15,7 @@ namespace ts {
const defaultLibrarySearchPaths = <Path[]>[
"typings/",
"node_modules/",
"node_modules/@types/",
"node_modules/@typings/",
];
export const version = "1.9.0";
@ -1597,7 +1597,7 @@ namespace ts {
const otherFileText = host.readFile(secondaryResult);
if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
fileProcessingDiagnostics.add(createFileDiagnostic(file, ref.pos, ref.end - ref.pos,
Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_a_local_typings_folder_to_resolve_this_conflict,
Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict,
ref.fileName,
secondaryResult,
previousResolution.resolvedFileName));

1
src/compiler/tsc.ts
View File

@ -390,7 +390,6 @@ namespace ts {
reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--watch"), /* compilerHost */ undefined);
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
}
configParseResult.options.configFilePath = configFileName as Path;
return configParseResult;
}