microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity
3,070 Commits 371 Branches 237 Tags
e259ee9f8fab2ee59e3b506557ad8f95e40cce37
Commit Graph

3070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cyrus Najmabadi
e259ee9f8f Merge branch 'funcDeclsInBlocks' into sourceFileUpdate 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/utilities.ts
 2014-12-12 15:15:37 -08:00
Cyrus Najmabadi
c5b87e9070 Merge branch 'master' into sourceFileUpdate 2014-12-12 15:06:45 -08:00
Cyrus Najmabadi
b38b5fd1b5 Merge branch 'master' into funcDeclsInBlocks 2014-12-12 14:57:34 -08:00
CyrusNajmabadi
7d2009ab64 Merge pull request #1469 from Microsoft/262baselines 
Simplify 262 baselines.
 2014-12-12 14:46:28 -08:00
CyrusNajmabadi
102cb2f406 Merge pull request #1468 from Microsoft/LKG 
Update LKG.
 2014-12-12 14:34:24 -08:00
Cyrus Najmabadi
9f59cf6e19 Simplify 262 baselines. 2014-12-12 14:26:31 -08:00
Cyrus Najmabadi
a163cb965c Merge branch 'master' into funcDeclsInBlocks 2014-12-12 14:18:28 -08:00
Cyrus Najmabadi
cf8afc3124 Update LKG. 2014-12-12 14:16:35 -08:00
Cyrus Najmabadi
760eb9b8e0 Merge branch 'master' into sourceFileUpdate 
Conflicts:
	src/compiler/parser.ts
	src/compiler/types.ts
	src/compiler/utilities.ts
 2014-12-12 14:12:27 -08:00
Cyrus Najmabadi
ffdddd53af Merge branch 'master' into funcDeclsInBlocks 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.ts
 2014-12-12 14:05:09 -08:00
CyrusNajmabadi
dacbd982cf Merge pull request #1467 from Microsoft/postEditInvariants 
Resurrect the post edit invariants checking for fourslash.
 2014-12-12 13:52:19 -08:00
CyrusNajmabadi
126aaf949d Merge pull request #1465 from Microsoft/labeledStatement 
Avoid lookahead when parsing a statement.
 2014-12-12 13:45:06 -08:00
Cyrus Najmabadi
183c80a81a Merge branch 'master' into postEditInvariants 
Conflicts:
	src/harness/test262Runner.ts
 2014-12-12 13:42:39 -08:00
Cyrus Najmabadi
26badc686f Avoid lookahead when parsing a statement. 
If a statement started with an identifier, then we'd normally lookahead to see if the next token
was a colon.  Lookahead is expensive (as it has to rescan tokens).  Instead, we do the same thing
we do for arrow-functions.  We just parse out the identifier, and afterwards we check if there is
a colon as the current token.  Now, no lookahead is required.
 2014-12-12 13:32:54 -08:00
Cyrus Najmabadi
f6aaa84146 In Fourslash: Compare ASTs for files produced incrementally versus files produced with a full parse. 2014-12-12 13:26:43 -08:00
Cyrus Najmabadi
0aa3f6e607 Rename some locals. 2014-12-12 13:09:50 -08:00
Cyrus Najmabadi
6ff58e3028 Don't emit error flags in the 262 baselines unless the node actually had an error. 
This helps reduce clutter.
 2014-12-12 12:41:59 -08:00
Cyrus Najmabadi
f8dd19ed1c Resurrect the post edit invariants checking for fourslash. 2014-12-12 12:01:27 -08:00
Cyrus Najmabadi
a988283988 Merge branch 'master' into sourceFileUpdate 2014-12-12 11:44:10 -08:00
CyrusNajmabadi
7b528ddd2b Merge pull request #1464 from Microsoft/void0 
Properly emit 'void 0' when emitting destructuring assignments.
 2014-12-12 11:36:47 -08:00
Cyrus Najmabadi
83f0c91999 Properly emit 'void 0' when emitting destructuring assignments. 2014-12-12 11:28:05 -08:00
Mohamed Hegazy
90a9b3472a Merge pull request #1460 from Arnavion/compilefile-fail-task-on-error 
Actually fail the surrounding jake task on errors in compileFile()
 2014-12-12 09:02:09 -08:00
