Commit Graph

10487 Commits

Author SHA1 Message Date
Vladimir Matveev
0834a29b15 pick default chrome location based on platform 2015-10-21 17:04:18 -07:00
Daniel Rosenwasser
307d73ed0d Merge branch 'master' into stringLiteralTypes 2015-10-21 17:02:29 -07:00
Nathan Shively-Sanders
4d05189d8d Improve naming of test members 2015-10-21 16:23:59 -07:00
Wesley Wigham
255cde582d remove assertion 2015-10-21 16:15:53 -07:00
Nathan Shively-Sanders
7f989315da Accept baselines
A couple of tests were previously updated to give an incorrect error
message.
2015-10-21 16:12:15 -07:00
Wesley Wigham
8658bf487e Add JS breakpoint into Debug.assert failure
I was talking to @DanielRosenwasser the other day and mentioned this - it's been a floating patch that I keep reapplying on top of my own changes locally. Turns out, it's pretty useful to have a preset breakpoint when an assertion is violated.
2015-10-21 16:11:22 -07:00
zhengbli
172ff54475 Move the changes to sys.write to server.ts 2015-10-21 16:11:14 -07:00
Nathan Shively-Sanders
36ddd022a1 Tests for interfaces merged w/classes
Both interfaces and classes have base classes/interfaces; all members are
available on an instance of the merged child.
2015-10-21 16:10:46 -07:00
Vladimir Matveev
9afc2b3c8f Merge pull request #5355 from Microsoft/initFieldsInConstructor
pre-initialize Node fields in constructor
2015-10-21 16:07:19 -07:00
Nathan Shively-Sanders
c072a5fd4b getBaseTypes handles interfaces merged w/classes
Previously it assumed that if a class was present in the merge, only the
class base types needed to be used. This became false when classes and
interfaces could be merged.
2015-10-21 16:04:40 -07:00
Wesley Wigham
d18facbdc1 fix lint 2015-10-21 15:54:35 -07:00
Wesley Wigham
2fcdb0f700 bit more cleanup 2015-10-21 15:53:59 -07:00
Wesley Wigham
3f52686974 cleanup a bit, think toward the future 2015-10-21 15:37:58 -07:00
Vladimir Matveev
7c064af052 initialize fields from constructor parameters 2015-10-21 15:33:30 -07:00
Wesley Wigham
37bc2773a3 feedback form pr 2015-10-21 15:27:33 -07:00
Vladimir Matveev
7fc29d1b62 pre-initialize node fields in constructor 2015-10-21 13:49:51 -07:00
Vladimir Matveev
402baba28b Merge pull request #5353 from Microsoft/tokenFollowingMultilineComment
do not indent token if its start line matches end line of previous to…
2015-10-21 13:35:55 -07:00
zhengbli
214e21d05b Change writeSync to async 2015-10-21 13:14:26 -07:00
Vladimir Matveev
912e49b668 do not indent token if its start line matches end line of previous token\trivia 2015-10-21 12:49:14 -07:00
Wesley Wigham
d178945cd4 rename variable 2015-10-20 15:29:21 -07:00
Wesley Wigham
79cf984a83 feedback form pr 2015-10-20 15:14:28 -07:00
Wesley Wigham
7a4e995f01 feedback form pr 2015-10-20 15:14:18 -07:00
Ryan Cavanaugh
853e9a2462 Merge pull request #5295 from RyanCavanaugh/detectAdjacentJsxElements
Better error recovery for adjacent JSX elements in expression positions
2015-10-20 13:16:02 -07:00
Anders Hejlsberg
a8fa81b187 Merge pull request #5344 from Microsoft/excessPropertiesWithUnion
Fix excess property check in union and intersection types
2015-10-20 13:05:51 -07:00
Ron Buckton
c3f36e145d Merge pull request #5343 from Microsoft/fixES6LetInModule
Fixes emitExpressionIdentifier when combining --target ES6 with --module.
2015-10-20 12:51:13 -07:00
Anders Hejlsberg
a22f9b87bd Adding test 2015-10-20 12:40:39 -07:00
Anders Hejlsberg
6d8950e13c Fix check for excess properties in union and intersection types 2015-10-20 12:39:43 -07:00
Ron Buckton
c627802a43 Tests 2015-10-20 12:32:49 -07:00
Ron Buckton
85e587e1d3 Fixes issue in emitExpressionIdentifier when combining --target ES6 with --module.
Fixes #5315.
2015-10-20 10:59:23 -07:00
SaschaNaz
209aa20246 Merge https://github.com/Microsoft/TypeScript into formatWhitespaces 2015-10-21 01:14:09 +09:00
SaschaNaz
be550a932f Merge remote-tracking branch 'refs/remotes/Microsoft/master' into formatWhitespaces 2015-10-21 01:05:29 +09:00
zhengbli
7ecf90ee2d Fix issue: can't add a file back to a configured project after being deleted once 2015-10-19 22:56:00 -07:00
Zhengbo Li
1b3640760b Merge pull request #5263 from zhengbli/pr5127cr
Address code review of #5127
2015-10-19 22:01:15 -07:00
zhengbli
39254b54ae CR feedback 2015-10-19 21:48:40 -07:00
Wesley Wigham
a83b85870c Merge branch 'master' into out-module-concat 2015-10-19 17:17:08 -07:00
Vladimir Matveev
f9eaed7f7b Merge branch 'master' into reachabilityChecks 2015-10-19 15:54:45 -07:00
Vladimir Matveev
d2045a8784 fix typo 2015-10-19 15:51:20 -07:00
Vladimir Matveev
fb97e2f745 Merge pull request #5310 from Microsoft/convertConfigOptionsToCompilerOptions
extract 'convertCompilerOptionsFromJson' to separate function
2015-10-19 15:48:12 -07:00
Nathan Shively-Sanders
f9c40d11a9 Merge pull request #5267 from Microsoft/disallow-primitive-assignability-to-index-of-any
Disallow primitive assignability to indexer of type any
2015-10-19 15:48:04 -07:00
Daniel Rosenwasser
683eec0d07 Merge pull request #5321 from Microsoft/updateContributingMdTestOptions
Updated test options in 'CONTRIBUTING.md'.
2015-10-19 15:22:21 -07:00
Vladimir Matveev
96a4b237ac Merge branch 'master' into capturedBlockScopedVars 2015-10-19 14:22:25 -07:00
Daniel Rosenwasser
67d43ad75f Just say all compiler options are supported. 2015-10-19 14:22:00 -07:00
Vladimir Matveev
f279c82409 fix linter issues 2015-10-19 14:21:53 -07:00
Vladimir Matveev
c13c8bf316 addressed PR feedback 2015-10-19 14:10:27 -07:00
Ryan Cavanaugh
eda6eca3c7 Merge remote-tracking branch 'upstream/master' into javaScriptModules 2015-10-19 13:53:52 -07:00
Sheetal Nandi
0496bfe278 Merge branch 'master' into tscJsFiles 2015-10-19 12:32:51 -07:00
Daniel Rosenwasser
174f8c3e6e Fixups. 2015-10-19 11:49:21 -07:00
Ryan Cavanaugh
efa63b98bb LKG update 2015-10-19 11:02:27 -07:00
Ryan Cavanaugh
5725fc4497 CR feedback 2015-10-19 11:02:20 -07:00
Vladimir Matveev
9fa268a44a addressed PR feedback 2015-10-19 10:15:59 -07:00