Commit Graph

2195 Commits

Author SHA1 Message Date
Vladimir Matveev
b82fd590d2 merge with master, accept baselines 2015-03-17 18:23:43 -07:00
Mohamed Hegazy
a06ce61684 Merge branch 'master' into es6ImportExportEmit 2015-03-17 13:03:17 -07:00
Mohamed Hegazy
766cb68f7c Add comments 2015-03-17 13:03:13 -07:00
Jason Freeman
3879d0ae9a Merge branch 'master' of https://github.com/Microsoft/TypeScript into typeParameterFixing 2015-03-17 10:45:41 -07:00
Jason Freeman
f14abfefab Add clarifying comment 2015-03-17 10:45:25 -07:00
Vladimir Matveev
a301ee3616 Merge pull request #2382 from Microsoft/mergingConstEnumOnlyModules
correctly merge const enum only and instantiated modules irregardless of order
2015-03-17 10:42:48 -07:00
Anders Hejlsberg
ad75193528 Merge branch 'master' into cleanupDiagnostics
Conflicts:
	src/compiler/program.ts
2015-03-17 06:26:24 -07:00
Mohamed Hegazy
1932f720cb Handel export name bindings in internal modules in ES6 2015-03-16 21:58:57 -07:00
Mohamed Hegazy
3d802438f1 Export classes defined wihtin internal modules correctelly 2015-03-16 21:18:31 -07:00
Mohamed Hegazy
99108694d5 Do not emit "export" for classes within modules, and do not write the name of an export default class 2015-03-16 20:54:28 -07:00
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
Vladimir Matveev
74eb96a5b9 correctly merge const enum only and instantiated modules 2015-03-16 19:51:22 -07:00
Mohamed Hegazy
eb954e1cb5 Respond to code review comments 2015-03-16 19:25:02 -07:00
Jason Freeman
6fc552339f Merge branch 'master' of https://github.com/Microsoft/TypeScript into typeParameterFixing 2015-03-16 17:43:31 -07:00
Yui
c4cb3e3483 Merge pull request #2333 from Microsoft/emitClass
Class emit for ES6
2015-03-16 17:40:03 -07:00
Yui T
9b3fccd5c4 Address code review; Use for..of and use if-statement 2015-03-16 16:24:40 -07:00
Yui T
513b45d101 Merge branch 'master' into emitClass
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/emitter.ts
	src/compiler/parser.ts
2015-03-16 15:55:57 -07:00
Yui T
c51983df3c Address code review 2015-03-16 15:48:03 -07:00
Yui T
91c5bae6e5 Address code review 2015-03-16 15:41:51 -07:00
Yui T
88933d54cc Address code review 2015-03-16 15:20:40 -07:00
Jason Freeman
28c4b02577 Merge branch 'master' of https://github.com/Microsoft/TypeScript into typeParameterFixing 2015-03-16 14:52:17 -07:00
Jason Freeman
90fae03f1f More PR feedback 2015-03-16 14:52:03 -07:00
Mohamed Hegazy
5845d2d214 Merge branch 'master' into es6ImportExportEmit 2015-03-16 14:49:41 -07:00
Yui T
e573461745 Address code review. Use-before-def check will be added to separate work item 2015-03-16 14:43:53 -07:00
Mohamed Hegazy
696b688987 Merge branch 'master' into exportDefaultType
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-03-16 14:42:47 -07:00
Vladimir Matveev
7f8ef3881b addressed PR feedback 2015-03-16 13:36:34 -07:00
Vladimir Matveev
f5a4b0b31a use 'allowGeneratedIdentifiers' to explicitly tell when identifier can be renamed 2015-03-16 12:37:21 -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
Jason Freeman
bd811cea2a Merge branch 'master' of https://github.com/Microsoft/TypeScript into typeParameterFixing 2015-03-16 11:04:40 -07:00
Jason Freeman
9933f6cd00 Address PR feedback 2015-03-16 11:04:11 -07:00
Daniel Rosenwasser
ad98fadb0a Merge pull request #2283 from caitp/issue-2282
Disallow line terminator after arrow function parameters, before =>
2015-03-15 21:59:54 -04:00
Mohamed Hegazy
c984e81053 Fix issue of the default binding not elided if namedImport is reference
Conflicts:
	src/compiler/checker.ts
	src/compiler/emitter.ts
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
	tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
2015-03-15 18:23:48 -07:00
Yui T
9bf5a11bef Update baselines 2015-03-15 16:29:41 -07:00
Mohamed Hegazy
b6a6d85e6b Merge branch 'master' into es6ImportExportEmit
Conflicts:
	src/compiler/checker.ts
	src/compiler/emitter.ts
	src/compiler/program.ts
2015-03-15 15:48:23 -07:00
Mohamed Hegazy
44a5343c1e Upate error message 2015-03-15 14:37:12 -07:00
Mohamed Hegazy
7430f3c9c7 Merge branch 'master' into exportDefaultType
Conflicts:
	src/compiler/checker.ts
2015-03-15 14:23:40 -07:00
Yui T
2a07d3f8db Address code review: do not emit default constructor 2015-03-15 12:33:29 -07:00
Vladimir Matveev
3cea68d955 Merge pull request #2353 from Microsoft/shadowingNameViaBindingPattern
consider binding elements as always initialized with doing shadow check
2015-03-15 11:53:42 -07:00
Vladimir Matveev
fac3cf8b55 addressed PR feedback 2015-03-14 18:50:05 -07:00
Caitlin Potter
02d356800f Share SourceFile with other grammar checker that needs it 2015-03-14 20:12:10 -04:00
Yui T
13e55ae8cb Address code review 2015-03-14 16:53:33 -07:00
Caitlin Potter
10925c1e9b Make sure arrow function grammar rules can deal with type annotations 2015-03-14 19:51:42 -04:00
Caitlin Potter
3dc5faf707 Restore earlier behaviour when parsing non-simple arrow function bodies 2015-03-14 19:51:42 -04:00
Caitlin Potter
bd828e3024 Parse arrow function body as identifier if missing => or {
Restores functionality broken in previous commit
2015-03-14 19:51:42 -04:00
Caitlin Potter
5e107e6042 Address slew of review comments 2015-03-14 19:51:41 -04:00
Caitlin Potter
fdc673f5eb Fix line wrapping 2015-03-14 19:51:41 -04:00
Caitlin Potter
aa3cefb63d Check that arrow is on same line as parameters 2015-03-14 19:51:41 -04:00
Caitlin Potter
dd16fed21e Perform error reporting in checker 2015-03-14 19:50:55 -04:00
Caitlin Potter
84634ac25d Disallow line terminator after arrow function parameters, before =>
Closes #2282
2015-03-14 19:50:24 -04:00
Jason Freeman
a0b96079c2 Get rid of inferenceFailureType, just set the failedTypeParameterIndex directly 2015-03-13 18:36:12 -07:00