Commit graph

7483 commits

Author SHA1 Message Date
Yui 0a9fb1a7b5 Merge pull request #3946 from Microsoft/disambiguating
Fix resolution when block-scoped variable names collide with those of other entities
2015-07-28 16:01:48 -07:00
Yui T 9d1f051e84 Update test baseline 2015-07-28 15:34:02 -07:00
Ryan Cavanaugh 9f7e71d9e8 Merge remote-tracking branch 'upstream/master' into fix4060
Conflicts:
	src/compiler/emitter.ts
2015-07-28 15:32:53 -07:00
Ryan Cavanaugh da39a8be10 Don't forget about spread attributes 2015-07-28 15:31:39 -07:00
Jason Freeman bbadd702e7 Merge pull request #4022 from Microsoft/defaultInitializer
Default initializers on required parameters
2015-07-28 15:27:04 -07:00
Yui T 3edecbfa47 Merge branch 'master' into disambiguating 2015-07-28 15:26:31 -07:00
Yui T a07d911f63 Address code review 2015-07-28 15:25:27 -07:00
Jason Freeman cdd451586e Merge pull request #3986 from Microsoft/anyFunctionTypeDontAddCandidate
Don't add a type that contains anyFunctionType as an inference candidate
2015-07-28 14:58:16 -07:00
Jason Freeman ef80ff2229 Merge branch 'master' of https://github.com/Microsoft/TypeScript into anyFunctionTypeDontAddCandidate
Conflicts:
	src/compiler/types.ts
2015-07-28 14:52:10 -07:00
Jason Freeman 71a7c19cea Fix naming and update comment 2015-07-28 14:49:28 -07:00
Jason Freeman 3e5711fa01 Merge branch 'master' of https://github.com/Microsoft/TypeScript into defaultInitializer 2015-07-28 14:42:21 -07:00
Jason Freeman 4673d618a7 Make declaration emitter call resolver.isOptionalParameter 2015-07-28 14:42:08 -07:00
Ryan Cavanaugh fc9b10eeb6 Correctly identify JSX expressions as identifier parents 2015-07-28 13:49:39 -07:00
unknown 90e31adea8 Raise error if mixing tsconfig.json and directives. 2015-07-27 21:02:58 -07:00
Vladimir Matveev d0bc070fb8 Merge pull request #3969 from Microsoft/forwardRefsInEnumInitializers
Forward refs in enum initializers
2015-07-27 18:13:59 -07:00
Vladimir Matveev 4c3d21f8f3 updated baselines 2015-07-27 18:03:07 -07:00
Vladimir Matveev cb14a9ec13 merge with master 2015-07-27 17:58:20 -07:00
Vladimir Matveev e1708e7e2f Merge branch 'master' into forwardRefsInEnumInitializers 2015-07-27 17:51:20 -07:00
unknown 450112d28a Remove debugger; 2015-07-27 17:45:18 -07:00
unknown 53e449c901 Allow tsconfig.json to be added to fourslash test. 2015-07-27 17:45:15 -07:00
Yui 6af52ee62f Merge pull request #3897 from Microsoft/errorForUseSuperInNullExtension
Error for use super in null extension
2015-07-27 15:59:12 -07:00
Yui T 5e6078133c Merge branch 'master' into errorForUseSuperInNullExtension
Conflicts:
	src/compiler/checker.ts
2015-07-27 15:37:02 -07:00
Jason Freeman 40d6c7f740 Merge branch 'master' of https://github.com/Microsoft/TypeScript into defaultInitializer 2015-07-27 15:34:29 -07:00
Jason Freeman 06f63b2e04 Merge branch 'master' of https://github.com/Microsoft/TypeScript into anyFunctionTypeDontAddCandidate 2015-07-27 15:33:11 -07:00
Arthur Ozga 266e5e66f6 Merge pull request #3911 from Microsoft/removeForLoop
remove for-loops
2015-07-27 13:48:09 -07:00
Arthur Ozga 7c024aba56 cleanup 2015-07-27 13:19:14 -07:00
Arthur Ozga a95f608f1d Merge branch 'master' into removeForLoop 2015-07-27 13:17:18 -07:00
Ryan Cavanaugh 0da9b7a850 Merge pull request #3942 from RyanCavanaugh/fix3903
Fix crash when the element instance type was undefined
2015-07-27 12:41:14 -07:00
Ryan Cavanaugh 4e3751c07c Use Debug.assert instead of Debug.fail; preserve 'any' variants 2015-07-27 12:31:53 -07:00
Daniel Rosenwasser 4f507a6b7e Merge pull request #3973 from Microsoft/disallowDefaultExportDeclMerging
Disallow merging for default export declarations
2015-07-27 15:03:40 -04:00
Daniel Rosenwasser 28ce0a1a84 Accepted baselines. 2015-07-27 11:51:53 -07:00
Daniel Rosenwasser 157235f5da Fixed test message. 2015-07-27 11:45:22 -07:00
Daniel Rosenwasser 92902011ce Added a test. 2015-07-27 11:45:10 -07:00
Ryan Cavanaugh 079047c60b Simplify code a bit. 2015-07-27 11:21:27 -07:00
Daniel Rosenwasser a8f0491d62 space -> spaces 2015-07-27 11:17:23 -07:00
Daniel Rosenwasser bad5919fa8 Addressed CR feedback. 2015-07-27 11:14:13 -07:00
Daniel Rosenwasser b84e4071a5 Accepted baselines. 2015-07-27 10:23:05 -07:00
Daniel Rosenwasser cf801efb20 Added test. 2015-07-27 10:12:52 -07:00
Vladimir Matveev ad449ce0fa Moved LKG folder to lib 2015-07-27 10:07:07 -07:00
Vladimir Matveev 4146406367 tsserver: set +x 2015-07-27 09:46:42 -07:00
Mohamed Hegazy 8a2ded3cd6 Merge pull request #4034 from basarat/patch-1
SourceFile.fileWatcher should be optional
2015-07-27 01:05:19 -07:00
Basarat Ali Syed 1251b46eb6 SourceFile.fileWatcher should be optional 2015-07-27 17:42:49 +10:00
Yui T 7296cc7a4e Merge branch 'master' into errorForUseSuperInNullExtension 2015-07-26 20:46:51 -07:00
Yui T 442855f7e1 Address CR 2015-07-26 20:46:03 -07:00
Anders Hejlsberg 0713d3465e More formatting glitches 2015-07-26 16:45:13 -07:00
Anders Hejlsberg 6092ddd5bb Fix formatting glitches 2015-07-26 16:28:17 -07:00
Anders Hejlsberg dc816900f1 Update word2md tool to support hyperlinks 2015-07-26 16:26:58 -07:00
Anders Hejlsberg c079ee84f9 Updated language specification 2015-07-26 14:30:25 -07:00
pcan 6895237f9a Added tests for issue #3932 2015-07-25 10:01:39 +02:00
pcan bcf89e89e6 Invert null-check in emitSerializedTypeNode 2015-07-25 09:13:31 +02:00