5753 Commits

Author SHA1 Message Date
Jason Freeman
e1d05150f6 Merge pull request #3071 from Microsoft/removeSubtypesRecursion
Make removeSubtypes resilient to reentry
2015-05-07 15:41:55 -07:00
Jason Freeman
7a92282af3 Merge branch 'release-1.5' of https://github.com/Microsoft/TypeScript into removeSubtypesRecursion 2015-05-07 15:08:29 -07:00
Jason Freeman
bb7f617e72 PR feedback and another test 2015-05-07 14:35:58 -07:00
Mohamed Hegazy
ebb5a0d1d0 Merge branch 'master' into release-1.5 2015-05-07 12:31:04 -07:00
Mohamed Hegazy
b40849b717 Merge pull request #3064 from Microsoft/refactorNarrowTypeByInstanceOf
Refactor narrow type by instance of
2015-05-07 11:39:40 -07:00
Jason Freeman
d8ef7b612a Make removeSubtypes resilient to reentry 2015-05-07 11:39:28 -07:00
Mohamed Hegazy
69f94cde8e Merge branch 'master' into refactorNarrowTypeByInstanceOf 2015-05-07 11:27:42 -07:00
Mohamed Hegazy
4381d1655d Add new line 2015-05-07 11:27:38 -07:00
Jason Freeman
dd6c87e302 Merge pull request #3058 from Microsoft/promiseVoidErrorCallback
Fix typing for Promises so that a void error callback doesn't mess up inference
2015-05-07 10:33:22 -07:00
Mohamed Hegazy
7a5804cf45 Update LKG 2015-05-06 22:44:55 -07:00
Mohamed Hegazy
805558b7ee Update version 2015-05-06 22:39:23 -07:00
Mohamed Hegazy
60b7bbb6c5 Merge branch 'master' into release-1.5
Conflicts:
	bin/tsc.js
	bin/tsserver.js
	bin/typescript.js
	bin/typescriptServices.js
	src/compiler/checker.ts
	src/compiler/emitter.ts
	src/services/services.ts
	src/services/shims.ts
	tests/baselines/reference/classExpressionWithDecorator1.js
	tests/baselines/reference/decoratedClassFromExternalModule.js
	tests/baselines/reference/decoratorOnClass1.js
	tests/baselines/reference/decoratorOnClass2.js
	tests/baselines/reference/decoratorOnClass3.js
	tests/baselines/reference/decoratorOnClass4.js
	tests/baselines/reference/decoratorOnClass5.js
	tests/baselines/reference/decoratorOnClass8.js
	tests/baselines/reference/decoratorOnClassAccessor1.js
	tests/baselines/reference/decoratorOnClassAccessor2.js
	tests/baselines/reference/decoratorOnClassAccessor3.js
	tests/baselines/reference/decoratorOnClassAccessor4.js
	tests/baselines/reference/decoratorOnClassAccessor5.js
	tests/baselines/reference/decoratorOnClassAccessor6.js
	tests/baselines/reference/decoratorOnClassConstructorParameter1.js
	tests/baselines/reference/decoratorOnClassConstructorParameter4.js
	tests/baselines/reference/decoratorOnClassMethod1.js
	tests/baselines/reference/decoratorOnClassMethod10.js
	tests/baselines/reference/decoratorOnClassMethod11.js
	tests/baselines/reference/decoratorOnClassMethod12.js
	tests/baselines/reference/decoratorOnClassMethod13.js
	tests/baselines/reference/decoratorOnClassMethod2.js
	tests/baselines/reference/decoratorOnClassMethod3.js
	tests/baselines/reference/decoratorOnClassMethod4.js
	tests/baselines/reference/decoratorOnClassMethod5.js
	tests/baselines/reference/decoratorOnClassMethod6.js
	tests/baselines/reference/decoratorOnClassMethod7.js
	tests/baselines/reference/decoratorOnClassMethod8.js
	tests/baselines/reference/decoratorOnClassMethodParameter1.js
	tests/baselines/reference/decoratorOnClassProperty1.js
	tests/baselines/reference/decoratorOnClassProperty10.js
	tests/baselines/reference/decoratorOnClassProperty11.js
	tests/baselines/reference/decoratorOnClassProperty2.js
	tests/baselines/reference/decoratorOnClassProperty3.js
	tests/baselines/reference/decoratorOnClassProperty6.js
	tests/baselines/reference/decoratorOnClassProperty7.js
	tests/baselines/reference/missingDecoratorType.js
	tests/baselines/reference/sourceMapValidationDecorators.js
	tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
