Commit Graph

12831 Commits

Author SHA1 Message Date
Richard Knoll
50f0033e61 Merge branch 'master' into glob2_merged
Conflicts:
	src/compiler/sys.ts
	src/harness/harnessLanguageService.ts
	tests/cases/unittests/cachingInServerLSHost.ts
	tests/cases/unittests/tsconfigParsing.ts
2016-05-26 10:04:54 -07:00
Andy Hanson
f012159220 Revert previous commit 2016-05-26 09:59:45 -07:00
Andy Hanson
cc5b103b2e Fix localeCompare differences in node versions 2016-05-26 09:45:40 -07:00
Andy Hanson
12914eacc5 Fix lint errors 2016-05-26 09:01:56 -07:00
Andy Hanson
fe970abc81 Change tests to use the full JSON output of the navigation bar.
This reduces the confusion of verify.navigationBarCount() counting duplicate items.
2016-05-26 08:40:35 -07:00
Andy Hanson
fe77f541f6 Always include a root node in the navigation bar.
This lets us change the navigation bar counting algorithm to traverse from the root only, so it never has duplicate nodes.
2016-05-26 08:40:35 -07:00
Andy
27a1e91268 Merge pull request #8814 from Microsoft/navbar_modules
Include modules as childItems in navigation bar
2016-05-26 07:07:02 -07:00
Andy
cd5a4439b9 Merge pull request #8811 from Microsoft/navbar_class_child_item
Include classes as childItems in navigation bar
2016-05-26 06:48:18 -07:00
Andy
7ec13b3b4e Merge pull request #8828 from Microsoft/no_null_harness
Remove many uses of 'null' in harness
2016-05-26 06:24:40 -07:00
Andy Hanson
1be09c9c57 Merge branch 'navbar_class_child_item' into navbar_modules 2016-05-26 06:23:01 -07:00
Andy Hanson
5c23b3bc20 Fix more tests 2016-05-26 06:04:42 -07:00
Andy Hanson
5a627ad176 Fix trailing whitespace 2016-05-26 06:01:20 -07:00
Mohamed Hegazy
6173696b25 Merge pull request #8825 from Microsoft/Fix8795-1
Fix #8795: make properties defined in optional constructor parameters optional
2016-05-25 17:11:57 -07:00
Richard Knoll
c340c88706 Bringing back excludes error and fixing faulty test 2016-05-25 17:08:24 -07:00
Richard Knoll
db856431e8 Fixing linter and test errors 2016-05-25 17:07:36 -07:00
Richard Knoll
084b94c4c1 Merge branch 'master' into glob2
Conflicts:
	Jakefile.js
	src/compiler/commandLineParser.ts
	src/compiler/core.ts
	src/compiler/sys.ts
	src/harness/harness.ts
	src/server/editorServices.ts
	src/services/shims.ts
	tests/cases/unittests/cachingInServerLSHost.ts
