Mohamed Hegazy
|
cb012e01fd
|
Merge branch 'master' into es6ImportExportEmit
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
|
2015-03-16 20:47:08 -07:00 |
|
|
Mohamed Hegazy
|
090148fdee
|
Merge branch 'master' into es6ImportExportEmit
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
|
2015-03-16 12:11:43 -07:00 |
|
|
Mohamed Hegazy
|
b6bbf06e13
|
Update error message
|
2015-03-12 17:21:04 -07:00 |
|
|
Mohamed Hegazy
|
b52d9ec23e
|
Report error if module gen target is specified in es6
Conflicts:
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
src/compiler/program.ts
tests/baselines/reference/constDeclarations-access5.errors.txt
tests/baselines/reference/es6ExportAssignment.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
tests/cases/compiler/es6ImportDefaultBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts
tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts
tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts
tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts
tests/cases/compiler/es6ImportNameSpaceImport.ts
tests/cases/compiler/es6ImportNamedImport.ts
tests/cases/compiler/es6ImportNamedImportMergeErrors.ts
tests/cases/compiler/es6ImportNamedImportNoExportMember.ts
tests/cases/compiler/es6ImportWithoutFromClause.ts
tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts
|
2015-03-11 22:53:36 -07:00 |
|
|
Mohamed Hegazy
|
61a5bfb09d
|
Report error on export assignment with es6 and above target
Conflicts:
src/compiler/checker.ts
tests/baselines/reference/es6ImportDefaultBinding.errors.txt
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt
tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt
tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts
tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts
tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts
tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts
tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts
|
2015-03-11 21:53:37 -07:00 |
|
|
Mohamed Hegazy
|
e902d8462e
|
ES6 doesnt support import id = require("mod") syntax
Conflicts:
src/compiler/checker.ts
src/compiler/diagnosticInformationMap.generated.ts
src/compiler/diagnosticMessages.json
|
2015-03-11 21:40:10 -07:00 |
|