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

Merge branch 'master' into cancellableDiagnostics

Browse Source 
Conflicts:
	src/services/services.ts
	src/services/shims.ts
This commit is contained in:
Cyrus Najmabadi
2015-07-06 15:19:57 -07:00
parent c9c0f3a4ad e009d68d6b
commit 1dfcc3ec0e
1031 changed files with 42922 additions and 18545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/program.ts
View File

@@ -368,7 +368,6 @@ namespace ts {
function processSourceFile(fileName: string, isDefaultLib: boolean, refFile?: SourceFile, refPos?: number, refEnd?: number) {
let start: number;
let length: number;
let extensions: string;
let diagnosticArgument: string[];
if (refEnd !== undefined && refPos !== undefined) {
start = refPos;
@@ -706,6 +705,11 @@ namespace ts {
!options.experimentalDecorators) {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_experimentalDecorators_must_also_be_specified_when_option_emitDecoratorMetadata_is_specified));
}
if (options.experimentalAsyncFunctions &&
options.target !== ScriptTarget.ES6) {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_experimentalAsyncFunctions_cannot_be_specified_when_targeting_ES5_or_lower));
}
}
}
}