microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 07:13:45 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'release-1.6'

Browse Source 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/program.ts
	tests/baselines/reference/emptyObjectBindingPatternParameter04.symbols
	tests/baselines/reference/emptyObjectBindingPatternParameter04.types
	tests/baselines/reference/nodeResolution5.errors.txt
	tests/baselines/reference/nodeResolution7.errors.txt
This commit is contained in:
Daniel Rosenwasser
2015-09-15 13:36:08 -07:00
parent 89718cf5a5 a44d8e76c6
commit 38b605ea7d
87 changed files with 2280 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/commandLineParser.ts
View File

@@ -243,8 +243,9 @@ namespace ts {
"node": ModuleResolutionKind.NodeJs,
"classic": ModuleResolutionKind.Classic
},
description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_or_classic_TypeScript_pre_1_6
}
description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic,
}
];
/* @internal */
@@ -327,7 +328,7 @@ namespace ts {
options[opt.name] = map[key];
}
else {
errors.push(createCompilerDiagnostic(opt.error));
errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
}
}
}
@@ -440,7 +441,7 @@ namespace ts {
value = optType[key];
}
else {
errors.push(createCompilerDiagnostic(opt.error));
errors.push(createCompilerDiagnostic((<CommandLineOptionOfCustomType>opt).error));
value = 0;
}
}