Commit Graph

3318 Commits

Author SHA1 Message Date
Ron Buckton
a894f04495 Merge branch 'master' into moveTypeSerializationToEmitter 2015-07-10 13:18:56 -07:00
Ron Buckton
990ce29c00 PR feedback 2015-07-10 13:13:42 -07:00
Yui T
f16f9d129a Merge branch 'master' of https://github.com/Microsoft/TypeScript into completionListWithLocalName 2015-07-10 11:04:21 -07:00
Dan Quirk
9c2a7705b0 merge master 2015-07-09 18:16:21 -07:00
Dan Quirk
1a3dbc0a5f Final CR feedback fixes 2015-07-09 18:07:48 -07:00
Yui T
d0b8002701 Address code review 2015-07-09 16:34:30 -07:00
Jason Freeman
9d6dc36e51 Merge pull request #3798 from Microsoft/typeArgumentInferenceClassExpressions
Type argument inference for class expressions
2015-07-09 14:56:49 -07:00
Dan Quirk
27f5bf10de CR feedback 2015-07-09 14:44:47 -07:00
Mohamed Hegazy
e336701ba8 Merge pull request #3763 from tinganho/typePredicateDeclEmit
Fixes emit of type predicate in declaration files
2015-07-09 12:34:43 -07:00
Tingan Ho
4e644e5ab8 Fixes spacing issue 2015-07-10 03:27:31 +08:00
Jason Freeman
f37fc1d42e Infer types to statics in a class expression 2015-07-09 11:31:08 -07:00
shyyko.serhiy@gmail.com
43307edd4a fixed issue https://github.com/Microsoft/TypeScript/issues/3486 2015-07-09 20:27:05 +03:00
Tingan Ho
28976a0e34 Adds type predicate signature display and addresses CR feedback 2015-07-09 12:10:39 +08:00
Tingan Ho
951084fc85 Fixes emit of type predicated in delcaration files 2015-07-09 12:08:14 +08:00
Dan Quirk
5dfa6104f9 Turn off a few rules and more cleanup post merge 2015-07-08 17:42:26 -07:00
Dan Quirk
be1371d3cd Merge master 2015-07-08 15:35:49 -07:00
Yui
42bff6bc77 Merge pull request #3772 from Microsoft/allowModifier
Allow modifier on class member for classDeclaration/classExpression inside function
2015-07-08 14:34:41 -07:00
Yui T
8e15a42632 Address code review 2015-07-08 13:56:27 -07:00
CyrusNajmabadi
aaf0f78553 Merge pull request #3778 from Microsoft/noPushApply
Don't call push.apply, it can stack overflow with large arrays.
2015-07-08 11:25:48 -07:00
Cyrus Najmabadi
e0e9bcff46 Don't call push.apply, it can stack overflow with large arrays. 2015-07-07 17:44:22 -07:00
Yui T
cdc999a6c5 Only check if method declaration has modifier when method is declared in object literal expression 2015-07-07 16:26:48 -07:00
Ryan Cavanaugh
8f3bce121d Actually fix the bug this time. 2015-07-07 16:22:04 -07:00
Ryan Cavanaugh
24d22da804 Merge remote-tracking branch 'upstream/master' into fix3737 2015-07-07 15:36:13 -07:00
Yui T
b5b1b7b5bb Use symbol.getName for classExpression and functionExpression since it now correctly represent declared-name. 2015-07-07 15:26:01 -07:00
Yui T
872fdcf444 Merge branch 'master' into completionListWithLocalName
Conflicts:
	tests/cases/fourslash/renameLocationsForClassExpression01.ts
2015-07-07 15:17:42 -07:00
Ryan Cavanaugh
719498eb0f Merge pull request #3770 from RyanCavanaugh/fix3764
Fix #3764
2015-07-07 14:38:26 -07:00
Ryan Cavanaugh
3ccaa0ee26 Cleanup 2015-07-07 14:33:59 -07:00
Ryan Cavanaugh
99fc99f3bc Improved fix from @JsonFreeman 2015-07-07 14:27:57 -07:00
Yui
42168e39ec Merge pull request #3769 from Microsoft/bindingAnonymouseWithName
Binding anonymous with name for functionExpression and classExpression
2015-07-07 13:28:38 -07:00
Yui T
48ae5ea6f8 Remove check if node is a block 2015-07-07 13:25:39 -07:00
Ryan Cavanaugh
006356d2a3 Whitespace 2015-07-07 12:53:53 -07:00
Ryan Cavanaugh
311d20fa99 Fix bug #3737 (exported JSX classes props not validated) 2015-07-07 12:46:58 -07:00
Ryan Cavanaugh
1568bfd642 Mark 'React' symbol as used and error if it doesn't exist 2015-07-07 11:32:57 -07:00
Yui T
93a721cf1d Bind classExpression and functionExpression to its name if the expression is declared with name 2015-07-07 09:57:58 -07:00
Yui T
0148915daf Fix comment 2015-07-07 09:18:08 -07:00
Ryan Cavanaugh
f682980216 Merge pull request #3751 from RyanCavanaugh/fix3678
Properly parse keyword-like identifiers in JSX
2015-07-06 17:43:24 -07:00
Yui T
f4cd1ac868 Address code review, handle type parameter in completion list inside class expression 2015-07-06 17:03:33 -07:00
Cyrus Najmabadi
3a26cd21f9 Adding comments. 2015-07-06 15:31:22 -07:00
Cyrus Najmabadi
1dfcc3ec0e Merge branch 'master' into cancellableDiagnostics
Conflicts:
	src/services/services.ts
	src/services/shims.ts
2015-07-06 15:19:57 -07:00
Yui T
b01e4d82c3 Address code review 2015-07-06 14:18:47 -07:00
Yui T
7c52aaa4b8 Merge branch 'master' into completionListWithLocalName
Conflicts:
	src/compiler/checker.ts
2015-07-06 13:35:01 -07:00
Anders Hejlsberg
71c6433514 Merge pull request #3622 from Microsoft/intersectionTypes
Intersection types
2015-07-06 12:58:28 -07:00
Ryan Cavanaugh
48c48417a6 Properly parse keyword-like identifiers in JSX 2015-07-06 11:42:06 -07:00
Yui T
6da98ce897 Fix comments 2015-07-06 10:51:43 -07:00
Jason Freeman
f126767eb3 Merge pull request #3724 from Microsoft/apparentTypeOfContextualType
Always get the apparent type when retrieving a contextual type
2015-07-06 10:18:21 -07:00
Anders Hejlsberg
fc1888ec8a Merge branch 'master' into intersectionTypes
Conflicts:
	tests/baselines/reference/APISample_linter.js
2015-07-03 11:26:38 -07:00
Anders Hejlsberg
144a635bc5 Changing comment per CR feedback 2015-07-03 11:20:44 -07:00
Ron Buckton
b294443c35 Merge pull request #3719 from Microsoft/createNodePos
Change default node pos/end to -1
2015-07-02 18:47:15 -07:00
Jason Freeman
0fcc63e33e Disallow modifiers on rest parameters 2015-07-02 16:13:38 -07:00
Jason Freeman
1085e39b9a Always take the apparent type when you retrieve a contextual type 2015-07-02 15:20:57 -07:00