Merge remote-tracking branch 'origin/master' into tyriar/101_hot_exit

.vscode/extensions.json

@@ -1,5 +1,5 @@
 {
-	// See https://go.microsoft.com/fwlink/?LinkId=733558
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"eg2.tslint",

.vscode/settings.json

@@ -24,5 +24,6 @@
 		"windows": {
 			"command": "${workspaceRoot}\\scripts\\test.bat --coverage --run ${file}"
 		}
-	}]
+	}],
+	"typescript.check.workspaceVersion": false
 }

OSSREADME.json

@@ -36,6 +36,36 @@
 	],
 	"isProd": true
 },
+{
+	"isLicense": true,
+	"name": "chokidar",
+	"repositoryURL": "https://github.com/paulmillr/chokidar",
+	"license": "MIT",
+	"licenseDetail": [
+		"The MIT license.",
+		"",
+		"Copyright (c) 2012 - 2016 Paul Miller [paulmillr.com](http://paulmillr.com) & Elan Shanker",
+		"",
+		"Permission is hereby granted, free of charge, to any person obtaining a copy of",
+		"this software and associated documentation files (the \"Software\"), to deal in",
+		"the Software without restriction, including without limitation the rights to",
+		"use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies",
+		"of the Software, and to permit persons to whom the Software is furnished to do",
+		"so, subject to the following conditions:",
+		"",
+		"The above copyright notice and this permission notice shall be included in all",
+		"copies or substantial portions of the Software.",
+		"",
+		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+		"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+		"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+		"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+		"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+		"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
+		"SOFTWARE."
+	],
+	"isProd": true
+},
 {
 	"name": "chromium",
 	"version": "52.0.2743.82",
@@ -81,13 +111,13 @@
 },
 {
 	"name": "nodejs",
-	"version": "6.3.0",
+	"version": "6.5.0",
 	"repositoryURL": "https://github.com/nodejs/node",
 	"isProd": true
 },
 {
 	"name": "electron",
-	"version": "1.3.5",
+	"version": "1.3.7",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/electron",
 	"isProd": true

README.md

@@ -32,7 +32,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 ## Feedback
 
 * Ask a question on [Stack Overflow](http://stackoverflow.com/questions/tagged/vscode).
-* Request a new feature on [Github](CONTRIBUTING.md).
+* Request a new feature on [GitHub](CONTRIBUTING.md).
 * Vote for [popular feature requests](https://github.com/Microsoft/vscode/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc).
 * File a bug in [GitHub Issues](https://github.com/Microsoft/vscode/issues).
 * [Tweet](https://twitter.com/code) us with other feedback.

ThirdPartyNotices.txt

@@ -248,25 +248,23 @@ END OF Colorsublime-Themes NOTICES AND INFORMATION
 
 %% daaain/Handlebars NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+-- Credits
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Adapted from the great sublime-text-handlebars package by Nicholas Westlake.
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
+Thanks a lot to all the generous contributors (in alphabetical order): @bittersweetryan, @bradcliffe, @calumbrodie, @duncanbeevers, @hlvnst, @jonschlinkert, @Krutius, @samselikoff, @utkarshkukreti, @zeppelin
-all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- License
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+(The MIT License)
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+Copyright (c) daaain/Handlebars project authors
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+
-THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF daaain/Handlebars NOTICES AND INFORMATION
 

build/gulpfile.vscode.js

@@ -28,6 +28,7 @@ const commit = util.getVersion(root);
 const packageJson = require('../package.json');
 const product = require('../product.json');
 const shrinkwrap = require('../npm-shrinkwrap.json');
+const crypto = require('crypto');
 
 const dependencies = Object.keys(shrinkwrap.dependencies);
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
@@ -38,7 +39,8 @@ const nodeModules = ['electron', 'original-fs']
 // Build
 
 const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.6.2' }
+	{ name: 'ms-vscode.node-debug', version: '1.6.8' },
+	{ name: 'ms-vscode.node-debug2', version: '0.0.7' }
 ];
 
 const vscodeEntryPoints = _.flatten([
@@ -68,7 +70,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/parts/git/**/*.html',
 	'out-build/vs/workbench/parts/git/**/*.sh',
 	'out-build/vs/workbench/parts/html/browser/webview.html',
-	'out-build/vs/workbench/parts/extensions/electron-browser/media/markdown.css',
+	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
 	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
 	'out-build/vs/workbench/services/files/**/*.exe',
@@ -142,6 +144,40 @@ gulp.task('electron', ['clean-electron'], () => {
 
 const languages = ['chs', 'cht', 'jpn', 'kor', 'deu', 'fra', 'esn', 'rus', 'ita'];
 
+/**
+ * Compute checksums for some files.
+ *
+ * @param {string} out The out folder to read the file from.
+ * @param {string[]} filenames The paths to compute a checksum for.
+ * @return {Object} A map of paths to checksums.
+ */
+function computeChecksums(out, filenames) {
+	var result = {};
+	filenames.forEach(function(filename) {
+		var fullPath = path.join(process.cwd(), out, filename);
+		result[filename] = computeChecksum(fullPath);
+	});
+	return result;
+}
+
+/**
+ * Compute checksum for a file.
+ *
+ * @param {string} filename The absolute path to a filename.
+ * @return {string} The checksum for `filename`.
+ */
+function computeChecksum(filename) {
+	var contents = fs.readFileSync(filename);
+
+	var hash = crypto
+		.createHash('md5')
+		.update(contents)
+		.digest('base64')
+		.replace(/=+$/, '');
+
+	return hash;
+}
+
 function packageTask(platform, arch, opts) {
 	opts = opts || {};
 
@@ -152,12 +188,19 @@ function packageTask(platform, arch, opts) {
 	return () => {
 		const out = opts.minified ? 'out-vscode-min' : 'out-vscode';
 
+		const checksums = computeChecksums(out, [
+			'vs/workbench/workbench.main.js',
+			'vs/workbench/workbench.main.css',
+			'vs/workbench/electron-browser/bootstrap/index.html',
+			'vs/workbench/electron-browser/bootstrap/index.js'
+		]);
+
 		const src = gulp.src(out + '/**', { base: '.' })
 			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
 			.pipe(util.setExecutableBit(['**/*.sh']));
 
-		const extensions = gulp.src([
+		const extensionsList = [
-			'extensions/**',
+			'extensions/*/**',
 			'!extensions/*/src/**',
 			'!extensions/*/out/**/test/**',
 			'!extensions/*/test/**',
@@ -170,8 +213,11 @@ function packageTask(platform, arch, opts) {
 			'!extensions/**/tsconfig.json',
 			'!extensions/typescript/bin/**',
 			'!extensions/vscode-api-tests/**',
-			'!extensions/vscode-colorize-tests/**'
+			'!extensions/vscode-colorize-tests/**',
-		], { base: '.' });
+			...builtInExtensions.map(e => `!extensions/${ e.name }/**`)
+		];
+
+		const extensions = gulp.src(extensionsList, { base: '.' });
 
 		const marketplaceExtensions = es.merge(...builtInExtensions.map(extension => {
 			return ext.src(extension.name, extension.version)
@@ -207,7 +253,7 @@ function packageTask(platform, arch, opts) {
 
 		const date = new Date().toISOString();
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date }));
+			.pipe(json({ commit, date, checksums }));
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
 
@@ -222,6 +268,7 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
 			.pipe(util.cleanNodeModule('pty.js', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
 
 		let all = es.merge(

build/gulpfile.vscode.linux.js

@@ -151,14 +151,14 @@ gulp.task('clean-vscode-linux-arm-rpm', util.rimraf('.build/linux/rpm/armhf'));
 
 gulp.task('vscode-linux-ia32-prepare-deb', ['clean-vscode-linux-ia32-deb', 'vscode-linux-ia32-min'], prepareDebPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-deb', ['clean-vscode-linux-x64-deb', 'vscode-linux-x64-min'], prepareDebPackage('x64'));
-gulp.task('vscode-linux-arm-prepare-deb', ['clean-vscode-linux-arm-deb', 'vscode-linux-arm-min'], prepareDebPackage('armhf'));
+gulp.task('vscode-linux-arm-prepare-deb', ['clean-vscode-linux-arm-deb', 'vscode-linux-arm-min'], prepareDebPackage('arm'));
 gulp.task('vscode-linux-ia32-build-deb', ['vscode-linux-ia32-prepare-deb'], buildDebPackage('ia32'));
 gulp.task('vscode-linux-x64-build-deb', ['vscode-linux-x64-prepare-deb'], buildDebPackage('x64'));
-gulp.task('vscode-linux-arm-build-deb', ['vscode-linux-arm-prepare-deb'], buildDebPackage('armhf'));
+gulp.task('vscode-linux-arm-build-deb', ['vscode-linux-arm-prepare-deb'], buildDebPackage('arm'));
 
 gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-vscode-linux-ia32-rpm', 'vscode-linux-ia32-min'], prepareRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-prepare-rpm', ['clean-vscode-linux-x64-rpm', 'vscode-linux-x64-min'], prepareRpmPackage('x64'));
-gulp.task('vscode-linux-arm-prepare-rpm', ['clean-vscode-linux-arm-rpm', 'vscode-linux-arm-min'], prepareRpmPackage('armhf'));
+gulp.task('vscode-linux-arm-prepare-rpm', ['clean-vscode-linux-arm-rpm', 'vscode-linux-arm-min'], prepareRpmPackage('arm'));
 gulp.task('vscode-linux-ia32-build-rpm', ['vscode-linux-ia32-prepare-rpm'], buildRpmPackage('ia32'));
 gulp.task('vscode-linux-x64-build-rpm', ['vscode-linux-x64-prepare-rpm'], buildRpmPackage('x64'));
-gulp.task('vscode-linux-arm-build-rpm', ['vscode-linux-arm-prepare-rpm'], buildRpmPackage('armhf'));
+gulp.task('vscode-linux-arm-build-rpm', ['vscode-linux-arm-prepare-rpm'], buildRpmPackage('arm'));

build/win32/code.iss

@@ -44,6 +44,7 @@ Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}
 
 [InstallDelete]
+Type: filesandordirs; Name: {app}\resources\app\out
 Type: filesandordirs; Name: {app}\resources\app\plugins
 Type: filesandordirs; Name: {app}\resources\app\extensions
 Type: filesandordirs; Name: {app}\resources\app\node_modules
@@ -296,18 +297,21 @@ Root: HKCR; Subkey: "{#RegValueName}.gemspec\shell\open\command"; ValueType: str
 Root: HKCR; Subkey: ".gitattributes\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: ".gitattributes\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitattributes"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitattributes"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Attributes}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCR; Subkey: "{#RegValueName}.gitattributes"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitattributes\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitattributes\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: HKCR; Subkey: ".gitconfig\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: ".gitconfig\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitconfig"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitconfig"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Config}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCR; Subkey: "{#RegValueName}.gitconfig"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitconfig\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitconfig\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 
 Root: HKCR; Subkey: ".gitignore\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: ".gitignore\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.gitignore"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitignore"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,Git Ignore}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCR; Subkey: "{#RegValueName}.gitignore"; ValueType: string; ValueName: "AlwaysShowExt"; ValueData: ""; Flags: uninsdeletekey; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitignore\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
 Root: HKCR; Subkey: "{#RegValueName}.gitignore\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 

extensions/css/server/npm-shrinkwrap.json

@@ -3,9 +3,9 @@
   "version": "1.0.0",
   "dependencies": {
     "vscode-css-languageservice": {
-      "version": "1.0.9-next.1",
+      "version": "1.1.0",
       "from": "vscode-css-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-1.0.9-next.1.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-1.1.0.tgz"
     },
     "vscode-jsonrpc": {
       "version": "2.3.2-next.5",

extensions/css/server/package.json

@@ -8,7 +8,7 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^1.0.9-next.1",
+    "vscode-css-languageservice": "^1.1.0",
     "vscode-languageserver": "^2.4.0-next.12"
   },
   "scripts": {

extensions/handlebars/OSSREADME.json

@@ -3,5 +3,24 @@
 	"name": "daaain/Handlebars",
 	"version": "0.0.0",
 	"license": "MIT",
-	"repositoryURL": "https://github.com/daaain/Handlebars"
+	"repositoryURL": "https://github.com/daaain/Handlebars",
+	"licenseDetail": [
+		"-- Credits",
+		"",
+		"Adapted from the great sublime-text-handlebars package by Nicholas Westlake.",
+		"",
+		"Thanks a lot to all the generous contributors (in alphabetical order): @bittersweetryan, @bradcliffe, @calumbrodie, @duncanbeevers, @hlvnst, @jonschlinkert, @Krutius, @samselikoff, @utkarshkukreti, @zeppelin",
+		"",
+		"-- License",
+		"",
+		"(The MIT License)",
+		"",
+		"Copyright (c) daaain/Handlebars project authors",
+		"",
+		"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
+		"",
+		"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+		"",
+		"THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+	]
 }]

extensions/handlebars/language-configuration.json

@@ -5,15 +5,16 @@
 	"brackets": [
 		["<!--", "-->"],
 		["<", ">"],
-		["{{", "}}"]
+		["{{", "}}"],
+		["{", "}"],
+		["(", ")"]
 	],
 	"autoClosingPairs": [
 		{ "open": "{", "close": "}"},
 		{ "open": "[", "close": "]"},
 		{ "open": "(", "close": ")" },
 		{ "open": "'", "close": "'" },
-		{ "open": "\"", "close": "\"" },
+		{ "open": "\"", "close": "\"" }
-		{ "open": "<", "close": ">" }
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },

extensions/html/client/src/htmlMain.ts

@@ -77,4 +77,19 @@ export function activate(context: ExtensionContext) {
 			}
 		],
 	});
+
+	languages.setLanguageConfiguration('razor', {
+		wordPattern: /("(?:[^\\\"]*(?:\\.)?)*"?)|('(?:[^\\\']*(?:\\.)?)*'?)|[^\s<>={}\[\],]+/,
+		onEnterRules:[
+			{
+				beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+				afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>$/i,
+				action: { indentAction: IndentAction.IndentOutdent }
+			},
+			{
+				beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join('|')}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+				action: { indentAction: IndentAction.Indent }
+			}
+		],
+	});
 }

extensions/html/language-configuration.json

@@ -4,15 +4,16 @@
 	},
 	"brackets": [
 		["<!--", "-->"],
-		["<", ">"]
+		["<", ">"],
+		["{", "}"],
+		["(", ")"]
 	],
 	"autoClosingPairs": [
 		{ "open": "{", "close": "}"},
 		{ "open": "[", "close": "]"},
 		{ "open": "(", "close": ")" },
 		{ "open": "'", "close": "'" },
-		{ "open": "\"", "close": "\"" },
+		{ "open": "\"", "close": "\"" }
-		{ "open": "<", "close": ">" }
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },

extensions/javascript/syntaxes/JavaScript.tmLanguage.json

@@ -498,7 +498,7 @@
 					"include": "#jsx-tag-invalid"
 				},
 				{
-					"begin": "(?<=(?:'|\"|})>)",
+					"begin": "(?<!text/javascript(?:'|\")>)(?<=(?:'|\"|})>)",
 					"end": "(?=</)",
 					"name": "meta.jsx.children.js",
 					"patterns": [

extensions/markdown/media/markdown.css

@@ -45,6 +45,16 @@ h1, h2, h3 {
 	font-weight: normal;
 }
 
+h1 code,
+h2 code,
+h3 code,
+h4 code,
+h5 code,
+h6 code {
+	font-size: inherit;
+	line-height: auto;
+}
+
 a:hover {
 	color: #4080D0;
 	text-decoration: underline;

extensions/markdown/package.json

@@ -73,7 +73,7 @@
 		"menus": {
 			"editor/title": [
 				{
-					"when": "resourceLangId == markdown",
+					"when": "editorLangId == markdown",
 					"command": "markdown.showPreview",
 					"alt": "markdown.showPreviewToSide",
 					"group": "navigation"
@@ -86,7 +86,7 @@
 			],
 			"explorer/context": [
 				{
-					"when": "resourceLangId == markdown",
+					"when": "editorLangId == markdown",
 					"command": "markdown.showPreview",
 					"group": "navigation"
 				}

extensions/markdown/syntaxes/markdown.tmLanguage

@@ -194,6 +194,10 @@
 					<key>include</key>
 					<string>#fenced_code_block_tsx</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#fenced_code_block_csharp</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#link-def</string>
@@ -218,7 +222,7 @@
 						<key>2</key>
 						<dict>
 							<key>name</key>
-							<string>punctuation.definition.quote.markdown</string>
+							<string>beginning.punctuation.definition.quote.markdown</string>
 						</dict>
 					</dict>
 					<key>name</key>
@@ -283,7 +287,7 @@
 					<array>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(^|\G)(?=&lt;(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del).*&lt;/\2\s*&gt;\s*$)</string>
+							<string>(?i)(^|\G)\s*(?=&lt;(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del).*&lt;/\2\s*&gt;\s*$)</string>
 							<key>end</key>
 							<string>$</string>
 							<key>patterns</key>
@@ -296,7 +300,7 @@
 						</dict>
 						<dict>
 							<key>begin</key>
-							<string>(?i)(^|\G)(?=&lt;(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del))</string>
+							<string>(?i)(^|\G)\s*(?=&lt;(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del))</string>
 							<key>patterns</key>
 							<array>
 								<dict>
@@ -305,7 +309,7 @@
 								</dict>
 							</array>
 							<key>while</key>
-							<string>\G(?!&lt;/\2\s*&gt;)</string>
+							<string>^(?!\s*$)</string>
 						</dict>
 					</array>
 				</dict>
@@ -432,7 +436,7 @@
 								<key>3</key>
 								<dict>
 									<key>name</key>
-									<string>punctuation.definition.list.markdown</string>
+									<string>beginning.punctuation.definition.list.markdown</string>
 								</dict>
 							</dict>
 							<key>comment</key>
@@ -461,7 +465,7 @@
 								<key>3</key>
 								<dict>
 									<key>name</key>
-									<string>punctuation.definition.list.markdown</string>
+									<string>beginning.punctuation.definition.list.markdown</string>
 								</dict>
 							</dict>
 							<key>name</key>
@@ -485,7 +489,7 @@
 				<key>paragraph</key>
 				<dict>
 					<key>begin</key>
-					<string>(^|\G)(?=\S)</string>
+					<string>(^|\G)[ ]{0,3}(?=\S)</string>
 					<key>name</key>
 					<string>meta.paragraph.markdown</string>
 					<key>patterns</key>
@@ -507,7 +511,7 @@
 					<!-- seperator    [ ]{0,3}([-*_][ ]{0,2}\2){2,}[ \t]*$\n? -->
 					<!-- list         [ ]{0,3}[*+-]([ ]{1,3}|\t) -->
 					<!-- both are folded together in the expression below -->
-					<string>(^|\G)(?!\s*$|#|[ ]{0,3}((([-*_][ ]{0,2}\2){2,}[ \t]*$\n?)|([*+-]([ ]{1,3}|\t)))|\s*\[.+?\]:|&gt;)</string>
+					<string>(^|\G)(?!\s*$|#|[ ]{0,3}((([*_][ ]{0,2}\2){2,}[ \t]*$\n?)|([*+-]([ ]{1,3}|\t)))|\s*\[.+?\]:|&gt;)</string>
 				</dict>
 				<key>raw_block</key>
 				<dict>
@@ -525,7 +529,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -541,7 +545,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -557,7 +561,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -573,7 +577,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -589,7 +593,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -605,7 +609,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -621,7 +625,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -637,7 +641,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -653,7 +657,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -669,7 +673,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -685,7 +689,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -701,7 +705,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -717,7 +721,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -733,7 +737,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -749,7 +753,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -765,7 +769,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -781,7 +785,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -797,7 +801,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -813,7 +817,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -829,7 +833,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -845,7 +849,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -861,7 +865,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -877,7 +881,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -893,7 +897,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -909,7 +913,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -925,7 +929,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -941,7 +945,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -957,7 +961,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -973,7 +977,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -989,7 +993,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1005,7 +1009,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1021,7 +1025,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1037,7 +1041,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1053,7 +1057,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1069,7 +1073,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1085,7 +1089,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1101,7 +1105,7 @@
 					<key>name</key>
 					<string>markup.fenced_code.block.markdown</string>
 					<key>end</key>
-					<string>(^|\G)(\2)\n</string>
+					<string>(^|\G)[ ]{0,3}(\2)\s*\n</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -1110,10 +1114,26 @@
 						</dict>
 					</array>
 				</dict>
+				<key>fenced_code_block_csharp</key>
+				<dict>
+					<key>begin</key>
+					<string>(^|\G)\s*([`~]{3,})\s*(cs|csharp|c#)\s*$</string>
+					<key>name</key>
+					<string>markup.fenced_code.block.markdown</string>
+					<key>end</key>
+					<string>(^|\G)(\2)\n</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>source.cs</string>
+						</dict>
+					</array>
+				</dict>
 				<key>separator</key>
 				<dict>
 					<key>match</key>
-					<string>(^|\G)[ ]{0,3}([-*_])([ ]{0,2}\2){2,}[ \t]*$\n?</string>
+					<string>(^|\G)[ ]{0,3}([*-_])([ ]{0,2}\2){2,}[ \t]*$\n?</string>
 					<key>name</key>
 					<string>meta.separator.markdown</string>
 				</dict>

extensions/markdown/test/colorize-fixtures/test.md

@@ -4,6 +4,12 @@
 ## Markdown plus h2 with a custom ID ##   {#id-goes-here}
 [Link back to H2](#id-goes-here)
 
+### Alternate heading styles:
+Alternate Header 1
+==================
+Alternate Header 2
+------------------
+
 <!-- html madness -->
 <div class="custom-class" markdown="1">
   <div>

extensions/markdown/test/colorize-results/test_md.json

@@ -241,6 +241,83 @@
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
+	{
+		"c": "###",
+		"t": "${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.definition.heading.markdown.markup.punctuation",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.heading rgb(86, 156, 214)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.heading rgb(128, 0, 0)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.heading rgb(86, 156, 214)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.heading rgb(128, 0, 0)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.markup.heading rgb(103, 150, 230)"
+		}
+	},
+	{
+		"c": " ",
+		"t": "${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.heading.markdown.markup",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.heading rgb(86, 156, 214)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.heading rgb(128, 0, 0)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.heading rgb(86, 156, 214)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.heading rgb(128, 0, 0)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.markup.heading rgb(103, 150, 230)"
+		}
+	},
+	{
+		"c": "Alternate heading styles:",
+		"t": "${1/(#)(#)?(#)?(#)?(#)?(#)?/${6:?6:${5:?5:${4:?4:${3:?3:${2:?2:1}}}}}/}.entity.heading.markdown.markup.name.section",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.heading rgb(86, 156, 214)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.heading rgb(128, 0, 0)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.heading rgb(86, 156, 214)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.heading rgb(128, 0, 0)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.markup.heading rgb(103, 150, 230)"
+		}
+	},
+	{
+		"c": "Alternate Header 1",
+		"t": "markdown.meta.paragraph",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "==================",
+		"t": "1.heading.markdown.markup.meta.paragraph.setext",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.heading rgb(86, 156, 214)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.heading rgb(128, 0, 0)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.heading rgb(86, 156, 214)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.heading rgb(128, 0, 0)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.markup.heading rgb(103, 150, 230)"
+		}
+	},
+	{
+		"c": "Alternate Header 2",
+		"t": "markdown.meta.paragraph",
+		"r": {
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
+			"hc_black": ".hc-black .token rgb(255, 255, 255)"
+		}
+	},
+	{
+		"c": "------------------",
+		"t": "2.heading.markdown.markup.meta.paragraph.setext",
+		"r": {
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.heading rgb(86, 156, 214)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.heading rgb(128, 0, 0)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.heading rgb(86, 156, 214)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.heading rgb(128, 0, 0)",
+			"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.markup.heading rgb(103, 150, 230)"
+		}
+	},
 	{
 		"c": "<!--",
 		"t": "block.comment.definition.html.markdown.meta.paragraph.punctuation",
@@ -1211,12 +1288,12 @@
 	},
 	{
 		"c": "*",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1224,10 +1301,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1235,21 +1312,21 @@
 		"c": "Bullet lists are easy too",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "-",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1257,10 +1334,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1268,21 +1345,21 @@
 		"c": "Another one",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "+",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1290,10 +1367,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1301,10 +1378,10 @@
 		"c": "Another one",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1585,12 +1662,12 @@
 	},
 	{
 		"c": ">",
-		"t": "definition.markdown.markup.punctuation.quote",
+		"t": "beginning.definition.markdown.markup.punctuation.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.quote rgb(96, 139, 78)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.quote.beginning rgb(96, 139, 78)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.quote rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.quote.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.quote rgb(96, 139, 78)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.quote.beginning rgb(96, 139, 78)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.quote rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.quote.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1598,10 +1675,10 @@
 		"c": " ",
 		"t": "markdown.markup.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.quote rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.quote rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1609,21 +1686,21 @@
 		"c": "Blockquotes are like quoted text in email replies",
 		"t": "markdown.markup.meta.paragraph.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.quote rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.quote rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": ">>",
-		"t": "definition.markdown.markup.punctuation.quote",
+		"t": "beginning.definition.markdown.markup.punctuation.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.quote rgb(96, 139, 78)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.quote.beginning rgb(96, 139, 78)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.quote rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.quote.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.quote rgb(96, 139, 78)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.quote.beginning rgb(96, 139, 78)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.quote rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.quote.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1631,10 +1708,10 @@
 		"c": " ",
 		"t": "markdown.markup.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.quote rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.quote rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1642,21 +1719,21 @@
 		"c": "And, they can be nested",
 		"t": "markdown.markup.meta.paragraph.quote",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.quote rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.quote rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.quote rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "1.",
-		"t": "definition.list.markdown.markup.numbered.punctuation",
+		"t": "beginning.definition.list.markdown.markup.numbered.punctuation",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1664,10 +1741,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.numbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1675,21 +1752,21 @@
 		"c": "A numbered list",
 		"t": "list.markdown.markup.meta.numbered.paragraph",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "2.",
-		"t": "definition.list.markdown.markup.numbered.punctuation",
+		"t": "beginning.definition.list.markdown.markup.numbered.punctuation",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1697,10 +1774,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.numbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1708,21 +1785,21 @@
 		"c": "Which is numbered",
 		"t": "list.markdown.markup.meta.numbered.paragraph",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "3.",
-		"t": "definition.list.markdown.markup.numbered.punctuation",
+		"t": "beginning.definition.list.markdown.markup.numbered.punctuation",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1730,10 +1807,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.numbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -1741,10 +1818,10 @@
 		"c": "With periods and a space",
 		"t": "list.markdown.markup.meta.numbered.paragraph",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2267,12 +2344,12 @@
 	},
 	{
 		"c": "*",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2280,10 +2357,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2291,21 +2368,21 @@
 		"c": "Outer pipes on tables are optional",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "*",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2313,10 +2390,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2324,10 +2401,10 @@
 		"c": "Colon used for alignment (right versus left)",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2454,12 +2531,12 @@
 	},
 	{
 		"c": "*",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2467,10 +2544,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2478,21 +2555,21 @@
 		"c": "Multiple definitions and terms are possible",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
 	{
 		"c": "*",
-		"t": "definition.list.markdown.markup.punctuation.unnumbered",
+		"t": "beginning.definition.list.markdown.markup.punctuation.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list rgb(103, 150, 230)",
+			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.punctuation.list.beginning rgb(103, 150, 230)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list rgb(4, 81, 165)",
+			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.punctuation.list.beginning rgb(4, 81, 165)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2500,10 +2577,10 @@
 		"c": " ",
 		"t": "list.markdown.markup.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},
@@ -2511,10 +2588,10 @@
 		"c": "Definitions can include multiple paragraphs too",
 		"t": "list.markdown.markup.meta.paragraph.unnumbered",
 		"r": {
-			"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.markup.list rgb(212, 212, 212)",
+			"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
-			"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.markup.list rgb(4, 81, 165)",
+			"light_plus": ".vs .token rgb(0, 0, 0)",
-			"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.markup.list rgb(212, 212, 212)",
+			"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
-			"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.markup.list rgb(0, 0, 0)",
+			"light_vs": ".vs .token rgb(0, 0, 0)",
 			"hc_black": ".hc-black .token rgb(255, 255, 255)"
 		}
 	},

extensions/ms-vscode.node-debug2/OSSREADME.json

@@ -0,0 +1,150 @@
+// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
+[
+{
+	"name": "agent-base",
+	"repositoryURL": "https://github.com/TooTallNate/node-agent-base",
+	"version": "1.0.2",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "balanced-match",
+	"repositoryURL": "https://github.com/juliangruber/balanced-match",
+	"version": "0.4.2",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "brace-expansion",
+	"repositoryURL": "https://github.com/juliangruber/brace-expansion",
+	"version": "1.1.6",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "concat-map",
+	"repositoryURL": "https://github.com/substack/node-concat-map",
+	"version": "0.0.1",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "debug",
+	"repositoryURL": "https://github.com/visionmedia/debug",
+	"version": "2.2.0",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "extend",
+	"repositoryURL": "https://github.com/justmoon/node-extend",
+	"version": "3.0.0",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "fs.realpath",
+	"repositoryURL": "https://github.com/isaacs/fs.realpath",
+	"version": "1.0.0",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "glob",
+	"repositoryURL": "https://github.com/isaacs/node-glob",
+	"version": "7.1.0",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "http-proxy-agent",
+	"repositoryURL": "https://github.com/TooTallNate/node-http-proxy-agent",
+	"version": "0.2.7",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "https-proxy-agent",
+	"repositoryURL": "https://github.com/TooTallNate/node-https-proxy-agent",
+	"version": "0.3.6",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "inflight",
+	"repositoryURL": "https://github.com/npm/inflight",
+	"version": "1.0.5",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "inherits",
+	"repositoryURL": "https://github.com/isaacs/inherits",
+	"version": "2.0.3",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "minimatch",
+	"repositoryURL": "https://github.com/isaacs/minimatch",
+	"version": "3.0.3",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "ms",
+	"repositoryURL": "https://github.com/rauchg/ms.js",
+	"version": "0.7.1",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "once",
+	"repositoryURL": "https://github.com/isaacs/once",
+	"version": "1.4.0",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "options",
+	"repositoryURL": "https://github.com/einaros/options.js",
+	"version": "0.0.6",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "ultron",
+	"repositoryURL": "https://github.com/unshiftio/ultron",
+	"version": "1.0.2",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "path-is-absolute",
+	"repositoryURL": "https://github.com/sindresorhus/path-is-absolute",
+	"version": "1.0.0",
+	"license": "MIT",
+	"isProd": true
+},
+{
+	"name": "source-map",
+	"repositoryURL": "https://github.com/mozilla/source-map",
+	"version": "0.5.6",
+	"license": "BSD-3-Clause",
+	"isProd": true
+},
+{
+	"name": "wrappy",
+	"repositoryURL": "https://github.com/npm/wrappy",
+	"version": "1.0.2",
+	"license": "ISC",
+	"isProd": true
+},
+{
+	"name": "ws",
+	"repositoryURL": "https://github.com/websockets/ws",
+	"version": "1.1.1",
+	"license": "MIT",
+	"isProd": true
+}
+]

extensions/ms-vscode.node-debug2/package.json

@@ -0,0 +1,8 @@
+{
+	"name": "node-debug2-placeholder",
+	"version": "0.0.3",
+	"publisher": "vscode",
+	"engines": {
+		"vscode": "1.6.x"
+	}
+}

extensions/razor/language-configuration.json

@@ -13,8 +13,7 @@
 		{ "open": "[", "close": "]"},
 		{ "open": "(", "close": ")" },
 		{ "open": "'", "close": "'" },
-		{ "open": "\"", "close": "\"" },
+		{ "open": "\"", "close": "\"" }
-		{ "open": "<", "close": ">" }
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },

extensions/theme-abyss/themes/Abyss.tmTheme

@@ -21,6 +21,8 @@
 				<string>#082050</string>
 				<key>selection</key>
 				<string>#770811</string>
+				<key>guide</key>
+				<string>#002952</string>
 			</dict>
 		</dict>
 		<dict>

extensions/theme-defaults/themes/dark_vs.json

@@ -137,23 +137,17 @@
 			}
 		},
 		{
-			"scope": "markup.punctuation.quote",
+			"scope": "markup.punctuation.quote.beginning",
 			"settings": {
 				"foreground": "#608b4e"
 			}
 		},
 		{
-			"scope": "markup.punctuation.list",
+			"scope": "markup.punctuation.list.beginning",
 			"settings": {
 				"foreground": "#6796e6"
 			}
 		},
-		{
-			"scope": ["markup.quote", "markup.list"],
-			"settings": {
-				"foreground": "#d4d4d4"
-			}
-		},
 		{
 			"scope": "markup.inline.raw",
 			"settings": {

extensions/theme-defaults/themes/light_plus.json

@@ -48,12 +48,6 @@
 			"settings": {
 				"foreground": "#001080"
 			}
-		},
-		{
-			"scope": ["markup.quote", "markup.list"],
-			"settings": {
-				"foreground": "#0451a5"
-			}
 		}
 	]
 }

extensions/theme-defaults/themes/light_vs.json

@@ -128,17 +128,11 @@
 			}
 		},
 		{
-			"scope": ["markup.punctuation.quote", "markup.punctuation.list"],
+			"scope": ["markup.punctuation.quote.beginning", "markup.punctuation.list.beginning"],
 			"settings": {
 				"foreground": "#0451a5"
 			}
 		},
-		{
-			"scope": ["markup.quote", "markup.list"],
-			"settings": {
-				"foreground": "#000000"
-			}
-		},
 		{
 			"scope": "markup.inline.raw",
 			"settings": {

extensions/theme-monokai/themes/Monokai.tmTheme

@@ -29,6 +29,8 @@
 				<string>#222218</string>
 				<key>activeGuide</key>
 				<string>#9D550FB0</string>
+				<key>guide</key>
+				<string>#48473E</string>
 
 				<key>bracketsForeground</key>
 				<string>#F8F8F2A5</string>

extensions/typescript/OSSREADME.json

@@ -192,9 +192,9 @@
 	]
 },
 {
-	"isLicense": true, // We override the license since we need a coorect Copyright 
+	"isLicense": true, // We override the license since we need a coorect Copyright
 	"name": "typescript",
-	"version": "1.8.10",
+	"version": "2.0.3",
 	"license": "Apache2",
 	"repositoryURL": "https://github.com/Microsoft/TypeScript",
 	"description": "The contents of the folder lib is from the TypeScript project https://github.com/Microsoft/TypeScript.",

extensions/typescript/npm-shrinkwrap.json

@@ -13,7 +13,7 @@
       "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.5.tgz"
     },
     "vscode-nls": {
-      "version": "1.0.7",
+      "version": "2.0.1",
       "from": "vscode-nls@>=1.0.4 <2.0.0",
       "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz"
     },

extensions/typescript/package.json

@@ -12,7 +12,7 @@
 	},
 	"dependencies": {
 		"vscode-extension-telemetry": "^0.0.5",
-		"vscode-nls": "^1.0.4"
+		"vscode-nls": "^2.0.1"
 	},
 	"scripts": {
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json",
@@ -75,17 +75,22 @@
 					"default": null,
 					"description": "%typescript.tsdk.desc%"
 				},
+				"typescript.check.workspaceVersion" :{
+					"type": "boolean",
+					"default": true,
+					"description": "%typescript.check.workspaceVersion%"
+				},
+				"typescript.check.tscVersion" :{
+					"type": "boolean",
+					"default": true,
+					"description": "%typescript.check.tscVersion%"
+				},
 				"typescript.tsserver.trace": {
 					"type": "string",
 					"enum": ["off", "messages", "verbose"],
 					"default": "off",
 					"description": "%typescript.tsserver.trace%"
 				},
-				"typescript.tsserver.experimentalAutoBuild": {
-					"type": "boolean",
-					"default": false,
-					"description": "%typescript.tsserver.experimentalAutoBuild%"
-				},
 				"typescript.useCodeSnippetsOnMethodSuggest": {
 					"type": "boolean",
 					"default": false,

extensions/typescript/package.nls.json

@@ -5,6 +5,8 @@
 	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.",
 	"typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.",
 	"typescript.tsdk_version.desc": "Specifies the version of the tsserver. Only necessary if the tsserver is not installed using npm.",
+	"typescript.check.workspaceVersion": "Check if a TypeScript version is available in the workspace",
+	"typescript.check.tscVersion": "Check if a global install TypeScript compiler (e.g. tsc) differs from the used TypeScript language service.",
 	"typescript.tsserver.trace": "Enables tracing of messages send to the TS server",
 	"typescript.tsserver.experimentalAutoBuild": "Enables experimental auto build. Requires 1.9 dev or 2.x tsserver version and a restart of VS Code after changing it.",
 	"typescript.validate.enable": "Enable / disable TypeScript validation",

extensions/typescript/server/typescript/.npmignore

@@ -1,10 +1,12 @@
 built
 doc
+internal
+issue_template.md
 lib/README.md
+pull_request_template.md
 scripts
 src
 tests
-internal
 tslint.json
 Jakefile.js
 .editorconfig

extensions/typescript/server/typescript/AUTHORS.md

@@ -1,85 +1,141 @@
 TypeScript is authored by:
-
+* Abubaker Bashir
 * Adam Freidin
+* Adi Dahiya
 * Ahmad Farid
+* Alex Eagle
+* Alexander Kuvaev
 * Anders Hejlsberg
+* Andrew Z Allen
+* Andy Hanson
+* Anil Anar
+* Anton Tolmachev
 * Arnav Singh
 * Arthur Ozga
+* Asad Saeeduddin
+* Avery Morin
 * Basarat Ali Syed
 * Ben Duffield
 * Bill Ticehurst
+* Blake Embrey
+* Bowden Kelly
 * Brett Mayen
 * Bryan Forbes
 * Caitlin Potter
 * Chris Bubernak
+* Chuck Jazdzewski
 * Colby Russell
 * Colin Snover
 * Cyrus Najmabadi
+* Dan Corder
 * Dan Quirk
 * Daniel Rosenwasser
 * David Li
+* David Souther
 * Denis Nedelyaev
 * Dick van den Brink
 * Dirk Bäumer
+* Dirk Holtwick
+* Doug Ilijev
+* Erik Edrosa
+* Ethan Rubio
+* Evan Martin
+* Evan Sebastian
 * Eyas Sharaiha
+* @falsandtru
 * Frank Wallis
+* František Žiačik
 * Gabriel Isenberg
 * Gilad Peleg
 * Graeme Wicksted
 * Guillaume Salles
+* Guy Bedford
 * Harald Niesche
+* Herrington Darkholme
+* Iain Monro
 * Ingvar Stepanyan
+* Isiah Meadows
 * Ivo Gabe de Wolff
 * James Whitney
 * Jason Freeman
+* Jason Killian
 * Jason Ramsay
+* JBerger
 * Jed Mao
+* Jeffrey Morlan
+* Jesse Schalken
+* Jiri Tobisek
 * Johannes Rieken
 * John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
+* Jonathan Toland
 * Jonathan Turner
 * Josh Kalderimis
+* Josh Soref
+* Juan Luis Boya García
 * Julian Williams
 * Kagami Sascha Rosylight
+* Kanchalai Tanglertsampan
 * Keith Mashinter
 * Ken Howard
 * Kenji Imamula
+* Kyle Kelley
 * Lorant Pinter
-* Martin Všetička
+* Lucien Greathouse
+* Martin Vseticka
 * Masahiro Wakame
+* Matt McCutchen
 * Max Deepfield
 * Micah Zoltu
 * Mohamed Hegazy
 * Nathan Shively-Sanders
+* Nathan Yee
+* Nima Zahedi
+* Noj Vek
 * Oleg Mihailik
 * Oleksandr Chekhovskyi
+* Oskar Segersva¨rd
+* Patrick Zhong
 * Paul van Brenk
+* @pcbro
 * Pedro Maltez
 * Philip Bulley
-* piloopin
+* Piero Cangianiello
+* @piloopin
+* Prayag Verma
 * @progre
 * Punya Biswal
+* Rado Kirov
+* Richard Knoll
 * Ron Buckton
+* Rowan Wyborn
 * Ryan Cavanaugh
 * Ryohei Ikegami
-* Sébastien Arod
+* Sarangan Rajamanickam
 * Sheetal Nandi
 * Shengping Zhong
 * Shyyko Serhiy
 * Simon Hürlimann
 * Solal Pirelli
 * Stan Thomas
+* Stanislav Sysoev
 * Steve Lucco
+* Sébastien Arod
+* @T18970237136
+* Tarik Ozket
 * Tien Hoanhtien
+* Tim Perry
+* Tim Viiding-Spader
 * Tingan Ho
+* Todd Thomson
 * togru
 * Tomas Grubliauskas
 * TruongSinh Tran-Nguyen
-* Viliv Vane
+* Vilic Vane
 * Vladimir Matveev
 * Wesley Wigham
 * York Yao
-* Yui Tanglertsampan
+* Yuichi Nukiyama
 * Zev Spitz
-* Zhengbo Li
+* Zhengbo Li

extensions/typescript/server/typescript/CONTRIBUTING.md

@@ -13,7 +13,7 @@ Issues that ask questions answered in the FAQ will be closed without elaboration
 ## 3. Do you have a question?
 
 The issue tracker is for **issues**, in other words, bugs and suggestions.
-If you have a *question*, please use [http://stackoverflow.com/questions/tagged/typescript](Stack Overflow), [https://gitter.im/Microsoft/TypeScript](Gitter), your favorite search engine, or other resources.
+If you have a *question*, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
 Due to increased traffic, we can no longer answer questions in the issue tracker.
 
 ## 4. Did you find a bug?
@@ -30,7 +30,7 @@ You can try out the nightly build of TypeScript (`npm install typescript@next`)
 We also accept suggestions in the issue tracker.
 Be sure to [check the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) and [search](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) first.
 
-In general, things we find useful when reviewing suggestins are:
+In general, things we find useful when reviewing suggestions are:
 * A description of the problem you're trying to solve
 * An overview of the suggested solution
 * Examples of how the suggestion would work in various places
@@ -40,6 +40,10 @@ In general, things we find useful when reviewing suggestins are:
 
 # Instructions for Contributing Code
 
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
 ## Contributing bug fixes
 
 TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
@@ -71,7 +75,7 @@ Your pull request should:
     * Tests should include reasonable permutations of the target fix/change
     * Include baseline changes with your change
     * All changed code must have 100% code coverage
-* Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
+* Follow the code conventions described in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines)
 * To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
 
 ## Contributing `lib.d.ts` fixes
@@ -91,10 +95,10 @@ These two files represent the DOM typings and are auto-generated. To make any mo
 
 ## Running the Tests
 
-To run all tests, invoke the `runtests` target using jake:
+To run all tests, invoke the `runtests-parallel` target using jake:
 
 ```Shell
-jake runtests
+jake runtests-parallel
 ```
 
 This run will all tests; to run only a specific subset of tests, use:

extensions/typescript/server/typescript/README.md

@@ -6,7 +6,7 @@
 
 [![Join the chat at https://gitter.im/Microsoft/TypeScript](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/TypeScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [Twitter account](https://twitter.com/typescriptlang).
+[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](https://blogs.msdn.microsoft.com/typescript) and [Twitter account](https://twitter.com/typescriptlang).
 
 ## Installing
 
@@ -56,29 +56,29 @@ Change to the TypeScript directory:
 cd TypeScript
 ```
 
-Install Jake tools and dev dependencies:
+Install Gulp tools and dev dependencies:
 
 ```
-npm install -g jake
+npm install -g gulp
 npm install
 ```
 
 Use one of the following to build and test:
 
 ```
-jake local            # Build the compiler into built/local
+gulp local            # Build the compiler into built/local
-jake clean            # Delete the built compiler
+gulp clean            # Delete the built compiler
-jake LKG              # Replace the last known good with the built one.
+gulp LKG              # Replace the last known good with the built one.
                       # Bootstrapping step to be executed when the built compiler reaches a stable state.
-jake tests            # Build the test infrastructure using the built compiler.
+gulp tests            # Build the test infrastructure using the built compiler.
-jake runtests         # Run tests using the built compiler and test infrastructure.
+gulp runtests         # Run tests using the built compiler and test infrastructure.
                       # You can override the host or specify a test for this command.
                       # Use host=<hostName> or tests=<testPath>.
-jake runtests-browser # Runs the tests using the built run.js file. Syntax is jake runtests. Optional
+gulp runtests-browser # Runs the tests using the built run.js file. Syntax is gulp runtests. Optional
                         parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]'.
-jake baseline-accept  # This replaces the baseline test results with the results obtained from jake runtests.
+gulp baseline-accept  # This replaces the baseline test results with the results obtained from gulp runtests.
-jake lint             # Runs tslint on the TypeScript source.
+gulp lint             # Runs tslint on the TypeScript source.
-jake -T               # List the above commands.
+gulp help             # List the above commands.
 ```
 
 

extensions/typescript/server/typescript/ThirdPartyNoticeText.txt

@@ -21,7 +21,7 @@ Third Party Code Components
 --------------------------------------------
 
 ------------------- DefinitelyTyped --------------------
-This file is based on or incorporates material from the projects listed below (collectively ?Third Party Code?). Microsoft is not the original author of the Third Party Code. The original copyright notice and the license, under which Microsoft received such Third Party Code, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft, not the third party, licenses the Third Party Code to you under the terms set forth in the EULA for the Microsoft Product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.
+This file is based on or incorporates material from the projects listed below (collectively "Third Party Code"). Microsoft is not the original author of the Third Party Code. The original copyright notice and the license, under which Microsoft received such Third Party Code, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft, not the third party, licenses the Third Party Code to you under the terms set forth in the EULA for the Microsoft Product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise.
 DefinitelyTyped
 This project is licensed under the MIT license.
 Copyrights are respective of each contributor listed at the beginning of each definition file.

extensions/typescript/server/typescript/lib/README.md

@@ -1,4 +1,5 @@
-# Read this!
+# Read This!
 
-These files are not meant to be edited by hand.
+**These files are not meant to be edited by hand.**
-If you need to make modifications, the respective files should be changed within the repository's top-level `src` directory. Running `jake LKG` will then appropriately update the files in this directory.
+If you need to make modifications, the respective files should be changed within the repository's top-level `src` directory.
+Running `jake LKG` will then appropriately update the files in this directory.

extensions/typescript/server/typescript/lib/lib.dom.iterable.d.ts

@@ -0,0 +1,29 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.dom.generated.d.ts" />
+
+interface DOMTokenList {
+    [Symbol.iterator](): IterableIterator<string>;
+}
+
+interface NodeList {
+    [Symbol.iterator](): IterableIterator<Node>
+}
+
+interface NodeListOf<TNode extends Node> {
+    [Symbol.iterator](): IterableIterator<TNode>
+}

extensions/typescript/server/typescript/lib/lib.es2015.collection.d.ts

@@ -0,0 +1,75 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Map<K, V> {
+    clear(): void;
+    delete(key: K): boolean;
+    forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): this;
+    readonly size: number;
+}
+
+interface MapConstructor {
+    new (): Map<any, any>;
+    new <K, V>(entries?: [K, V][]): Map<K, V>;
+    readonly prototype: Map<any, any>;
+}
+declare var Map: MapConstructor;
+
+interface WeakMap<K, V> {
+    delete(key: K): boolean;
+    get(key: K): V | undefined;
+    has(key: K): boolean;
+    set(key: K, value?: V): this;
+}
+
+interface WeakMapConstructor {
+    new (): WeakMap<any, any>;
+    new <K, V>(entries?: [K, V][]): WeakMap<K, V>;
+    readonly prototype: WeakMap<any, any>;
+}
+declare var WeakMap: WeakMapConstructor;
+
+interface Set<T> {
+    add(value: T): this;
+    clear(): void;
+    delete(value: T): boolean;
+    forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
+    has(value: T): boolean;
+    readonly size: number;
+}
+
+interface SetConstructor {
+    new (): Set<any>;
+    new <T>(values?: T[]): Set<T>;
+    readonly prototype: Set<any>;
+}
+declare var Set: SetConstructor;
+
+interface WeakSet<T> {
+    add(value: T): this;
+    delete(value: T): boolean;
+    has(value: T): boolean;
+}
+
+interface WeakSetConstructor {
+    new (): WeakSet<any>;
+    new <T>(values?: T[]): WeakSet<T>;
+    readonly prototype: WeakSet<any>;
+}
+declare var WeakSet: WeakSetConstructor;

extensions/typescript/server/typescript/lib/lib.es2015.core.d.ts

@@ -0,0 +1,540 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+declare type PropertyKey = string | number | symbol;
+
+interface Array<T> {
+    /**
+      * Returns the value of the first element in the array where predicate is true, and undefined
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found, find
+      * immediately returns that element value. Otherwise, find returns undefined.
+      * @param thisArg If provided, it will be used as the this value for each invocation of
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T | undefined;
+
+    /**
+      * Returns the index of the first element in the array where predicate is true, and undefined
+      * otherwise.
+      * @param predicate find calls predicate once for each element of the array, in ascending
+      * order, until it finds one where predicate returns true. If such an element is found,
+      * findIndex immediately returns that element index. Otherwise, findIndex returns -1.
+      * @param thisArg If provided, it will be used as the this value for each invocation of
+      * predicate. If it is not provided, undefined is used instead.
+      */
+    findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
+
+    /**
+      * Returns the this object after filling the section identified by start and end with value
+      * @param value value to fill array section with
+      * @param start index to start filling the array at. If start is negative, it is treated as
+      * length+start where length is the length of the array.
+      * @param end index to stop filling the array at. If end is negative, it is treated as
+      * length+end.
+      */
+    fill(value: T, start?: number, end?: number): this;
+
+    /**
+      * Returns the this object after copying a section of the array identified by start and end
+      * to the same array starting at position target
+      * @param target If target is negative, it is treated as length+target where length is the
+      * length of the array.
+      * @param start If start is negative, it is treated as length+start. If end is negative, it
+      * is treated as length+end.
+      * @param end If not specified, length of the this object is used as its default value.
+      */
+    copyWithin(target: number, start: number, end?: number): this;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(arrayLike: ArrayLike<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+
+    /**
+      * Creates an array from an array-like object.
+      * @param arrayLike An array-like object to convert to an array.
+      */
+    from<T>(arrayLike: ArrayLike<T>): Array<T>;
+
+    /**
+      * Returns a new array from a set of elements.
+      * @param items A set of elements to include in the new array object.
+      */
+    of<T>(...items: T[]): Array<T>;
+}
+
+interface DateConstructor {
+    new (value: Date): Date;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    readonly name: string;
+}
+
+interface Math {
+    /**
+      * Returns the number of leading zero bits in the 32-bit binary representation of a number.
+      * @param x A numeric expression.
+      */
+    clz32(x: number): number;
+
+    /**
+      * Returns the result of 32-bit multiplication of two numbers.
+      * @param x First number
+      * @param y Second number
+      */
+    imul(x: number, y: number): number;
+
+    /**
+      * Returns the sign of the x, indicating whether x is positive, negative or zero.
+      * @param x The numeric expression to test
+      */
+    sign(x: number): number;
+
+    /**
+      * Returns the base 10 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log10(x: number): number;
+
+    /**
+      * Returns the base 2 logarithm of a number.
+      * @param x A numeric expression.
+      */
+    log2(x: number): number;
+
+    /**
+      * Returns the natural logarithm of 1 + x.
+      * @param x A numeric expression.
+      */
+    log1p(x: number): number;
+
+    /**
+      * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of
+      * the natural logarithms).
+      * @param x A numeric expression.
+      */
+    expm1(x: number): number;
+
+    /**
+      * Returns the hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    cosh(x: number): number;
+
+    /**
+      * Returns the hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    sinh(x: number): number;
+
+    /**
+      * Returns the hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    tanh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic cosine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    acosh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic sine of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    asinh(x: number): number;
+
+    /**
+      * Returns the inverse hyperbolic tangent of a number.
+      * @param x A numeric expression that contains an angle measured in radians.
+      */
+    atanh(x: number): number;
+
+    /**
+      * Returns the square root of the sum of squares of its arguments.
+      * @param values Values to compute the square root for.
+      *     If no arguments are passed, the result is +0.
+      *     If there is only one argument, the result is the absolute value.
+      *     If any argument is +Infinity or -Infinity, the result is +Infinity.
+      *     If any argument is NaN, the result is NaN.
+      *     If all arguments are either +0 or −0, the result is +0.
+      */
+    hypot(...values: number[] ): number;
+
+    /**
+      * Returns the integral part of the a numeric expression, x, removing any fractional digits.
+      * If x is already an integer, the result is x.
+      * @param x A numeric expression.
+      */
+    trunc(x: number): number;
+
+    /**
+      * Returns the nearest single precision float representation of a number.
+      * @param x A numeric expression.
+      */
+    fround(x: number): number;
+
+    /**
+      * Returns an implementation-dependent approximation to the cube root of number.
+      * @param x A numeric expression.
+      */
+    cbrt(x: number): number;
+}
+
+interface NumberConstructor {
+    /**
+      * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1
+      * that is representable as a Number value, which is approximately:
+      * 2.2204460492503130808472633361816 x 10‍−‍16.
+      */
+    readonly EPSILON: number;
+
+    /**
+      * Returns true if passed value is finite.
+      * Unlike the global isFinite, Number.isFinite doesn't forcibly convert the parameter to a
+      * number. Only finite values of the type number, result in true.
+      * @param number A numeric value.
+      */
+    isFinite(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is an integer, false otherwise.
+      * @param number A numeric value.
+      */
+    isInteger(number: number): boolean;
+
+    /**
+      * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a
+      * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter
+      * to a number. Only values of the type number, that are also NaN, result in true.
+      * @param number A numeric value.
+      */
+    isNaN(number: number): boolean;
+
+    /**
+      * Returns true if the value passed is a safe integer.
+      * @param number A numeric value.
+      */
+    isSafeInteger(number: number): boolean;
+
+    /**
+      * The value of the largest integer n such that n and n + 1 are both exactly representable as
+      * a Number value.
+      * The value of Number.MAX_SAFE_INTEGER is 9007199254740991 2^53 − 1.
+      */
+    readonly MAX_SAFE_INTEGER: number;
+
+    /**
+      * The value of the smallest integer n such that n and n − 1 are both exactly representable as
+      * a Number value.
+      * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)).
+      */
+    readonly MIN_SAFE_INTEGER: number;
+
+    /**
+      * Converts a string to a floating-point number.
+      * @param string A string that contains a floating-point number.
+      */
+    parseFloat(string: string): number;
+
+    /**
+      * Converts A string to an integer.
+      * @param s A string to convert into a number.
+      * @param radix A value between 2 and 36 that specifies the base of the number in numString.
+      * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+      * All other strings are considered decimal.
+      */
+    parseInt(string: string, radix?: number): number;
+}
+
+interface Object {
+    /**
+      * Determines whether an object has a property with the specified name.
+      * @param v A property name.
+      */
+    hasOwnProperty(v: PropertyKey): boolean
+
+    /**
+      * Determines whether a specified property is enumerable.
+      * @param v A property name.
+      */
+    propertyIsEnumerable(v: PropertyKey): boolean;
+}
+
+interface ObjectConstructor {
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source The source object from which to copy properties.
+      */
+    assign<T, U>(target: T, source: U): T & U;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      */
+    assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param source1 The first source object from which to copy properties.
+      * @param source2 The second source object from which to copy properties.
+      * @param source3 The third source object from which to copy properties.
+      */
+    assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+
+    /**
+      * Copy the values of all of the enumerable own properties from one or more source objects to a
+      * target object. Returns the target object.
+      * @param target The target object to copy to.
+      * @param sources One or more source objects from which to copy properties
+      */
+    assign(target: any, ...sources: any[]): any;
+
+    /**
+      * Returns an array of all symbol properties found directly on object o.
+      * @param o Object to retrieve the symbols from.
+      */
+    getOwnPropertySymbols(o: any): symbol[];
+
+    /**
+      * Returns true if the values are the same value, false otherwise.
+      * @param value1 The first value.
+      * @param value2 The second value.
+      */
+    is(value1: any, value2: any): boolean;
+
+    /**
+      * Sets the prototype of a specified object o to  object proto or null. Returns the object o.
+      * @param o The object to change its prototype.
+      * @param proto The value of the new prototype or null.
+      */
+    setPrototypeOf(o: any, proto: any): any;
+
+    /**
+      * Gets the own property descriptor of the specified object.
+      * An own property descriptor is one that is defined directly on the object and is not
+      * inherited from the object's prototype.
+      * @param o Object that contains the property.
+      * @param p Name of the property.
+    */
+    getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor;
+
+    /**
+      * Adds a property to an object, or modifies attributes of an existing property.
+      * @param o Object on which to add or modify the property. This can be a native JavaScript
+      * object (that is, a user-defined object or a built in object) or a DOM object.
+      * @param p The property name.
+      * @param attributes Descriptor for the property. It can be for a data property or an accessor
+      *  property.
+      */
+    defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any;
+}
+
+interface ReadonlyArray<T> {
+  /**
+    * Returns the value of the first element in the array where predicate is true, and undefined
+    * otherwise.
+    * @param predicate find calls predicate once for each element of the array, in ascending
+    * order, until it finds one where predicate returns true. If such an element is found, find
+    * immediately returns that element value. Otherwise, find returns undefined.
+    * @param thisArg If provided, it will be used as the this value for each invocation of
+    * predicate. If it is not provided, undefined is used instead.
+    */
+  find(predicate: (value: T, index: number, obj: ReadonlyArray<T>) => boolean, thisArg?: any): T | undefined;
+
+  /**
+    * Returns the index of the first element in the array where predicate is true, and undefined
+    * otherwise.
+    * @param predicate find calls predicate once for each element of the array, in ascending
+    * order, until it finds one where predicate returns true. If such an element is found,
+    * findIndex immediately returns that element index. Otherwise, findIndex returns -1.
+    * @param thisArg If provided, it will be used as the this value for each invocation of
+    * predicate. If it is not provided, undefined is used instead.
+    */
+  findIndex(predicate: (value: T) => boolean, thisArg?: any): number;
+}
+
+interface RegExp {
+    /**
+      * Returns a string indicating the flags of the regular expression in question. This field is read-only.
+      * The characters in this string are sequenced and concatenated in the following order:
+      *
+      *    - "g" for global
+      *    - "i" for ignoreCase
+      *    - "m" for multiline
+      *    - "u" for unicode
+      *    - "y" for sticky
+      *
+      * If no flags are set, the value is the empty string.
+      */
+    readonly flags: string;
+
+    /**
+      * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular
+      * expression. Default is false. Read-only.
+      */
+    readonly sticky: boolean;
+
+    /**
+      * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular
+      * expression. Default is false. Read-only.
+      */
+    readonly unicode: boolean;
+}
+
+interface RegExpConstructor {
+    new (pattern: RegExp, flags?: string): RegExp;
+    (pattern: RegExp, flags?: string): RegExp;
+}
+
+interface String {
+    /**
+      * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point
+      * value of the UTF-16 encoded code point starting at the string element at position pos in
+      * the String resulting from converting this object to a String.
+      * If there is no element at that position, the result is undefined.
+      * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos.
+      */
+    codePointAt(pos: number): number | undefined;
+
+    /**
+      * Returns true if searchString appears as a substring of the result of converting this
+      * object to a String, at one or more positions that are
+      * greater than or equal to position; otherwise, returns false.
+      * @param searchString search string
+      * @param position If position is undefined, 0 is assumed, so as to search all of the String.
+      */
+    includes(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
+      * endPosition – length(this). Otherwise returns false.
+      */
+    endsWith(searchString: string, endPosition?: number): boolean;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form: "NFC" | "NFD" | "NFKC" | "NFKD"): string;
+
+    /**
+      * Returns the String value result of normalizing the string into the normalization form
+      * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms.
+      * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default
+      * is "NFC"
+      */
+    normalize(form?: string): string;
+
+    /**
+      * Returns a String value that is made from count copies appended together. If count is 0,
+      * T is the empty String is returned.
+      * @param count number of copies to append
+      */
+    repeat(count: number): string;
+
+    /**
+      * Returns true if the sequence of elements of searchString converted to a String is the
+      * same as the corresponding elements of this object (converted to a String) starting at
+      * position. Otherwise returns false.
+      */
+    startsWith(searchString: string, position?: number): boolean;
+
+    /**
+      * Returns an <a> HTML anchor element and sets the name attribute to the text value
+      * @param name
+      */
+    anchor(name: string): string;
+
+    /** Returns a <big> HTML element */
+    big(): string;
+
+    /** Returns a <blink> HTML element */
+    blink(): string;
+
+    /** Returns a <b> HTML element */
+    bold(): string;
+
+    /** Returns a <tt> HTML element */
+    fixed(): string
+
+    /** Returns a <font> HTML element and sets the color attribute value */
+    fontcolor(color: string): string
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: number): string;
+
+    /** Returns a <font> HTML element and sets the size attribute value */
+    fontsize(size: string): string;
+
+    /** Returns an <i> HTML element */
+    italics(): string;
+
+    /** Returns an <a> HTML element and sets the href attribute value */
+    link(url: string): string;
+
+    /** Returns a <small> HTML element */
+    small(): string;
+
+    /** Returns a <strike> HTML element */
+    strike(): string;
+
+    /** Returns a <sub> HTML element */
+    sub(): string;
+
+    /** Returns a <sup> HTML element */
+    sup(): string;
+}
+
+interface StringConstructor {
+    /**
+      * Return the String value whose elements are, in order, the elements in the List elements.
+      * If length is 0, the empty string is returned.
+      */
+    fromCodePoint(...codePoints: number[]): string;
+
+    /**
+      * String.raw is intended for use as a tag function of a Tagged Template String. When called
+      * as such the first argument will be a well formed template call site object and the rest
+      * parameter will contain the substitution values.
+      * @param template A well-formed template string call site representation.
+      * @param substitutions A set of substitution values.
+      */
+    raw(template: TemplateStringsArray, ...substitutions: any[]): string;
+}

extensions/typescript/server/typescript/lib/lib.es2015.d.ts

@@ -0,0 +1,26 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.core.d.ts" />
+/// <reference path="lib.es2015.collection.d.ts" />
+/// <reference path="lib.es2015.generator.d.ts" />
+/// <reference path="lib.es2015.iterable.d.ts" />
+/// <reference path="lib.es2015.promise.d.ts" />
+/// <reference path="lib.es2015.proxy.d.ts" />
+/// <reference path="lib.es2015.reflect.d.ts" />
+/// <reference path="lib.es2015.symbol.d.ts" />
+/// <reference path="lib.es2015.symbol.wellknown.d.ts" />
+/// <reference path="lib.es5.d.ts" />

extensions/typescript/server/typescript/lib/lib.es2015.generator.d.ts

@@ -0,0 +1,28 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface GeneratorFunction extends Function { }
+
+interface GeneratorFunctionConstructor {
+    /**
+      * Creates a new Generator function.
+      * @param args A list of arguments the function accepts.
+      */
+    new (...args: string[]): GeneratorFunction;
+    (...args: string[]): GeneratorFunction;
+    readonly prototype: GeneratorFunction;
+}
+declare var GeneratorFunction: GeneratorFunctionConstructor;

extensions/typescript/server/typescript/lib/lib.es2015.iterable.d.ts

@@ -0,0 +1,461 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface SymbolConstructor {
+    /**
+      * A method that returns the default iterator for an object. Called by the semantics of the
+      * for-of statement.
+      */
+    readonly iterator: symbol;
+}
+
+interface IteratorResult<T> {
+    done: boolean;
+    value: T;
+}
+
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+    return?(value?: any): IteratorResult<T>;
+    throw?(e?: any): IteratorResult<T>;
+}
+
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
+
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
+
+interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+}
+
+interface ArrayConstructor {
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from<T, U>(iterable: Iterable<T>, mapfn: (v: T, k: number) => U, thisArg?: any): Array<U>;
+
+    /**
+      * Creates an array from an iterable object.
+      * @param iterable An iterable object to convert to an array.
+      */
+    from<T>(iterable: Iterable<T>): Array<T>;
+}
+
+interface ReadonlyArray<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, T]>;
+
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<T>;
+}
+
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
+interface Map<K, V> {
+    [Symbol.iterator](): IterableIterator<[K,V]>;
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+}
+
+interface MapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
+}
+
+interface WeakMap<K, V> { }
+
+interface WeakMapConstructor {
+    new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+}
+
+interface Set<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+    entries(): IterableIterator<[T, T]>;
+    keys(): IterableIterator<T>;
+    values(): IterableIterator<T>;
+}
+
+interface SetConstructor {
+    new <T>(iterable: Iterable<T>): Set<T>;
+}
+
+interface WeakSet<T> { }
+
+interface WeakSetConstructor {
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+}
+
+interface Promise<T> { }
+
+interface PromiseConstructor {
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<TAll>(values: Iterable<TAll | PromiseLike<TAll>>): Promise<TAll[]>;
+
+    /**
+     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+     * or rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
+}
+
+declare namespace Reflect {
+    function enumerate(target: any): IterableIterator<any>;
+}
+
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int8ArrayConstructor {
+    new (elements: Iterable<number>): Int8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ArrayConstructor {
+    new (elements: Iterable<number>): Uint8Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array;
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint8ClampedArrayConstructor {
+    new (elements: Iterable<number>): Uint8ClampedArray;
+
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray;
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int16ArrayConstructor {
+    new (elements: Iterable<number>): Int16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array;
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint16ArrayConstructor {
+    new (elements: Iterable<number>): Uint16Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array;
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Int32ArrayConstructor {
+    new (elements: Iterable<number>): Int32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array;
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Uint32ArrayConstructor {
+    new (elements: Iterable<number>): Uint32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array;
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float32ArrayConstructor {
+    new (elements: Iterable<number>): Float32Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array;
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    [Symbol.iterator](): IterableIterator<number>;
+    /**
+      * Returns an array of key, value pairs for every entry in the array
+      */
+    entries(): IterableIterator<[number, number]>;
+    /**
+      * Returns an list of keys in the array
+      */
+    keys(): IterableIterator<number>;
+    /**
+      * Returns an list of values in the array
+      */
+    values(): IterableIterator<number>;
+}
+
+interface Float64ArrayConstructor {
+    new (elements: Iterable<number>): Float64Array;
+
+    /**
+      * Creates an array from an array-like or iterable object.
+      * @param arrayLike An array-like or iterable object to convert to an array.
+      * @param mapfn A mapping function to call on every element of the array.
+      * @param thisArg Value of 'this' used to invoke the mapfn.
+      */
+    from(arrayLike: Iterable<number>, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array;
+}

extensions/typescript/server/typescript/lib/lib.es2015.promise.d.ts

@@ -0,0 +1,187 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/**
+ * Represents the completion of an asynchronous operation
+ */
+interface Promise<T> {
+    /**
+     * Attaches callbacks for the resolution and/or rejection of the Promise.
+     * @param onfulfilled The callback to execute when the Promise is resolved.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of which ever callback is executed.
+     */
+    then<TResult1, TResult2>(onfulfilled: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>;
+
+    /**
+     * Attaches callbacks for the resolution and/or rejection of the Promise.
+     * @param onfulfilled The callback to execute when the Promise is resolved.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of which ever callback is executed.
+     */
+    then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
+
+    /**
+     * Attaches callbacks for the resolution and/or rejection of the Promise.
+     * @param onfulfilled The callback to execute when the Promise is resolved.
+     * @returns A Promise for the completion of which ever callback is executed.
+     */
+    then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>): Promise<TResult>;
+
+    /**
+     * Creates a new Promise with the same internal state of this Promise.
+     * @returns A Promise.
+     */
+    then(): Promise<T>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch<TResult>(onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult>;
+
+    /**
+     * Attaches a callback for only the rejection of the Promise.
+     * @param onrejected The callback to execute when the Promise is rejected.
+     * @returns A Promise for the completion of the callback.
+     */
+    catch(onrejected: (reason: any) => T | PromiseLike<T>): Promise<T>;
+}
+
+interface PromiseConstructor {
+    /**
+      * A reference to the prototype.
+      */
+    readonly prototype: Promise<any>;
+
+    /**
+     * Creates a new Promise.
+     * @param executor A callback used to initialize the promise. This callback is passed two arguments:
+     * a resolve callback used resolve the promise with a value or the result of another promise,
+     * and a reject callback used to reject the promise with a provided reason or error.
+     */
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>]): Promise<[T1, T2, T3, T4]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
+
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T>(values: (T | PromiseLike<T>)[]): Promise<T[]>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject(reason: any): Promise<never>;
+
+    /**
+     * Creates a new rejected promise for the provided reason.
+     * @param reason The reason the promise was rejected.
+     * @returns A new rejected Promise.
+     */
+    reject<T>(reason: any): Promise<T>;
+
+    /**
+      * Creates a new resolved promise for the provided value.
+      * @param value A promise.
+      * @returns A promise whose internal state matches the provided promise.
+      */
+    resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+    /**
+     * Creates a new resolved promise .
+     * @returns A resolved promise.
+     */
+    resolve(): Promise<void>;
+}
+
+declare var Promise: PromiseConstructor;

extensions/typescript/server/typescript/lib/lib.es2015.proxy.d.ts

@@ -0,0 +1,38 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface ProxyHandler<T> {
+    getPrototypeOf? (target: T): any;
+    setPrototypeOf? (target: T, v: any): boolean;
+    isExtensible? (target: T): boolean;
+    preventExtensions? (target: T): boolean;
+    getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor;
+    has? (target: T, p: PropertyKey): boolean;
+    get? (target: T, p: PropertyKey, receiver: any): any;
+    set? (target: T, p: PropertyKey, value: any, receiver: any): boolean;
+    deleteProperty? (target: T, p: PropertyKey): boolean;
+    defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean;
+    enumerate? (target: T): PropertyKey[];
+    ownKeys? (target: T): PropertyKey[];
+    apply? (target: T, thisArg: any, argArray?: any): any;
+    construct? (target: T, thisArg: any, argArray?: any): any;
+}
+
+interface ProxyConstructor {
+    revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
+    new <T>(target: T, handler: ProxyHandler<T>): T
+}
+declare var Proxy: ProxyConstructor;

extensions/typescript/server/typescript/lib/lib.es2015.reflect.d.ts

@@ -0,0 +1,32 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+declare namespace Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>, newTarget?: any): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}

extensions/typescript/server/typescript/lib/lib.es2015.symbol.d.ts

@@ -0,0 +1,52 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Symbol {
+    /** Returns a string representation of an object. */
+    toString(): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): Object;
+}
+
+interface SymbolConstructor {
+    /**
+      * A reference to the prototype.
+      */
+    readonly prototype: Symbol;
+
+    /**
+      * Returns a new unique Symbol value.
+      * @param  description Description of the new Symbol object.
+      */
+    (description?: string|number): symbol;
+
+    /**
+      * Returns a Symbol object from the global symbol registry matching the given key if found.
+      * Otherwise, returns a new symbol with this key.
+      * @param key key to search for.
+      */
+    for(key: string): symbol;
+
+    /**
+      * Returns a key from the global symbol registry matching the given Symbol if found.
+      * Otherwise, returns a undefined.
+      * @param sym Symbol to find the key for.
+      */
+    keyFor(sym: symbol): string | undefined;
+}
+
+declare var Symbol: SymbolConstructor;

extensions/typescript/server/typescript/lib/lib.es2015.symbol.wellknown.d.ts

@@ -0,0 +1,343 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.symbol.d.ts" />
+
+interface SymbolConstructor {
+    /**
+      * A method that determines if a constructor object recognizes an object as one of the
+      * constructor’s instances. Called by the semantics of the instanceof operator.
+      */
+    readonly hasInstance: symbol;
+
+    /**
+      * A Boolean value that if true indicates that an object should flatten to its array elements
+      * by Array.prototype.concat.
+      */
+    readonly isConcatSpreadable: symbol;
+
+    /**
+      * A regular expression method that matches the regular expression against a string. Called
+      * by the String.prototype.match method.
+      */
+    readonly match: symbol;
+
+    /**
+      * A regular expression method that replaces matched substrings of a string. Called by the
+      * String.prototype.replace method.
+      */
+    readonly replace: symbol;
+
+    /**
+      * A regular expression method that returns the index within a string that matches the
+      * regular expression. Called by the String.prototype.search method.
+      */
+    readonly search: symbol;
+
+    /**
+      * A function valued property that is the constructor function that is used to create
+      * derived objects.
+      */
+    readonly species: symbol;
+
+    /**
+      * A regular expression method that splits a string at the indices that match the regular
+      * expression. Called by the String.prototype.split method.
+      */
+    readonly split: symbol;
+
+    /**
+      * A method that converts an object to a corresponding primitive value.
+      * Called by the ToPrimitive abstract operation.
+      */
+    readonly toPrimitive: symbol;
+
+    /**
+      * A String value that is used in the creation of the default string description of an object.
+      * Called by the built-in method Object.prototype.toString.
+      */
+    readonly toStringTag: symbol;
+
+    /**
+      * An Object whose own property names are property names that are excluded from the 'with'
+      * environment bindings of the associated objects.
+      */
+    readonly unscopables: symbol;
+}
+
+interface Symbol {
+    readonly [Symbol.toStringTag]: "Symbol";
+}
+
+interface Array<T> {
+    /**
+     * Returns an object whose properties have the value 'true'
+     * when they will be absent when used in a 'with' statement.
+     */
+    [Symbol.unscopables](): {
+        copyWithin: boolean;
+        entries: boolean;
+        fill: boolean;
+        find: boolean;
+        findIndex: boolean;
+        keys: boolean;
+        values: boolean;
+    };
+}
+
+interface Date {
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "default"): string;
+    /**
+     * Converts a Date object to a string.
+     */
+    [Symbol.toPrimitive](hint: "string"): string;
+    /**
+     * Converts a Date object to a number.
+     */
+    [Symbol.toPrimitive](hint: "number"): number;
+    /**
+     * Converts a Date object to a string or number.
+     *
+     * @param hint The strings "number", "string", or "default" to specify what primitive to return.
+     *
+     * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default".
+     * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default".
+     */
+    [Symbol.toPrimitive](hint: string): string | number;
+}
+
+interface Map<K, V> {
+    readonly [Symbol.toStringTag]: "Map";
+}
+
+interface WeakMap<K, V>{
+    readonly [Symbol.toStringTag]: "WeakMap";
+}
+
+interface Set<T> {
+    readonly [Symbol.toStringTag]: "Set";
+}
+
+interface WeakSet<T> {
+    readonly [Symbol.toStringTag]: "WeakSet";
+}
+
+interface JSON {
+    readonly [Symbol.toStringTag]: "JSON";
+}
+
+interface Function {
+    /**
+     * Determines whether the given value inherits from this function if this function was used
+     * as a constructor function.
+     *
+     * A constructor function can control which objects are recognized as its instances by
+     * 'instanceof' by overriding this method.
+     */
+    [Symbol.hasInstance](value: any): boolean;
+}
+
+interface GeneratorFunction extends Function {
+    readonly [Symbol.toStringTag]: "GeneratorFunction";
+}
+
+interface Math {
+    readonly [Symbol.toStringTag]: "Math";
+}
+
+interface Promise<T> {
+    readonly [Symbol.toStringTag]: "Promise";
+}
+
+interface PromiseConstructor {
+    readonly [Symbol.species]: Function;
+}
+
+interface RegExp {
+        /**
+      * Matches a string with this regular expression, and returns an array containing the results of
+      * that search.
+      * @param string A string to search within.
+      */
+    [Symbol.match](string: string): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replaceValue A String object or string literal containing the text to replace for every
+      *                     successful match of this regular expression.
+      */
+    [Symbol.replace](string: string, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using this regular expression.
+      * @param string A String object or string literal whose contents matching against
+      *               this regular expression will be replaced
+      * @param replacer A function that returns the replacement text.
+      */
+    [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the position beginning first substring match in a regular expression search
+      * using this regular expression.
+      *
+      * @param string The string to search within.
+      */
+    [Symbol.search](string: string): number;
+
+    /**
+      * Returns an array of substrings that were delimited by strings in the original input that
+      * match against this regular expression.
+      *
+      * If the regular expression contains capturing parentheses, then each time this
+      * regular expression matches, the results (including any undefined results) of the
+      * capturing parentheses are spliced.
+      *
+      * @param string string value to split
+      * @param limit if not undefined, the output array is truncated so that it contains no more
+      * than 'limit' elements.
+      */
+    [Symbol.split](string: string, limit?: number): string[];
+}
+
+interface RegExpConstructor {
+    [Symbol.species](): RegExpConstructor;
+}
+
+interface String {
+    /**
+      * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
+      * @param matcher An object that supports being matched against.
+      */
+    match(matcher: { [Symbol.match](string: string): RegExpMatchArray | null; }): RegExpMatchArray | null;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+      * Replaces text in a string, using an object that supports replacement within a string.
+      * @param searchValue A object can search for and replace matches within a string.
+      * @param replacer A function that returns the replacement text.
+      */
+    replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+
+    /**
+      * Finds the first substring match in a regular expression search.
+      * @param searcher An object which supports searching within a string.
+      */
+    search(searcher: { [Symbol.search](string: string): number; }): number;
+
+    /**
+      * Split a string into substrings using the specified separator and return them as an array.
+      * @param splitter An object that can split a string.
+      * @param limit A value used to limit the number of elements returned in the array.
+      */
+    split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[];
+}
+
+/**
+  * Represents a raw buffer of binary data, which is used to store data for the
+  * different typed arrays. ArrayBuffers cannot be read from or written to directly,
+  * but can be passed to a typed array or DataView Object to interpret the raw
+  * buffer as needed.
+  */
+interface ArrayBuffer {
+    readonly [Symbol.toStringTag]: "ArrayBuffer";
+}
+
+interface DataView {
+    readonly [Symbol.toStringTag]: "DataView";
+}
+
+/**
+  * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Int8Array {
+    readonly [Symbol.toStringTag]: "Int8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8Array {
+    readonly [Symbol.toStringTag]: "UInt8Array";
+}
+
+/**
+  * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0.
+  * If the requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint8ClampedArray {
+    readonly [Symbol.toStringTag]: "Uint8ClampedArray";
+}
+
+/**
+  * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int16Array {
+    readonly [Symbol.toStringTag]: "Int16Array";
+}
+
+/**
+  * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint16Array {
+    readonly [Symbol.toStringTag]: "Uint16Array";
+}
+
+/**
+  * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Int32Array {
+    readonly [Symbol.toStringTag]: "Int32Array";
+}
+
+/**
+  * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the
+  * requested number of bytes could not be allocated an exception is raised.
+  */
+interface Uint32Array {
+    readonly [Symbol.toStringTag]: "Uint32Array";
+}
+
+/**
+  * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number
+  * of bytes could not be allocated an exception is raised.
+  */
+interface Float32Array {
+    readonly [Symbol.toStringTag]: "Float32Array";
+}
+
+/**
+  * A typed array of 64-bit float values. The contents are initialized to 0. If the requested
+  * number of bytes could not be allocated an exception is raised.
+  */
+interface Float64Array {
+    readonly [Symbol.toStringTag]: "Float64Array";
+}

extensions/typescript/server/typescript/lib/lib.es2016.array.include.d.ts

@@ -0,0 +1,105 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface Array<T> {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: T, fromIndex?: number): boolean;
+}
+
+interface Int8Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint8Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint8ClampedArray {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Int16Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint16Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Int32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Uint32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Float32Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}
+
+interface Float64Array {
+    /**
+      * Determines whether an array includes a certain element, returning true or false as appropriate.
+      * @param searchElement The element to search for.
+      * @param fromIndex The position in this array at which to begin searching for searchElement.
+      */
+    includes(searchElement: number, fromIndex?: number): boolean;
+}

extensions/typescript/server/typescript/lib/lib.es2016.d.ts

@@ -0,0 +1,18 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.d.ts" />
+/// <reference path="lib.es2016.array.include.d.ts" />

extensions/typescript/server/typescript/lib/lib.es2017.d.ts

@@ -0,0 +1,19 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2016.d.ts" />
+/// <reference path="lib.es2017.object.d.ts" />
+/// <reference path="lib.es2017.sharedmemory.d.ts" />

extensions/typescript/server/typescript/lib/lib.es2017.object.d.ts

@@ -0,0 +1,30 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+interface ObjectConstructor {
+    /**
+      * Returns an array of values of the enumerable properties of an object
+      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
+      */
+    values<T>(o: { [s: string]: T }): T[];
+    values(o: any): any[];
+    /**
+      * Returns an array of key/values of the enumerable properties of an object
+      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
+      */
+    entries<T>(o: { [s: string]: T }): [string, T][];
+    entries(o: any): [string, any][];
+}

extensions/typescript/server/typescript/lib/lib.es2017.sharedmemory.d.ts

@@ -0,0 +1,43 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+/// <reference no-default-lib="true"/>
+/// <reference path="lib.es2015.symbol.d.ts" />
+/// <reference path="lib.es2015.symbol.wellknown.d.ts" />
+
+interface SharedArrayBuffer {
+    /**
+      * Read-only. The length of the ArrayBuffer (in bytes).
+      */
+    readonly byteLength: number;
+
+    /*
+     * The SharedArrayBuffer constructor's length property whose value is 1.
+     */
+    length: number;
+    /**
+      * Returns a section of an SharedArrayBuffer.
+      */
+    slice(begin:number, end?:number): SharedArrayBuffer;
+    readonly [Symbol.species]: SharedArrayBuffer;
+    readonly [Symbol.toStringTag]: "SharedArrayBuffer";
+}
+
+interface SharedArrayBufferConstructor {
+    readonly prototype: SharedArrayBuffer;
+    new (byteLength: number): SharedArrayBuffer;
+}
+
+declare var SharedArrayBuffer: SharedArrayBufferConstructor;

extensions/typescript/server/typescript/lib/lib.scriptHost.d.ts

@@ -13,7 +13,7 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-/// <reference path="lib.core.d.ts" />
+/// <reference no-default-lib="true"/>
 
 
 /////////////////////////////
@@ -292,3 +292,16 @@ interface VBArrayConstructor {
 }
 
 declare var VBArray: VBArrayConstructor;
+
+/**
+ * Automation date (VT_DATE)
+ */
+interface VarDate { }
+
+interface DateConstructor {
+    new (vd: VarDate): Date;
+}
+
+interface Date {
+    getVarDate: () => VarDate;
+}

extensions/typescript/server/typescript/package.json

@@ -1,88 +1,163 @@
 {
-  "name": "typescript",
+  "_args": [
+    [
+      {
+        "raw": "typescript",
+        "scope": null,
+        "escapedName": "typescript",
+        "name": "typescript",
+        "rawSpec": "",
+        "spec": "latest",
+        "type": "tag"
+      },
+      "P:\\tmp"
+    ]
+  ],
+  "_from": "typescript@latest",
+  "_id": "typescript@2.0.3",
+  "_inCache": true,
+  "_location": "/typescript",
+  "_nodeVersion": "5.11.1",
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/typescript-2.0.3.tgz_1474560003144_0.4724818258546293"
+  },
+  "_npmUser": {
+    "name": "typescript",
+    "email": "typescript@microsoft.com"
+  },
+  "_npmVersion": "3.8.6",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "typescript",
+    "scope": null,
+    "escapedName": "typescript",
+    "name": "typescript",
+    "rawSpec": "",
+    "spec": "latest",
+    "type": "tag"
+  },
+  "_requiredBy": [
+    "#USER"
+  ],
+  "_resolved": "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz",
+  "_shasum": "33dec9eae86b8eee327dd419ca050c853cabd514",
+  "_shrinkwrap": null,
+  "_spec": "typescript",
+  "_where": "P:\\tmp",
   "author": {
     "name": "Microsoft Corp."
   },
-  "homepage": "http://typescriptlang.org/",
-  "version": "1.8.10",
-  "license": "Apache-2.0",
-  "description": "TypeScript is a language for application scale JavaScript development",
-  "keywords": [
-    "TypeScript",
-    "Microsoft",
-    "compiler",
-    "language",
-    "javascript"
-  ],
-  "bugs": {
-    "url": "https://github.com/Microsoft/TypeScript/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Microsoft/TypeScript.git"
-  },
-  "main": "./lib/typescript.js",
-  "typings": "./lib/typescript.d.ts",
   "bin": {
     "tsc": "./bin/tsc",
     "tsserver": "./bin/tsserver"
   },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "devDependencies": {
-    "jake": "latest",
-    "mocha": "2.3.4",
-    "chai": "latest",
-    "browserify": "latest",
-    "istanbul": "latest",
-    "mocha-fivemat-progress-reporter": "latest",
-    "tslint": "next",
-    "typescript": "next",
-    "tsd": "latest"
-  },
-  "scripts": {
-    "pretest": "jake tests",
-    "test": "jake runtests",
-    "build": "npm run build:compiler && npm run build:tests",
-    "build:compiler": "jake local",
-    "build:tests": "jake tests",
-    "clean": "jake clean",
-    "jake": "jake",
-    "lint": "jake lint",
-    "setup-hooks": "node scripts/link-hooks.js"
-  },
   "browser": {
     "buffer": false,
     "fs": false,
     "os": false,
     "path": false
   },
-  "gitHead": "794c57478ec2a44ee15fb3e245a4c5d2d1612375",
+  "bugs": {
-  "_id": "typescript@1.8.10",
+    "url": "https://github.com/Microsoft/TypeScript/issues"
-  "_shasum": "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e",
-  "_from": "typescript@latest",
-  "_npmVersion": "2.14.2",
-  "_nodeVersion": "5.9.0",
-  "_npmUser": {
-    "name": "typescript",
-    "email": "typescript@microsoft.com"
   },
+  "dependencies": {},
+  "description": "TypeScript is a language for application scale JavaScript development",
+  "devDependencies": {
+    "@types/browserify": "latest",
+    "@types/chai": "latest",
+    "@types/convert-source-map": "latest",
+    "@types/del": "latest",
+    "@types/glob": "latest",
+    "@types/gulp": "latest",
+    "@types/gulp-concat": "latest",
+    "@types/gulp-help": "latest",
+    "@types/gulp-newer": "latest",
+    "@types/gulp-sourcemaps": "latest",
+    "@types/gulp-typescript": "latest",
+    "@types/merge2": "latest",
+    "@types/minimatch": "latest",
+    "@types/minimist": "latest",
+    "@types/mkdirp": "latest",
+    "@types/mocha": "latest",
+    "@types/node": "latest",
+    "@types/q": "latest",
+    "@types/run-sequence": "latest",
+    "@types/through2": "latest",
+    "browserify": "latest",
+    "chai": "latest",
+    "convert-source-map": "latest",
+    "del": "latest",
+    "gulp": "latest",
+    "gulp-clone": "latest",
+    "gulp-concat": "latest",
+    "gulp-help": "latest",
+    "gulp-insert": "latest",
+    "gulp-newer": "latest",
+    "gulp-sourcemaps": "latest",
+    "gulp-typescript": "latest",
+    "into-stream": "latest",
+    "istanbul": "latest",
+    "jake": "latest",
+    "merge2": "latest",
+    "minimist": "latest",
+    "mkdirp": "latest",
+    "mocha": "latest",
+    "mocha-fivemat-progress-reporter": "latest",
+    "q": "latest",
+    "run-sequence": "latest",
+    "sorcery": "latest",
+    "through2": "latest",
+    "travis-fold": "latest",
+    "ts-node": "latest",
+    "tslint": "3.15.1",
+    "typescript": "2.0.*"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "33dec9eae86b8eee327dd419ca050c853cabd514",
+    "tarball": "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz"
+  },
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "gitHead": "4f65a2885e000c27e5f079171d440797d7307b97",
+  "homepage": "http://typescriptlang.org/",
+  "keywords": [
+    "TypeScript",
+    "Microsoft",
+    "compiler",
+    "language",
+    "javascript"
+  ],
+  "license": "Apache-2.0",
+  "main": "./lib/typescript.js",
   "maintainers": [
     {
       "name": "typescript",
       "email": "typescript@microsoft.com"
     }
   ],
-  "dist": {
+  "name": "typescript",
-    "shasum": "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e",
+  "optionalDependencies": {},
-    "tarball": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Microsoft/TypeScript.git"
   },
-  "_npmOperationalInternal": {
+  "scripts": {
-    "host": "packages-12-west.internal.npmjs.com",
+    "build": "npm run build:compiler && npm run build:tests",
-    "tmp": "tmp/typescript-1.8.10.tgz_1460493736776_0.9304528103675693"
+    "build:compiler": "jake local",
+    "build:tests": "jake tests",
+    "clean": "jake clean",
+    "gulp": "gulp",
+    "jake": "jake",
+    "lint": "jake lint",
+    "pretest": "jake tests",
+    "setup-hooks": "node scripts/link-hooks.js",
+    "start": "node lib/tsc",
+    "test": "jake runtests-parallel"
   },
-  "directories": {},
+  "typings": "./lib/typescript.d.ts",
-  "_resolved": "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz",
+  "version": "2.0.3"
-  "readme": "ERROR: No README data found!"
 }

extensions/typescript/src/features/bufferSyncSupport.ts

@@ -5,6 +5,7 @@
 'use strict';
 
 import * as path from 'path';
+import * as fs from 'fs';
 
 import { workspace, TextDocument, TextDocumentChangeEvent, TextDocumentContentChangeEvent, Disposable } from 'vscode';
 import * as Proto from '../protocol';
@@ -15,7 +16,7 @@ interface IDiagnosticRequestor {
 	requestDiagnostic(filepath: string): void;
 }
 
-const Mode2ScriptKind: Map<"TS" | "JS" | "TSX" | "JSX"> = {
+const Mode2ScriptKind: Map<'TS' | 'JS' | 'TSX' | 'JSX'> = {
 	'typescript': 'TS',
 	'typescriptreact': 'TSX',
 	'javascript': 'JS',
@@ -55,6 +56,10 @@ class SyncedBuffer {
 		this.client.execute('open', args, false);
 	}
 
+	public get lineCount(): number {
+		return this.document.lineCount;
+	}
+
 	public close(): void {
 		let args: Proto.FileRequestArgs = {
 			file: this.filepath
@@ -117,7 +122,7 @@ export default class BufferSyncSupport {
 		this.projectValidationRequested = false;
 
 		this.pendingDiagnostics = Object.create(null);
-		this.diagnosticDelayer = new Delayer<any>(100);
+		this.diagnosticDelayer = new Delayer<any>(300);
 
 		this.syncedBuffers = Object.create(null);
 	}
@@ -183,6 +188,9 @@ export default class BufferSyncSupport {
 		this.diagnostics.delete(filepath);
 		delete this.syncedBuffers[filepath];
 		syncedBuffer.close();
+		if (!fs.existsSync(filepath)) {
+			this.requestAllDiagnostics();
+		}
 	}
 
 	private onDidChangeTextDocument(e: TextDocumentChangeEvent): void {
@@ -204,7 +212,7 @@ export default class BufferSyncSupport {
 		Object.keys(this.syncedBuffers).forEach(filePath => this.pendingDiagnostics[filePath] = Date.now());
 		this.diagnosticDelayer.trigger(() => {
 			this.sendPendingDiagnostics();
-		});
+		}, 200);
 	}
 
 	public requestDiagnostic(file: string): void {
@@ -213,9 +221,15 @@ export default class BufferSyncSupport {
 		}
 
 		this.pendingDiagnostics[file] = Date.now();
+		let buffer = this.syncedBuffers[file];
+		let delay = 300;
+		if (buffer) {
+			let lineCount = buffer.lineCount;
+			delay = Math.min(Math.max(Math.ceil(lineCount / 20), 300), 800);
+		}
 		this.diagnosticDelayer.trigger(() => {
 			this.sendPendingDiagnostics();
-		});
+		}, delay);
 	}
 
 	private sendPendingDiagnostics(): void {

extensions/typescript/src/protocol.d.ts

@@ -482,7 +482,7 @@ export interface FormatOptions extends EditorOptions {
     placeOpenBraceOnNewLineForControlBlocks?: boolean;
 
     /** Index operator */
-    [key: string]: string | number | boolean;
+    [key: string]: string | number | boolean | undefined;
 }
 
 /**

extensions/typescript/src/typescriptServiceClient.ts

@@ -68,9 +68,9 @@ namespace Trace {
 
 enum MessageAction {
 	useLocal,
-	alwaysUseLocal,
 	useBundled,
-	doNotCheckAgain
+	neverCheckLocalVersion,
+	close
 }
 
 interface MyMessageItem extends MessageItem  {
@@ -146,14 +146,14 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		this.callbacks = Object.create(null);
 		const configuration = workspace.getConfiguration();
 		this.tsdk = configuration.get<string>('typescript.tsdk', null);
-		this._experimentalAutoBuild = configuration.get<boolean>('typescript.tsserver.experimentalAutoBuild', false);
+		this._experimentalAutoBuild = false; // configuration.get<boolean>('typescript.tsserver.experimentalAutoBuild', false);
 		this._apiVersion = APIVersion.v1_x;
 		this.trace = this.readTrace();
 		workspace.onDidChangeConfiguration(() => {
 			this.trace = this.readTrace();
-			let oldTask = this.tsdk;
+			let oldTsdk = this.tsdk;
 			this.tsdk = workspace.getConfiguration().get<string>('typescript.tsdk', null);
-			if (this.servicePromise === null && oldTask !== this.tsdk) {
+			if (this.servicePromise === null && oldTsdk !== this.tsdk) {
 				this.startService();
 			}
 		});
@@ -291,130 +291,161 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 				modulePath = path.join(workspace.rootPath, this.tsdk, 'tsserver.js');
 			}
 		}
-		let versionCheckPromise: Thenable<string> = Promise.resolve(modulePath);
+		const tsConfig = workspace.getConfiguration('typescript');
-		const doLocalVersionCheckKey: string = 'doLocalVersionCheck';
+		const checkWorkspaceVersionKey = 'check.workspaceVersion';
 
-		if (!this.tsdk && workspace.rootPath && this.globalState.get(doLocalVersionCheckKey, true)) {
+		this.servicePromise = new Promise<cp.ChildProcess>((resolve, reject) => {
-			let localModulePath = path.join(workspace.rootPath, 'node_modules', 'typescript', 'lib', 'tsserver.js');
+			let versionCheckPromise: Thenable<string> = Promise.resolve(modulePath);
-			if (fs.existsSync(localModulePath)) {
+
-				let localVersion = this.getTypeScriptVersion(localModulePath);
+			if (!workspace.rootPath) {
-				let shippedVersion = this.getTypeScriptVersion(modulePath);
+				versionCheckPromise = this.informAboutTS20(modulePath);
-				if (localVersion && localVersion !== shippedVersion) {
+			} else {
-					checkGlobalVersion = false;
+				if (!this.tsdk && tsConfig.get(checkWorkspaceVersionKey, true)) {
-					versionCheckPromise = window.showInformationMessage<MyMessageItem>(
+					let localModulePath = path.join(workspace.rootPath, 'node_modules', 'typescript', 'lib', 'tsserver.js');
-						localize(
+					if (fs.existsSync(localModulePath)) {
-							'localTSFound',
+						let localVersion = this.getTypeScriptVersion(localModulePath);
-							'The workspace folder contains TypeScript version {0}. Do you want to use this version instead of the bundled version {1}?',
+						let shippedVersion = this.getTypeScriptVersion(modulePath);
-							localVersion, shippedVersion
+						if (localVersion && localVersion !== shippedVersion) {
-						),
+							checkGlobalVersion = false;
-						...[{
+							versionCheckPromise = window.showInformationMessage<MyMessageItem>(
-							title: localize('use', 'Use {0}', localVersion),
+								localize(
-							id: MessageAction.useLocal
+									'localTSFound',
-						},
+									'The workspace folder contains TypeScript version {0}. Do you want to use this version instead of the bundled version {1}?',
-						{
+									localVersion, shippedVersion
-							title: localize('useBundled', 'Use {0}', shippedVersion),
+								),
-							id: MessageAction.useBundled,
+								{
-						},
+									title: localize('use', 'Use Workspace ({0})', localVersion),
-						{
+									id: MessageAction.useLocal
-							title: localize('useAlways', /*'Always use {0}'*/ 'More Information', localVersion),
+								},
-							id: MessageAction.alwaysUseLocal
+								{
-						},
+									title: localize({
-						{
+										key: 'useBundled',
-							title: localize('doNotCheckAgain', 'Don\'t Check Again'),
+										comment: ["Bundled has the meaning of packaged with VS Code itself."]
-							id: MessageAction.doNotCheckAgain,
+									}, 'Use Bundled ({0})', shippedVersion),
-							isCloseAffordance: true
+									id: MessageAction.useBundled,
-						}].reverse()
+								},
-					).then((selected) => {
+								{
-						if (!selected) {
+									title: localize('neverCheckLocalVesion', 'Never Check for Workspace Version'),
-							return modulePath;
+									id: MessageAction.neverCheckLocalVersion
-						}
+								},
-						switch(selected.id) {
+								{
-							case MessageAction.useLocal:
+									title: localize('close', 'Close'),
-								showVersionStatusItem = true;
+									id: MessageAction.close,
-								return localModulePath;
+									isCloseAffordance: true
-							case MessageAction.alwaysUseLocal:
+								}
-								window.showInformationMessage(localize('continueWithVersion', 'Continuing with version {0}', shippedVersion));
+							).then((selected) => {
-								openUrl('http://go.microsoft.com/fwlink/?LinkId=826239');
+								if (!selected || selected.id === MessageAction.close) {
-								return modulePath;
+									return modulePath;
-							case MessageAction.useBundled:
+								}
-								return modulePath;
+								switch(selected.id) {
-							case MessageAction.doNotCheckAgain:
+									case MessageAction.useLocal:
-								this.globalState.update(doLocalVersionCheckKey, false);
+										let pathValue = './node_modules/typescript/lib';
-								return modulePath;
+										tsConfig.update('tsdk', pathValue, false);
-							default:
+										window.showInformationMessage(localize('updatedtsdk', 'Updated workspace setting \'typescript.tsdk\' to {0}', pathValue));
-								return modulePath;
+										showVersionStatusItem = true;
-						}
+										return localModulePath;
-					});
+									case MessageAction.useBundled:
-				}
+										tsConfig.update(checkWorkspaceVersionKey, false, false);
-			}
+										window.showInformationMessage(localize('updateLocalWorkspaceCheck', 'Updated workspace setting \'typescript.check.workspaceVersion\' to false'));
-		}
+										return modulePath;
-		versionCheckPromise.then((modulePath) => {
+									case MessageAction.neverCheckLocalVersion:
-			this.info(`Using tsserver from location: ${modulePath}`);
+										window.showInformationMessage(localize('updateGlobalWorkspaceCheck', 'Updated user setting \'typescript.check.workspaceVersion\' to false'));
-			if (!fs.existsSync(modulePath)) {
+										tsConfig.update(checkWorkspaceVersionKey, false, true);
-				window.showErrorMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. TypeScript language features will be disabled.', path.dirname(modulePath)));
+										return modulePath;
-				return;
+									default:
-			}
+										return modulePath;
-
+								}
-			let version = this.getTypeScriptVersion(modulePath);
+							});
-			if (!version) {
-				version = workspace.getConfiguration().get<string>('typescript.tsdk_version', undefined);
-			}
-			if (version) {
-				this._apiVersion = APIVersion.fromString(version);
-			}
-
-
-			const label = version || localize('versionNumber.custom' ,'custom');
-			const tooltip = modulePath;
-			VersionStatus.enable(!!this.tsdk || showVersionStatusItem);
-			VersionStatus.setInfo(label, tooltip);
-
-			const doGlobalVersionCheckKey: string = 'doGlobalVersionCheck';
-			if (checkGlobalVersion && this.globalState.get(doGlobalVersionCheckKey, true)) {
-				let tscVersion: string = undefined;
-				try {
-					let out = cp.execSync('tsc --version', { encoding: 'utf8' });
-					if (out) {
-						let matches = out.trim().match(/Version\s*(.*)$/);
-						if (matches && matches.length === 2) {
-							tscVersion = matches[1];
 						}
+					} else {
+						versionCheckPromise = this.informAboutTS20(modulePath);
 					}
-				} catch (error) {
-				}
-				if (tscVersion && tscVersion !== version) {
-					window.showInformationMessage(
-						localize('versionMismatch', 'A version mismatch between the globally installed tsc compiler ({0}) and VS Code\'s language service ({1}) has been detected. This might result in inconsistent compile errors.', tscVersion, version),
-						...[{
-							title: localize('moreInformation', 'More Information'),
-							id: 1
-						},
-						{
-							title: localize('doNotCheckAgain', 'Don\'t Check Again'),
-							id: 2,
-							isCloseAffordance: true
-						}].reverse()
-					).then((selected) => {
-						if (!selected) {
-							return;
-						}
-						switch (selected.id) {
-							case 1:
-								openUrl('http://go.microsoft.com/fwlink/?LinkId=826239');
-								break;
-							case 2:
-								this.globalState.update(doGlobalVersionCheckKey, false);
-								break;
-						}
-					});
 				}
 			}
 
-			this.servicePromise = new Promise<cp.ChildProcess>((resolve, reject) => {
+			versionCheckPromise.then((modulePath) => {
+				this.info(`Using tsserver from location: ${modulePath}`);
+				if (!fs.existsSync(modulePath)) {
+					window.showErrorMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. TypeScript language features will be disabled.', path.dirname(modulePath)));
+					this.servicePromise = null;
+					reject(new Error('No TSServer found'));
+					return;
+				}
+
+				let version = this.getTypeScriptVersion(modulePath);
+				if (!version) {
+					version = workspace.getConfiguration().get<string>('typescript.tsdk_version', undefined);
+				}
+				if (version) {
+					this._apiVersion = APIVersion.fromString(version);
+				}
+
+
+				const label = version || localize('versionNumber.custom' ,'custom');
+				const tooltip = modulePath;
+				VersionStatus.enable(!!this.tsdk || showVersionStatusItem);
+				VersionStatus.setInfo(label, tooltip);
+
+				const doGlobalVersionCheckKey: string = 'doGlobalVersionCheck';
+				const globalStateValue = this.globalState.get(doGlobalVersionCheckKey, true);
+				const checkTscVersion = 'check.tscVersion';
+				if (!globalStateValue) {
+					tsConfig.update(checkTscVersion, false, true);
+					this.globalState.update(doGlobalVersionCheckKey, true);
+				}
+				if (checkGlobalVersion && tsConfig.get(checkTscVersion)) {
+					let tscVersion: string = undefined;
+					try {
+						let out = cp.execSync('tsc --version', { encoding: 'utf8' });
+						if (out) {
+							let matches = out.trim().match(/Version\s*(.*)$/);
+							if (matches && matches.length === 2) {
+								tscVersion = matches[1];
+							}
+						}
+					} catch (error) {
+					}
+					if (tscVersion && tscVersion !== version) {
+						window.showInformationMessage<MyMessageItem>(
+							localize('versionMismatch', 'A version mismatch between the globally installed tsc compiler ({0}) and VS Code\'s language service ({1}) has been detected. This might result in inconsistent compile errors.', tscVersion, version),
+							{
+								title: localize('moreInformation', 'More Information'),
+								id: 1
+							},
+							{
+								title: localize('doNotCheckAgain', 'Don\'t Check Again'),
+								id: 2
+							},
+							{
+								title: localize('close', 'Close'),
+								id: 3,
+								isCloseAffordance: true
+							}
+						).then((selected) => {
+							if (!selected || selected.id === 3) {
+								return;
+							}
+							switch (selected.id) {
+								case 1:
+									openUrl('http://go.microsoft.com/fwlink/?LinkId=826239');
+									break;
+								case 2:
+									tsConfig.update(checkTscVersion, false, true);
+									window.showInformationMessage(localize('updateTscCheck', 'Updated user setting \'typescript.check.tscVersion\' to false'));
+									this.globalState.update(doGlobalVersionCheckKey, false);
+									break;
+							}
+						});
+					}
+				}
+
 				try {
 					let options: electron.IForkOptions = {
 						execArgv: [] // [`--debug-brk=5859`]
 					};
+					if (workspace.rootPath) {
+						options.cwd = workspace.rootPath;
+					}
 					let value = process.env.TSS_DEBUG;
 					if (value) {
 						let port = parseInt(value);
@@ -446,15 +477,19 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 						});
 						this._onReady.resolve();
 						resolve(childProcess);
+						this.serviceStarted(resendModels);
 					});
 				} catch (error) {
 					reject(error);
 				}
 			});
-			this.serviceStarted(resendModels);
 		});
 	}
 