Arnavion
f6fd263cbd Actually fail the surrounding jake task on errors in compileFile() 2014-12-12 08:49:21 -08:00
Cyrus Najmabadi
d5c6636854 Parse function and variable declarations uniformly, whether they're at teh top level, or inside a method. 
This is necessary for incremental parsing correctness, as the incremental parser
will attempt to reuse these types of nodes in both contexts, and we much ensure
it creates the same trees you would get if you were parsing normally.
 2014-12-12 03:52:01 -08:00
Cyrus Najmabadi
8820ca0596 Change the error-bit to be a node-flag and not a parser context flag. 
Do not reuse nodes with errors in them.  We need to reparse them to make
sure we produce the right errors the second time around.
 2014-12-12 03:25:49 -08:00
Cyrus Najmabadi
60c62e5b6b Don't consume nodes during calls to isListElement. 2014-12-12 03:06:05 -08:00
Cyrus Najmabadi
e32d030144 Update the source file positions as well. 2014-12-12 02:38:07 -08:00
Cyrus Najmabadi
9c0e4211bc Properly adjust nodes while walking down the tree. 2014-12-12 02:34:53 -08:00
Cyrus Najmabadi
2f833d5f97 Provide a way for tests to try out incremental parsing. 2014-12-12 02:21:45 -08:00
Cyrus Najmabadi
62dd12cb7a Move functions from 'types.ts' to 'utilities.ts'. 2014-12-12 00:56:14 -08:00
Cyrus Najmabadi
f218ce7684 Merge branch 'master' into sourceFileUpdate 
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/parser.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
 2014-12-12 00:52:07 -08:00
Cyrus Najmabadi
7eb0f42560 Add assert. 2014-12-12 00:48:08 -08:00
Cyrus Najmabadi
15f3b89297 Add the syntax cursor. We will use this to retrieve nodes from the previous source tree. 2014-12-12 00:41:12 -08:00
Daniel Rosenwasser
001e29cd75 Merge pull request #1461 from Microsoft/fixProcessDiagMessagesProbWith1.4Merge 
Fix processDiagnosticMessages script issue in master with a 1.4 merge
 2014-12-12 00:31:16 -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
87b7ddd51b Merge pull request #1453 from Microsoft/fixSysDependencyForDiagnostics 
Fix sys dependency for processDiagnosticMessages.ts
 2014-12-12 00:03:43 -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
Cyrus Najmabadi
14cb05f443 Add explanatory comments to explain how node moving works. 2014-12-11 23:39:44 -08:00
Cyrus Najmabadi
c9f8aaecb6 Don't incrementally parse when teh old tree had no source module elements. 
Also, provide explanatory comments as to why we pass setNodeParents:true.
 2014-12-11 22:16:06 -08:00
Cyrus Najmabadi
400cf91e96 Nodes are not resuable if the parser has a outstanding, unattached, parse error. 
This is conservative, but safe.   If we wanted to support node reuse here,
we'd have to carefully ensure that the errors and tree shape would be the
same that hte normal parse would produce.
 2014-12-11 18:23:14 -08:00
Cyrus Najmabadi
0391e02fee Merge branch 'master' into sourceFileUpdate 
Conflicts:
	src/compiler/parser.ts
	src/services/formatting/tokenSpan.ts
	src/services/text.ts
 2014-12-11 18:08:57 -08:00
Vladimir Matveev
c189011d39 remove trailing comma 2014-12-11 18:08:12 -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
CyrusNajmabadi
353dd9f988 Merge pull request #1458 from Microsoft/test262ErrorBit 
For 262 tests, emit a bit in the baseline stating if the node had an error or not.
 2014-12-11 18:03:31 -08:00
Vladimir Matveev
9083fdf94d Merge pull request #1457 from Microsoft/extra_comma 
remove trailing comma at the end of optionDeclarations array
 2014-12-11 17:54:53 -08:00
Cyrus Najmabadi
11dd1ca00f For 262 tests, emit a bit in the baseline stating if the node had an error or not. 2014-12-11 17:53:24 -08:00
Vladimir Matveev
53bdd562c8 remove trailing comma 2014-12-11 17:47:29 -08:00
Cyrus Najmabadi
c8a2d5de1a CR feedback. 2014-12-11 17:35:02 -08:00
Jason Freeman
7f097140c9 Merge branch 'release-1.4' 2014-12-11 17:29:03 -08:00
Jason Freeman
b2b17d5ae9 Merge pull request #1455 from Microsoft/disableComputedProperty 
Disable computed properties in TypeScript 1.4
 2014-12-11 17:27:07 -08:00