Commit graph

6 commits

Author SHA1 Message Date
Cyrus Najmabadi a2efe474cf Split symbol baselines from type baselines. 2015-04-15 16:44:20 -07:00
Cyrus Najmabadi 29f3f6fcae Merge branch 'master' into typeWriter 2015-04-13 14:29:37 -07:00
Cyrus Najmabadi b5b9f517ce Include symbol information in the typewriter baselines. 2015-04-13 13:54:22 -07:00
Cyrus Najmabadi 592e2314d4 Simplify typewriter code. 2015-04-13 12:36:11 -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
Sheetal Nandi 4f1b908212 Parse import ModuleSpecifier; 2015-01-27 16:16:27 -08:00