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
3,025 Commits 367 Branches 233 Tags
b416cbc599c3dbababe12e97de3139a3cea82eed
Commit Graph

992 Commits

Author SHA1 Message Date
Anders Hejlsberg b416cbc599 Merge branch 'master' into spreadAndRest 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
 2014-12-12 14:32:53 -08:00
Anders Hejlsberg 86a9c80ff8 Adding tests and accepting new baselines 2014-12-12 10:56:22 -08:00
Daniel Rosenwasser 854586e824 Merge branch 'release-1.4' into fixProcessDiagMessagesProbWith1.4Merge 
Conflicts:
	tests/baselines/reference/APISample_node_compile.js
	tests/baselines/reference/APISample_node_compile.types
	tests/baselines/reference/APISample_standalone_compile.js
	tests/baselines/reference/APISample_standalone_compile.types
	tests/cases/compiler/APISample_node_compile.ts
	tests/cases/compiler/APISample_standalone_compile.ts
 2014-12-12 00:09:23 -08:00
Daniel Rosenwasser c5943de3cd Just temporarily removing the tests until we can get back into a good state. 2014-12-11 23:54:33 -08:00
CyrusNajmabadi 122d8a4d98 Merge pull request #1456 from Microsoft/mergeMarkers 
Make the compiler resilient to encountering merge conflict markers in a source code file.
 2014-12-11 18:04:25 -08:00
Cyrus Najmabadi 402c57cf7e Adding classification test. 2014-12-11 17:04:21 -08:00
Cyrus Najmabadi 7df3a407c2 Make the compiler resilient to encountering merge conflict markers in a source code file. 2014-12-11 16:56:10 -08:00
Daniel Rosenwasser d92d6379bd Merge branch 'release-1.4' into mergeFor1.4ToMaster 
Conflicts:
	src/compiler/parser.ts
	src/compiler/utilities.ts
	src/harness/harness.ts
	tests/baselines/reference/APISample_node_compile.js
	tests/baselines/reference/APISample_node_compile.types
	tests/baselines/reference/APISample_standalone_compile.js
	tests/baselines/reference/APISample_standalone_compile.types
	tests/cases/compiler/APISample_node_compile.ts
	tests/cases/compiler/APISample_standalone_compile.ts
 2014-12-11 14:49:43 -08:00
Daniel Rosenwasser 036209a89e Moved createCompilerHost into parser.ts 
Conflicts:
	src/compiler/tsc.ts
 2014-12-11 14:11:01 -08:00
Mohamed Hegazy b45ab580d5 Add tests for public declarations 2014-12-11 14:02:01 -08:00
Vladimir Matveev 997aadb902 Merge pull request #1437 from Microsoft/formatting_conditionals 
conditionals are now introduce indentation scope
 2014-12-10 23:28:54 -08:00
Vladimir Matveev 638518cae2 Merge pull request #1441 from Microsoft/dont_indent_comments_on_errors 
do not indent leading comments that attached to tokens with errors
 2014-12-10 22:02:15 -08:00
Vladimir Matveev d69ba56ece added test for inherited indentation 2014-12-10 22:01:34 -08:00
Mohamed Hegazy 774c061779 Merge branch 'release-1.4' into suppressNoImplicitAnyErrors 
Conflicts:
	src/compiler/parser.ts
	src/harness/harness.ts
 2014-12-10 18:45:28 -08:00
Mohamed Hegazy 38bf383f03 Add tests for public declarations 2014-12-10 16:54:42 -08:00
Daniel Rosenwasser 9ad6eb21ed Merge pull request #1341 from Microsoft/escapingTheTemplateOfDoom 
Template string escaping fixes
 2014-12-10 16:29:00 -08:00
