microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-12-12 20:25:48 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity
6,857 Commits 365 Branches 233 Tags
Commit Graph

1564 Commits

Author SHA1 Message Date
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
Ryan Cavanaugh
006356d2a3 Whitespace 2015-07-07 12:53:53 -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
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
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
Jason Freeman
1085e39b9a Always take the apparent type when you retrieve a contextual type 2015-07-02 15:20:57 -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 a0bd465a7d2df6cc68f1d689a0bb6431563b4def.
 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
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
306de4d681 CR feedback 2015-06-26 14:18:51 -07:00
Anders Hejlsberg
18588104db Preserve order in intersection types 2015-06-26 09:47:58 -07:00
Anders Hejlsberg
529fcfd4c9 Assignment compatibility fix / contextual intersection types 2015-06-25 18:44:30 -07:00
Mohamed Hegazy
f9de30c728 Fix assert with declaration emit for export specifier for a global 2015-06-25 17:38:11 -07:00
Dan Quirk
d4403df35e var -> let 2015-06-25 17:36:19 -07:00
Dan Quirk
ed1ff3d57d Fixing up whitespace and semicolons 2015-06-25 16:24:41 -07:00