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

Merge branch 'release-1.5' into filterTranspileDiagnostics

Browse Source
This commit is contained in:
Mohamed Hegazy
2015-06-02 18:01:05 -07:00
parent 2cbe14e131 a10cd1e822
commit c83054cd4b
78 changed files with 492 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/program.ts
View File

@@ -636,6 +636,11 @@ module ts {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_noEmit_cannot_be_specified_with_option_declaration));
}
}
if (options.emitDecoratorMetadata &&
!options.experimentalDecorators) {
diagnostics.add(createCompilerDiagnostic(Diagnostics.Option_experimentalDecorators_must_also_be_specified_when_option_emitDecoratorMetadata_is_specified));
}
}
}
}