Commit Graph

23471 Commits

Author SHA1 Message Date
Nathan Shively-Sanders 3a55c849c7 Assert that ambient classes merge with interfaces
Specifically, overloads are recognised as having the same export/ambient
flags when merging the two.
2015-10-12 14:26:45 -07:00
Nathan Shively-Sanders d6ae55708d Do not mark class members as ambient or export.
Even members of ambient classes. These flags have no useful semantics
there, and it prevents ambient classes from merging properly with
interfaces.
2015-10-12 14:25:39 -07:00
Nathan Shively-Sanders 8a051343ff Merge pull request #5169 from Microsoft/fix-simple-uses-of-polymorphic-this-in-services
Fix simple uses of polymorphic this in services
2015-10-12 13:54:50 -07:00
Vladimir Matveev 4ccf630f63 merge with master 2015-10-12 13:45:06 -07:00
Sheetal Nandi 286fb3e948 Fix the lint error 2015-10-12 13:10:54 -07:00
Sheetal Nandi f28fbfd7c5 Merge branch 'master' into tscJsFiles 2015-10-12 12:51:24 -07:00
Sheetal Nandi 6882035dc0 Verify if one or more files are emitting into same output file we provide error 2015-10-12 12:50:35 -07:00
Sheetal Nandi a87dae15a9 Verify that when emit blocking error occurs rest of the emit occurs as expected 2015-10-12 12:44:21 -07:00
Sheetal Nandi 5e14edb4b7 Verify the emit file name is unique and doesnt overwrite input file
Fixes #4424
2015-10-12 12:25:13 -07:00
Ryan Cavanaugh c05297cfea Merge pull request #5178 from RyanCavanaugh/fix5132
Escape quotes when emitting React
2015-10-12 11:56:46 -07:00
Yui T e405ccebec fix linter failure 2015-10-12 11:48:38 -07:00
Zhengbo Li 5605c8a639 Merge pull request #5177 from zhengbli/i4684
Change the definition of NodeFilter in lib.d.ts
2015-10-12 11:44:26 -07:00
zhengbli de52865243 Remove prototype from NodeFilter static type 2015-10-12 11:35:36 -07:00
Vladimir Matveev 22e68de7ec Merge pull request #5216 from Microsoft/checkFunctionsInClassExpressions
check functions in class expressions
2015-10-12 11:09:21 -07:00
Yui T 6a62c01aab Merge branch 'exponentiation' of https://github.com/Microsoft/TypeScript into exponentiation 2015-10-12 10:55:17 -07:00
Yui T 2918f9d7a2 Update baseline after merge conflict 2015-10-12 10:55:10 -07:00
Yui T d3e10b3d3f Merge remote-tracking branch 'origin/master' into exponentiation
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/program.ts
2015-10-12 10:54:46 -07:00
Vladimir Matveev d757e5e7a2 Merge pull request #5226 from Microsoft/blockScopedExports
check initialization of exported block scoped variables
2015-10-12 10:32:57 -07:00
Vladimir Matveev 61c5b95f8a Merge pull request #5217 from Microsoft/formatAsyncOpenParen
add rule to insert space between async keyword and open paren
2015-10-12 10:23:32 -07:00
Vladimir Matveev ca98831674 addressed PR feedback: added tests for let declarations 2015-10-12 10:22:18 -07:00
Wesley Wigham 1ae7b7c254 Merge branch 'master' into out-module-concat 2015-10-12 10:21:01 -07:00
Vladimir Matveev adf9f9b8df check initialization of exported block scoped variables 2015-10-12 09:59:41 -07:00
Vladimir Matveev c35419e12e add rule to insert space between async keyword and open paren 2015-10-11 22:19:51 -07:00
Vladimir Matveev a0683276d1 check functions in class expressions 2015-10-11 21:57:17 -07:00
Nathan Shively-Sanders ec2eac53bf Improved non-namespace overriding
Per @ahejlsberg's suggestion, only overwrite a namespace
`valueDeclaration` if the new declaration is not a namespace itself. This
means that if there are multiple namespace declarations, and nothing else,
`valueDeclaration` will be the first namespace declaration, not the last.
2015-10-11 15:33:17 -07:00
Vladimir Matveev ebfcd2547f merge with master 2015-10-11 12:42:27 -07:00
Vladimir Matveev f0ba3f471a support block scoped vars captured in closures inside loops 2015-10-11 01:12:26 -07:00
Vladimir Matveev 1b5dc0d7d1 Merge pull request #5121 from Microsoft/shorthandPropsInDestructuring
parse/check/emit shorthand property assignment in destructuring
2015-10-10 22:39:05 -07:00
SaschaNaz 82bed69123 last line whitespace test 2015-10-10 16:41:54 +09:00
SaschaNaz 6580f877e7 trim the whole last line when it has whitespaces only 2015-10-10 16:38:10 +09:00
Paul van Brenk 573652160c Merge pull request #5197 from Microsoft/supportIndentStyle
Support different indentation styles
2015-10-09 16:51:39 -07:00
Nathan Shively-Sanders 9e8031cfc3 Non-namespace merges override valueDeclaration
Instead of searching `declarations` for a class declaration, make the
binder and checker merge `valueDeclaration` such that non-namespace merges
always have their `valueDeclaration` win.
2015-10-09 14:19:49 -07:00
Daniel Rosenwasser 12b436bb2c Merge pull request #5084 from MartyIX/patch-4
Compiler gives unhelpful error messages in the presence of multiple default exports
2015-10-09 14:18:18 -07:00
Martin Vseticka 69ff6f5090 Add "A module cannot have multiple default exports." message for multiple "default" exports 2015-10-09 21:37:54 +02:00
Nathan Shively-Sanders 440d01f0bd Fall back to valueDeclaration
Fall back to `valueDeclaration` in getBaseTypeNodeOfClass when no
ClassDeclaration exists.
2015-10-09 10:12:17 -07:00
Vladimir Matveev a556209b7e addressed PR feedback 2015-10-09 09:55:25 -07:00
Daniel Rosenwasser 543cce5e43 Merge pull request #5191 from jbondc/typo-1
Typo
2015-10-09 09:32:18 -07:00
Nathan Shively-Sanders f19a2f54ed Fixup comments 2015-10-09 09:02:42 -07:00
jbondc 3d6398162e Typo 2015-10-09 11:16:36 -04:00
SaschaNaz 13d2a729c9 restore fall-through indentation 2015-10-09 16:40:47 +09:00
SaschaNaz 790bb21b12 trimTrailingWhitespacesForRemainingRange 2015-10-09 16:38:16 +09:00
Yui T d57ee1db79 Merge branch 'master' into errorsuperbeforethis
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/types.ts
2015-10-08 23:57:26 -07:00
Yui T 1fc11aa18f Address PR feedback, add comment 2015-10-08 23:25:05 -07:00
Yui T 5e921c1d8d Address PR feedback, remove scriptTarget ES7 2015-10-08 17:12:22 -07:00
Yui T af5dc3e3b3 Address PR feedback. Always emit parentheses around emit capturing 2015-10-08 16:59:49 -07:00
Nathan Shively-Sanders 08c78fbe76 Check for ClassDeclaration in getBaseTypeNodeOfClass
Previously, it just used valueDeclaration. Now, it searches the
declarations.
2015-10-08 16:39:53 -07:00
Nathan Shively-Sanders ff43d464fc Add test case 2015-10-08 16:36:15 -07:00
Daniel Rosenwasser ebc47d5e02 Linting. 2015-10-08 16:04:09 -07:00
Daniel Rosenwasser 3788254fdc Semicolon. 2015-10-08 15:49:32 -07:00
Mohamed Hegazy 350bb1f315 Merge pull request #5167 from jbondc/const-indexed-access
Const enum indexed access
2015-10-08 15:39:14 -07:00