+	private informAboutTS20(modulePath: string): Thenable<string> {
+		return Promise.resolve(modulePath);
+	}
+
 	private serviceStarted(resendModels: boolean): void {
 		if (this._experimentalAutoBuild && this.storagePath) {
 			try {
@@ -525,8 +560,11 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 			return null;
 		}
 		let result = resource.fsPath;
+		if (!result) {
+			return null;
+		}
 		// Both \ and / must be escaped in regular expressions
-		return result ? result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/') : null;
+		return result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/');
 	}
 
 	public asUrl(filepath: string): Uri {

i18n/chs/extensions/html/client/out/htmlMain.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/extensions/typescript/out/typescriptServiceClient.i18n.json

@@ -5,7 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"channelName": "TypeScript",
-	"continueWithVersion": "继续使用版本 {0}",
+	"close": "关闭",
 	"doNotCheckAgain": "不要再次检查",
 	"localTSFound": "工作区文件夹包含 TypeScript 版本 {0}。是否要使用此版本而不是捆绑的版本 {1}?",
 	"moreInformation": "详细信息",
@@ -14,7 +14,6 @@
 	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。请考虑启用 bug 报告。",
 	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。请启用 bug 报告。",
 	"use": "使用 {0}",
-	"useAlways": "详细信息",
 	"useBundled": "使用 {0}",
 	"versionMismatch": "检测到全局安装的 tsc 编译器({0})与 VS 代码语言服务({1})版本不匹配。这可能导致不一致的编译错误。",
 	"versionNumber.custom": "自定义"

i18n/chs/src/vs/base/common/errorMessage.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/base/common/keybinding.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/editor/common/modes/snippetsRegistry.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/platform/environment/node/argv.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"close": "关闭",
 	"invalidManifest": "扩展无效: package.json 不是 JSON 文件。",
 	"invalidName": "扩展无效: 清单名不匹配。",
 	"invalidPublisher": "扩展无效: 清单发布服务器不匹配。",
 	"invalidVersion": "扩展无效: 清单版本不匹配。",
-	"noCompatible": "找不到可与此代码版本兼容的 {0} 版本。",
 	"notExists": "找不到扩展",
 	"restartCode": "请先重启 Code 再重新安装 {0}。"
 }

i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json

@@ -12,7 +12,6 @@
 	"closeEditorsToTheLeft": "关闭左侧编辑器",
 	"closeEditorsToTheRight": "关闭右侧编辑器",
 	"closeOtherEditorsInGroup": "关闭其他编辑器",
-	"closeQuickOpen": "关闭速启",
 	"evenEditorGroups": "编辑器组平均宽度",
 	"focusFirstEditorGroup": "聚焦于左侧编辑器组",
 	"focusLastEditorInStack": "打开组中上一个编辑器",
@@ -38,9 +37,6 @@
 	"openPreviousEditor": "打开上一个编辑器",
 	"openPreviousEditorInGroup": "打开组中上一个最近使用的编辑器",
 	"openToSide": "打开到侧边",
-	"quickNavigateNext": "在速启中导航到下一个",
-	"quickNavigatePrevious": "在速启中导航到上一个",
-	"quickOpen": "转到文件...",
 	"removeFromEditorHistory": "从编辑器历史记录中删除",
 	"reopenClosedEditor": "重新打开已关闭的编辑器",
 	"showAllEditors": "显示所有编辑器",

i18n/chs/src/vs/workbench/electron-browser/main.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/execution/electron-browser/terminalService.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"close": "关闭",
 	"neverShowAgain": "不再显示",
 	"reallyRecommended": "建议安装“{0}”扩展。",
 	"showRecommendations": "显示建议"

i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsFileTemplate.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json

@@ -6,6 +6,8 @@
 {
 	"ascending": "排序顺序: ↑",
 	"descending": "排序顺序: ↓",
+	"extensions": "扩展",
+	"outdatedExtensions": "{0} 个过时的扩展",
 	"searchExtensions": "在应用商店中搜索扩展",
 	"sort by installs": "排序依据: 安装计数",
 	"sort by rating": "排序依据: 分级",

i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/files/browser/views/openEditorsView.i18n.json

@@ -5,7 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"dirtyCounter": "{0} 个未保存",
-	"openEditors": "打开编辑器",
+	"openEditors": "打开的编辑器",
-	"openEditosrSection": "打开编辑器部分",
+	"openEditosrSection": "打开的编辑器部分",
-	"treeAriaLabel": "打开编辑器"
+	"treeAriaLabel": "打开的编辑器"
 }

i18n/chs/src/vs/workbench/parts/files/electron-browser/dirtyFilesTracker.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/files/electron-browser/textFileService.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.i18n.json

@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"terminal.integrated.copySelection.noSelection": "当终端没有位于焦点时无法复制终端选定内容",
 	"terminal.integrated.exitedWithCode": "通过退出代码 {0} 终止的终端进程"
 }