2016-05-25 17:06:50 -07:00
Nathan Shively-Sanders
42c17e194e Address PR comments 2016-05-25 17:03:33 -07:00
Vladimir Matveev
df4ab083f4 Merge pull request #8829 from Microsoft/tslintPerf
add a extra check to avoid rescans in Node.getStart
2016-05-25 16:54:25 -07:00
Mohamed Hegazy
6ab389174c Accept baselines 2016-05-25 16:46:20 -07:00
Vladimir Matveev
3e3ae7bd90 merge with origin/master, address PR feedback 2016-05-25 16:23:51 -07:00
Andy Hanson
1bae2c4982 Merge branch 'master' into navbar_class_child_item 2016-05-25 13:49:31 -07:00
Andy Hanson
7ddb1631bc Remove many uses of 'null' in harness. Remaining uses should be commented. 2016-05-25 13:44:08 -07:00
Mohamed Hegazy
cbbc0ca8de Merge branch 'master' into Fix8795-1 2016-05-25 12:35:58 -07:00
Mohamed Hegazy
e5ed3755dc Merge branch 'master' of https://github.com/Microsoft/TypeScript 2016-05-25 12:27:39 -07:00
Mohamed Hegazy
1e41af30fe Update LKG 2016-05-25 12:27:29 -07:00
Vladimir Matveev
b3531b0158 add a extra check to avoid rescans 2016-05-25 12:25:53 -07:00
Andy
1abc2a7846 Merge pull request #8823 from Microsoft/no_null
Remove uses of `null` in services
2016-05-25 12:23:37 -07:00
Mohamed Hegazy
473f40664b Merge branch 'master' of https://github.com/Microsoft/TypeScript 2016-05-25 12:18:14 -07:00
Mohamed Hegazy
58c8d345bc Update LKG 2016-05-25 12:17:57 -07:00
Anders Hejlsberg
b3f167f7a5 Merge pull request #8821 from Microsoft/intersectionTypeInference
Improve intersection type inference
2016-05-25 11:51:12 -07:00
Andy Hanson
f7ff3eb562 Remove uses of null in services 2016-05-25 11:42:48 -07:00
Nathan Shively-Sanders
5138e8be8e Correct tests and update baselines.
A lot of tests used non-numeric property names for object literals that
are contextually typed only by a numeric indexer.
2016-05-25 11:37:10 -07:00
Anders Hejlsberg
6a27289b2d Add test 2016-05-25 11:17:03 -07:00
Anders Hejlsberg
a431a0b60b Improve intersection type inference 2016-05-25 11:16:33 -07:00
Nathan Shively-Sanders
41db405f4c Merge branch 'master' into excess-property-check-numeric-indexers 2016-05-25 10:56:15 -07:00
Ryan Cavanaugh
f5a52ee7db Merge pull request #8819 from RyanCavanaugh/fixBaselines
Fix broken baselines
2016-05-25 10:37:37 -07:00
Nathan Shively-Sanders
89fb304eee Add test case for excess checking of numeric properties 2016-05-25 10:18:49 -07:00
Andy Hanson
5bfdf69fbf Remove comment 2016-05-25 10:17:59 -07:00
Andy
c9050db259 Merge pull request #8815 from Microsoft/navbar_debug
Show indent and childItems when debugging the navigation bar
2016-05-25 10:12:47 -07:00
Nathan Shively-Sanders
642d6d5407 Only allow excess numeric properties w/numeric indexers
Previously, having a numeric indexer on a target type meant that excess
object property checking would allow any property. Now only numeric
properties are allowed.
2016-05-25 10:12:16 -07:00
Andy
d26d0cea71 Merge pull request #8813 from Microsoft/navbar_interface
Include interfaces as childItems in navigation bar
2016-05-25 10:12:01 -07:00
Ryan Cavanaugh
34e8560070 Fix broken baselines 2016-05-25 10:11:54 -07:00
Vladimir Matveev
aa53b9ee7b Merge pull request #8804 from Microsoft/fixTestRun
do not swallow test execution errors (uncovers recent build break)
2016-05-25 09:50:22 -07:00
Vladimir Matveev
c4b517ce45 run linter once after last worker is finished in case if there are no errors 2016-05-25 09:42:59 -07:00
Andy
d7e30f099d Merge pull request #8810 from Microsoft/lint_more_more
Lint all servicesSources
2016-05-25 08:10:38 -07:00
Andy Hanson
c707e80463 Show indent and childItems when debugging the navigation bar 2016-05-25 08:02:17 -07:00
Andy Hanson
109c05863e Include modules as childItems in navigation bar 2016-05-25 07:49:56 -07:00
Andy Hanson
91b473389b Include interfaces as childItems in navigation bar 2016-05-25 07:34:35 -07:00
Andy Hanson
dbd30542a6 Include classes as childItems in navigation bar 2016-05-25 07:16:23 -07:00
Andy Hanson
bd633c828f Lint all servicesSources 2016-05-25 06:45:52 -07:00