microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-11 10:34:29 -05: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
Download Patch File Download Diff File Expand all files Collapse all files

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