Vladimir Matveev 10d08b816e do not indent leading comments that attached to tokens with errors 2014-12-10 15:08:26 -08:00
Anders Hejlsberg 35adeb8363 Addressing CR feedback 2014-12-10 14:44:31 -08:00
Anders Hejlsberg 98c9f75e21 Adding test case 2014-12-10 14:41:37 -08:00
Anders Hejlsberg ab4706a211 Merge pull request #1433 from Microsoft/typeGuardWithAny 
Type guards should not affect values of type any
 2014-12-10 14:33:31 -08:00
Anders Hejlsberg 2876ba6a6c Addressing CR feedback 2014-12-10 14:25:02 -08:00
Vladimir Matveev 30ada4cffe conditionals are now introduce indentation scope 2014-12-10 14:03:14 -08:00
Mohamed Hegazy b0574cbdf9 Respond to code review comments 2014-12-10 12:37:09 -08:00
Anders Hejlsberg 37b5c74b93 Adding test case 2014-12-10 10:17:48 -08:00
Cyrus Najmabadi 1170a1c436 Only set parents for parse trees in the LS for the syntactic trees. 
we don't need this for the semantic trees because the compiler will set them all during
the binding.
 2014-12-10 10:09:40 -08:00
Cyrus Najmabadi dd2c869d7b Use chai asserts. 2014-12-09 19:49:40 -08:00
Cyrus Najmabadi aa30ac8a9c Add incremental test. 2014-12-09 19:37:26 -08:00
Cyrus Najmabadi 2a845726ab Add incremental test. 2014-12-09 18:36:32 -08:00
Cyrus Najmabadi 3c35b9097f Add incremental test. 2014-12-09 18:35:23 -08:00
Cyrus Najmabadi 58d36afbec Add incremental test. 2014-12-09 18:32:43 -08:00
Cyrus Najmabadi 3928f743ac Add incremental test. 2014-12-09 18:30:40 -08:00
Cyrus Najmabadi 01ead476cf Add incremental test. 2014-12-09 18:29:18 -08:00
Cyrus Najmabadi b8bb8e9998 Add incremental test. 2014-12-09 18:27:59 -08:00
Cyrus Najmabadi 467d303c67 Add incremental test. 2014-12-09 18:26:50 -08:00
Cyrus Najmabadi dad3faecf3 Add incremental test. 2014-12-09 18:25:10 -08:00
Cyrus Najmabadi c489c4fcfe Add incremental test. 2014-12-09 18:24:16 -08:00
Cyrus Najmabadi 9b53947d51 Add incremental test. 2014-12-09 18:23:25 -08:00
Cyrus Najmabadi afec0fb9f0 Add incremental test. 2014-12-09 18:17:11 -08:00
Cyrus Najmabadi 197b62e92a Add incremental test. 2014-12-09 18:13:09 -08:00
Cyrus Najmabadi 025dd23c1b Add incremental test. 2014-12-09 18:11:56 -08:00
Cyrus Najmabadi 78c4b92216 Add incremental test. 2014-12-09 18:10:15 -08:00
Cyrus Najmabadi d6fa98d00b Add incremental test. 2014-12-09 18:07:48 -08:00
Cyrus Najmabadi ec13fbee96 Add incremental test. 2014-12-09 18:05:45 -08:00
Cyrus Najmabadi 3e70073211 Add incremental test. 2014-12-09 18:03:52 -08:00
Cyrus Najmabadi 18f9acb7fc Add incremental test. 2014-12-09 18:00:08 -08:00
Cyrus Najmabadi b8942992a0 Add incremental test. 2014-12-09 17:58:23 -08:00
Cyrus Najmabadi 418c0d9d91 Add incremental test. 2014-12-09 17:57:13 -08:00
Cyrus Najmabadi 5b2778c200 Add incremental test. 2014-12-09 17:45:50 -08:00
Cyrus Najmabadi 666363a7de Add incremental test. 2014-12-09 17:42:36 -08:00
Cyrus Najmabadi e564fa5c9d Add incremental test. 2014-12-09 17:37:17 -08:00