Remove unneeded d.ts files from extensions (#19653)

* Remove unneeded d.ts files from extensions

Moves most extensions to use the lib files for the standard library that typescript provides.

* Remove a few more node.d.ts references

extensions/configuration-editing/src/typings/ref.d.ts

@@ -5,5 +5,3 @@
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
\ No newline at end of file

extensions/configuration-editing/tsconfig.json

 {
 	"compilerOptions": {
-		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
 		"outDir": "./out",
+		"lib": [
+			"es2015"
+		],
 		"strictNullChecks": true
 	},
 	"exclude": [

extensions/extension-editing/src/typings/ref.d.ts

@@ -5,5 +5,3 @@
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
\ No newline at end of file

extensions/extension-editing/tsconfig.json

 {
 	"compilerOptions": {
-		"noLib": true,
 		"target": "es5",
+		"lib": [
+			"es2015"
+		],
 		"module": "commonjs",
 		"outDir": "./out"
 	},

extensions/git/src/typings/refs.d.ts

@@ -5,6 +5,4 @@
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
-/// <reference path='../../../../src/typings/mocha.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-// / <reference path='../../../../extensions/lib.core.d.ts'/>
\ No newline at end of file

extensions/javascript/package.json

@@ -118,5 +118,8 @@
         "url": "http://json.schemastore.org/jsconfig"
       }
     ]
+  },
+  "devDependencies": {
+    "@types/node": "^7.0.4"
   }
 }

extensions/javascript/src/typings/ref.d.ts

@@ -4,6 +4,4 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
\ No newline at end of file
+/// <reference path='../../node_modules/@types/node/index.d.ts'/>

extensions/javascript/tsconfig.json

 {
 	"compilerOptions": {
-		"noLib": true,
 		"target": "es5",
 		"module": "commonjs",
-		"outDir": "./out"
+		"outDir": "./out",
+		"lib": [
+			"es2015"
+		]
 	},
 	"exclude": [
 		"node_modules"

extensions/markdown/package.json

@@ -178,5 +178,8 @@
 		"markdown-it": "^8.2.2",
 		"markdown-it-named-headers": "0.0.4",
 		"vscode-extension-telemetry": "^0.0.5"
+	},
+	"devDependencies": {
+		"@types/node": "^7.0.4"
 	}
 }
\ No newline at end of file

extensions/markdown/src/documentLinkProvider.ts

@@ -52,7 +52,7 @@ export default class MarkdownDocumentLinkProvider implements vscode.DocumentLink
 		if (!uri.path) {
 			resourcePath = document.uri.path;
 		} else if (uri.path[0] === '/') {
-			resourcePath = path.join(vscode.workspace.rootPath, uri.path);
+			resourcePath = path.join(vscode.workspace.rootPath || '', uri.path);
 		} else {
 			resourcePath = path.join(base, uri.path);
 		}

extensions/markdown/src/markdownEngine.ts

