Commit Graph

34146 Commits

Author SHA1 Message Date
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
Jason Freeman d385f2ebf4 Disable computed properties in TypeScript 1.4 2014-12-11 16:49:53 -08:00
Daniel Rosenwasser 47ed584d12 Re-add baselines. 2014-12-11 16:39:54 -08:00
Daniel Rosenwasser cfca38f0af Remove baselines. 2014-12-11 16:39:32 -08:00
Yui T 279aa39467 Move grammar checking: classDeclaration; there are still errors from checking declare keyword and grammar checking of moduleDeclaration 2014-12-11 16:26:27 -08:00
Mohamed Hegazy 2f6bb57137 Merge branch 'release-1.4' into compilationSettingsCleanup 2014-12-11 16:24:05 -08:00
Anders Hejlsberg afa3111955 Check and emit of spread elements in array literals 2014-12-11 16:23:57 -08:00
Daniel Rosenwasser 90829b4f75 Merge pull request #1454 from Microsoft/mergeFor1.4ToMaster
Merge for release-1.4 to master
2014-12-11 16:16:44 -08:00
Daniel Rosenwasser 644951b1e0 Fixed old sys dependency, as sys is now ts.sys. 2014-12-11 16:03:49 -08:00
Yui T 4c91ae0040 Move checkGrammarCatchClause into checkTryStatement 2014-12-11 15:44:52 -08:00
Yui T 414a4a2295 Address code review 2014-12-11 15:38:24 -08:00
Cyrus Najmabadi fbeb7dd75e Merge branch 'funcDeclsInBlocks' into sourceFileUpdate
Conflicts:
	src/services/outliningElementsCollector.ts
2014-12-11 15:16:46 -08:00
Cyrus Najmabadi 63dbb78d02 Merge branch 'master' into sourceFileUpdate 2014-12-11 15:07:49 -08:00
Cyrus Najmabadi 76df92cc78 Merge branch 'master' into funcDeclsInBlocks 2014-12-11 14:59:03 -08:00
Yui T f13308be31 Move grammar checking: catchCaluse 2014-12-11 14:53:30 -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
Cyrus Najmabadi b692ea9b66 Remove TryBlock and FinallyBlock.
They break the rule that syntactically identical constructs use the same syntax kind.  This
prevents node reuse in incremental parsing.
2014-12-11 14:40:25 -08:00
Yui T b34a453cd4 Move grammar checking: bindingElement 2014-12-11 14:35:55 -08:00
Daniel Rosenwasser 987dd0cede Fixed 'use strict' check. 2014-12-11 14:21:39 -08:00
Daniel Rosenwasser 94cce178dd Responded to CR feedback.
Conflicts:
	src/compiler/parser.ts
2014-12-11 14:21:18 -08:00
Daniel Rosenwasser 036209a89e Moved createCompilerHost into parser.ts
Conflicts:
	src/compiler/tsc.ts
2014-12-11 14:11:01 -08:00
Yui T 0d99f1afd5 Move grammar checking: binaryExpression 2014-12-11 14:09:49 -08:00
Yui T a485fbbf5a Merge branch 'refactorGrammarCheck' of https://github.com/Microsoft/TypeScript into refactorGrammarCheck
Conflicts:
	src/compiler/checker.ts
2014-12-11 14:05:35 -08:00
Yui T d8621069c1 Address code review: move checkGrammarAnySignature into checkSignatureDeclaration 2014-12-11 14:02:09 -08:00
Daniel Rosenwasser 77d5d40d20 Fixed up baselines. 2014-12-11 14:02:07 -08:00
Mohamed Hegazy b45ab580d5 Add tests for public declarations 2014-12-11 14:02:01 -08:00
Daniel Rosenwasser 0ce3861602 Moved non-exposed functions to utilities; fix up emitted .d.ts in Jakefile.
Conflicts:
	src/compiler/parser.ts
2014-12-11 14:00:36 -08:00
Daniel Rosenwasser a173017aa6 Explicit default target for fourslash tests in the harness. 2014-12-11 13:44:47 -08:00
Mohamed Hegazy 1fe19136d7 Remove unused parameter to getCompletionsAtPosition
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
2014-12-11 13:44:38 -08:00
Daniel Rosenwasser 8420fae7a4 Make getLocalizedDiagnosticMessages and getCancellationToken optional 2014-12-11 13:44:32 -08:00
Mohamed Hegazy a7219e7569 move OutliningSpan definitions to services to ensure it is visible in definitions file 2014-12-11 13:44:12 -08:00
Daniel Rosenwasser f207acff51 Removed tokenSpan.ts. 2014-12-11 13:44:08 -08:00
Mohamed Hegazy b87a7fafaf move formatting.ts and smartIndernter.ts into formatting folder to match thier namespace 2014-12-11 13:44:02 -08:00
Mohamed Hegazy 791ba336cc remove unused file 2014-12-11 13:43:55 -08:00
Mohamed Hegazy eaa812e3b5 Move Map to types to ensure it is visible in definition files 2014-12-11 13:43:48 -08:00
Mohamed Hegazy 841842b733 use ts.System for tests 2014-12-11 13:43:44 -08:00
Mohamed Hegazy 606ee84fd1 move text defintions to services.ts 2014-12-11 13:43:39 -08:00
Daniel Rosenwasser be1eb3430c Put 'sys' into the 'ts' module. 2014-12-11 13:43:34 -08:00
Daniel Rosenwasser c5510444d9 Use __filename for 'getExecutingFilePath'. 2014-12-11 13:43:29 -08:00
Daniel Rosenwasser 978ac26eff Allow typescript to be importable in node. 2014-12-11 13:43:24 -08:00
Yui T c23b6a66e2 Address code review: move checkGrammarAnySignature into checkSignatureDeclaration 2014-12-11 12:55:27 -08:00
Yui T 5fe2594ec2 Merge branch 'refactorGrammarCheck' of https://github.com/Microsoft/TypeScript into refactorGrammarCheck 2014-12-11 12:07:09 -08:00
Yui T 907d1d001b Move grammar checking: callExpression, newExpression 2014-12-11 12:07:01 -08:00
Yui T 9698244391 Move grammar checking: callExpression, newExpression 2014-12-11 12:06:21 -08:00
Yui T b31981c6e9 Address code review 2014-12-11 11:35:51 -08:00
Cyrus Najmabadi 12f8bfb687 Unify accessor declaration parsing. 2014-12-10 23:33:30 -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
Cyrus Najmabadi ba0fd4453d Add additional incremental tests. 2014-12-10 23:04:13 -08:00
Cyrus Najmabadi fe57f3d2e4 Support modifiers on object literal methods and accessors, and question tokens on object literal methods.
This makes parsing of these constructs the same whether they are in an object literal or a class.

This is important for incrementla parsing for knowing if we can reuse these nodes if we run
into them.
2014-12-10 22:30:40 -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