i18n/chs/src/vs/workbench/services/configurationResolver/node/configurationResolverService.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/chs/src/vs/workbench/services/message/browser/messagelist/messageList.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/extensions/html/client/out/htmlMain.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/extensions/typescript/out/typescriptServiceClient.i18n.json

@@ -5,7 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"channelName": "TypeScript",
-	"continueWithVersion": "繼續使用版本 {0}",
+	"close": "關閉",
 	"doNotCheckAgain": "不要再檢查",
 	"localTSFound": "工作區資料夾包含 TypeScript 版本 {0}。要使用此版本，而非配套版本 {1} 嗎?",
 	"moreInformation": "詳細資訊",
@@ -14,7 +14,6 @@
 	"serverDied": "TypeScript 語言服務在過去 5 分鐘內意外中止 5 次。請考慮開啟問題報告。",
 	"serverDiedAfterStart": "TypeScript 語言服務在啟動後立即中止 5 次。服務將不會重新啟動。請開啟問題報告。",
 	"use": "使用 {0}",
-	"useAlways": "詳細資訊",
 	"useBundled": "使用 {0}",
 	"versionMismatch": "偵測到全域安裝的 TSC 編譯器 ({0}) 和 VS Code 的語言服務 ({1}) 之間版本不符。這可能會導致編譯不一致的錯誤。",
 	"versionNumber.custom": "自訂"

