Commit Graph
3012 Commits
Author SHA1 Message Date
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 RosenwasserandDaniel 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 RosenwasserandDaniel Rosenwasser c5943de3cd Just temporarily removing the tests until we can get back into a good state. 2014-12-11 23:54:33 -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
Jason Freeman e502a866df Merge branch 'release-1.4' into disableComputedProperty 2014-12-11 17:22:54 -08:00
Jason Freeman 06d7ef14cf Don't quote the word 'generators' in error messages 2014-12-11 17:22:22 -08:00
Mohamed Hegazy b87839dfb1 respond to code review commments 2014-12-11 17:08:18 -08:00
Mohamed Hegazy 1049b7139d Respond to code review comments 2014-12-11 17:08:11 -08:00
Mohamed Hegazy de73d50ee9 Remove compiletionSettings handeling from shims 2014-12-11 17:08:05 -08:00
Mohamed Hegazy 5f80804d3a Merge pull request #1431 from Microsoft/compilationSettingsCleanup
Remove compiletionSettings handeling from shims
2014-12-11 17:05:21 -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
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
Mohamed Hegazy 2f6bb57137 Merge branch 'release-1.4' into compilationSettingsCleanup 2014-12-11 16:24:05 -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
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 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
Daniel Rosenwasser 77d5d40d20 Fixed up baselines. 2014-12-11 14:02:07 -08:00
Mohamed HegazyandDaniel Rosenwasser 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 HegazyandDaniel Rosenwasser 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 HegazyandDaniel Rosenwasser 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 HegazyandDaniel Rosenwasser b87a7fafaf move formatting.ts and smartIndernter.ts into formatting folder to match thier namespace 2014-12-11 13:44:02 -08:00
Mohamed HegazyandDaniel Rosenwasser 791ba336cc remove unused file 2014-12-11 13:43:55 -08:00
Mohamed HegazyandDaniel Rosenwasser eaa812e3b5 Move Map to types to ensure it is visible in definition files 2014-12-11 13:43:48 -08:00
Mohamed HegazyandDaniel Rosenwasser 841842b733 use ts.System for tests 2014-12-11 13:43:44 -08:00
Mohamed HegazyandDaniel Rosenwasser 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
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