@@ -115,7 +115,7 @@ export class MarkdownEngine {
 				if (!uri.scheme && uri.path && !uri.fragment) {
 					// Assume it must be a file
 					if (uri.path[0] === '/') {
-						uri = vscode.Uri.file(path.join(vscode.workspace.rootPath, uri.path));
+						uri = vscode.Uri.file(path.join(vscode.workspace.rootPath || '', uri.path));
 					} else {
 						uri = vscode.Uri.file(path.join(path.dirname(this.currentDocument.path), uri.path));
 					}

extensions/markdown/src/typings/ref.d.ts

@@ -4,4 +4,4 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../node.d.ts'/>
+/// <reference path='../../node_modules/@types/node/index.d.ts'/>

extensions/php/src/typings/refs.d.ts

@@ -5,4 +5,3 @@
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
\ No newline at end of file

extensions/php/tsconfig.json

 {
 	"compilerOptions": {
-		"noLib": true,
 		"target": "es5",
+		"lib": [
+			"es2015"
+		],
 		"module": "commonjs",
 		"outDir": "./out"
 	},

extensions/python/src/typings/ref.d.ts

@@ -3,7 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
\ No newline at end of file
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
\ No newline at end of file

extensions/python/tsconfig.json

 {
 	"compilerOptions": {
-		"noLib": true,
 		"target": "es5",
+		"lib": [
+			"es2015"
+		],
 		"module": "commonjs",
 		"outDir": "./out"
 	},

extensions/ruby/src/typings/ref.d.ts

@@ -3,7 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
\ No newline at end of file
+/// <reference path='../../../../src/vs/vscode.d.ts'/>
\ No newline at end of file

extensions/ruby/tsconfig.json

@@ -3,7 +3,9 @@
 		"module": "commonjs",
 		"target": "es5",
 		"outDir": "./out",
-		"noLib": true,
+		"lib": [
+			"es2015"
+		],
 		"sourceMap": true
 	},
 	"exclude": [

extensions/typescript/package.json

 {
-	"name": "typescript",
-	"description": "Extension to add Typescript capabilities to VSCode.",
-	"displayName": "TypeScript support for VSCode",
-	"version": "0.10.1",
-	"author": "Microsoft Corporation",
-	"license": "MIT",
-	"publisher": "vscode",
-	"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-	"engines": {
-		"vscode": "*"
-	},
-	"dependencies": {
-		"semver": "4.3.6",
-		"vscode-extension-telemetry": "^0.0.5",
-		"vscode-nls": "^2.0.1",
-		"typescript": "2.1.5"
-	},
-	"devDependencies": {
-		"@types/semver": "^5.3.30"
-	},
-	"scripts": {
-		"postinstall": "node ./bin/postinstall",
-		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json",
-		"update-grammars": "node ./build/update-grammars.js"
-	},
-	"activationEvents": [
-		"onLanguage:javascript",
-		"onLanguage:javascriptreact",
-		"onLanguage:typescript",
-		"onLanguage:typescriptreact",
-		"onLanguage:jsx-tags",
-		"onCommand:typescript.reloadProjects",
-		"onCommand:javascript.reloadProjects",
-		"onCommand:typescript.selectTypeScriptVersion"
-	],
-	"main": "./out/typescriptMain",
-	"enableProposedApi": true,
-	"contributes": {
-		"languages": [
-			{
-				"id": "typescript",
-				"aliases": [
-					"TypeScript",
-					"ts",
-					"typescript"
-				],
-				"extensions": [
-					".ts"
-				],
-				"configuration": "./language-configuration.json"
-			},
-			{
-				"id": "typescriptreact",
-				"aliases": [
-					"TypeScript React",
-					"tsx"
-				],
-				"extensions": [
-					".tsx"
-				],
-				"configuration": "./language-configuration.json"
-			}
-		],
-		"grammars": [
-			{
-				"language": "typescript",
-				"scopeName": "source.ts",
-				"path": "./syntaxes/TypeScript.tmLanguage.json"
-			},
-			{
-				"language": "typescriptreact",
-				"scopeName": "source.tsx",
-				"path": "./syntaxes/TypeScriptReact.tmLanguage.json",
-				"embeddedLanguages": {
-					"meta.tag.tsx": "jsx-tags",
-					"meta.tag.without-attributes.tsx": "jsx-tags"
-				}
-			}
-		],
-		"configuration": {
-			"type": "object",
-			"title": "%configuration.typescript%",
-			"order": 20,
-			"properties": {
-				"typescript.tsdk": {
-					"type": [
-						"string",
-						"null"
-					],
-					"default": null,
-					"description": "%typescript.tsdk.desc%"
-				},
-				"typescript.disableAutomaticTypeAcquisition": {
-					"type": "boolean",
-					"default": false,
-					"description": "%typescript.disableAutomaticTypeAcquisition%"
-				},
-				"typescript.check.tscVersion": {
-					"type": "boolean",
-					"default": true,
-					"description": "%typescript.check.tscVersion%"
-				},
-				"typescript.referencesCodeLens.enabled": {
-					"type": "boolean",
-					"default": false,
-					"description": "%typescript.referencesCodeLens.enabled%"
-				},
-				"typescript.tsserver.trace": {
-					"type": "string",
-					"enum": [
-						"off",
-						"messages",
-						"verbose"
-					],
-					"default": "off",
-					"description": "%typescript.tsserver.trace%"
-				},
-				"typescript.useCodeSnippetsOnMethodSuggest": {
-					"type": "boolean",
-					"default": false,
-					"description": "%typescript.useCodeSnippetsOnMethodSuggest.dec%"
-				},
-				"typescript.validate.enable": {
-					"type": "boolean",
-					"default": true,
-					"description": "%typescript.validate.enable%"
-				},
-				"typescript.format.enable": {
-					"type": "boolean",
-					"default": true,
-					"description": "%typescript.format.enable%"
-				},
-				"typescript.format.insertSpaceAfterCommaDelimiter": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterCommaDelimiter%"
-				},
-				"typescript.format.insertSpaceAfterSemicolonInForStatements": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterSemicolonInForStatements%"
-				},
-				"typescript.format.insertSpaceBeforeAndAfterBinaryOperators": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceBeforeAndAfterBinaryOperators%"
-				},
-				"typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterKeywordsInControlFlowStatements%"
-				},
-				"typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterFunctionKeywordForAnonymousFunctions%"
-				},
-				"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis%"
-				},
-				"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets%"
-				},
-				"typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces%"
-				},
-				"typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces%"
-				},
-				"typescript.format.placeOpenBraceOnNewLineForFunctions": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.placeOpenBraceOnNewLineForFunctions%"
-				},
-				"typescript.format.placeOpenBraceOnNewLineForControlBlocks": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.placeOpenBraceOnNewLineForControlBlocks%"
-				},
-				"javascript.validate.enable": {
-					"type": "boolean",
-					"default": true,
-					"description": "%javascript.validate.enable%"
-				},
-				"javascript.format.enable": {
-					"type": "boolean",
-					"default": true,
-					"description": "%javascript.format.enable%"
-				},
-				"javascript.format.insertSpaceAfterCommaDelimiter": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterCommaDelimiter%"
-				},
-				"javascript.format.insertSpaceAfterSemicolonInForStatements": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterSemicolonInForStatements%"
-				},
-				"javascript.format.insertSpaceBeforeAndAfterBinaryOperators": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceBeforeAndAfterBinaryOperators%"
-				},
-				"javascript.format.insertSpaceAfterKeywordsInControlFlowStatements": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterKeywordsInControlFlowStatements%"
-				},
-				"javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": {
-					"type": "boolean",
-					"default": true,
-					"description": "%format.insertSpaceAfterFunctionKeywordForAnonymousFunctions%"
-				},
-				"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis%"
-				},
-				"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets%"
-				},
-				"javascript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces%"
-				},
-				"javascript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces%"
-				},
-				"javascript.format.placeOpenBraceOnNewLineForFunctions": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.placeOpenBraceOnNewLineForFunctions%"
-				},
-				"javascript.format.placeOpenBraceOnNewLineForControlBlocks": {
-					"type": "boolean",
-					"default": false,
-					"description": "%format.placeOpenBraceOnNewLineForControlBlocks%"
-				}
-			}
-		},
-		"commands": [
-			{
-				"command": "typescript.reloadProjects",
-				"title": "%typescript.reloadProjects.title%"
-			},
-			{
-				"command": "javascript.reloadProjects",
-				"title": "%javascript.reloadProjects.title%"
-			},
-			{
-				"command": "typescript.selectTypeScriptVersion",
-				"title": "%typescript.selectTypeScriptVersion.title%"
-			}
-		],
-		"breakpoints": [
-			{
-				"language": "typescript"
-			},
-			{
-				"language": "typescriptreact"
-			}
-		],
-		"snippets": [
-			{
-				"language": "typescript",
-				"path": "./snippets/typescript.json"
-			},
-			{
-				"language": "typescriptreact",
-				"path": "./snippets/typescriptreact.json"
-			}
-		],
-		"jsonValidation": [
-			{
-				"fileMatch": "tsconfig.json",
-				"url": "http://json.schemastore.org/tsconfig"
-			},
-			{
-				"fileMatch": "tsconfig.json",
-				"url": "./schemas/tsconfig.schema.json"
-			},
-			{
-				"fileMatch": "typings.json",
-				"url": "http://json.schemastore.org/typings"
-			}
-		]
-	}
+  "name": "typescript",
+  "description": "Extension to add Typescript capabilities to VSCode.",
+  "displayName": "TypeScript support for VSCode",
+  "version": "0.10.1",
+  "author": "Microsoft Corporation",
+  "license": "MIT",
+  "publisher": "vscode",
+  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "engines": {
+    "vscode": "*"
+  },
+  "dependencies": {
+    "semver": "4.3.6",
+    "vscode-extension-telemetry": "^0.0.5",
+    "vscode-nls": "^2.0.1",
+    "typescript": "2.1.5"
+  },
+  "devDependencies": {
+    "@types/node": "^7.0.4",
+    "@types/semver": "^5.3.30"
+  },
+  "scripts": {
+    "postinstall": "node ./bin/postinstall",
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json",
+    "update-grammars": "node ./build/update-grammars.js"
+  },
+  "activationEvents": [
+    "onLanguage:javascript",
+    "onLanguage:javascriptreact",
+    "onLanguage:typescript",
+    "onLanguage:typescriptreact",
+    "onLanguage:jsx-tags",
+    "onCommand:typescript.reloadProjects",
+    "onCommand:javascript.reloadProjects",
+    "onCommand:typescript.selectTypeScriptVersion"
+  ],
+  "main": "./out/typescriptMain",
+  "enableProposedApi": true,
+  "contributes": {
+    "languages": [
+      {
+        "id": "typescript",
+        "aliases": [
+          "TypeScript",
+          "ts",
+          "typescript"
+        ],
+        "extensions": [
+          ".ts"
+        ],
+        "configuration": "./language-configuration.json"
+      },
+      {
+        "id": "typescriptreact",
+        "aliases": [
+          "TypeScript React",
+          "tsx"
+        ],
+        "extensions": [
+          ".tsx"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "typescript",
+        "scopeName": "source.ts",
+        "path": "./syntaxes/TypeScript.tmLanguage.json"
+      },
+      {
+        "language": "typescriptreact",
+        "scopeName": "source.tsx",
+        "path": "./syntaxes/TypeScriptReact.tmLanguage.json",
+        "embeddedLanguages": {
+          "meta.tag.tsx": "jsx-tags",
+          "meta.tag.without-attributes.tsx": "jsx-tags"
+        }
+      }
+    ],
+    "configuration": {
+      "type": "object",
+      "title": "%configuration.typescript%",
+      "order": 20,
+      "properties": {
+        "typescript.tsdk": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "%typescript.tsdk.desc%"
+        },
+        "typescript.disableAutomaticTypeAcquisition": {
+          "type": "boolean",
+          "default": false,
+          "description": "%typescript.disableAutomaticTypeAcquisition%"
+        },
+        "typescript.check.tscVersion": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.check.tscVersion%"
+        },
+        "typescript.referencesCodeLens.enabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "%typescript.referencesCodeLens.enabled%"
+        },
+        "typescript.tsserver.trace": {
+          "type": "string",
+          "enum": [
+            "off",
+            "messages",
+            "verbose"
+          ],
+          "default": "off",
+          "description": "%typescript.tsserver.trace%"
+        },
+        "typescript.useCodeSnippetsOnMethodSuggest": {
+          "type": "boolean",
+          "default": false,
+          "description": "%typescript.useCodeSnippetsOnMethodSuggest.dec%"
+        },
+        "typescript.validate.enable": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.validate.enable%"
+        },
+        "typescript.format.enable": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.format.enable%"
+        },
+        "typescript.format.insertSpaceAfterCommaDelimiter": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterCommaDelimiter%"
+        },
+        "typescript.format.insertSpaceAfterSemicolonInForStatements": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterSemicolonInForStatements%"
+        },
+        "typescript.format.insertSpaceBeforeAndAfterBinaryOperators": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceBeforeAndAfterBinaryOperators%"
+        },
+        "typescript.format.insertSpaceAfterKeywordsInControlFlowStatements": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterKeywordsInControlFlowStatements%"
+        },
+        "typescript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterFunctionKeywordForAnonymousFunctions%"
+        },
+        "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis%"
+        },
+        "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets%"
+        },
+        "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces%"
+        },
+        "typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces%"
+        },
+        "typescript.format.placeOpenBraceOnNewLineForFunctions": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.placeOpenBraceOnNewLineForFunctions%"
+        },
+        "typescript.format.placeOpenBraceOnNewLineForControlBlocks": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.placeOpenBraceOnNewLineForControlBlocks%"
+        },
+        "javascript.validate.enable": {
+          "type": "boolean",
+          "default": true,
+          "description": "%javascript.validate.enable%"
+        },
+        "javascript.format.enable": {
+          "type": "boolean",
+          "default": true,
+          "description": "%javascript.format.enable%"
+        },
+        "javascript.format.insertSpaceAfterCommaDelimiter": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterCommaDelimiter%"
+        },
+        "javascript.format.insertSpaceAfterSemicolonInForStatements": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterSemicolonInForStatements%"
+        },
+        "javascript.format.insertSpaceBeforeAndAfterBinaryOperators": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceBeforeAndAfterBinaryOperators%"
+        },
+        "javascript.format.insertSpaceAfterKeywordsInControlFlowStatements": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterKeywordsInControlFlowStatements%"
+        },
+        "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": {
+          "type": "boolean",
+          "default": true,
+          "description": "%format.insertSpaceAfterFunctionKeywordForAnonymousFunctions%"
+        },
+        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis%"
+        },
+        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets%"
+        },
+        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces%"
+        },
+        "javascript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces%"
+        },
+        "javascript.format.placeOpenBraceOnNewLineForFunctions": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.placeOpenBraceOnNewLineForFunctions%"
+        },
+        "javascript.format.placeOpenBraceOnNewLineForControlBlocks": {
+          "type": "boolean",
+          "default": false,
+          "description": "%format.placeOpenBraceOnNewLineForControlBlocks%"
+        }
+      }
+    },
+    "commands": [
+      {
+        "command": "typescript.reloadProjects",
+        "title": "%typescript.reloadProjects.title%"
+      },
+      {
+        "command": "javascript.reloadProjects",
+        "title": "%javascript.reloadProjects.title%"
+      },
+      {
+        "command": "typescript.selectTypeScriptVersion",
+        "title": "%typescript.selectTypeScriptVersion.title%"
+      }
+    ],
+    "breakpoints": [
+      {
+        "language": "typescript"
+      },
+      {
+        "language": "typescriptreact"
+      }
+    ],
+    "snippets": [
+      {
+        "language": "typescript",
+        "path": "./snippets/typescript.json"
+      },
+      {
+        "language": "typescriptreact",
+        "path": "./snippets/typescriptreact.json"
+      }
+    ],
+    "jsonValidation": [
+      {
+        "fileMatch": "tsconfig.json",
+        "url": "http://json.schemastore.org/tsconfig"
+      },
+      {
+        "fileMatch": "tsconfig.json",
+        "url": "./schemas/tsconfig.schema.json"
+      },
+      {
+        "fileMatch": "typings.json",
+        "url": "http://json.schemastore.org/typings"
+      }
+    ]
+  }
 }