i18n/cht/src/vs/base/common/errorMessage.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/src/vs/base/common/keybinding.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/src/vs/editor/common/modes/snippetsRegistry.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/src/vs/platform/environment/node/argv.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"close": "關閉",
+	"installWithoutDependenices": "只安裝這項",
 	"invalidManifest": "擴充功能無效: package.json 不是 JSON 檔案。",
 	"invalidName": "擴充功能無效: 資訊清單名稱不相符。",
 	"invalidPublisher": "擴充功能無效: 資訊清單發行者不相符。",
 	"invalidVersion": "擴充功能無效: 資訊清單版本不相符。",
-	"noCompatible": "找不到與此 Code 版本相容的 {0} 版本。",
 	"notExists": "找不到擴充功能",
 	"restartCode": "請先重新啟動 Code，再重新安裝 {0}。"
 }

i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json

@@ -12,7 +12,6 @@
 	"closeEditorsToTheLeft": "將編輯器關到左側",
 	"closeEditorsToTheRight": "將編輯器關到右側",
 	"closeOtherEditorsInGroup": "關閉其他編輯器",
-	"closeQuickOpen": "關閉快速開啟",
 	"evenEditorGroups": "均分編輯器群組寬度",
 	"focusFirstEditorGroup": "聚焦左側編輯器群組",
 	"focusLastEditorInStack": "開啟群組中最後一個編輯器",
@@ -38,9 +37,6 @@
 	"openPreviousEditor": "開啟上一個編輯器",
 	"openPreviousEditorInGroup": "開啟群組中上一個最近使用的編輯器",
 	"openToSide": "開至側邊",
-	"quickNavigateNext": "快速開啟時導覽至下一個項目",
-	"quickNavigatePrevious": "快速開啟時導覽至上一個項目",
-	"quickOpen": "移至檔案...",
 	"removeFromEditorHistory": "從編輯器記錄中移除",
 	"reopenClosedEditor": "重新開啟已關閉的編輯器",
 	"showAllEditors": "顯示所有編輯器",

i18n/cht/src/vs/workbench/electron-browser/main.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}

i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}