Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,815 Commits 367 Branches 233 Tags
9b2d44a676f753d9d73d6ea22cb5fc98f08b3cf0
Commit Graph
3265 Commits
Author SHA1 Message Date
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
Anders Hejlsberg 71c6433514 Merge pull request #3622 from Microsoft/intersectionTypes 
Intersection types
 2015-07-06 12:58:28 -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
Ron Buckton e4ebf1fe4c Change default node pos/end to -1 2015-07-02 12:57:34 -07:00
Arthur Ozga f37a7f5752 Merge pull request #3712 from Microsoft/abstractExtraError 
Abstract extra error
 2015-07-02 10:59:06 -07:00
Arthur Ozga 4878cce73f merged with master 2015-07-02 10:10:17 -07:00
Arthur Ozga 06472035a4 Prevent extra checks once abstract new-call detected 2015-07-02 09:37:14 -07:00
Arthur Ozga 6d0c7c9f6a removed a comment 2015-07-01 16:14:46 -07:00
Arthur Ozga f3b1321f56 Appeasing Jason lite 2015-07-01 15:39:06 -07:00
Arthur Ozga 07142a4ec2 Revert "Appeasing Jason" 
This reverts commit a0bd465a7d.
 2015-07-01 15:37:42 -07:00
Arthur Ozga a0bd465a7d Appeasing Jason 2015-07-01 15:31:14 -07:00
Arthur Ozga 27ebd5c749 removed a prototype 2015-07-01 14:47:56 -07:00
Arthur Ozga 1efff2857f fixed union-type determination, moved abstract implementation test, and reformatted a line 2015-07-01 14:45:53 -07:00
Arthur Ozga 1608845f33 merged with master 2015-07-01 13:51:27 -07:00
Arthur Ozga 4dd369fe12 moved initialization and changed a comment 2015-07-01 13:37:41 -07:00
Arthur Ozga a1877ef336 fexed comment and initialization 2015-07-01 10:46:10 -07:00
Ron Buckton 4b4a96b9dc Merge branch 'master' into asyncFunctions 2015-07-01 09:27:45 -07:00
Anders Hejlsberg 30d15a8d7c Addressing CR feedback 2015-06-30 19:46:59 -07:00
Arthur Ozga feb7e1d10e Fixed generic abstract class inheritance and some comments 2015-06-30 16:13:09 -07:00
Arthur Ozga 994b73f9cb fixed an erroneous assertion 2015-06-30 15:19:51 -07:00
Ryan Cavanaugh 5208bded90 Merge pull request #3675 from RyanCavanaugh/fix3674 
Correctly flag JSX elements as being used for the purposes of module imports
 2015-06-30 14:38:06 -07:00
Arthur Ozga 18d6e73aa0 Revert isRelatedFlags changes 2015-06-30 14:33:13 -07:00
Anders Hejlsberg 6ae775b4ff Support intersection types as target in type inference 2015-06-30 12:23:21 -07:00
Anders Hejlsberg a13b64246a Merge branch 'master' into intersectionTypes 
Conflicts:
	tests/baselines/reference/APISample_linter.js
 2015-06-30 11:57:49 -07:00
Mohamed Hegazy fe4612273c Merge pull request #3641 from Microsoft/exportSepcifierInDeclarations 
Fix assert with declaration emit for export specifier for a global
 2015-06-29 17:28:55 -07:00
Arthur Ozga 12383af225 Responding to Jason 2015-06-29 17:20:10 -07:00
Arthur Ozga b445f90eb9 Merge branch 'contextSensitiveIsRelatedTo' into abstract-classes2 2015-06-29 15:09:14 -07:00
Arthur Ozga e47e5bcbcd fixed a comment 2015-06-29 15:08:22 -07:00
Arthur Ozga d932618351 merged with contextSensitiveRelatedTo 2015-06-29 14:53:32 -07:00
Arthur Ozga ded24410e6 fixed a conflict 2015-06-29 14:39:09 -07:00
Arthur Ozga d8fe237edf merged in master 2015-06-29 14:34:12 -07:00
Ryan Cavanaugh 342ae9614e Fix tabbing 2015-06-29 14:30:11 -07:00
Arthur Ozga 2a9ea48680 Merge branch 'master' into contextSensitiveIsRelatedTo 2015-06-29 14:06:57 -07:00
Arthur Ozga a183ba9020 added flag as argument to checkTypeRelatedTo 2015-06-29 14:02:01 -07:00
Ryan Cavanaugh 8da353e169 Add spaces between if and ( 2015-06-29 11:39:10 -07:00
Ryan Cavanaugh 430c2c8721 Correct flag JSX elements as being used for the purposes of module imports 2015-06-29 11:25:49 -07:00
Ryan Cavanaugh 3402f3556c Missed a file in merge; use Tristate.True in arrow fn check 2015-06-29 10:39:52 -07:00
Ryan Cavanaugh 1d09c6e9c1 Don't use ES5 array APIs 2015-06-29 09:37:40 -07:00
Ryan Cavanaugh 634d35a7d0 Merge remote-tracking branch 'upstream/master' into jsxAndAs 
Conflicts:
	src/compiler/checker.ts
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/services/services.ts
 2015-06-29 09:23:44 -07:00
Ryan Cavanaugh 042f1fc4a8 Update for style 🎩 2015-06-29 09:07:12 -07:00
Ryan Cavanaugh d9ca99dfad Merge pull request #3637 from RyanCavanaugh/errorCheck 
Remove unused errors
 2015-06-26 14:23:45 -07:00
Ryan Cavanaugh ce6f39edca Move token scan to inside if 2015-06-26 14:21:29 -07:00
Ryan Cavanaugh 306de4d681 CR feedback 2015-06-26 14:18:51 -07:00
Mohamed Hegazy 72050073bc use double quotes 2015-06-26 10:25:58 -07:00