extensions/typescript/src/features/referencesCodeLensProvider.ts

@@ -96,7 +96,7 @@ export default class TypeScriptReferencesCodeLensProvider implements CodeLensPro
 				};
 				return Promise.resolve(codeLens);
 			}
-			return Promise.reject(codeLens);
+			return Promise.reject<CodeLens>(codeLens);
 		}).catch(() => {
 			codeLens.command = {
 				title: localize('referenceErrorLabel', 'Could not determine references'),

extensions/typescript/src/typings/ref.d.ts

@@ -4,5 +4,4 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../extensions/declares.d.ts'/>
-/// <reference path='../../../../extensions/node.d.ts'/>
+/// <reference path='../../node_modules/@types/node/index.d.ts'/>

extensions/typescript/typings/mocha.d.ts

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare function run(): void;
-
-declare function suite(name: string, fn: (err?) => void);
-declare function test(name: string, fn: (done?: (err?) => void) => void);
-declare function suiteSetup(fn: (done?: (err?) => void) => void);
-declare function suiteTeardown(fn: (done?: (err?) => void) => void);
-declare function setup(fn: (done?: (err?) => void) => void);
-declare function teardown(fn: (done?: (err?) => void) => void);

extensions/vscode-api-tests/src/typings/ref.d.ts

@@ -7,4 +7,3 @@
 /// <reference path='../../../../src/typings/mocha.d.ts'/>
 /// <reference path='../../../../extensions/declares.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>

extensions/vscode-api-tests/src/workspace.test.ts

@@ -184,7 +184,10 @@ suite('workspace-namespace', () => {
 							assert.ok(onDidSaveTextDocument);
 
 							while (disposables.length) {
-								disposables.pop().dispose();
+								const item = disposables.pop();
+								if (item) {
+									item.dispose();
+								}
 							}
 
 							return deleteFile(file);

extensions/vscode-api-tests/tsconfig.json

@@ -3,11 +3,13 @@
 		"module": "commonjs",
 		"target": "ES5",
 		"outDir": "out",
-		"noLib": true,
+		"lib": [
+			"es2015"
+		],
 		"sourceMap": true,
 		"strictNullChecks": true
 	},
 	"exclude": [
 		"node_modules"
 	]
-}
+}
\ No newline at end of file

extensions/vscode-colorize-tests/src/typings/ref.d.ts

@@ -6,4 +6,3 @@
 /// <reference path='../../../../src/typings/mocha.d.ts'/>
 /// <reference path='../../../../extensions/declares.d.ts'/>
 /// <reference path='../../../../extensions/node.d.ts'/>
-/// <reference path='../../../../extensions/lib.core.d.ts'/>
\ No newline at end of file

extensions/vscode-colorize-tests/tsconfig.json

@@ -3,7 +3,9 @@
 		"module": "commonjs",
 		"target": "ES5",
 		"outDir": "out",
-		"noLib": true,
+		"lib": [
+			"es2015"
+		],
 		"sourceMap": true
 	},
 	"exclude": [