2015-05-06 22:36:01 -07:00
Vladimir Matveev
3d0daef8eb Merge pull request #3059 from Microsoft/'canonicalFileNamesInHostCache'
use canonical file name when asking the host if file exists
2015-05-06 21:01:01 -07:00
Mohamed Hegazy
42b56cf671 Add a regression test 2015-05-06 20:25:12 -07:00
Mohamed Hegazy
8b43b3d18c Update test 2015-05-06 20:18:32 -07:00
Mohamed Hegazy
ac9b16cff3 refactor narrowTypeByInstanceof 2015-05-06 20:11:31 -07:00
Ron Buckton
93e2f91398 Merge pull request #3063 from Microsoft/removeDefineFunctionName
Removed Object.defineProperty for function name
2015-05-06 17:41:15 -07:00
Ron Buckton
6be18f821e Updated LKG 2015-05-06 17:30:41 -07:00
Ron Buckton
7acc488757 Removed Object.defineProperty for function name 2015-05-06 17:23:04 -07:00
Vladimir Matveev
a33bb6bb19 use canonical file name when asking the host if file exists 2015-05-06 16:00:50 -07:00
Jason Freeman
498f315256 Fix typing for Promises so that a void error callback doesn't mess up inference 2015-05-06 15:53:01 -07:00
Mohamed Hegazy
14362b0ca5 Merge branch 'vvakame-typeguardsByConstructorSigniture' 2015-05-06 13:05:41 -07:00
Mohamed Hegazy
0a28a3ec80 Remove getUnionTypeOfSubtypeConstituents 2015-05-06 13:05:12 -07:00
Mohamed Hegazy
5e94ce65ed Merge branch 'typeguardsByConstructorSigniture' of https://github.com/vvakame/TypeScript into vvakame-typeguardsByConstructorSigniture 2015-05-06 12:44:45 -07:00
Mohamed Hegazy
61a404d3e5 Update LKG 2015-05-06 11:26:55 -07:00
Mohamed Hegazy
63369251b6 Merge pull request #3047 from bryanforbes/fix-tsserver-config-parse
ProjectService passing incorrect object to parseConfigFile()
2015-05-06 10:32:30 -07:00
vvakame
ee4a15c602 PR feedback 2015-05-06 10:13:46 -07:00
Mohamed Hegazy
e43680de11 show more clearly error message when found missing module name
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-05-06 10:13:32 -07:00
vvakame
776f390786 PR feedback 2015-05-06 21:18:15 +09:00
Dan Quirk
78f81efd3a Merge pull request #3050 from tinganho/iojs
Fixes iojs environment check issue
2015-05-05 19:23:25 -07:00
Tingan Ho
0c2ae8fc53 Fixes iojs environment check issue 2015-05-06 10:12:37 +08:00
Bryan Forbes
884ca4edbc ProjectService passing incorrect object to parseConfigFile()
The return signature of `readConfigFile()` changed in
f8424d0b0c91a487a2c8cc226c89ffb359816b7b and the code using it in
`ProjectService` was never updated to match. This lead to the language
services attempting to parse an object that doesn't match what is
expected and using the default compiler options instead of what is
defined in `tsconfig.json`. Similarly, the return value of the
closure in `getTSConfigFileInfo()` was never updated to match in
both places it returns.
2015-05-05 16:51:14 -05:00
Anders Hejlsberg
7b860f5df0 Merge pull request #2991 from Microsoft/circularVar
Error when variable is circularly referenced in type annotation
2015-05-05 13:07:29 -07:00
Anders Hejlsberg
69de046074 Merge pull request #3041 from Microsoft/fixCircularAliasError
Fix circular alias error
2015-05-05 12:24:14 -07:00
Jason Freeman
6c934aa288 Merge pull request #3030 from Microsoft/lineEndings
Harness now reports a difference in line endings when comparing baselines
2015-05-05 12:17:46 -07:00
Mohamed Hegazy
e62db556f6 Update LKG 2015-05-05 11:47:10 -07:00
Jason Freeman
ed7df8138f Merge branch 'master' of https://github.com/Microsoft/TypeScript into lineEndings 2015-05-05 11:37:08 -07:00
Jason Freeman
a25534bd8d Remove unnecessary LineEndingSensitive option from BaselineOptions 2015-05-05 11:36:21 -07:00
Zhengbo Li
fcecd816f4 Merge pull request #3042 from zhengbli/issue3002
Add missing overload to XMLHttpRequest.send
2015-05-05 11:30:54 -07:00
Mohamed Hegazy
13e4450de0 Delete emitter.js 2015-05-05 10:57:15 -07:00
Zhengbo Li
2a098cd36c Add missing overload to XMLHttpRequest.send
Fix issue #3002
2015-05-05 10:23:51 -07:00
Anders Hejlsberg
f08d3793a3 Adding regression test 2015-05-05 10:02:29 -07:00
Anders Hejlsberg
6338e2b192 Fix 'resolveName' to correctly obtain local name of export default 2015-05-05 09:50:11 -07:00
vvakame
e342c95562 fix code styling 2015-05-06 01:00:17 +09:00
Anders Hejlsberg
eeb23ad96e Addressing CR feedback 2015-05-05 07:23:56 -07:00
vvakame
880ccf0221 PR feedback 2015-05-05 20:29:43 +09:00
Vladimir Matveev
3c9a3c558f Merge pull request #3029 from Microsoft/outputJsFiles
emit input non .ts files as separate files when 'allowNonTsExtensions' a...
2015-05-04 18:02:19 -07:00
Vladimir Matveev
82796673ca use only 'separateCompilation' flag when checking of file should be emitted 2015-05-04 17:49:13 -07:00
Jason Freeman
08cffc598c Rebaseline tests 2015-05-04 17:30:06 -07:00
Jason Freeman
d3a2c2a042 Make the harness report a failure if the line endings differ from the baselines 2015-05-04 17:29:57 -07:00