diff --git a/.github/calendar.yml b/.github/calendar.yml
index 06ea947f56d..276adfcda36 100644
--- a/.github/calendar.yml
+++ b/.github/calendar.yml
@@ -10,4 +10,6 @@
   '2018-03-15 12:00, US/Pacific':    'release', # 1.21.1
   '2018-03-20 12:00, US/Pacific':    'development',
   '2018-03-26 18:00, US/Pacific':    'endgame',
-}
\ No newline at end of file
+  '2018-04-06 18:00, US/Pacific':    'release', # 1.22.1
+  '2018-04-11 18:00, US/Pacific':    'development',
+}
diff --git a/.github/classifier.yml b/.github/classifier.yml
index dbdd23ddfb7..a83c95ad2ba 100644
--- a/.github/classifier.yml
+++ b/.github/classifier.yml
@@ -10,7 +10,7 @@
         color-picker: [],
         css-less-sass: [ aeschli ],
         debug: {
-            assignees: [ isidorn ],
+            assignees: [ weinand ],
             assignLabel: false
         },
         diff-editor: [],
@@ -35,15 +35,15 @@
         error-list: [],
         extensions: [],
         file-encoding: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-io: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-watcher: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         file-explorer: {
@@ -65,7 +65,7 @@
         markdown: [ mjbvz ],
         merge-conflict: [ chrmarti ],
         multi-root: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         perf-profile: [],
@@ -86,59 +86,59 @@
         themes: [],
         typescript: [ mjbvz ],
         workbench: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-dnd: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-editors: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-electron: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-feedback: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-history: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-layout: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-menu: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-notifications: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-state: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-status: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-tabs: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-title: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-touchbar: {
-            assignees: [ bpasero ],
+            assignees: [],
             assignLabel: false
         },
         workbench-welcome: [ chrmarti ]
diff --git a/.travis.yml b/.travis.yml
index cb271784ad9..8547e3081cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,6 @@ install:
 
 script:
   - node_modules/.bin/gulp electron --silent
-  - node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
   - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
   - ./scripts/test-integration.sh
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 6cb9439d5c7..8ad783bcbe3 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,9 +1,9 @@
 {
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"eg2.tslint",
 		"dbaeumer.vscode-eslint",
 		"msjsdiag.debugger-for-chrome"
 	]
-}
\ No newline at end of file
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5b9bd2fff8b..e55a5f5bd4a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -162,7 +162,7 @@
 		{
 			"type": "extensionHost",
 			"request": "launch",
-			"name": "VS Code Markdown Extension Tests",
+			"name": "Markdown Extension Tests",
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"${workspaceFolder}/extensions/markdown-language-features/test-fixtures",
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index b0e4112b770..4c4a9b9d6b6 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -14,31 +14,31 @@ This project incorporates components from the projects listed below. The origina
 7.	atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
 8.	atom/language-shellscript (https://github.com/atom/language-shellscript)
 9.	atom/language-xml (https://github.com/atom/language-xml)
-10.	Benvie/JavaScriptNext.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
-11.	chjj-marked version 0.3.12 (https://github.com/npmcomponent/chjj-marked)
-12.	chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
-13.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-14.	daaain/Handlebars (https://github.com/daaain/Handlebars)
-15.	davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
-16.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-17.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
-18.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-19.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-20.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-21.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-22.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-23.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
-24.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-25.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-26.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-27.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-28.	language-docker (https://github.com/moby/moby)
-29.	language-go version 0.39.0 (https://github.com/atom/language-go)
-30.	language-less (https://github.com/atom/language-less)
-31.	language-php (https://github.com/atom/language-php)
-32.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
-33.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
-34.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+10.	chjj-marked version 0.3.18 (https://github.com/npmcomponent/chjj-marked)
+11.	chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
+12.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+13.	daaain/Handlebars (https://github.com/daaain/Handlebars)
+14.	davidrios/jade-tmbundle (https://github.com/davidrios/jade-tmbundle)
+15.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+16.	demyte/language-cshtml (https://github.com/demyte/language-cshtml)
+17.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+18.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+19.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+20.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+21.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+22.	Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
+23.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+24.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+27.	language-docker (https://github.com/moby/moby)
+28.	language-go version 0.39.0 (https://github.com/atom/language-go)
+29.	language-less (https://github.com/atom/language-less)
+30.	language-php (https://github.com/atom/language-php)
+31.	language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
+32.	MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
+33.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+34.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
 35.	Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
 36.	mmims/language-batchfile (https://github.com/mmims/language-batchfile)
 37.	octicons-code version 3.1.0 (https://octicons.github.com)
@@ -446,30 +446,6 @@ suitability for any purpose.
 =========================================
 END OF atom/language-xml NOTICES AND INFORMATION
 
-%% Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION BEGIN HERE
-=========================================
-vscode-JSON.tmLanguage
-
-Copyright (c) Microsoft Corporation
-
-All rights reserved.
-
-MIT License
-
-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 Benvie/JavaScriptNext.tmLanguage NOTICES AND INFORMATION
-
 %% chjj-marked NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1326,6 +1302,30 @@ THE SOFTWARE.
 =========================================
 END OF Microsoft/TypeScript-TmLanguage NOTICES AND INFORMATION
 
+%% Microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION BEGIN HERE
+=========================================
+vscode-JSON.tmLanguage
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+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 Microsoft/vscode-JSON.tmLanguage NOTICES AND INFORMATION
+
 %% Microsoft/vscode-mssql NOTICES AND INFORMATION BEGIN HERE
 =========================================
 ------------------------------------------ START OF LICENSE -----------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 3ece36f7a3e..d9471f2a8f8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,6 @@ install:
 build_script:
   - yarn
   - .\node_modules\.bin\gulp electron
-  - .\node_modules\.bin\tsc -p .\src\tsconfig.monaco.json --noEmit
   - npm run compile
 
 test_script:
diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 3244b9f5d70..ca2bcf5144a 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,12 +1,12 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.22.8",
+		"version": "1.23.1",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.22.5",
+		"version": "1.23.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
-]
\ No newline at end of file
+]
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index a2366ec1720..659ef8b3008 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -93,7 +93,7 @@ gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
 gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
 
 gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
-gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function() {
+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function () {
 	standalone.createESMSourcesAndResources({
 		entryPoints: [
 			'vs/editor/editor.main',
@@ -107,7 +107,7 @@ gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], fun
 		}
 	});
 });
-gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function() {
+gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function () {
 	const result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
 		cwd: path.join(__dirname, '../out-editor-esm')
 	});
@@ -235,3 +235,60 @@ function filterStream(testFunc) {
 		this.emit('data', data);
 	});
 }
+
+
+//#region monaco type checking
+
+function createTscCompileTask(watch) {
+	return () => {
+		const createReporter = require('./lib/reporter').createReporter;
+
+		return new Promise((resolve, reject) => {
+			const args = ['./node_modules/.bin/tsc', '-p', './src/tsconfig.monaco.json', '--noEmit'];
+			if (watch) {
+				args.push('-w');
+			}
+			const child = cp.spawn(`node`, args, {
+				cwd: path.join(__dirname, '..'),
+				// stdio: [null, 'pipe', 'inherit']
+			});
+			let errors = [];
+			let reporter = createReporter();
+			let report;
+			let magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
+
+			child.stdout.on('data', data => {
+				let str = String(data);
+				str = str.replace(magic, '').trim();
+				if (str.indexOf('Starting compilation') >= 0 || str.indexOf('File change detected') >= 0) {
+					errors.length = 0;
+					report = reporter.end(false);
+
+				} else if (str.indexOf('Compilation complete') >= 0) {
+					report.end();
+
+				} else if (str) {
+					let match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
+					if (match) {
+						// trying to massage the message so that it matches the gulp-tsb error messages
+						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
+						let fullpath = path.join(root, match[1]);
+						let message = match[3];
+						// @ts-ignore
+						reporter(fullpath + message);
+					} else {
+						// @ts-ignore
+						reporter(str);
+					}
+				}
+			});
+			child.on('exit', resolve);
+			child.on('error', reject);
+		});
+	};
+}
+
+gulp.task('monaco-typecheck-watch', createTscCompileTask(true));
+gulp.task('monaco-typecheck', createTscCompileTask(false));
+
+//#endregion
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index 6b4cdd2855f..5ea1b5c51a4 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -49,7 +49,6 @@ const indentationFilter = [
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/common/winjs.base.js',
 	'!src/vs/base/node/terminateProcess.sh',
-	'!src/vs/base/node/ps-win.ps1',
 	'!test/assert.js',
 
 	// except specific folders
@@ -62,6 +61,7 @@ const indentationFilter = [
 	// except multiple specific files
 	'!**/package.json',
 	'!**/yarn.lock',
+	'!**/yarn-error.log',
 
 	// except multiple specific folders
 	'!**/octicons/**',
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 403d4faad4c..67c8fe08858 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -67,18 +67,19 @@ const vscodeEntryPoints = _.flatten([
 const vscodeResources = [
 	'out-build/main.js',
 	'out-build/cli.js',
+	'out-build/driver.js',
 	'out-build/bootstrap.js',
 	'out-build/bootstrap-amd.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
 	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,ps-win.ps1}',
+	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/electron-browser/bootstrap/**',
 	'out-build/vs/workbench/parts/debug/**/*.json',
 	'out-build/vs/workbench/parts/execution/**/*.scpt',
-	'out-build/vs/workbench/parts/html/electron-browser/webview-pre.js',
+	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
 	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
@@ -87,6 +88,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
+	'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',
 	'!**/test/**'
 ];
 
@@ -275,7 +277,7 @@ function packageTask(platform, arch, opts) {
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
 			.pipe(json({ name, version }));
 
-		const settingsSearchBuildId = getBuildNumber();
+		const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
 		const date = new Date().toISOString();
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json({ commit, date, checksums, settingsSearchBuildId }));
@@ -481,14 +483,12 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
 	}
 
 	if (!fs.existsSync(allConfigDetailsPath)) {
-		console.error(`configuration file at ${allConfigDetailsPath} does not exist`);
-		return;
+		throw new Error(`configuration file at ${allConfigDetailsPath} does not exist`);
 	}
 
-	const settingsSearchBuildId = getBuildNumber();
+	const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
 	if (!settingsSearchBuildId) {
-		console.error('Failed to compute build number');
-		return;
+		throw new Error('Failed to compute build number');
 	}
 
 	return gulp.src(allConfigDetailsPath)
@@ -500,76 +500,18 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
 		}));
 });
 
-function getBuildNumber() {
-	const previous = getPreviousVersion(packageJson.version);
-	if (!previous) {
-		return 0;
-	}
+function getSettingsSearchBuildId(packageJson) {
+	const previous = util.getPreviousVersion(packageJson.version);
 
 	try {
 		const out = cp.execSync(`git rev-list ${previous}..HEAD --count`);
 		const count = parseInt(out.toString());
-		return versionStringToNumber(packageJson.version) * 1e4 + count;
+		return util.versionStringToNumber(packageJson.version) * 1e4 + count;
 	} catch (e) {
-		console.error('Could not determine build number: ' + e.toString());
-		return 0;
+		throw new Error('Could not determine build number: ' + e.toString());
 	}
 }
 
-/**
- * Given 1.17.2, return 1.17.1
- * 1.18.0 => 1.17.2.
- * 2.0.0 => 1.18.0 (or the highest 1.x)
- */
-function getPreviousVersion(versionStr) {
-	function tagExists(tagName) {
-		try {
-			cp.execSync(`git rev-parse ${tagName}`, { stdio: 'ignore' });
-			return true;
-		} catch (e) {
-			return false;
-		}
-	}
-
-	function getLastTagFromBase(semverArr, componentToTest) {
-		const baseVersion = semverArr.join('.');
-		if (!tagExists(baseVersion)) {
-			console.error('Failed to find tag for base version, ' + baseVersion);
-			return null;
-		}
-
-		let goodTag;
-		do {
-			goodTag = semverArr.join('.');
-			semverArr[componentToTest]++;
-		} while (tagExists(semverArr.join('.')));
-
-		return goodTag;
-	}
-
-	const semverArr = versionStr.split('.');
-	if (semverArr[2] > 0) {
-		semverArr[2]--;
-		return semverArr.join('.');
-	} else if (semverArr[1] > 0) {
-		semverArr[1]--;
-		return getLastTagFromBase(semverArr, 2);
-	} else {
-		semverArr[0]--;
-		return getLastTagFromBase(semverArr, 1);
-	}
-}
-
-function versionStringToNumber(versionStr) {
-	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
-	const match = versionStr.match(semverRegex);
-	if (!match) {
-		return 0;
-	}
-
-	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
-}
-
 // This task is only run for the MacOS build
 gulp.task('generate-vscode-configuration', () => {
 	return new Promise((resolve, reject) => {
@@ -601,8 +543,5 @@ gulp.task('generate-vscode-configuration', () => {
 			clearTimeout(timer);
 			reject(err);
 		});
-	}).catch(e => {
-		// Don't fail the build
-		console.error(e.toString());
 	});
 });
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index 61c178b392e..998ebb4f379 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -22,7 +22,7 @@ var rootDir = path.join(__dirname, '../../src');
 var options = require('../../src/tsconfig.json').compilerOptions;
 options.verbose = false;
 options.sourceMap = true;
-if (process.env['VSCODE_NO_SOURCEMAP']) {
+if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
     options.sourceMap = false;
 }
 options.rootDir = rootDir;
diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index 31282b6c5bb..61893ed8b1d 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -1046,7 +1046,10 @@ function createI18nFile(originalFilePath, messages) {
         var key = _a[_i];
         result[key] = messages[key];
     }
-    var content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+    var content = JSON.stringify(result, null, '\t');
+    if (process.platform === 'win32') {
+        content = content.replace(/\n/g, '\r\n');
+    }
     return new File({
         path: path.join(originalFilePath + '.i18n.json'),
         contents: Buffer.from(content, 'utf8')
@@ -1080,7 +1083,7 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse
                         extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} };
                     }
                     var externalId = externalExtensions[resource];
-                    if (!externalId) {
+                    if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent
                         var secondSlash = path.indexOf('/', firstSlash + 1);
                         extPack.contents[path.substr(secondSlash + 1)] = file.messages;
                     }
diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json
index 9de72cc968d..4cf0bc4cf6a 100644
--- a/build/lib/i18n.resources.json
+++ b/build/lib/i18n.resources.json
@@ -130,6 +130,10 @@
 			"name": "vs/workbench/parts/update",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/url",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/watermark",
 			"project": "vscode-workbench"
@@ -209,6 +213,10 @@
 		{
 			"name": "vs/workbench/services/decorations",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/preferences",
+			"project": "vscode-preferences"
 		}
 	]
-}
+}
\ No newline at end of file
diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index 7c5899ac953..06b51be8767 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -1171,7 +1171,10 @@ function createI18nFile(originalFilePath: string, messages: any): File {
 		result[key] = messages[key];
 	}
 
-	let content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+	let content = JSON.stringify(result, null, '\t');
+	if (process.platform === 'win32') {
+		content = content.replace(/\n/g, '\r\n');
+	}
 	return new File({
 		path: path.join(originalFilePath + '.i18n.json'),
 		contents: Buffer.from(content, 'utf8')
diff --git a/build/lib/nls.js b/build/lib/nls.js
index 7f2730ec891..a63d3699014 100644
--- a/build/lib/nls.js
+++ b/build/lib/nls.js
@@ -150,13 +150,16 @@ function isImportNode(node) {
             .filter(function (d) { return d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport; })
             .map(function (d) { return d.importClause.namedBindings.name; })
             .concat(importEqualsDeclarations.map(function (d) { return d.name; }))
+            // find read-only references to `nls`
             .map(function (n) { return service.getReferencesAtPosition(filename, n.pos + 1); })
             .flatten()
             .filter(function (r) { return !r.isWriteAccess; })
+            // find the deepest call expressions AST nodes that contain those references
             .map(function (r) { return collect(sourceFile, function (n) { return isCallExpressionWithinTextSpanCollectStep(r.textSpan, n); }); })
             .map(function (a) { return lazy(a).last(); })
             .filter(function (n) { return !!n; })
             .map(function (n) { return n; })
+            // only `localize` calls
             .filter(function (n) { return n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === 'localize'; });
         // `localize` named imports
         var allLocalizeImportDeclarations = importDeclarations
diff --git a/build/lib/reporter.js b/build/lib/reporter.js
index 93fd65351df..7dc3f50e038 100644
--- a/build/lib/reporter.js
+++ b/build/lib/reporter.js
@@ -34,7 +34,13 @@ catch (err) {
 }
 function log() {
     var errors = _.flatten(allErrors);
-    errors.map(function (err) { return util.log(util.colors.red('Error') + ": " + err); });
+    var seen = new Set();
+    errors.map(function (err) {
+        if (!seen.has(err)) {
+            seen.add(err);
+            util.log(util.colors.red('Error') + ": " + err);
+        }
+    });
     var regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
     var messages = errors
         .map(function (err) { return regex.exec(err); })
@@ -80,4 +86,3 @@ function createReporter() {
     return ReportFunc;
 }
 exports.createReporter = createReporter;
-;
diff --git a/build/lib/reporter.ts b/build/lib/reporter.ts
index e072a60bbfd..e4be8549ddb 100644
--- a/build/lib/reporter.ts
+++ b/build/lib/reporter.ts
@@ -11,7 +11,7 @@ import * as util from 'gulp-util';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const allErrors: Error[][] = [];
+const allErrors: string[][] = [];
 let startTime: number = null;
 let count = 0;
 
@@ -42,7 +42,14 @@ try {
 
 function log(): void {
 	const errors = _.flatten(allErrors);
-	errors.map(err => util.log(`${util.colors.red('Error')}: ${err}`));
+	const seen = new Set<string>();
+
+	errors.map(err => {
+		if (!seen.has(err)) {
+			seen.add(err);
+			util.log(`${util.colors.red('Error')}: ${err}`);
+		}
+	});
 
 	const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
 	const messages = errors
@@ -61,17 +68,17 @@ function log(): void {
 }
 
 export interface IReporter {
-	(err: Error): void;
+	(err: string): void;
 	hasErrors(): boolean;
 	end(emitError: boolean): NodeJS.ReadWriteStream;
 }
 
 export function createReporter(): IReporter {
-	const errors: Error[] = [];
+	const errors: string[] = [];
 	allErrors.push(errors);
 
 	class ReportFunc {
-		constructor(err: Error) {
+		constructor(err: string) {
 			errors.push(err);
 		}
 
@@ -97,4 +104,4 @@ export function createReporter(): IReporter {
 	}
 
 	return <IReporter><any>ReportFunc;
-};
+}
diff --git a/build/lib/test/util.test.js b/build/lib/test/util.test.js
new file mode 100644
index 00000000000..ef0616173b6
--- /dev/null
+++ b/build/lib/test/util.test.js
@@ -0,0 +1,56 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+var assert = require("assert");
+var util = require("../util");
+function getMockTagExists(tags) {
+    return function (tag) { return tags.indexOf(tag) >= 0; };
+}
+suite('util tests', function () {
+    test('getPreviousVersion - patch', function () {
+        assert.equal(util.getPreviousVersion('1.2.3', getMockTagExists(['1.2.2', '1.2.1', '1.2.0', '1.1.0'])), '1.2.2');
+    });
+    test('getPreviousVersion - patch invalid', function () {
+        try {
+            util.getPreviousVersion('1.2.2', getMockTagExists(['1.2.0', '1.1.0']));
+        }
+        catch (e) {
+            // expected
+            return;
+        }
+        throw new Error('Expected an exception');
+    });
+    test('getPreviousVersion - minor', function () {
+        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.2', '1.1.3'])), '1.1.3');
+        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.0.0'])), '1.1.0');
+    });
+    test('getPreviousVersion - minor gap', function () {
+        assert.equal(util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.3'])), '1.1.1');
+    });
+    test('getPreviousVersion - minor invalid', function () {
+        try {
+            util.getPreviousVersion('1.2.0', getMockTagExists(['1.0.0']));
+        }
+        catch (e) {
+            // expected
+            return;
+        }
+        throw new Error('Expected an exception');
+    });
+    test('getPreviousVersion - major', function () {
+        assert.equal(util.getPreviousVersion('2.0.0', getMockTagExists(['1.0.0', '1.1.0', '1.2.0', '1.2.1', '1.2.2'])), '1.2.2');
+    });
+    test('getPreviousVersion - major invalid', function () {
+        try {
+            util.getPreviousVersion('3.0.0', getMockTagExists(['1.0.0']));
+        }
+        catch (e) {
+            // expected
+            return;
+        }
+        throw new Error('Expected an exception');
+    });
+});
diff --git a/build/lib/test/util.test.ts b/build/lib/test/util.test.ts
new file mode 100644
index 00000000000..928e730f06c
--- /dev/null
+++ b/build/lib/test/util.test.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert = require('assert');
+import util = require('../util');
+
+function getMockTagExists(tags: string[]) {
+	return (tag: string) => tags.indexOf(tag) >= 0;
+}
+
+suite('util tests', () => {
+	test('getPreviousVersion - patch', () => {
+		assert.equal(
+			util.getPreviousVersion('1.2.3', getMockTagExists(['1.2.2', '1.2.1', '1.2.0', '1.1.0'])),
+			'1.2.2'
+		);
+	});
+
+	test('getPreviousVersion - patch invalid', () => {
+		try {
+			util.getPreviousVersion('1.2.2', getMockTagExists(['1.2.0', '1.1.0']));
+		} catch (e) {
+			// expected
+			return;
+		}
+
+		throw new Error('Expected an exception');
+	});
+
+	test('getPreviousVersion - minor', () => {
+		assert.equal(
+			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.2', '1.1.3'])),
+			'1.1.3'
+		);
+
+		assert.equal(
+			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.0.0'])),
+			'1.1.0'
+		);
+	});
+
+	test('getPreviousVersion - minor gap', () => {
+		assert.equal(
+			util.getPreviousVersion('1.2.0', getMockTagExists(['1.1.0', '1.1.1', '1.1.3'])),
+			'1.1.1'
+		);
+	});
+
+	test('getPreviousVersion - minor invalid', () => {
+		try {
+			util.getPreviousVersion('1.2.0', getMockTagExists(['1.0.0']));
+		} catch (e) {
+			// expected
+			return;
+		}
+
+		throw new Error('Expected an exception');
+	});
+
+	test('getPreviousVersion - major', () => {
+		assert.equal(
+			util.getPreviousVersion('2.0.0', getMockTagExists(['1.0.0', '1.1.0', '1.2.0', '1.2.1', '1.2.2'])),
+			'1.2.2'
+		);
+	});
+
+	test('getPreviousVersion - major invalid', () => {
+		try {
+			util.getPreviousVersion('3.0.0', getMockTagExists(['1.0.0']));
+		} catch (e) {
+			// expected
+			return;
+		}
+
+		throw new Error('Expected an exception');
+	});
+});
diff --git a/build/lib/tslint/translationRemindRule.js b/build/lib/tslint/translationRemindRule.js
index 1409dc54951..ec56aff1535 100644
--- a/build/lib/tslint/translationRemindRule.js
+++ b/build/lib/tslint/translationRemindRule.js
@@ -71,7 +71,7 @@ var TranslationRemindRuleWalker = /** @class */ (function (_super) {
             }
         });
         if (!resourceDefined) {
-            this.addFailureAtNode(node, "Please add '" + resource + "' to ./builds/lib/i18n.resources.json file to use translations here.");
+            this.addFailureAtNode(node, "Please add '" + resource + "' to ./build/lib/i18n.resources.json file to use translations here.");
         }
     };
     TranslationRemindRuleWalker.NLS_MODULE = 'vs/nls';
diff --git a/build/lib/tslint/translationRemindRule.ts b/build/lib/tslint/translationRemindRule.ts
index 6bc2a191619..2c5adcc4c49 100644
--- a/build/lib/tslint/translationRemindRule.ts
+++ b/build/lib/tslint/translationRemindRule.ts
@@ -67,7 +67,7 @@ class TranslationRemindRuleWalker extends Lint.RuleWalker {
 		});
 
 		if (!resourceDefined) {
-			this.addFailureAtNode(node, `Please add '${resource}' to ./builds/lib/i18n.resources.json file to use translations here.`);
+			this.addFailureAtNode(node, `Please add '${resource}' to ./build/lib/i18n.resources.json file to use translations here.`);
 		}
 	}
 }
diff --git a/build/lib/util.js b/build/lib/util.js
index 245ee13ae82..1a2d40327cd 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -14,6 +14,7 @@ var fs = require("fs");
 var _rimraf = require("rimraf");
 var git = require("./git");
 var VinylFile = require("vinyl");
+var cp = require("child_process");
 var NoCancellationToken = { isCancellationRequested: function () { return false; } };
 function incremental(streamProvider, initial, supportsCancellation) {
     var input = es.through();
@@ -210,3 +211,68 @@ function filter(fn) {
     return result;
 }
 exports.filter = filter;
+function tagExists(tagName) {
+    try {
+        cp.execSync("git rev-parse " + tagName, { stdio: 'ignore' });
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+/**
+ * Returns the version previous to the given version. Throws if a git tag for that version doesn't exist.
+ * Given 1.17.2, return 1.17.1
+ * 1.18.0 => 1.17.2. (or the highest 1.17.x)
+ * 2.0.0 => 1.18.0 (or the highest 1.x)
+ */
+function getPreviousVersion(versionStr, _tagExists) {
+    if (_tagExists === void 0) { _tagExists = tagExists; }
+    function getLatestTagFromBase(semverArr, componentToTest) {
+        var baseVersion = semverArr.join('.');
+        if (!_tagExists(baseVersion)) {
+            throw new Error('Failed to find git tag for base version, ' + baseVersion);
+        }
+        var goodTag;
+        do {
+            goodTag = semverArr.join('.');
+            semverArr[componentToTest]++;
+        } while (_tagExists(semverArr.join('.')));
+        return goodTag;
+    }
+    var semverArr = versionStringToNumberArray(versionStr);
+    if (semverArr[2] > 0) {
+        semverArr[2]--;
+        var previous = semverArr.join('.');
+        if (!_tagExists(previous)) {
+            throw new Error('Failed to find git tag for previous version, ' + previous);
+        }
+        return previous;
+    }
+    else if (semverArr[1] > 0) {
+        semverArr[1]--;
+        return getLatestTagFromBase(semverArr, 2);
+    }
+    else {
+        semverArr[0]--;
+        // Find 1.x.0 for latest x
+        var latestMinorVersion = getLatestTagFromBase(semverArr, 1);
+        // Find 1.x.y for latest y
+        return getLatestTagFromBase(versionStringToNumberArray(latestMinorVersion), 2);
+    }
+}
+exports.getPreviousVersion = getPreviousVersion;
+function versionStringToNumberArray(versionStr) {
+    return versionStr
+        .split('.')
+        .map(function (s) { return parseInt(s); });
+}
+function versionStringToNumber(versionStr) {
+    var semverRegex = /(\d+)\.(\d+)\.(\d+)/;
+    var match = versionStr.match(semverRegex);
+    if (!match) {
+        throw new Error('Version string is not properly formatted: ' + versionStr);
+    }
+    return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
+}
+exports.versionStringToNumber = versionStringToNumber;
diff --git a/build/lib/util.ts b/build/lib/util.ts
index bae298f5f05..9dcbbe72484 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -17,6 +17,7 @@ import * as git from './git';
 import * as VinylFile from 'vinyl';
 import { ThroughStream } from 'through';
 import * as sm from 'source-map';
+import * as cp from 'child_process';
 
 export interface ICancellationToken {
 	isCancellationRequested(): boolean;
@@ -268,4 +269,74 @@ export function filter(fn: (data: any) => boolean): FilterStream {
 
 	result.restore = es.through();
 	return result;
-}
\ No newline at end of file
+}
+
+function tagExists(tagName: string): boolean {
+	try {
+		cp.execSync(`git rev-parse ${tagName}`, { stdio: 'ignore' });
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+/**
+ * Returns the version previous to the given version. Throws if a git tag for that version doesn't exist.
+ * Given 1.17.2, return 1.17.1
+ * 1.18.0 => 1.17.2. (or the highest 1.17.x)
+ * 2.0.0 => 1.18.0 (or the highest 1.x)
+ */
+export function getPreviousVersion(versionStr: string, _tagExists = tagExists) {
+	function getLatestTagFromBase(semverArr: number[], componentToTest: number): string {
+		const baseVersion = semverArr.join('.');
+		if (!_tagExists(baseVersion)) {
+			throw new Error('Failed to find git tag for base version, ' + baseVersion);
+		}
+
+		let goodTag;
+		do {
+			goodTag = semverArr.join('.');
+			semverArr[componentToTest]++;
+		} while (_tagExists(semverArr.join('.')));
+
+		return goodTag;
+	}
+
+	const semverArr = versionStringToNumberArray(versionStr);
+	if (semverArr[2] > 0) {
+		semverArr[2]--;
+		const previous = semverArr.join('.');
+		if (!_tagExists(previous)) {
+			throw new Error('Failed to find git tag for previous version, ' + previous);
+		}
+
+		return previous;
+	} else if (semverArr[1] > 0) {
+		semverArr[1]--;
+		return getLatestTagFromBase(semverArr, 2);
+	} else {
+		semverArr[0]--;
+
+		// Find 1.x.0 for latest x
+		const latestMinorVersion = getLatestTagFromBase(semverArr, 1);
+
+		// Find 1.x.y for latest y
+		return getLatestTagFromBase(versionStringToNumberArray(latestMinorVersion), 2);
+	}
+}
+
+function versionStringToNumberArray(versionStr: string): number[] {
+	return versionStr
+		.split('.')
+		.map(s => parseInt(s));
+}
+
+export function versionStringToNumber(versionStr: string) {
+	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
+	const match = versionStr.match(semverRegex);
+	if (!match) {
+		throw new Error('Version string is not properly formatted: ' + versionStr);
+	}
+
+	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
+}
diff --git a/build/monaco/package.json b/build/monaco/package.json
index 958b4ee71c3..256ca1ff534 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,16 +1,17 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.11.7",
+  "version": "0.12.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
+  "typings": "./esm/vs/editor/editor.api.d.ts",
   "module": "./esm/vs/editor/editor.main.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/vscode"
   },
-   "bugs": {
+  "bugs": {
     "url": "https://github.com/Microsoft/vscode/issues"
   }
 }
diff --git a/build/package.json b/build/package.json
index 2d8dc9089f0..ade3af750cb 100644
--- a/build/package.json
+++ b/build/package.json
@@ -9,12 +9,15 @@
     "@types/mime": "0.0.29",
     "@types/node": "8.0.33",
     "@types/xml2js": "0.0.33",
+    "@types/request": "^2.47.0",
     "azure-storage": "^2.1.0",
     "documentdb": "1.13.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.7.2",
-    "xml2js": "^0.4.17"
+    "typescript": "2.8.1",
+    "xml2js": "^0.4.17",
+    "github-releases": "^0.4.1",
+    "request": "^2.85.0"
   },
   "scripts": {
     "compile": "tsc -p tsconfig.build.json",
diff --git a/build/tfs/common/symbols.ts b/build/tfs/common/symbols.ts
new file mode 100644
index 00000000000..eac0d610b73
--- /dev/null
+++ b/build/tfs/common/symbols.ts
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as request from 'request';
+import { createReadStream, createWriteStream, unlink, mkdir } from 'fs';
+import * as github from 'github-releases';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { promisify } from 'util';
+
+const BASE_URL = 'https://rink.hockeyapp.net/api/2/';
+const HOCKEY_APP_TOKEN_HEADER = 'X-HockeyAppToken';
+
+export interface IVersions {
+	app_versions: IVersion[];
+}
+
+export interface IVersion {
+	id: number;
+	version: string;
+}
+
+export interface IApplicationAccessor {
+	accessToken: string;
+	appId: string;
+}
+
+export interface IVersionAccessor extends IApplicationAccessor {
+	id: string;
+}
+
+enum Platform {
+	WIN_32 = 'win32-ia32',
+	WIN_64 = 'win32-x64',
+	LINUX_32 = 'linux-ia32',
+	LINUX_64 = 'linux-x64',
+	MAC_OS = 'darwin-x64'
+}
+
+function symbolsZipName(platform: Platform, electronVersion: string, insiders: boolean): string {
+	return `${insiders ? 'insiders' : 'stable'}-symbols-v${electronVersion}-${platform}.zip`;
+}
+
+const SEED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+async function tmpFile(name: string): Promise<string> {
+	let res = '';
+	for (let i = 0; i < 8; i++) {
+		res += SEED.charAt(Math.floor(Math.random() * SEED.length));
+	}
+
+	const tmpParent = join(tmpdir(), res);
+
+	await promisify(mkdir)(tmpParent);
+
+	return join(tmpParent, name);
+}
+
+function getVersions(accessor: IApplicationAccessor): Promise<IVersions> {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions`,
+		method: 'GET',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		}
+	});
+}
+
+function createVersion(accessor: IApplicationAccessor, version: string): Promise<IVersion> {
+	return asyncRequest<IVersion>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/new`,
+		method: 'POST',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			bundle_version: version
+		}
+	});
+}
+
+function updateVersion(accessor: IVersionAccessor, symbolsPath: string) {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/${accessor.id}`,
+		method: 'PUT',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			dsym: createReadStream(symbolsPath)
+		}
+	});
+}
+
+function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		request(options, (error, response, body) => {
+			if (error) {
+				reject(error);
+			} else {
+				resolve(JSON.parse(body));
+			}
+		});
+	});
+}
+
+function downloadAsset(repository, assetName: string, targetPath: string, electronVersion: string) {
+	return new Promise((resolve, reject) => {
+		repository.getReleases({ tag_name: `v${electronVersion}` }, (err, releases) => {
+			if (err) {
+				reject(err);
+			} else {
+				const asset = releases[0].assets.filter(asset => asset.name === assetName)[0];
+				if (!asset) {
+					reject(new Error(`Asset with name ${assetName} not found`));
+				} else {
+					repository.downloadAsset(asset, (err, reader) => {
+						if (err) {
+							reject(err);
+						} else {
+							const writer = createWriteStream(targetPath);
+							writer.on('error', reject);
+							writer.on('close', resolve);
+							reader.on('error', reject);
+
+							reader.pipe(writer);
+						}
+					});
+				}
+			}
+		});
+	});
+}
+
+interface IOptions {
+	repository: string;
+	platform: Platform;
+	versions: { code: string; insiders: boolean; electron: string; };
+	access: { hockeyAppToken: string; hockeyAppId: string; githubToken: string };
+}
+
+async function ensureVersionAndSymbols(options: IOptions) {
+
+	// Check version does not exist
+	console.log(`HockeyApp: checking for existing version ${options.versions.code} (${options.platform})`);
+	const versions = await getVersions({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId });
+	if (versions.app_versions.some(v => v.version === options.versions.code)) {
+		console.log(`HockeyApp: Returning without uploading symbols because version ${options.versions.code} (${options.platform}) was already found`);
+		return;
+	}
+
+	// Download symbols for platform and electron version
+	const symbolsName = symbolsZipName(options.platform, options.versions.electron, options.versions.insiders);
+	const symbolsPath = await tmpFile('symbols.zip');
+	console.log(`HockeyApp: downloading symbols ${symbolsName} for electron ${options.versions.electron} (${options.platform}) into ${symbolsPath}`);
+	await downloadAsset(new github({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);
+
+	// Create version
+	console.log(`HockeyApp: creating new version ${options.versions.code} (${options.platform})`);
+	const version = await createVersion({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, options.versions.code);
+
+	// Upload symbols
+	console.log(`HockeyApp: uploading symbols for version ${options.versions.code} (${options.platform})`);
+	await updateVersion({ id: String(version.id), accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, symbolsPath);
+
+	// Cleanup
+	await promisify(unlink)(symbolsPath);
+}
+
+// Environment
+const pakage = require('../../../package.json');
+const product = require('../../../product.json');
+const repository = product.electronRepository;
+const electronVersion = require('../../lib/electron').getElectronVersion();
+const insiders = product.quality !== 'stable';
+let codeVersion = pakage.version;
+if (insiders) {
+	codeVersion = `${codeVersion}-insider`;
+}
+const githubToken = process.argv[2];
+const hockeyAppToken = process.argv[3];
+const is64 = process.argv[4] === 'x64';
+const hockeyAppId = process.argv[5];
+
+let platform: Platform;
+if (process.platform === 'darwin') {
+	platform = Platform.MAC_OS;
+} else if (process.platform === 'win32') {
+	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
+} else {
+	platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
+}
+
+// Create version and upload symbols in HockeyApp
+if (repository && codeVersion && electronVersion && (product.quality === 'stable' || product.quality === 'insider')) {
+	ensureVersionAndSymbols({
+		repository,
+		platform,
+		versions: {
+			code: codeVersion,
+			insiders,
+			electron: electronVersion
+		},
+		access: {
+			githubToken,
+			hockeyAppToken,
+			hockeyAppId
+		}
+	}).then(() => {
+		console.log('HockeyApp: done');
+	}).catch(error => {
+		console.error(`HockeyApp: error (${error})`);
+	});
+} else {
+	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);
+}
\ No newline at end of file
diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml
index b5333d7de8d..107c7ff9cdd 100644
--- a/build/tfs/continuous-build.yml
+++ b/build/tfs/continuous-build.yml
@@ -9,26 +9,34 @@ phases:
     inputs:
       versionSpec: "1.3.2"
   - powershell: |
+      $ErrorActionPreference = "Stop"
       yarn
       .\node_modules\.bin\gulp electron
       npm run gulp -- hygiene
       .\node_modules\.bin\tsc -p .\src\tsconfig.monaco.json --noEmit
       npm run compile
+      node build/lib/builtInExtensions.js
     name: build
   - powershell: |
+      $ErrorActionPreference = "Stop"
       .\scripts\test.bat --tfs
       .\scripts\test-integration.bat
+      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
     name: test
-  - task: PublishTestResults@2
+  - task: PublishBuildArtifacts@1
     inputs:
-      testResultsFiles: '.build\tests\unit-test-results.xml'
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+      ArtifactName: build-artifacts-win32
+      publishLocation: Container
+    condition: succeededOrFailed()
 
 - phase: Linux
   queue: Hosted Linux Preview
   steps:
   - script: |
+      set -e
       apt-get update
-      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb
+      apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
       cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
       chmod +x /etc/init.d/xvfb
       update-rc.d xvfb defaults
@@ -42,20 +50,21 @@ phases:
     inputs:
       versionSpec: "1.3.2"
   - script: |
+      set -e
       yarn
       npm run gulp -- electron-x64
   - script: |
+      set -e
       npm run gulp -- hygiene
       ./node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
       npm run compile
+      node build/lib/builtInExtensions.js
     name: build
   - script: |
+      set -e
       DISPLAY=:10 ./scripts/test.sh --tfs
       # DISPLAY=:10 ./scripts/test-integration.sh
     name: test
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '.build/tests/unit-test-results.xml'
 
 - phase: macOS
   queue: Hosted macOS Preview
@@ -67,17 +76,25 @@ phases:
     inputs:
       versionSpec: "1.3.2"
   - script: |
+      set -e
       yarn
       npm run gulp -- electron-x64
   - script: |
+      set -e
       npm run gulp -- hygiene
       ./node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
       npm run compile
+      node build/lib/builtInExtensions.js
     name: build
   - script: |
+      set -e
       ./scripts/test.sh --tfs
       ./scripts/test-integration.sh
+      yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
     name: test
-  - task: PublishTestResults@2
+  - task: PublishBuildArtifacts@1
     inputs:
-      testResultsFiles: '.build/tests/unit-test-results.xml'
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+      ArtifactName: build-artifacts-darwin
+      publishLocation: Container
+    condition: succeededOrFailed()
\ No newline at end of file
diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 5becec89bca..2a0f41bb644 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -29,6 +29,7 @@ phases:
       $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
       npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - powershell: |
       $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
@@ -39,6 +40,7 @@ phases:
   - powershell: |
       npm run gulp -- "electron-$(VSCODE_ARCH)"
       .\scripts\test.bat --build --tfs
+      # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
     name: test
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -55,11 +57,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "PageHash",
@@ -79,11 +81,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "Append",
@@ -137,11 +139,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "PageHash",
@@ -161,11 +163,11 @@ phases:
             "parameters": [
               {
                 "parameterName": "OpusName",
-                "parameterValue": "Microsoft"
+                "parameterValue": "VS Code"
               },
               {
                 "parameterName": "OpusInfo",
-                "parameterValue": "http://www.microsoft.com"
+                "parameterValue": "https://code.visualstudio.com/"
               },
               {
                 "parameterName": "Append",
@@ -222,80 +224,17 @@ phases:
       node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip
       node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $Exe
 
+      # publish hockeyapp symbols
+      $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
+      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId
+
 - phase: Linux
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
-  queue:
-    name: Hosted Linux Preview
-    parallel: 2
-    matrix:
-      x64:
-        VSCODE_ARCH: x64
-      ia32:
-        VSCODE_ARCH: ia32
+  queue: linux-x64
+  variables:
+    VSCODE_ARCH: x64
 
   steps:
-  - script: |
-      # dependencies
-      dpkg --add-architecture i386
-      apt-get update
-
-      DEPS=" \
-        gcc-multilib g++-multilib \
-        pkg-config \
-        dbus \
-        xvfb \
-        fakeroot \
-        bc \
-        bsdmainutils \
-        rpm \
-      "
-
-      if [[ "$(VSCODE_ARCH)" == "x64" ]]; then
-        DEPS="$DEPS \
-          dpkg-dev \
-          libgconf-2-4 \
-          libnss3 \
-          libasound2 \
-          libxtst6 \
-          libx11-dev \
-          libxkbfile-dev \
-          libxss1 \
-          libx11-xcb-dev \
-          libsecret-1-dev \
-        "
-      else
-        DEPS="$DEPS \
-          dpkg-dev:i386 \
-          libgconf-2-4:i386 \
-          libnss3:i386 \
-          libasound2:i386 \
-          libxtst6:i386 \
-          libnotify4:i386 \
-          libx11-dev:i386 \
-          libxkbfile-dev:i386 \
-          libxss1:i386 \
-          libx11-xcb-dev:i386 \
-          libgl1-mesa-glx:i386 libgl1-mesa-dri:i386 \
-          libgirepository-1.0-1:i386 \
-          gir1.2-glib-2.0:i386 \
-          gir1.2-secret-1:i386 \
-          libsecret-1-dev:i386 \
-          libgtk2.0-0:i386 \
-        "
-      fi
-
-      apt-get install -y $DEPS
-
-      # setup xvfb
-      cp build/tfs/linux/$(VSCODE_ARCH)/xvfb.init /etc/init.d/xvfb
-      chmod +x /etc/init.d/xvfb
-      update-rc.d xvfb defaults
-      service xvfb start
-
-      # setup dbus
-      ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
-      service dbus start
-
   - task: NodeTool@0
     inputs:
       versionSpec: "8.9.1"
@@ -316,6 +255,7 @@ phases:
       npm run monaco-compile-check
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - script: |
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
@@ -324,6 +264,7 @@ phases:
   - script: |
       npm run gulp -- "electron-$(VSCODE_ARCH)"
       DISPLAY=:10 ./scripts/test.sh --build --tfs
+      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
     name: test
 
   - script: |
@@ -336,6 +277,61 @@ phases:
       MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
       ./build/tfs/linux/release2.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
 
+      # publish hockeyapp symbols
+      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
+
+- phase: Linux32
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  queue: linux-ia32
+  variables:
+    VSCODE_ARCH: ia32
+
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "8.9.1"
+
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+    inputs:
+      versionSpec: "1.3.2"
+
+  - script: |
+      export npm_config_arch="$(VSCODE_ARCH)"
+      if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
+        export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+      fi
+
+      echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+      yarn
+      npm run gulp -- hygiene
+      npm run monaco-compile-check
+      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+      node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
+
+  - script: |
+      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
+    name: build
+
+  - script: |
+      npm run gulp -- "electron-$(VSCODE_ARCH)"
+      DISPLAY=:10 ./scripts/test.sh --build --tfs
+      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+    name: test
+
+  - script: |
+      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
+      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+      #npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-snap"
+
+      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+      MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+      ./build/tfs/linux/release2.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
+
+      # publish hockeyapp symbols
+      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX32)"
+
 - phase: macOS
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
   queue: Hosted macOS Preview
@@ -355,6 +351,7 @@ phases:
       npm run monaco-compile-check
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
       node build/tfs/common/installDistro.js
+      node build/lib/builtInExtensions.js
 
   - script: |
       VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
@@ -364,6 +361,8 @@ phases:
 
   - script: |
       ./scripts/test.sh --build --tfs
+      APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
+      # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
     name: test
 
   - script: |
@@ -385,6 +384,9 @@ phases:
         false \
         ../VSCode-darwin-unsigned.zip
 
+      # publish hockeyapp symbols
+      node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
+
       # enqueue the unsigned build
       AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
       AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
diff --git a/build/win32/OSSREADME.json b/build/win32/OSSREADME.json
index cbcef582e54..10f47d06684 100755
--- a/build/win32/OSSREADME.json
+++ b/build/win32/OSSREADME.json
@@ -1,10 +1,10 @@
 [
 	{
-		"name": "rust-lang-nursery/lazy-static.rs",
-		"version": "1.0.0",
-		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
+		"name": "rust-lang/libc",
+		"version": "0.2.36",
+		"repositoryUrl": "https://github.com/rust-lang/libc",
 		"licenseDetail": [
-			"Copyright (c) 2010 The Rust Project Developers",
+			"Copyright (c) 2014 The Rust Project Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any",
 			"person obtaining a copy of this software and associated",
@@ -32,6 +32,33 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.4.0",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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": "rust-num/num",
 		"version": "0.1.41",
@@ -65,6 +92,35 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "BurntSushi/byteorder",
+		"version": "1.2.1",
+		"repositoryUrl": "https://github.com/BurntSushi/byteorder",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2015 Andrew Gallant",
+			"",
+			"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": "dtolnay/isatty",
 		"version": "0.1.6",
@@ -98,6 +154,72 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "rust-lang-nursery/lazy-static.rs",
+		"version": "1.0.0",
+		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
+		"licenseDetail": [
+			"Copyright (c) 2010 The Rust Project Developers",
+			"",
+			"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": "rust-num/num-integer",
+		"version": "0.1.35",
+		"repositoryUrl": "https://github.com/rust-num/num-integer",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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": "retep998/winapi-rs",
 		"version": "0.2.2",
@@ -126,100 +248,9 @@
 		"isProd": true
 	},
 	{
-		"name": "BurntSushi/byteorder",
-		"version": "1.2.1",
-		"repositoryUrl": "https://github.com/BurntSushi/byteorder",
-		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2015 Andrew Gallant",
-			"",
-			"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": "rust-num/num-integer",
-		"version": "0.1.35",
-		"repositoryUrl": "https://github.com/rust-num/num-integer",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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": "mrhooray/crc-rs",
-		"version": "1.7.0",
-		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 crc-rs Developers",
-			"",
-			"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": "rust-lang/libc",
-		"version": "0.2.36",
-		"repositoryUrl": "https://github.com/rust-lang/libc",
+		"name": "rust-num/num-iter",
+		"version": "0.1.34",
+		"repositoryUrl": "https://github.com/rust-num/num-iter",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -283,9 +314,9 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-num/num-iter",
-		"version": "0.1.34",
-		"repositoryUrl": "https://github.com/rust-num/num-iter",
+		"name": "slog-rs/slog",
+		"version": "2.1.1",
+		"repositoryUrl": "https://github.com/slog-rs/slog",
 		"licenseDetail": [
 			"Copyright (c) 2014 The Rust Project Developers",
 			"",
@@ -316,35 +347,60 @@
 		"isProd": true
 	},
 	{
-		"name": "slog-rs/slog",
-		"version": "2.1.1",
-		"repositoryUrl": "https://github.com/slog-rs/slog",
+		"name": "Sgeo/take_mut",
+		"version": "0.2.0",
+		"repositoryUrl": "https://github.com/Sgeo/take_mut",
 		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
+			"The MIT License (MIT)",
 			"",
-			"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:",
+			"Copyright (c) 2016 Sgeo",
 			"",
-			"The above copyright notice and this permission notice",
-			"shall be included in all copies or substantial portions",
-			"of 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 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."
+			"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": "redox-os/termios",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/redox-os/termios",
+		"licenseDetail": [
+			"MIT License",
+			"",
+			"Copyright (c) 2017 Redox OS",
+			"",
+			"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
 	},
@@ -379,75 +435,13 @@
 		"isProd": true
 	},
 	{
-		"name": "Stebalien/term",
-		"version": "0.4.6",
-		"repositoryUrl": "https://github.com/Stebalien/term",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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": "redox-os/termios",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/redox-os/termios",
+		"name": "mrhooray/crc-rs",
+		"version": "1.7.0",
+		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
 		"licenseDetail": [
 			"MIT License",
 			"",
-			"Copyright (c) 2017 Redox OS",
-			"",
-			"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": "Sgeo/take_mut",
-		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/Sgeo/take_mut",
-		"licenseDetail": [
-			"The MIT License (MIT)",
-			"",
-			"Copyright (c) 2016 Sgeo",
+			"Copyright (c) 2017 crc-rs Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -560,39 +554,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "rust-lang/time",
-		"version": "0.1.39",
-		"repositoryUrl": "https://github.com/rust-lang/time",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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": "chronotope/chrono",
 		"version": "0.4.0",
@@ -868,29 +829,35 @@
 		"isProd": true
 	},
 	{
-		"name": "retep998/winapi-rs",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"name": "rust-lang/time",
+		"version": "0.1.39",
+		"repositoryUrl": "https://github.com/rust-lang/time",
 		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
+			"Copyright (c) 2014 The Rust Project Developers",
 			"",
-			"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:",
+			"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 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."
+			"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
 	},
@@ -948,33 +915,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.4.0",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"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": "retep998/winapi-rs",
 		"version": "0.3.4",
@@ -1002,33 +942,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.4.0",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"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": "slog-rs/async",
 		"version": "2.2.0",
@@ -1790,5 +1703,92 @@
 			"  defined by the Mozilla Public License, v. 2.0."
 		],
 		"isProd": true
+	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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": "retep998/winapi-rs",
+		"version": "0.4.0",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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": "Stebalien/term",
+		"version": "0.4.6",
+		"repositoryUrl": "https://github.com/Stebalien/term",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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
 	}
 ]
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index c216c404332..b69182a7e91 100755
Binary files a/build/win32/inno_updater.exe and b/build/win32/inno_updater.exe differ
diff --git a/build/yarn.lock b/build/yarn.lock
index ec3bd73e853..59bb057c34d 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -8,6 +8,10 @@
   dependencies:
     "@types/node" "*"
 
+"@types/caseless@*":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
+
 "@types/documentdb@1.10.2":
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/@types/documentdb/-/documentdb-1.10.2.tgz#6795025cdc51577af5ed531b6f03bd44404f5350"
@@ -22,6 +26,12 @@
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@types/es6-promise/-/es6-promise-0.0.33.tgz#280a707e62b1b6bef1a86cc0861ec63cd06c7ff3"
 
+"@types/form-data@*":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
+  dependencies:
+    "@types/node" "*"
+
 "@types/mime@0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
@@ -34,6 +44,19 @@
   version "8.0.33"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
 
+"@types/request@^2.47.0":
+  version "2.47.0"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.0.tgz#76a666cee4cb85dcffea6cd4645227926d9e114e"
+  dependencies:
+    "@types/caseless" "*"
+    "@types/form-data" "*"
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+
+"@types/tough-cookie@*":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.2.tgz#e0d481d8bb282ad8a8c9e100ceb72c995fb5e709"
+
 "@types/xml2js@0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.0.33.tgz#20c5dd6460245284d64a55690015b95e409fb7de"
@@ -45,6 +68,15 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+ajv@^5.1.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -65,10 +97,18 @@ aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
 aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+aws4@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+
 azure-storage@^2.1.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.6.0.tgz#84747ee54a4bd194bb960f89f3eff89d67acf1cf"
@@ -85,6 +125,10 @@ azure-storage@^2.1.0:
     xml2js "0.2.7"
     xmlbuilder "0.4.3"
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -101,6 +145,25 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
 browserify-mime@~1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"
@@ -113,12 +176,26 @@ co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
+colors@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794"
+
+combined-stream@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -129,6 +206,12 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -158,7 +241,7 @@ extend@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-1.2.1.tgz#a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"
 
-extend@~3.0.0:
+extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
@@ -166,6 +249,14 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -178,16 +269,37 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
   dependencies:
     assert-plus "^1.0.0"
 
+github-releases@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/github-releases/-/github-releases-0.4.1.tgz#4a13bdf85c4161344271db3d81db08e7379102ff"
+  dependencies:
+    minimatch "3.0.4"
+    optimist "0.6.1"
+    prettyjson "1.2.1"
+    request "2.81.0"
+
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -195,6 +307,13 @@ har-validator@~4.2.1:
     ajv "^4.9.1"
     har-schema "^1.0.5"
 
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
@@ -211,10 +330,23 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
+hoek@4.x.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -223,6 +355,14 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 inherits@^2.0.1, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
@@ -249,6 +389,10 @@ json-edm-parser@0.1.2:
   dependencies:
     jsonparse "~1.2.0"
 
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -291,28 +435,66 @@ mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 mime-types@^2.1.12, mime-types@~2.1.7:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
     mime-db "~1.30.0"
 
+mime-types@~2.1.17:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
+minimatch@3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-oauth-sign@~0.8.1:
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+optimist@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+prettyjson@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289"
+  dependencies:
+    colors "^1.1.2"
+    minimist "^1.2.0"
+
 priorityqueuejs@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz#2ee4f23c2560913e08c07ce5ccdd6de3df2c5af8"
@@ -329,6 +511,10 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -340,7 +526,7 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-request@~2.81.0:
+request@2.81.0, request@~2.81.0:
   version "2.81.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
   dependencies:
@@ -367,7 +553,34 @@ request@~2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-safe-buffer@^5.0.1:
+request@^2.85.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
@@ -389,6 +602,12 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
 sshpk@^1.7.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
@@ -407,7 +626,7 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-stringstream@~0.0.4:
+stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
@@ -417,6 +636,12 @@ tough-cookie@~2.3.0:
   dependencies:
     punycode "^1.4.1"
 
+tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -427,9 +652,9 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-typescript@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
 
 underscore@1.8.3, underscore@~1.8.3:
   version "1.8.3"
@@ -443,6 +668,10 @@ uuid@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
 validator@~3.35.0:
   version "3.35.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-3.35.0.tgz#3f07249402c1fc8fc093c32c6e43d72a79cca1dc"
@@ -455,6 +684,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 xml2js@0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.7.tgz#1838518bb01741cae0878bab4915e494c32306af"
diff --git a/extensions/bat/syntaxes/batchfile.tmLanguage.json b/extensions/bat/syntaxes/batchfile.tmLanguage.json
index 996d5aed4da..e5f00ed3827 100644
--- a/extensions/bat/syntaxes/batchfile.tmLanguage.json
+++ b/extensions/bat/syntaxes/batchfile.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/mmims/language-batchfile/commit/9b2d868a43d6a04a4dc27cb31f907b960a4fdab1",
+	"version": "https://github.com/mmims/language-batchfile/commit/6235c491be4dff49cd3966b50142874d7f79580a",
 	"name": "Batch File",
 	"scopeName": "source.batchfile",
 	"patterns": [
@@ -46,14 +46,17 @@
 		"commands": {
 			"patterns": [
 				{
-					"match": "(?<=^|[\\s@])(?i:adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|brea|cacls|cd|certreq|certutil|change|chcp|chdir|chglogon|chgport|chgusr|chkdsk|chkntfs|choice|cipher|clip|clscluadmin|cluster|cmd|cmdkey|cmstp|color|comp|compact|convert|copy|cprofile|cscript|csvde|date|dcdiag|dcgpofix|dcpromo|defra|del|dfscmd|dfsdiag|dfsrmig|diantz|dir|dirquota|diskcomp|diskcopy|diskpart|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm|edit|endlocal|eraseesentutl|eventcreate|eventquery|eventtriggers|evntcmd|expand|extract|fc|filescrn|find|findstr|finger|flattemp|fonde|forfiles|format|freedisk|fsutil|ftp|ftype|fveupdate|getmac|gettype|gpfixup|gpresult|gpupdate|graftabl|hashgen|hep|helpctr|hostname|icacls|iisreset|inuse|ipconfig|ipxroute|irftp|ismserv|jetpack|klist|ksetup|ktmutil|ktpass|label|ldifd|ldp|lodctr|logman|logoff|lpq|lpr|macfile|makecab|manage-bde|mapadmin|md|mkdir|mklink|mmc|mode|more|mount|mountvol|move|mqbup|mqsvc|mqtgsvc|msdt|msg|msiexec|msinfo32|mstsc|nbtstat|net computer|net group|net localgroup|net print|net session|net share|net start|net stop|net use|net user|net view|net|netcfg|netdiag|netdom|netsh|netstat|nfsadmin|nfsshare|nfsstat|nlb|nlbmgr|nltest|nslookup|ntackup|ntcmdprompt|ntdsutil|ntfrsutl|openfiles|pagefileconfig|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd|powercfg|powershell|powershell_ise|print|prncnfg|prndrvr|prnjobs|prnmngr|prnport|prnqctl|prompt|pubprn|pushd|pushprinterconnections|pwlauncher|qappsrv|qprocess|query|quser|qwinsta|rasdial|rcp|rd|rdpsign|regentc|recover|redircmp|redirusr|reg|regini|regsvr32|relog|ren|rename|rendom|repadmin|repair-bde|replace|reset session|rxec|risetup|rmdir|robocopy|route|rpcinfo|rpcping|rsh|runas|rundll32|rwinsta|sc|schtasks|scwcmd|secedit|serverceipoptin|servrmanagercmd|serverweroptin|setlocal|setspn|setx|sfc|shadow|shift|showmount|shutdown|sort|start|storrept|subst|sxstrace|ysocmgr|systeminfo|takeown|tapicfg|taskkill|tasklist|tcmsetup|telnet|tftp|time|timeout|title|tlntadmn|tpmvscmgr|tpmvscmgr|tacerpt|tracert|tree|tscon|tsdiscon|tsecimp|tskill|tsprof|type|typeperf|tzutil|uddiconfig|umount|unlodctr|ver|verifier|verif|vol|vssadmin|w32tm|waitfor|wbadmin|wdsutil|wecutil|wevtutil|where|whoami|winnt|winnt32|winpop|winrm|winrs|winsat|wlbs|mic|wscript|xcopy)(?=$|\\s)",
+					"match": "(?<=^|[\\s@])(?i:adprep|append|arp|assoc|at|atmadm|attrib|auditpol|autochk|autoconv|autofmt|bcdboot|bcdedit|bdehdcfg|bitsadmin|bootcfg|brea|cacls|cd|certreq|certutil|change|chcp|chdir|chglogon|chgport|chgusr|chkdsk|chkntfs|choice|cipher|clip|cls|clscluadmin|cluster|cmd|cmdkey|cmstp|color|comp|compact|convert|copy|cprofile|cscript|csvde|date|dcdiag|dcgpofix|dcpromo|defra|del|dfscmd|dfsdiag|dfsrmig|diantz|dir|dirquota|diskcomp|diskcopy|diskpart|diskperf|diskraid|diskshadow|dispdiag|doin|dnscmd|doskey|driverquery|dsacls|dsadd|dsamain|dsdbutil|dsget|dsmgmt|dsmod|dsmove|dsquery|dsrm|edit|endlocal|eraseesentutl|eventcreate|eventquery|eventtriggers|evntcmd|expand|extract|fc|filescrn|find|findstr|finger|flattemp|fonde|forfiles|format|freedisk|fsutil|ftp|ftype|fveupdate|getmac|gettype|gpfixup|gpresult|gpupdate|graftabl|hashgen|hep|helpctr|hostname|icacls|iisreset|inuse|ipconfig|ipxroute|irftp|ismserv|jetpack|klist|ksetup|ktmutil|ktpass|label|ldifd|ldp|lodctr|logman|logoff|lpq|lpr|macfile|makecab|manage-bde|mapadmin|md|mkdir|mklink|mmc|mode|more|mount|mountvol|move|mqbup|mqsvc|mqtgsvc|msdt|msg|msiexec|msinfo32|mstsc|nbtstat|net computer|net group|net localgroup|net print|net session|net share|net start|net stop|net use|net user|net view|net|netcfg|netdiag|netdom|netsh|netstat|nfsadmin|nfsshare|nfsstat|nlb|nlbmgr|nltest|nslookup|ntackup|ntcmdprompt|ntdsutil|ntfrsutl|openfiles|pagefileconfig|path|pathping|pause|pbadmin|pentnt|perfmon|ping|pnpunatten|pnputil|popd|powercfg|powershell|powershell_ise|print|prncnfg|prndrvr|prnjobs|prnmngr|prnport|prnqctl|prompt|pubprn|pushd|pushprinterconnections|pwlauncher|qappsrv|qprocess|query|quser|qwinsta|rasdial|rcp|rd|rdpsign|regentc|recover|redircmp|redirusr|reg|regini|regsvr32|relog|ren|rename|rendom|repadmin|repair-bde|replace|reset session|rxec|risetup|rmdir|robocopy|route|rpcinfo|rpcping|rsh|runas|rundll32|rwinsta|sc|schtasks|scwcmd|secedit|serverceipoptin|servrmanagercmd|serverweroptin|setspn|setx|sfc|shadow|shift|showmount|shutdown|sort|start|storrept|subst|sxstrace|ysocmgr|systeminfo|takeown|tapicfg|taskkill|tasklist|tcmsetup|telnet|tftp|time|timeout|title|tlntadmn|tpmvscmgr|tpmvscmgr|tacerpt|tracert|tree|tscon|tsdiscon|tsecimp|tskill|tsprof|type|typeperf|tzutil|uddiconfig|umount|unlodctr|ver|verifier|verif|vol|vssadmin|w32tm|waitfor|wbadmin|wdsutil|wecutil|wevtutil|where|whoami|winnt|winnt32|winpop|winrm|winrs|winsat|wlbs|mic|wscript|xcopy)(?=$|\\s)",
 					"name": "keyword.command.batchfile"
 				},
 				{
-					"begin": "(?<=^|[\\s@])(?i:echo)(?=$|\\s|\\.)",
+					"begin": "(?i)(?<=^|[\\s@])(echo)(?:(?=$|\\.|:)|\\s+(?:(on|off)(?=\\s*$))?)",
 					"beginCaptures": {
-						"0": {
+						"1": {
 							"name": "keyword.command.batchfile"
+						},
+						"2": {
+							"name": "keyword.other.special-method.batchfile"
 						}
 					},
 					"end": "(?=$\\n|[&|><)])",
@@ -72,6 +75,17 @@
 						}
 					]
 				},
+				{
+					"match": "(?i)(?<=^|[\\s@])(setlocal)(?:\\s*$|\\s+(EnableExtensions|DisableExtensions|EnableDelayedExpansion|DisableDelayedExpansion)(?=\\s*$))",
+					"captures": {
+						"1": {
+							"name": "keyword.command.batchfile"
+						},
+						"2": {
+							"name": "keyword.other.special-method.batchfile"
+						}
+					}
+				},
 				{
 					"include": "#command_set"
 				}
@@ -110,36 +124,7 @@
 					"include": "#parens"
 				},
 				{
-					"begin": "(\")\\s*([^ ][^=]*)(=)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.batchfile"
-						},
-						"2": {
-							"name": "variable.other.readwrite.batchfile"
-						},
-						"3": {
-							"name": "keyword.operator.assignment.batchfile"
-						}
-					},
-					"end": "\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.batchfile"
-						}
-					},
-					"name": "string.quoted.double.batchfile",
-					"patterns": [
-						{
-							"include": "#variables"
-						},
-						{
-							"include": "#numbers"
-						},
-						{
-							"include": "#parens"
-						}
-					]
+					"include": "#command_set_strings"
 				},
 				{
 					"include": "#strings"
@@ -216,6 +201,9 @@
 					"begin": "\\s+/[pP]\\s+",
 					"end": "(?=$\\n|[&|><)])",
 					"patterns": [
+						{
+							"include": "#command_set_strings"
+						},
 						{
 							"begin": "([^ ][^=]*)(=)",
 							"beginCaptures": {
@@ -295,6 +283,42 @@
 				}
 			]
 		},
+		"command_set_strings": {
+			"patterns": [
+				{
+					"begin": "(\")\\s*([^ ][^=]*)(=)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.batchfile"
+						},
+						"2": {
+							"name": "variable.other.readwrite.batchfile"
+						},
+						"3": {
+							"name": "keyword.operator.assignment.batchfile"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.batchfile"
+						}
+					},
+					"name": "string.quoted.double.batchfile",
+					"patterns": [
+						{
+							"include": "#variables"
+						},
+						{
+							"include": "#numbers"
+						},
+						{
+							"include": "#escaped_characters"
+						}
+					]
+				}
+			]
+		},
 		"comments": {
 			"patterns": [
 				{
@@ -360,7 +384,7 @@
 		"controls": {
 			"patterns": [
 				{
-					"match": "(?<=^|\\s)(?i)(?:goto|call|exit)(?=$|\\s)",
+					"match": "(?i)(?<=^|\\s)(?:call|exit(?=$|\\s)|goto(?=$|\\s|:))",
 					"name": "keyword.control.statement.batchfile"
 				},
 				{
@@ -390,7 +414,7 @@
 		"escaped_characters": {
 			"patterns": [
 				{
-					"match": "%%|\\^\\^!|\\^.|\\^\\n",
+					"match": "%%|\\^\\^!|\\^(?=.)|\\^\\n",
 					"name": "constant.character.escape.batchfile"
 				}
 			]
@@ -398,7 +422,7 @@
 		"labels": {
 			"patterns": [
 				{
-					"match": "^\\s*(:)([^+=,;:\\s].*)$",
+					"match": "(?i)(?:^\\s*|(?<=goto)\\s*)(:)([^+=,;:\\s].*)$",
 					"captures": {
 						"1": {
 							"name": "punctuation.separator.batchfile"
@@ -433,11 +457,11 @@
 					"name": "keyword.operator.logical.batchfile"
 				},
 				{
-					"match": "&&?|\\|\\|",
+					"match": "(?<!\\^)&&?|\\|\\|",
 					"name": "keyword.operator.conditional.batchfile"
 				},
 				{
-					"match": "\\|",
+					"match": "(?<!\\^)\\|",
 					"name": "keyword.operator.pipe.batchfile"
 				},
 				{
diff --git a/extensions/bat/test/colorize-results/test_bat.json b/extensions/bat/test/colorize-results/test_bat.json
index 0f2541c1edf..789c3bc3e72 100644
--- a/extensions/bat/test/colorize-results/test_bat.json
+++ b/extensions/bat/test/colorize-results/test_bat.json
@@ -22,7 +22,7 @@
 		}
 	},
 	{
-		"c": " off",
+		"c": " ",
 		"t": "source.batchfile",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -32,6 +32,17 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "off",
+		"t": "source.batchfile keyword.other.special-method.batchfile",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
 	{
 		"c": "setlocal",
 		"t": "source.batchfile keyword.command.batchfile",
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 817d50a451d..7a6798f8eba 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -7,10 +7,6 @@
   "engines": {
     "vscode": "^1.0.0"
   },
-  "categories": [
-    "Languages",
-    "Other"
-  ],
   "activationEvents": [
     "onLanguage:json",
     "onLanguage:jsonc"
diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index 4b7b3e678aa..5aa5ebed1eb 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -70,7 +70,12 @@ function autoFixSettingsJSON(willSaveEvent: vscode.TextDocumentWillSaveEvent): v
 		onError(error: ParseErrorCode, offset: number, length: number): void {
 			if (error === ParseErrorCode.CommaExpected && lastEndOfSomething > -1) {
 				const fixPosition = document.positionAt(lastEndOfSomething);
-				edit.insert(document.uri, fixPosition, ',');
+
+				// Don't insert a comma immediately before a : or ' :'
+				const colonRange = document.getWordRangeAtPosition(fixPosition, / *:/);
+				if (!colonRange) {
+					edit.insert(document.uri, fixPosition, ',');
+				}
 			}
 		}
 	});
diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index 23d99a485e1..e50df32dd11 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -20,7 +20,8 @@
 		["[", "]"],
 		["(", ")"],
 		["\"", "\""],
-		["'", "'"]
+		["'", "'"],
+		["<", ">"]
 	],
 	"folding": {
 		"markers": {
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index fb3f667f5b1..397c2712e03 100644
--- a/extensions/csharp/syntaxes/csharp.tmLanguage.json
+++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/ca22c5211b87a6a1a8fd5356895237bb821df728",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/7689494edad006eafb9025aa6d72f8a634011a00",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -2050,6 +2050,9 @@
 			"patterns": [
 				{
 					"include": "#block"
+				},
+				{
+					"include": "#comment"
 				}
 			]
 		},
@@ -3670,7 +3673,7 @@
 			}
 		},
 		"type-builtin": {
-			"match": "\\b(bool|byte|char|decimal|double|float|int|long|object|sbyte|short|string|uint|ulong|ushort|void)\\b",
+			"match": "\\b(bool|byte|char|decimal|double|float|int|long|object|sbyte|short|string|uint|ulong|ushort|void|dynamic)\\b",
 			"captures": {
 				"1": {
 					"name": "keyword.type.cs"
@@ -4131,7 +4134,7 @@
 						},
 						{
 							"name": "comment.line.double-slash.cs",
-							"begin": "(?<!/)//(?!/)",
+							"begin": "(?<!/)//(?:(?!/)|(?=//))",
 							"beginCaptures": {
 								"0": {
 									"name": "punctuation.definition.comment.cs"
diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts
index a8aaa53a18a..c03c44b6cd6 100644
--- a/extensions/css-language-features/client/src/cssMain.ts
+++ b/extensions/css-language-features/client/src/cssMain.ts
@@ -8,8 +8,9 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
+import { languages, window, commands, ExtensionContext, Range, Position, TextDocument, CompletionItem, CompletionItemKind, TextEdit, SnippetString, FoldingRangeKind, FoldingRange, FoldingContext, CancellationToken } from 'vscode';
+import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Disposable } from 'vscode-languageclient';
+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
@@ -41,6 +42,21 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('css', localize('cssserver.name', 'CSS Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
+	client.registerFeature({
+		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
+			let textDocumentCap = capabilities.textDocument;
+			if (!textDocumentCap) {
+				textDocumentCap = capabilities.textDocument = {};
+			}
+			textDocumentCap.foldingRange = {
+				dynamicRegistration: false,
+				rangeLimit: 5000,
+				lineFoldingOnly: true
+			};
+		},
+		initialize(capabilities, documentSelector): void {
+		}
+	});
 
 	let disposable = client.start();
 	// Push the disposable to the context's subscriptions so that the
@@ -67,31 +83,70 @@ export function activate(context: ExtensionContext) {
 		indentationRules: indentationRules
 	});
 
-	const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/;
-	languages.registerCompletionItemProvider(documentSelector, {
-		provideCompletionItems(doc, pos) {
-			let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos));
-			let match = lineUntilPos.match(regionCompletionRegExpr);
-			if (match) {
-				let range = new Range(new Position(pos.line, match[1].length), pos);
-				let beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet);
-				beginProposal.range = range; TextEdit.replace(range, '/* #region */');
-				beginProposal.insertText = new SnippetString('/* #region $1*/');
-				beginProposal.documentation = localize('folding.start', 'Folding Region Start');
-				beginProposal.filterText = match[2];
-				beginProposal.sortText = 'za';
-				let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet);
-				endProposal.range = range;
-				endProposal.insertText = '/* #endregion */';
-				endProposal.documentation = localize('folding.end', 'Folding Region End');
-				endProposal.sortText = 'zb';
-				endProposal.filterText = match[2];
-				return [beginProposal, endProposal];
-			}
-			return null;
-		}
+	client.onReady().then(() => {
+		context.subscriptions.push(initCompletionProvider());
+		context.subscriptions.push(initFoldingProvider());
 	});
 
+	function initCompletionProvider(): Disposable {
+		const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/;
+
+		return languages.registerCompletionItemProvider(documentSelector, {
+			provideCompletionItems(doc, pos) {
+				let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos));
+				let match = lineUntilPos.match(regionCompletionRegExpr);
+				if (match) {
+					let range = new Range(new Position(pos.line, match[1].length), pos);
+					let beginProposal = new CompletionItem('#region', CompletionItemKind.Snippet);
+					beginProposal.range = range; TextEdit.replace(range, '/* #region */');
+					beginProposal.insertText = new SnippetString('/* #region $1*/');
+					beginProposal.documentation = localize('folding.start', 'Folding Region Start');
+					beginProposal.filterText = match[2];
+					beginProposal.sortText = 'za';
+					let endProposal = new CompletionItem('#endregion', CompletionItemKind.Snippet);
+					endProposal.range = range;
+					endProposal.insertText = '/* #endregion */';
+					endProposal.documentation = localize('folding.end', 'Folding Region End');
+					endProposal.sortText = 'zb';
+					endProposal.filterText = match[2];
+					return [beginProposal, endProposal];
+				}
+				return null;
+			}
+		});
+	}
+
+	function initFoldingProvider(): Disposable {
+		const kinds: { [value: string]: FoldingRangeKind } = Object.create(null);
+		function getKind(value: string | undefined) {
+			if (!value) {
+				return void 0;
+			}
+			let kind = kinds[value];
+			if (!kind) {
+				kind = new FoldingRangeKind(value);
+				kinds[value] = kind;
+			}
+			return kind;
+		}
+		return languages.registerFoldingRangeProvider(documentSelector, {
+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
+				const param: FoldingRangeRequestParam = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
+				};
+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
+					if (Array.isArray(ranges)) {
+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
+					}
+					return null;
+				}, error => {
+					client.logFailedRequest(FoldingRangeRequest.type, error);
+					return null;
+				});
+			}
+		});
+	}
+
 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
 
 	function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) {
diff --git a/extensions/css-language-features/client/tsconfig.json b/extensions/css-language-features/client/tsconfig.json
index ee67f8333d4..473f4e85fc9 100644
--- a/extensions/css-language-features/client/tsconfig.json
+++ b/extensions/css-language-features/client/tsconfig.json
@@ -4,6 +4,7 @@
 		"module": "commonjs",
 		"outDir": "./out",
 		"noUnusedLocals": true,
+		"sourceMap": true,
 		"lib": [
 			"es2016"
 		],
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index deb2c755d7a..4179c9fef2c 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -1,7 +1,7 @@
 {
   "name": "css-language-features",
-	"displayName": "%displayName%",
-	"description": "%description%",
+  "displayName": "%displayName%",
+  "description": "%description%",
   "version": "1.0.0",
   "publisher": "vscode",
   "engines": {
@@ -21,6 +21,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+  "categories": [
+    "Programming Languages"
+  ],
   "contributes": {
     "configuration": [
       {
@@ -692,7 +695,8 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "4.0.0-next.9",
+    "vscode-languageclient": "^4.0.0",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 26769bfeb61..97379871be5 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -8,9 +8,9 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.9-next.1",
-    "vscode-emmet-helper": "^1.2.0",
-    "vscode-languageserver": "^4.0.0"
+    "vscode-css-languageservice": "^3.0.9-next.10",
+    "vscode-languageserver": "^4.0.0",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2"
   },
   "devDependencies": {
     "@types/mocha": "2.2.33",
diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts
index 66b473f1a6d..b78b9e4e40d 100644
--- a/extensions/css-language-features/server/src/cssServerMain.ts
+++ b/extensions/css-language-features/server/src/cssServerMain.ts
@@ -5,17 +5,17 @@
 'use strict';
 
 import {
-	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities,
-	ConfigurationRequest, WorkspaceFolder, DocumentColorRequest, ColorPresentationRequest
+	createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities, ConfigurationRequest, WorkspaceFolder
 } from 'vscode-languageserver';
 
 import { TextDocument, CompletionList } from 'vscode-languageserver-types';
 
 import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
-import { formatError, runSafe } from './utils/errors';
+import { formatError, runSafe } from './utils/runner';
 import URI from 'vscode-uri';
 import { getPathCompletionParticipant } from './pathCompletion';
+import { FoldingRangeServerCapabilities, FoldingRangeRequest } from 'vscode-languageserver-protocol-foldingprovider';
 
 export interface Settings {
 	css: LanguageSettings;
@@ -49,9 +49,10 @@ connection.onShutdown(() => {
 });
 
 let scopedSettingsSupport = false;
-let workspaceFolders: WorkspaceFolder[] | undefined;
+let foldingRangeLimit = Number.MAX_VALUE;
+let workspaceFolders: WorkspaceFolder[];
 
-// After the server has started the client sends an initilize request. The server receives
+// After the server has started the client sends an initialize request. The server receives
 // in the passed params the rootPath of the workspace plus the client capabilities.
 connection.onInitialize((params: InitializeParams): InitializeResult => {
 	workspaceFolders = (<any>params).workspaceFolders;
@@ -62,20 +63,25 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		}
 	}
 
-	function hasClientCapability(name: string) {
+	function getClientCapability<T>(name: string, def: T) {
 		let keys = name.split('.');
 		let c: any = params.capabilities;
 		for (let i = 0; c && i < keys.length; i++) {
+			if (!c.hasOwnProperty(keys[i])) {
+				return def;
+			}
 			c = c[keys[i]];
 		}
-		return !!c;
+		return c;
 	}
-	let snippetSupport = hasClientCapability('textDocument.completion.completionItem.snippetSupport');
-	scopedSettingsSupport = hasClientCapability('workspace.configuration');
-	let capabilities: ServerCapabilities = {
+	let snippetSupport = !!getClientCapability('textDocument.completion.completionItem.snippetSupport', false);
+	scopedSettingsSupport = !!getClientCapability('workspace.configuration', false);
+	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
+
+	let capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
-		completionProvider: snippetSupport ? { resolveProvider: false } : undefined,
+		completionProvider: snippetSupport ? { resolveProvider: false, triggerCharacters: ['/'] } : undefined,
 		hoverProvider: true,
 		documentSymbolProvider: true,
 		referencesProvider: true,
@@ -83,7 +89,8 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		documentHighlightProvider: true,
 		codeActionProvider: true,
 		renameProvider: true,
-		colorProvider: true
+		colorProvider: true,
+		foldingRangeProvider: true
 	};
 	return { capabilities };
 });
@@ -179,7 +186,7 @@ function validateTextDocument(textDocument: TextDocument): void {
 	});
 }
 
-connection.onCompletion(textDocumentPosition => {
+connection.onCompletion((textDocumentPosition, token) => {
 	return runSafe(() => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
 		const cssLS = getLanguageService(document);
@@ -190,61 +197,61 @@ connection.onCompletion(textDocumentPosition => {
 		cssLS.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, pathCompletionList)]);
 		const result = cssLS.doComplete(document, textDocumentPosition.position, stylesheets.get(document))!; /* TODO: remove ! once LS has null annotations */
 		return {
-			isIncomplete: result.isIncomplete,
+			isIncomplete: pathCompletionList.isIncomplete,
 			items: [...pathCompletionList.items, ...result.items]
 		};
-	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
+	}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`, token);
 });
 
-connection.onHover(textDocumentPosition => {
+connection.onHover((textDocumentPosition, token) => {
 	return runSafe(() => {
 		let document = documents.get(textDocumentPosition.textDocument.uri);
 		let styleSheet = stylesheets.get(document);
-		return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet)!; /* TODO: remove ! once LS has null annotations */
-	}, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`);
+		return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet);
+	}, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`, token);
 });
 
-connection.onDocumentSymbol(documentSymbolParams => {
+connection.onDocumentSymbol((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDocumentSymbols(document, stylesheet);
-	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`);
+	}, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onDefinition(documentSymbolParams => {
+connection.onDefinition((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDefinition(document, documentSymbolParams.position, stylesheet);
-	}, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`);
+	}, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onDocumentHighlight(documentSymbolParams => {
+connection.onDocumentHighlight((documentSymbolParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(documentSymbolParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findDocumentHighlights(document, documentSymbolParams.position, stylesheet);
-	}, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`);
+	}, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`, token);
 });
 
-connection.onReferences(referenceParams => {
+connection.onReferences((referenceParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(referenceParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).findReferences(document, referenceParams.position, stylesheet);
-	}, [], `Error while computing references for ${referenceParams.textDocument.uri}`);
+	}, [], `Error while computing references for ${referenceParams.textDocument.uri}`, token);
 });
 
-connection.onCodeAction(codeActionParams => {
+connection.onCodeAction((codeActionParams, token) => {
 	return runSafe(() => {
 		let document = documents.get(codeActionParams.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).doCodeActions(document, codeActionParams.range, codeActionParams.context, stylesheet);
-	}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`);
+	}, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token);
 });
 
-connection.onRequest(DocumentColorRequest.type, params => {
+connection.onDocumentColor((params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
@@ -252,10 +259,10 @@ connection.onRequest(DocumentColorRequest.type, params => {
 			return getLanguageService(document).findDocumentColors(document, stylesheet);
 		}
 		return [];
-	}, [], `Error while computing document colors for ${params.textDocument.uri}`);
+	}, [], `Error while computing document colors for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(ColorPresentationRequest.type, params => {
+connection.onColorPresentation((params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
@@ -263,15 +270,22 @@ connection.onRequest(ColorPresentationRequest.type, params => {
 			return getLanguageService(document).getColorPresentations(document, stylesheet, params.color, params.range);
 		}
 		return [];
-	}, [], `Error while computing color presentations for ${params.textDocument.uri}`);
+	}, [], `Error while computing color presentations for ${params.textDocument.uri}`, token);
 });
 
-connection.onRenameRequest(renameParameters => {
+connection.onRenameRequest((renameParameters, token) => {
 	return runSafe(() => {
 		let document = documents.get(renameParameters.textDocument.uri);
 		let stylesheet = stylesheets.get(document);
 		return getLanguageService(document).doRename(document, renameParameters.position, renameParameters.newName, stylesheet);
-	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`);
+	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`, token);
+});
+
+connection.onRequest(FoldingRangeRequest.type, (params, token) => {
+	return runSafe(() => {
+		let document = documents.get(params.textDocument.uri);
+		return getLanguageService(document).getFoldingRanges(document, { rangeLimit: foldingRangeLimit });
+	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token);
 });
 
 // Listen on the connection
diff --git a/extensions/css-language-features/server/src/pathCompletion.ts b/extensions/css-language-features/server/src/pathCompletion.ts
index 76b93f3a628..b072c4136f6 100644
--- a/extensions/css-language-features/server/src/pathCompletion.ts
+++ b/extensions/css-language-features/server/src/pathCompletion.ts
@@ -16,74 +16,65 @@ import { startsWith } from './utils/strings';
 
 export function getPathCompletionParticipant(
 	document: TextDocument,
-	workspaceFolders: WorkspaceFolder[] | undefined,
+	workspaceFolders: WorkspaceFolder[],
 	result: CompletionList
 ): ICompletionParticipant {
 	return {
-		onURILiteralValue: (context: { uriValue: string, position: Position, range: Range; }) => {
+		onCssURILiteralValue: ({ position, range, uriValue }) => {
+			const isValueQuoted = startsWith(uriValue, `'`) || startsWith(uriValue, `"`);
+			const fullValue = stripQuotes(uriValue);
+			const valueBeforeCursor = isValueQuoted
+				? fullValue.slice(0, position.character - (range.start.character + 1))
+				: fullValue.slice(0, position.character - range.start.character);
+
+			if (fullValue === '.' || fullValue === '..') {
+				result.isIncomplete = true;
+				return;
+			}
+
 			if (!workspaceFolders || workspaceFolders.length === 0) {
 				return;
 			}
 			const workspaceRoot = resolveWorkspaceRoot(document, workspaceFolders);
+			const paths = providePaths(valueBeforeCursor, URI.parse(document.uri).fsPath, workspaceRoot);
 
-			// Handle quoted values
-			let uriValue = context.uriValue;
-			let range = context.range;
-			if (startsWith(uriValue, `'`) || startsWith(uriValue, `"`)) {
-				uriValue = uriValue.slice(1, -1);
-				range = getRangeWithoutQuotes(range);
-			}
-
-			const suggestions = providePathSuggestions(uriValue, range, URI.parse(document.uri).fsPath, workspaceRoot);
+			const fullValueRange = isValueQuoted ? shiftRange(range, 1, -1) : range;
+			const replaceRange = pathToReplaceRange(valueBeforeCursor, fullValue, fullValueRange);
+			const suggestions = paths.map(p => pathToSuggestion(p, replaceRange));
 			result.items = [...suggestions, ...result.items];
 		}
+
 	};
 }
 
-export function providePathSuggestions(value: string, range: Range, activeDocFsPath: string, root?: string): CompletionItem[] {
-	if (startsWith(value, '/') && !root) {
+function stripQuotes(fullValue: string) {
+	if (startsWith(fullValue, `'`) || startsWith(fullValue, `"`)) {
+		return fullValue.slice(1, -1);
+	} else {
+		return fullValue;
+	}
+}
+
+/**
+ * Get a list of path suggestions. Folder suggestions are suffixed with a slash.
+ */
+function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?: string): string[] {
+	if (startsWith(valueBeforeCursor, '/') && !root) {
 		return [];
 	}
 
-	let replaceRange: Range;
-	const lastIndexOfSlash = value.lastIndexOf('/');
-	if (lastIndexOfSlash === -1) {
-		replaceRange = getFullReplaceRange(range);
-	} else {
-		const valueAfterLastSlash = value.slice(lastIndexOfSlash + 1);
-		replaceRange = getReplaceRange(range, valueAfterLastSlash);
-	}
+	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
+	const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
 
-	let parentDir: string;
-	if (lastIndexOfSlash === -1) {
-		parentDir = path.resolve(root);
-	} else {
-		const valueBeforeLastSlash = value.slice(0, lastIndexOfSlash + 1);
-
-		parentDir = startsWith(value, '/')
-			? path.resolve(root, '.' + valueBeforeLastSlash)
-			: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
-	}
+	const parentDir = startsWith(valueBeforeCursor, '/')
+		? path.resolve(root, '.' + valueBeforeLastSlash)
+		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
-			if (isDir(path.resolve(parentDir, f))) {
-				return {
-					label: f + '/',
-					kind: CompletionItemKind.Folder,
-					textEdit: TextEdit.replace(replaceRange, f + '/'),
-					command: {
-						title: 'Suggest',
-						command: 'editor.action.triggerSuggest'
-					}
-				};
-			} else {
-				return {
-					label: f,
-					kind: CompletionItemKind.File,
-					textEdit: TextEdit.replace(replaceRange, f)
-				};
-			}
+			return isDir(path.resolve(parentDir, f))
+				? f + '/'
+				: f;
 		});
 	} catch (e) {
 		return [];
@@ -91,9 +82,64 @@ export function providePathSuggestions(value: string, range: Range, activeDocFsP
 }
 
 const isDir = (p: string) => {
-	return fs.statSync(p).isDirectory();
+	try {
+		return fs.statSync(p).isDirectory();
+	} catch (e) {
+		return false;
+	}
 };
 
+function pathToReplaceRange(valueBeforeCursor: string, fullValue: string, fullValueRange: Range) {
+	let replaceRange: Range;
+	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
+	if (lastIndexOfSlash === -1) {
+		replaceRange = fullValueRange;
+	} else {
+		// For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
+		// Find the last slash before cursor, and calculate the start of replace range from there
+		const valueAfterLastSlash = fullValue.slice(lastIndexOfSlash + 1);
+		const startPos = shiftPosition(fullValueRange.end, -valueAfterLastSlash.length);
+		// If whitespace exists, replace until it
+		const whiteSpaceIndex = valueAfterLastSlash.indexOf(' ');
+		let endPos;
+		if (whiteSpaceIndex !== -1) {
+			endPos = shiftPosition(startPos, whiteSpaceIndex);
+		} else {
+			endPos = fullValueRange.end;
+		}
+		replaceRange = Range.create(startPos, endPos);
+	}
+
+	return replaceRange;
+}
+
+function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
+	const isDir = p[p.length - 1] === '/';
+
+	if (isDir) {
+		return {
+			label: escapePath(p),
+			kind: CompletionItemKind.Folder,
+			textEdit: TextEdit.replace(replaceRange, escapePath(p)),
+			command: {
+				title: 'Suggest',
+				command: 'editor.action.triggerSuggest'
+			}
+		};
+	} else {
+		return {
+			label: escapePath(p),
+			kind: CompletionItemKind.File,
+			textEdit: TextEdit.replace(replaceRange, escapePath(p))
+		};
+	}
+}
+
+// Escape https://www.w3.org/TR/CSS1/#url
+function escapePath(p: string) {
+	return p.replace(/(\s|\(|\)|,|"|')/g, '\\$1');
+}
+
 function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: WorkspaceFolder[]): string | undefined {
 	for (let i = 0; i < workspaceFolders.length; i++) {
 		if (startsWith(activeDoc.uri, workspaceFolders[i].uri)) {
@@ -102,18 +148,11 @@ function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: Workspa
 	}
 }
 
-function getFullReplaceRange(valueRange: Range) {
-	const start = Position.create(valueRange.end.line, valueRange.start.character);
-	const end = Position.create(valueRange.end.line, valueRange.end.character);
-	return Range.create(start, end);
-}
-function getReplaceRange(valueRange: Range, valueAfterLastSlash: string) {
-	const start = Position.create(valueRange.end.line, valueRange.end.character - valueAfterLastSlash.length);
-	const end = Position.create(valueRange.end.line, valueRange.end.character);
-	return Range.create(start, end);
-}
-function getRangeWithoutQuotes(range: Range) {
-	const start = Position.create(range.start.line, range.start.character + 1);
-	const end = Position.create(range.end.line, range.end.character - 1);
+function shiftPosition(pos: Position, offset: number): Position {
+	return Position.create(pos.line, pos.character + offset);
+}
+function shiftRange(range: Range, startOffset: number, endOffset: number): Range {
+	const start = shiftPosition(range.start, startOffset);
+	const end = shiftPosition(range.end, endOffset);
 	return Range.create(start, end);
 }
diff --git a/extensions/css-language-features/server/src/test/completion.test.ts b/extensions/css-language-features/server/src/test/completion.test.ts
index 518a467cf40..62094de6b5b 100644
--- a/extensions/css-language-features/server/src/test/completion.test.ts
+++ b/extensions/css-language-features/server/src/test/completion.test.ts
@@ -41,14 +41,14 @@ suite('Completions', () => {
 		const position = document.positionAt(offset);
 
 		if (!workspaceFolders) {
-			workspaceFolders = [{ name: 'x', uri: path.dirname(testUri) }];
+			workspaceFolders = [{ name: 'x', uri: testUri.substr(0, testUri.lastIndexOf('/')) }];
 		}
 
 		let participantResult = CompletionList.create([]);
 		cssLanguageService.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, participantResult)]);
 
 		const stylesheet = cssLanguageService.parseStylesheet(document);
-		let list = cssLanguageService.doComplete!(document, position, stylesheet);
+		let list = cssLanguageService.doComplete(document, position, stylesheet)!;
 		list.items = list.items.concat(participantResult.items);
 
 		if (expected.count) {
@@ -62,13 +62,14 @@ suite('Completions', () => {
 	}
 
 	test('CSS Path completion', function () {
-		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).fsPath;
+		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
+		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
 
 		assertCompletions('html { background-image: url("./|")', {
 			items: [
 				{ label: 'about.html', resultText: 'html { background-image: url("./about.html")' }
 			]
-		}, testUri);
+		}, testUri, folders);
 
 		assertCompletions(`html { background-image: url('../|')`, {
 			items: [
@@ -76,6 +77,76 @@ suite('Completions', () => {
 				{ label: 'index.html', resultText: `html { background-image: url('../index.html')` },
 				{ label: 'src/', resultText: `html { background-image: url('../src/')` }
 			]
-		}, testUri);
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('../src/a|')`, {
+			items: [
+				{ label: 'feature.js', resultText: `html { background-image: url('../src/feature.js')` },
+				{ label: 'data/', resultText: `html { background-image: url('../src/data/')` },
+				{ label: 'test.js', resultText: `html { background-image: url('../src/test.js')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('../src/data/f|.asar')`, {
+			items: [
+				{ label: 'foo.asar', resultText: `html { background-image: url('../src/data/foo.asar')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('|')`, {
+			items: [
+				{ label: 'about.css', resultText: `html { background-image: url('about.css')` },
+				{ label: 'about.html', resultText: `html { background-image: url('about.html')` },
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('/|')`, {
+			items: [
+				{ label: 'pathCompletionFixtures/', resultText: `html { background-image: url('/pathCompletionFixtures/')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url('/pathCompletionFixtures/|')`, {
+			items: [
+				{ label: 'about/', resultText: `html { background-image: url('/pathCompletionFixtures/about/')` },
+				{ label: 'index.html', resultText: `html { background-image: url('/pathCompletionFixtures/index.html')` },
+				{ label: 'src/', resultText: `html { background-image: url('/pathCompletionFixtures/src/')` }
+			]
+		}, testUri, folders);
+
+		assertCompletions(`html { background-image: url("/|")`, {
+			items: [
+				{ label: 'pathCompletionFixtures/', resultText: `html { background-image: url("/pathCompletionFixtures/")` }
+			]
+		}, testUri, folders);
+	});
+
+	test('CSS Path Completion - Unquoted url', function () {
+		let testUri = Uri.file(path.resolve(__dirname, '../../test/pathCompletionFixtures/about/about.css')).toString();
+		let folders = [{ name: 'x', uri: Uri.file(path.resolve(__dirname, '../../test')).toString() }];
+
+		assertCompletions('html { background-image: url(./|)', {
+			items: [
+				{ label: 'about.html', resultText: 'html { background-image: url(./about.html)' }
+			]
+		}, testUri, folders);
+
+		assertCompletions('html { background-image: url(./a|)', {
+			items: [
+				{ label: 'about.html', resultText: 'html { background-image: url(./about.html)' }
+			]
+		}, testUri, folders);
+
+		assertCompletions('html { background-image: url(../|src/)', {
+			items: [
+				{ label: 'about/', resultText: 'html { background-image: url(../about/)' }
+			]
+		}, testUri, folders);
+
+		assertCompletions('html { background-image: url(../s|rc/)', {
+			items: [
+				{ label: 'about/', resultText: 'html { background-image: url(../about/)' }
+			]
+		}, testUri, folders);
 	});
 });
\ No newline at end of file
diff --git a/extensions/css-language-features/server/src/test/emmet.test.ts b/extensions/css-language-features/server/src/test/emmet.test.ts
deleted file mode 100644
index 7c850fe2697..00000000000
--- a/extensions/css-language-features/server/src/test/emmet.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import 'mocha';
-import * as assert from 'assert';
-import { getCSSLanguageService, getSCSSLanguageService } from 'vscode-css-languageservice';
-import { TextDocument, CompletionList } from 'vscode-languageserver-types';
-import { getEmmetCompletionParticipants } from 'vscode-emmet-helper';
-
-suite('CSS Emmet Support', () => {
-
-	const cssLanguageService = getCSSLanguageService();
-	const scssLanguageService = getSCSSLanguageService();
-
-	function assertCompletions(syntax: string, value: string, expectedProposal: string, expectedProposalDoc: string): void {
-		const offset = value.indexOf('|');
-		value = value.substr(0, offset) + value.substr(offset + 1);
-
-		const document = TextDocument.create('test://test/test.' + syntax, syntax, 0, value);
-		const position = document.positionAt(offset);
-		const emmetCompletionList: CompletionList = {
-			isIncomplete: true,
-			items: undefined
-		};
-		const languageService = syntax === 'scss' ? scssLanguageService : cssLanguageService;
-		languageService.setCompletionParticipants([getEmmetCompletionParticipants(document, position, document.languageId, {}, emmetCompletionList)]);
-		const stylesheet = languageService.parseStylesheet(document);
-		const list = languageService.doComplete!(document, position, stylesheet);
-
-		assert.ok(list);
-		assert.ok(emmetCompletionList);
-
-		if (expectedProposal && expectedProposalDoc) {
-			let actualLabels = (emmetCompletionList!.items || []).map(c => c.label).sort();
-			let actualDocs = (emmetCompletionList!.items || []).map(c => c.documentation).sort();
-			assert.ok(actualLabels.indexOf(expectedProposal) !== -1, 'Not found:' + expectedProposal + ' is ' + actualLabels.join(', '));
-			assert.ok(actualDocs.indexOf(expectedProposalDoc) !== -1, 'Not found:' + expectedProposalDoc + ' is ' + actualDocs.join(', '));
-		} else {
-			assert.ok(!emmetCompletionList || !emmetCompletionList.items);
-		}
-	}
-
-	test('Css Emmet Completions', function (): any {
-		this.skip(); // disabled again (see #29113)
-
-		assertCompletions('css', '.foo { display: none; m10| }', 'margin: 10px;', 'margin: 10px;');
-		assertCompletions('css', 'foo { display: none; pos:f| }', 'position: fixed;', 'position: fixed;');
-		assertCompletions('css', 'foo { display: none; margin: a| }', null, null);
-		assertCompletions('css', 'foo| { display: none; }', null, null);
-		assertCompletions('css', 'foo {| display: none; }', null, null);
-		assertCompletions('css', 'foo { display: none;| }', null, null);
-		assertCompletions('css', 'foo { display: none|; }', null, null);
-		assertCompletions('css', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
-	});
-
-	test('Scss Emmet Completions', function (): any {
-		this.skip(); // disabled again (see #29113)
-
-		assertCompletions('scss', '.foo { display: none; .bar { m10| } }', 'margin: 10px;', 'margin: 10px;');
-		assertCompletions('scss', 'foo { display: none; .bar { pos:f| } }', 'position: fixed;', 'position: fixed;');
-		assertCompletions('scss', 'foo { display: none; margin: a| .bar {}}', null, null);
-		assertCompletions('scss', 'foo| { display: none; }', null, null);
-		assertCompletions('scss', 'foo {| display: none; }', null, null);
-		assertCompletions('scss', 'foo { display: none;| }', null, null);
-		assertCompletions('scss', 'foo { display: none|; }', null, null);
-		assertCompletions('scss', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;');
-	});
-});
\ No newline at end of file
diff --git a/extensions/css-language-features/server/src/utils/errors.ts b/extensions/css-language-features/server/src/utils/errors.ts
deleted file mode 100644
index d5a0c8e7d05..00000000000
--- a/extensions/css-language-features/server/src/utils/errors.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-export function formatError(message: string, err: any): string {
-	if (err instanceof Error) {
-		let error = <Error>err;
-		return `${message}: ${error.message}\n${error.stack}`;
-	} else if (typeof err === 'string') {
-		return `${message}: ${err}`;
-	} else if (err) {
-		return `${message}: ${err.toString()}`;
-	}
-	return message;
-}
-
-export function runSafe<T>(func: () => Thenable<T> | T, errorVal: T, errorMessage: string): Thenable<T> | T {
-	try {
-		let t = func();
-		if (t instanceof Promise) {
-			return t.then(void 0, e => {
-				console.error(formatError(errorMessage, e));
-				return errorVal;
-			});
-		}
-		return t;
-	} catch (e) {
-		console.error(formatError(errorMessage, e));
-		return errorVal;
-	}
-}
\ No newline at end of file
diff --git a/extensions/css-language-features/server/src/utils/runner.ts b/extensions/css-language-features/server/src/utils/runner.ts
new file mode 100644
index 00000000000..273194ce431
--- /dev/null
+++ b/extensions/css-language-features/server/src/utils/runner.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { ResponseError, ErrorCodes, CancellationToken } from 'vscode-languageserver';
+
+export function formatError(message: string, err: any): string {
+	if (err instanceof Error) {
+		let error = <Error>err;
+		return `${message}: ${error.message}\n${error.stack}`;
+	} else if (typeof err === 'string') {
+		return `${message}: ${err}`;
+	} else if (err) {
+		return `${message}: ${err.toString()}`;
+	}
+	return message;
+}
+
+export function runSafe<T, E>(func: () => T, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<E>> {
+	return new Promise<T | ResponseError<E>>((resolve, reject) => {
+		setImmediate(() => {
+			if (token.isCancellationRequested) {
+				resolve(cancelValue());
+			} else {
+				try {
+					let result = func();
+					if (token.isCancellationRequested) {
+						resolve(cancelValue());
+						return;
+					} else {
+						resolve(result);
+					}
+
+				} catch (e) {
+					console.error(formatError(errorMessage, e));
+					resolve(errorVal);
+				}
+			}
+		});
+	});
+}
+
+function cancelValue<E>() {
+	return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled');
+}
diff --git a/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar b/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/css-language-features/server/test/pathCompletionFixtures/src/data/foo.asar
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/extensions/css-language-features/server/tsconfig.json b/extensions/css-language-features/server/tsconfig.json
index dc12dad6cf0..7f8b647d04b 100644
--- a/extensions/css-language-features/server/tsconfig.json
+++ b/extensions/css-language-features/server/tsconfig.json
@@ -6,7 +6,8 @@
 		"noUnusedLocals": true,
 		"lib": [
 			"es5", "es2015.promise"
-		]
+		],
+		"strict": true
 	},
 	"include": [
 		"src/**/*"
diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock
index 579deb4c9f1..9cf05dd88ee 100644
--- a/extensions/css-language-features/server/yarn.lock
+++ b/extensions/css-language-features/server/yarn.lock
@@ -2,10 +2,6 @@
 # yarn lockfile v1
 
 
-"@emmetio/extract-abbreviation@0.1.6":
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz#e4a9856c1057f0aff7d443b8536477c243abe28c"
-
 "@types/mocha@2.2.33":
   version "2.2.33"
   resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
@@ -14,29 +10,24 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-jsonc-parser@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
-
-vscode-css-languageservice@^3.0.9-next.1:
-  version "3.0.9-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.1.tgz#92319b641a7624e84950aef2c55e5b4db001ff9a"
+vscode-css-languageservice@^3.0.9-next.10:
+  version "3.0.9-next.10"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.10.tgz#be73d571221176b43d2c398a4a27f7d38206952d"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
 
-vscode-emmet-helper@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.0.tgz#6b9311be065c9c99d5de2dae18ea0730d9cfb734"
-  dependencies:
-    "@emmetio/extract-abbreviation" "0.1.6"
-    jsonc-parser "^1.0.0"
-    vscode-languageserver-types "^3.6.0-next.1"
-
 vscode-jsonrpc@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
+  dependencies:
+    vscode-languageserver-protocol "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
+
 vscode-languageserver-protocol@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040"
@@ -48,10 +39,6 @@ vscode-languageserver-types@^3.6.0, vscode-languageserver-types@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d"
 
-vscode-languageserver-types@^3.6.0-next.1:
-  version "3.6.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
-
 vscode-languageserver@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz#8b792f0d6d10acfe363d02371ed4ce53d08af88a"
diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock
index 5f63bd90373..37c6473e3aa 100644
--- a/extensions/css-language-features/yarn.lock
+++ b/extensions/css-language-features/yarn.lock
@@ -6,26 +6,33 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-jsonrpc@^3.6.0-next.1:
-  version "3.6.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
+vscode-jsonrpc@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
-vscode-languageclient@4.0.0-next.9:
-  version "4.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a"
+vscode-languageclient@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz#635f5bfbcfa1385dae489b394857f1db8b459a7d"
   dependencies:
-    vscode-languageserver-protocol "^3.6.0-next.5"
+    vscode-languageserver-protocol "^3.6.0"
 
-vscode-languageserver-protocol@^3.6.0-next.5:
-  version "3.6.0-next.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
   dependencies:
-    vscode-jsonrpc "^3.6.0-next.1"
-    vscode-languageserver-types "^3.6.0-next.1"
+    vscode-languageserver-protocol "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
 
-vscode-languageserver-types@^3.6.0-next.1:
-  version "3.6.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
+vscode-languageserver-protocol@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040"
+  dependencies:
+    vscode-jsonrpc "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
+
+vscode-languageserver-types@^3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d"
 
 vscode-nls@^3.2.1:
   version "3.2.1"
diff --git a/extensions/docker/OSSREADME.json b/extensions/docker/OSSREADME.json
index 28c0191ec17..bc514d5d8b4 100644
--- a/extensions/docker/OSSREADME.json
+++ b/extensions/docker/OSSREADME.json
@@ -4,5 +4,5 @@
 	"version": "0.0.0",
 	"license": "Apache2",
 	"repositoryURL": "https://github.com/moby/moby",
-	"description": "The file syntaxes/Dockerfile.tmLanguage was included from https://github.com/moby/moby/blob/master/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage."
+	"description": "The file syntaxes/docker.tmLanguage was included from https://github.com/moby/moby/blob/master/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage."
 }]
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 7bf52dce604..024c94d10da 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -211,6 +211,11 @@
                     "type": "boolean",
                     "default": false,
                     "description": "%emmetShowSuggestionsAsSnippets%"
+                },
+                "emmet.optimizeStylesheetParsing": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "%emmetOptimizeStylesheetParsing%"
                 }
             }
         },
@@ -439,7 +444,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.2.2",
+        "vscode-emmet-helper": "^1.2.6",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "3.2.1"
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index 36a62bd2694..d43ba09bc46 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -28,7 +28,7 @@
 	"emmetExtensionsPath": "Path to a folder containing Emmet profiles and snippets.'",
 	"emmetShowExpandedAbbreviation": "Shows expanded Emmet abbreviations as suggestions.\nThe option \"inMarkupAndStylesheetFilesOnly\" applies to html, haml, jade, slim, xml, xsl, css, scss, sass, less and stylus.\nThe option \"always\" applies to all parts of the file regardless of markup/css.",
 	"emmetShowAbbreviationSuggestions": "Shows possible Emmet abbreviations as suggestions. Not applicable in stylesheets or when emmet.showExpandedAbbreviation is set to \"never\".",
-	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n Eg: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetIncludeLanguages": "Enable Emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n E.g.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Variables to be used in Emmet snippets",
 	"emmetTriggerExpansionOnTab": "When enabled, Emmet abbreviations are expanded when pressing TAB.",
 	"emmetPreferences": "Preferences used to modify behavior of some actions and resolvers of Emmet.",
@@ -53,5 +53,6 @@
 	"emmetPreferencesCssMozProperties": "Comma separated CSS properties that get the 'moz' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'moz' prefix.",
 	"emmetPreferencesCssOProperties": "Comma separated CSS properties that get the 'o' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'o' prefix.",
 	"emmetPreferencesCssMsProperties": "Comma separated CSS properties that get the 'ms' vendor prefix when used in Emmet abbreviation that starts with `-`. Set to empty string to always avoid the 'ms' prefix.",
-	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches."
+	"emmetPreferencesCssFuzzySearchMinScore": "The minimum score (from 0 to 1) that fuzzy-matched abbreviation should achieve. Lower values may produce many false-positive matches, higher values may reduce possible matches.",
+	"emmetOptimizeStylesheetParsing": "When set to false, the whole file is parsed to determine if current position is valid for expanding Emmet abbreviations. When set to true, only the content around the current position in css/scss/less files is parsed."
 }
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 9441ccdebde..ad5934c6c99 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node, HtmlNode, Rule, Property } from 'EmmetNode';
-import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode } from './util';
+import { Node, HtmlNode, Rule, Property, Stylesheet } from 'EmmetNode';
+import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode, parsePartialStylesheet } from './util';
 
 const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/;
 const hexColorRegex = /^#\d+$/;
@@ -227,8 +227,13 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 	}
 
 	const editor = vscode.window.activeTextEditor;
-
-	let rootNode = parseDocument(editor.document, false);
+	let rootNode: Node | undefined;
+	let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true;
+	if (editor.selections.length === 1 && isStyleSheet(editor.document.languageId) && usePartialParsing && editor.document.lineCount > 1000) {
+		rootNode = parsePartialStylesheet(editor.document, editor.selection.isReversed ? editor.selection.anchor : editor.selection.active);
+	} else {
+		rootNode = parseDocument(editor.document, false);
+	}
 
 	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
 	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
@@ -290,8 +295,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 			return;
 		}
 
-		let currentNode = getNode(rootNode, position, true);
-		if (!isValidLocationForEmmetAbbreviation(editor.document, currentNode, syntax, position, rangeToReplace)) {
+		if (!isValidLocationForEmmetAbbreviation(editor.document, rootNode, syntax, position, rangeToReplace)) {
 			return;
 		}
 
@@ -321,13 +325,18 @@ function fallbackTab(): Thenable<boolean | undefined> {
  * Checks if given position is a valid location to expand emmet abbreviation.
  * Works only on html and css/less/scss syntax
  * @param document current Text Document
- * @param currentNode parsed node at given position
+ * @param rootNode parsed document
  * @param syntax syntax of the abbreviation
  * @param position position to validate
  * @param abbreviationRange The range of the abbreviation for which given position is being validated
  */
-export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, currentNode: Node | null, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
+export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocument, rootNode: Node | undefined, syntax: string, position: vscode.Position, abbreviationRange: vscode.Range): boolean {
+	const currentNode = rootNode ? getNode(rootNode, position, true) : null;
 	if (isStyleSheet(syntax)) {
+		const stylesheet = <Stylesheet>rootNode;
+		if (stylesheet && (stylesheet.comments || []).some(x => position.isAfterOrEqual(x.start) && position.isBeforeOrEqual(x.end))) {
+			return false;
+		}
 		// Continue validation only if the file was parse-able and the currentNode has been found
 		if (!currentNode) {
 			return true;
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
index 29fdcd860b1..9e06041548d 100644
--- a/extensions/emmet/src/defaultCompletionProvider.ts
+++ b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { Node } from 'EmmetNode';
+import { Stylesheet } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parseDocument, getEmmetConfiguration, getEmmetMode, isStyleSheet } from './util';
+import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument, } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
-	public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Thenable<vscode.CompletionList | undefined> | undefined {
+	public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
 		const emmetConfig = vscode.workspace.getConfiguration('emmet');
 		const excludedLanguages = emmetConfig['excludeLanguages'] ? emmetConfig['excludeLanguages'] : [];
 		if (excludedLanguages.indexOf(document.languageId) > -1) {
@@ -29,25 +29,26 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 
 		const helper = getEmmetHelper();
 		const extractAbbreviationResults = helper.extractAbbreviation(document, position, !isStyleSheet(syntax));
-		if (!extractAbbreviationResults) {
+		if (!extractAbbreviationResults || !helper.isAbbreviationValid(syntax, extractAbbreviationResults.abbreviation)) {
 			return;
 		}
 
-		let validateLocation = syntax === 'html';
-		let currentNode: Node | null = null;
+		let validateLocation = false;
+		let rootNode: Stylesheet | undefined = undefined;
 
-		// If document can be css parsed, get currentNode
-		if (isStyleSheet(document.languageId)) {
-			const rootNode = parseDocument(document, false);
-			if (!rootNode) {
-				return;
+		if (context.triggerKind !== vscode.CompletionTriggerKind.TriggerForIncompleteCompletions) {
+			validateLocation = syntax === 'html' || syntax === 'jsx' || syntax === 'xml' || isStyleSheet(document.languageId);
+			// If document can be css parsed, get currentNode
+			if (isStyleSheet(document.languageId)) {
+				let usePartialParsing = vscode.workspace.getConfiguration('emmet')['optimizeStylesheetParsing'] === true;
+				rootNode = usePartialParsing && document.lineCount > 1000 ? parsePartialStylesheet(document, position) : <Stylesheet>parseDocument(document, false);
+				if (!rootNode) {
+					return;
+				}
 			}
-
-			currentNode = getNode(rootNode, position, true);
-			validateLocation = true;
 		}
 
-		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, currentNode, syntax, position, extractAbbreviationResults.abbreviationRange)) {
+		if (validateLocation && !isValidLocationForEmmetAbbreviation(document, rootNode, syntax, position, extractAbbreviationResults.abbreviationRange)) {
 			return;
 		}
 
@@ -96,10 +97,4 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			return new vscode.CompletionList(newItems, true);
 		});
 	}
-
-
-
-
-
-
 }
\ No newline at end of file
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
index 67a403bce29..38d2b163c01 100644
--- a/extensions/emmet/src/splitJoinTag.ts
+++ b/extensions/emmet/src/splitJoinTag.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
-import { getNode, parseDocument, validate } from './util';
+import { getNode, parseDocument, validate, getEmmetMode, getEmmetConfiguration } from './util';
 
 export function splitJoinTag() {
 	if (!validate(false) || !vscode.window.activeTextEditor) {
@@ -48,6 +48,14 @@ function getRangesToReplace(document: vscode.TextDocument, nodeToUpdate: HtmlNod
 		let end = <vscode.Position>nodeToUpdate.end;
 		rangeToReplace = new vscode.Range(start, end);
 		textToReplaceWith = '/>';
+
+		const emmetMode = getEmmetMode(document.languageId, []) || '';
+		const emmetConfig = getEmmetConfiguration(emmetMode);
+		if (emmetMode && emmetConfig.syntaxProfiles[emmetMode] &&
+			(emmetConfig.syntaxProfiles[emmetMode]['selfClosingStyle'] === 'xhtml' || emmetConfig.syntaxProfiles[emmetMode]['self_closing_tag'] === 'xhtml')) {
+			textToReplaceWith = ' ' + textToReplaceWith;
+		}
+
 	}
 
 	return new vscode.TextEdit(rangeToReplace, textToReplaceWith);
diff --git a/extensions/emmet/src/test/abbreviationAction.test.ts b/extensions/emmet/src/test/abbreviationAction.test.ts
index 4f914717061..a8bd637da32 100644
--- a/extensions/emmet/src/test/abbreviationAction.test.ts
+++ b/extensions/emmet/src/test/abbreviationAction.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection, workspace, CompletionList, CancellationTokenSource } from 'vscode';
+import { Selection, workspace, CompletionList, CancellationTokenSource, CompletionTriggerKind, ConfigurationTarget } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { expandEmmetAbbreviation } from '../abbreviationActions';
 import { DefaultCompletionItemProvider } from '../defaultCompletionProvider';
@@ -36,9 +36,10 @@ const htmlContents = `
 `;
 
 suite('Tests for Expand Abbreviations (HTML)', () => {
+	const oldValueForExcludeLanguages = workspace.getConfiguration('emmet').inspect('excludeLanguages');
 	teardown(() => {
-		// Reset config and close all editors
-		return workspace.getConfiguration('emmet').update('excludeLanguages', []).then(closeAllEditors);
+		// close all editors
+		return closeAllEditors;
 	});
 
 	test('Expand snippets (HTML)', () => {
@@ -63,7 +64,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor('img', 'html', (editor, doc) => {
 			editor.selection = new Selection(0, 3, 0, 3);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise) {
 				assert.equal(!completionPromise, false, `Got unexpected undefined instead of a completion promise`);
 				return Promise.resolve();
@@ -165,7 +166,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(2, 4, 2, 4);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -185,7 +186,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(9, 8, 9, 8);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -207,7 +208,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 		return withRandomFileEditor(fileContents, 'html', (editor, doc) => {
 			editor.selection = new Selection(0, 6, 0, 6);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
 			return Promise.resolve();
 		});
@@ -234,7 +235,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 	// 	return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 	// 		editor.selection = new Selection(13, 3, 13, 6);
 	// 		const cancelSrc = new CancellationTokenSource();
-	// 		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+	// 		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 	// 		if (!completionPromise) {
 	// 			assert.equal(1, 2, `Problem with expanding m10`);
 	// 			return Promise.resolve();
@@ -254,34 +255,35 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
 	// 	});
 	// });
 
-	test('No expanding when html is excluded in the settings', () => {
-		return workspace.getConfiguration('emmet').update('excludeLanguages', ['html']).then(() => {
-			return testExpandAbbreviation('html', new Selection(9, 6, 9, 6), '', '', true).then(() => {
-				return workspace.getConfiguration('emmet').update('excludeLanguages', []);
-			});
-		});
-	});
+	// test('No expanding when html is excluded in the settings', () => {
+	// 	return workspace.getConfiguration('emmet').update('excludeLanguages', ['html'], ConfigurationTarget.Global).then(() => {
+	// 		return testExpandAbbreviation('html', new Selection(9, 6, 9, 6), '', '', true).then(() => {
+	// 			return workspace.getConfiguration('emmet').update('excludeLanguages', oldValueForExcludeLanguages ? oldValueForExcludeLanguages.globalValue : undefined, ConfigurationTarget.Global);
+	// 		});
+	// 	});
+	// });
 
 	test('No expanding when html is excluded in the settings in completion list', () => {
-		return workspace.getConfiguration('emmet').update('excludeLanguages', ['html']).then(() => {
+		return workspace.getConfiguration('emmet').update('excludeLanguages', ['html'], ConfigurationTarget.Global).then(() => {
 			return testHtmlCompletionProvider(new Selection(9, 6, 9, 6), '', '', true).then(() => {
-				return workspace.getConfiguration('emmet').update('excludeLanguages', []);
+				return workspace.getConfiguration('emmet').update('excludeLanguages', oldValueForExcludeLanguages ? oldValueForExcludeLanguages.globalValue : undefined, ConfigurationTarget.Global);
 			});
 		});
 	});
 
-	test('No expanding when php (mapped syntax) is excluded in the settings', () => {
-		return workspace.getConfiguration('emmet').update('excludeLanguages', ['php']).then(() => {
-			return testExpandAbbreviation('php', new Selection(9, 6, 9, 6), '', '', true).then(() => {
-				return workspace.getConfiguration('emmet').update('excludeLanguages', []);
-			});
-		});
-	});
+	// test('No expanding when php (mapped syntax) is excluded in the settings', () => {
+	// 	return workspace.getConfiguration('emmet').update('excludeLanguages', ['php'], ConfigurationTarget.Global).then(() => {
+	// 		return testExpandAbbreviation('php', new Selection(9, 6, 9, 6), '', '', true).then(() => {
+	// 			return workspace.getConfiguration('emmet').update('excludeLanguages', oldValueForExcludeLanguages ? oldValueForExcludeLanguages.globalValue : undefined, ConfigurationTarget.Global);
+	// 		});
+	// 	});
+	// });
 
 
 });
 
 suite('Tests for jsx, xml and xsl', () => {
+	const oldValueForSyntaxProfiles = workspace.getConfiguration('emmet').inspect('syntaxProfiles');
 	teardown(closeAllEditors);
 
 	test('Expand abbreviation with className instead of class in jsx', () => {
@@ -304,6 +306,18 @@ suite('Tests for jsx, xml and xsl', () => {
 		});
 	});
 
+	test('Expand abbreviation with single quotes for jsx', () => {
+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {"attr_quotes": "single"}}, ConfigurationTarget.Global).then(() => {
+			return withRandomFileEditor('img', 'javascriptreact', (editor, doc) => {
+				editor.selection = new Selection(0, 6, 0, 6);
+				return expandEmmetAbbreviation({ language: 'javascriptreact' }).then(() => {
+					assert.equal(editor.document.getText(), '<img src=\'\' alt=\'\'/>');
+					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
+				});
+			});
+		});
+	});
+
 	test('Expand abbreviation with self closing tags for xml', () => {
 		return withRandomFileEditor('img', 'xml', (editor, doc) => {
 			editor.selection = new Selection(0, 6, 0, 6);
@@ -324,6 +338,22 @@ suite('Tests for jsx, xml and xsl', () => {
 		});
 	});
 
+	test('No expanding text inside open tag in completion list (jsx)', () => {
+		return testNoCompletion('jsx', htmlContents, new Selection(2, 4, 2, 4));
+	});
+
+	test('No expanding tag that is opened, but not closed in completion list (jsx)', () => {
+		return testNoCompletion('jsx', htmlContents, new Selection(9, 6, 9, 6));
+	});
+
+	test('No expanding text inside open tag when there is no closing tag in completion list (jsx)', () => {
+		return testNoCompletion('jsx', htmlContents, new Selection(9, 8, 9, 8));
+	});
+
+	test('No expanding text in completion list inside open tag when there is no closing tag when there is no parent node (jsx)', () => {
+		return testNoCompletion('jsx', '<img s', new Selection(0, 6, 0, 6));
+	});
+
 });
 
 function testExpandAbbreviation(syntax: string, selection: Selection, abbreviation: string, expandedText: string, shouldFail?: boolean): Thenable<any> {
@@ -347,7 +377,7 @@ function testHtmlCompletionProvider(selection: Selection, abbreviation: string,
 	return withRandomFileEditor(htmlContents, 'html', (editor, doc) => {
 		editor.selection = selection;
 		const cancelSrc = new CancellationTokenSource();
-		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 		if (!completionPromise) {
 			if (!shouldFail) {
 				assert.equal(1, 2, `Problem with expanding ${abbreviation} to ${expandedText}`);
@@ -370,3 +400,12 @@ function testHtmlCompletionProvider(selection: Selection, abbreviation: string,
 	});
 }
 
+function testNoCompletion(syntax: string, fileContents: string, selection: Selection): Thenable<any> {
+	return withRandomFileEditor(fileContents, syntax, (editor, doc) => {
+		editor.selection = selection;
+		const cancelSrc = new CancellationTokenSource();
+		const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+		assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
+		return Promise.resolve();
+	});
+}
diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
index 9d53d8599f1..78dd6c7c3ba 100644
--- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts
+++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection, CompletionList, CancellationTokenSource, Position } from 'vscode';
+import { Selection, CompletionList, CancellationTokenSource, Position, CompletionTriggerKind } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { expandEmmetAbbreviation } from '../abbreviationActions';
 import { DefaultCompletionItemProvider } from '../defaultCompletionProvider';
@@ -65,6 +65,30 @@ suite('Tests for Expand Abbreviations (CSS)', () => {
 		});
 	});
 
+	test('No emmet when cursor inside comment (CSS)', () => {
+		const testContent = `
+.foo {
+	/*margin: 10px;
+	m10
+	padding: 10px;*/
+	display: auto;
+}
+`;
+
+		return withRandomFileEditor(testContent, 'css', (editor, doc) => {
+			editor.selection = new Selection(3, 4, 3, 4);
+			return expandEmmetAbbreviation(null).then(() => {
+				assert.equal(editor.document.getText(), testContent);
+				const cancelSrc = new CancellationTokenSource();
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+				if (completionPromise) {
+					assert.equal(1, 2, `Invalid completion at property value`);
+				}
+				return Promise.resolve();
+			});
+		});
+	});
+
 	test('No emmet when cursor in selector of a rule (CSS)', () => {
 		const testContent = `
 .foo {
@@ -79,7 +103,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -101,7 +125,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -118,7 +142,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(0, 30), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(0, 30), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -140,7 +164,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -170,7 +194,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -192,7 +216,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(3, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -221,7 +245,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
@@ -242,7 +266,7 @@ nav#
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), testContent.replace('#12', '#121212'));
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(2, 12), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (!completionPromise) {
 					assert.fail('Completion promise wasnt returned');
 					return Promise.resolve();
@@ -266,8 +290,8 @@ nav#
 		return withRandomFileEditor(cssContents, 'css', (editor, doc) => {
 			editor.selection = new Selection(3, 1, 3, 6);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token);
-			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token);
+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 6), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise1 || !completionPromise2) {
 				assert.equal(1, 2, `Problem with expanding pos:f`);
 				return Promise.resolve();
@@ -312,10 +336,10 @@ nav#
 		return withRandomFileEditor(scssContents, 'scss', (editor, doc) => {
 			editor.selection = new Selection(3, 4, 3, 4);
 			const cancelSrc = new CancellationTokenSource();
-			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 4), cancelSrc.token);
-			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 5), cancelSrc.token);
-			const completionPromise3 = completionProvider.provideCompletionItems(editor.document, new Position(11, 4), cancelSrc.token);
-			const completionPromise4 = completionProvider.provideCompletionItems(editor.document, new Position(14, 5), cancelSrc.token);
+			const completionPromise1 = completionProvider.provideCompletionItems(editor.document, new Position(3, 4), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise2 = completionProvider.provideCompletionItems(editor.document, new Position(5, 5), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise3 = completionProvider.provideCompletionItems(editor.document, new Position(11, 4), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			const completionPromise4 = completionProvider.provideCompletionItems(editor.document, new Position(14, 5), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (!completionPromise1) {
 				assert.equal(1, 2, `Problem with expanding padding abbreviations at line 3 col 4`);
 			}
@@ -392,13 +416,13 @@ m10
 		return withRandomFileEditor(scssContentsNoExpand, 'scss', (editor, doc) => {
 			editor.selection = new Selection(1, 3, 1, 3); // outside rule
 			const cancelSrc = new CancellationTokenSource();
-			let completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			let completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (completionPromise) {
 				assert.equal(1, 2, `m10 gets expanded in invalid location (outside rule)`);
 			}
 
 			editor.selection = new Selection(5, 15, 5, 15); // in the value part of property value
-			completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token);
+			completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (completionPromise) {
 				return completionPromise.then((completionList: CompletionList) => {
 					if (completionList && completionList.items && completionList.items.length > 0) {
@@ -419,7 +443,7 @@ m10
 			return expandEmmetAbbreviation(null).then(() => {
 				assert.equal(editor.document.getText(), scssContents);
 				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token);
+				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 				if (completionPromise) {
 					assert.equal(1, 2, `Invalid completion at property value`);
 				}
diff --git a/extensions/emmet/src/test/partialParsingStylesheet.test.ts b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
new file mode 100644
index 00000000000..6c3b995960f
--- /dev/null
+++ b/extensions/emmet/src/test/partialParsingStylesheet.test.ts
@@ -0,0 +1,255 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'mocha';
+import * as assert from 'assert';
+import { withRandomFileEditor } from './testUtils';
+import * as vscode from 'vscode';
+import { parsePartialStylesheet } from '../util';
+import { isValidLocationForEmmetAbbreviation } from '../abbreviationActions';
+
+
+
+suite('Tests for partial parse of Stylesheets', () => {
+	test('Ignore block comment inside rule', function (): any {
+		const cssContents = `
+p {
+	margin: p ;
+	/*dn: none; p */ p
+	p
+	p.
+} p
+`;
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(3, 18, 3, 19),		// Same line after block comment
+				new vscode.Range(4, 1, 4, 2),		// p after block comment
+				new vscode.Range(5, 1, 5, 3)		// p. after block comment
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 1),		// Selector
+				new vscode.Range(2, 9, 2, 10),		// Property value
+				new vscode.Range(3, 3, 3, 5),		// dn inside block comment
+				new vscode.Range(3, 13, 3, 14),		// p just before ending of block comment
+				new vscode.Range(6, 2, 6, 3)		// p after ending of block
+
+			]
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), false);
+			});
+
+			return Promise.resolve();
+		});
+	});
+
+	test('Ignore commented braces', function (): any {
+		const sassContents = `
+.foo
+// .foo { brs
+/* .foo { op.3 
+dn	{
+*/
+	@
+} bg
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 4),		// Selector
+				new vscode.Range(2, 3, 2, 7),		// Line commented selector
+				new vscode.Range(3, 3, 3, 7),		// Block commented selector
+				new vscode.Range(4, 0, 4, 2),		// dn inside block comment
+				new vscode.Range(6, 1, 6, 2),		// @ inside a rule whose opening brace is commented
+				new vscode.Range(7, 2, 7, 4)		// bg after ending of badly constructed block
+			];
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Block comment between selector and open brace', function (): any {
+		const cssContents = `
+p   
+/* First line
+of a multiline
+comment */
+{
+	margin: p ;
+	/*dn: none; p */ p
+	p
+	p.
+} p
+`;
+		return withRandomFileEditor(cssContents, '.css', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(7, 18, 7, 19),		// Same line after block comment
+				new vscode.Range(8, 1, 8, 2),		// p after block comment
+				new vscode.Range(9, 1, 9, 3)		// p. after block comment
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 2, 1, 3),		// Selector
+				new vscode.Range(3, 3, 3, 4),		// Inside multiline comment
+				new vscode.Range(5, 0, 5, 1),		// Opening Brace
+				new vscode.Range(6, 9, 6, 10),		// Property value
+				new vscode.Range(7, 3, 7, 5),		// dn inside block comment
+				new vscode.Range(7, 13, 7, 14),		// p just before ending of block comment
+				new vscode.Range(10, 2, 10, 3)		// p after ending of block
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'css', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Nested and consecutive rulesets with errors', function (): any {
+		const sassContents = `
+.foo{
+	a
+	a
+}}{ p
+}
+.bar{
+	@
+	.rudi {
+		@
+	}
+}}}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 1, 2, 2),		// Inside a ruleset before errors
+				new vscode.Range(3, 1, 3, 2),		// Inside a ruleset after no serious error
+				new vscode.Range(7, 1, 7, 2),		// @ inside a so far well structured ruleset
+				new vscode.Range(9, 2, 9, 3),		// @ inside a so far well structured nested ruleset
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(4, 4, 4, 5),		// p inside ruleset without proper selector
+				new vscode.Range(6, 3, 6, 4)		// In selector
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('One liner sass', function (): any {
+		const sassContents = `
+.foo{dn}.bar{.boo{dn}dn}.comd{/*{dn*/p{div{dn}} }.foo{.other{dn}} dn
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(1, 5, 1, 7),		// Inside a ruleset
+				new vscode.Range(1, 18, 1, 20),		// Inside a nested ruleset
+				new vscode.Range(1, 21, 1, 23),		// Inside ruleset after nested one.
+				new vscode.Range(1, 43, 1, 45),		// Inside nested ruleset after comment
+				new vscode.Range(1, 61, 1, 63)		// Inside nested ruleset
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 3, 1, 4),		// In foo selector
+				new vscode.Range(1, 10, 1, 11),		// In bar selector
+				new vscode.Range(1, 15, 1, 16),		// In boo selector
+				new vscode.Range(1, 28, 1, 29),		// In comd selector
+				new vscode.Range(1, 33, 1, 34),		// In commented dn
+				new vscode.Range(1, 37, 1, 38),		// In p selector
+				new vscode.Range(1, 39, 1, 42),		// In div selector
+				new vscode.Range(1, 66, 1, 68)		// Outside any ruleset
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Variables and interpolation', function (): any {
+		const sassContents = `
+p.#{dn} {
+	p.3
+	#{$attr}-color: blue;
+	dn
+} op
+.foo{nes{ted}} {
+	dn
+}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 1, 2, 4),		// p.3 inside a ruleset whose selector uses interpolation
+				new vscode.Range(3, 1, 3, 2),		// # inside ruleset
+				new vscode.Range(4, 1, 4, 3)		// dn inside ruleset after property with variable
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(1, 0, 1, 1),		// In p in selector
+				new vscode.Range(1, 2, 1, 3),		// In # in selector
+				new vscode.Range(1, 4, 1, 6),		// In dn inside variable in selector
+				new vscode.Range(3, 7, 3, 8),		// r of attr inside variable
+				new vscode.Range(5, 2, 5, 4),		// op after ruleset
+				new vscode.Range(7, 1, 7, 3)		// dn inside ruleset whose selector uses nested interpolation
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	test('Comments in sass', function (): any {
+		const sassContents = `
+.foo{
+	/* p // p */ brs6-2p
+	dn
+}
+p
+/* c
+om
+ment */{
+	m10
+}
+.boo{ 
+	op.3
+}
+`;
+		return withRandomFileEditor(sassContents, '.scss', (editor, doc) => {
+			let rangesForEmmet = [
+				new vscode.Range(2, 14, 2, 21),		// brs6-2p with a block commented line comment ('/* */' overrides '//')
+				new vscode.Range(3, 1, 3, 3),		// dn after a line with combined comments inside a ruleset
+				new vscode.Range(9, 1, 9, 4),		// m10 inside ruleset whose selector is before a comment
+				new vscode.Range(12, 1, 12, 5)		// op3 inside a ruleset with commented extra braces
+			];
+			let rangesNotEmmet = [
+				new vscode.Range(2, 4, 2, 5),		// In p inside block comment
+				new vscode.Range(2, 9, 2, 10),		// In p inside block comment and after line comment
+				new vscode.Range(6, 3, 6, 4)		// In c inside block comment
+			];
+			rangesForEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), true);
+			});
+			rangesNotEmmet.forEach(range => {
+				assert.equal(isValidLocationForEmmetAbbreviation(doc, parsePartialStylesheet(doc, range.end), 'scss', range.end, range), false);
+			});
+			return Promise.resolve();
+		});
+	});
+
+	
+});
\ No newline at end of file
diff --git a/extensions/emmet/src/test/tagActions.test.ts b/extensions/emmet/src/test/tagActions.test.ts
index fa4f680cd18..4c721cf4d54 100644
--- a/extensions/emmet/src/test/tagActions.test.ts
+++ b/extensions/emmet/src/test/tagActions.test.ts
@@ -5,7 +5,7 @@
 
 import 'mocha';
 import * as assert from 'assert';
-import { Selection } from 'vscode';
+import { Selection, workspace, ConfigurationTarget } from 'vscode';
 import { withRandomFileEditor, closeAllEditors } from './testUtils';
 import { removeTag } from '../removeTag';
 import { updateTag } from '../updateTag';
@@ -14,7 +14,10 @@ import { splitJoinTag } from '../splitJoinTag';
 import { mergeLines } from '../mergeLines';
 
 suite('Tests for Emmet actions on html tags', () => {
-	teardown(closeAllEditors);
+	teardown(() => {
+		// close all editors
+		return closeAllEditors;
+	});
 
 	const contents = `
 	<div class="hello">
@@ -102,6 +105,33 @@ suite('Tests for Emmet actions on html tags', () => {
 		});
 	});
 
+	test('split/join tag in jsx with xhtml self closing tag', () => {
+		const expectedContents = `
+	<div class="hello">
+		<ul>
+			<li><span /></li>
+			<li><span>There</span></li>
+			<div><li><span>Bye</span></li></div>
+		</ul>
+		<span></span>
+	</div>
+	`;
+		const oldValueForSyntaxProfiles = workspace.getConfiguration('emmet').inspect('syntaxProfiles');
+		return workspace.getConfiguration('emmet').update('syntaxProfiles', {jsx: {selfClosingStyle: 'xhtml'}}, ConfigurationTarget.Global).then(() =>{
+			return withRandomFileEditor(contents, 'jsx', (editor, doc) => {
+				editor.selections = [
+					new Selection(3, 17, 3, 17), // join tag
+					new Selection(7, 5, 7, 5), // split tag
+				];
+
+				return splitJoinTag()!.then(() => {
+					assert.equal(doc.getText(), expectedContents);
+					return workspace.getConfiguration('emmet').update('syntaxProfiles', oldValueForSyntaxProfiles ? oldValueForSyntaxProfiles.globalValue : undefined, ConfigurationTarget.Global);
+				});
+			});
+		});
+	});
+
 	test('match tag with mutliple cursors', () => {
 		return withRandomFileEditor(contents, 'html', (editor, doc) => {
 			editor.selections = [
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index e9f21c463ae..3d0d8e2ac5d 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
-import { Node, HtmlNode, CssToken, Property, Rule } from 'EmmetNode';
+import { Node, HtmlNode, CssToken, Property, Rule, Stylesheet } from 'EmmetNode';
 import { DocumentStreamReader } from './bufferStream';
 
 let _emmetHelper: any;
@@ -128,6 +128,157 @@ export function parseDocument(document: vscode.TextDocument, showError: boolean
 	return undefined;
 }
 
+const closeBrace = 125;
+const openBrace = 123;
+const slash = 47;
+const star = 42;
+
+export function parsePartialStylesheet(document: vscode.TextDocument, position: vscode.Position): Stylesheet | undefined {
+	const isCSS = document.languageId === 'css';
+	let startPosition = new vscode.Position(0, 0);
+	let endPosition = new vscode.Position(document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length);
+	const limitCharacter = document.offsetAt(position) - 5000;
+	const limitPosition = limitCharacter > 0 ? document.positionAt(limitCharacter) : startPosition;
+	const stream = new DocumentStreamReader(document, position);
+
+	function consumeLineCommentBackwards() {
+		if (!isCSS && currentLine !== stream.pos.line) {
+			currentLine = stream.pos.line;
+			let startLineComment = document.lineAt(currentLine).text.indexOf('//');
+			if (startLineComment > -1) {
+				stream.pos = new vscode.Position(currentLine, startLineComment);
+			}
+		}
+	}
+
+	function consumeBlockCommentBackwards() {
+		if (stream.peek() === slash) {
+			if (stream.backUp(1) === star) {
+				stream.pos = findOpeningCommentBeforePosition(document, stream.pos) || startPosition;
+			} else {
+				stream.next();
+			}
+		}
+	}
+
+	function consumeCommentForwards() {
+		if (stream.eat(slash)) {
+			if (stream.eat(slash) && !isCSS) {
+				stream.pos = new vscode.Position(stream.pos.line + 1, 0);
+			} else if (stream.eat(star)) {
+				stream.pos = findClosingCommentAfterPosition(document, stream.pos) || endPosition;
+			}
+		}
+	}
+
+	// Go forward until we find a closing brace.
+	while (!stream.eof() && !stream.eat(closeBrace)) {
+		if (stream.peek() === slash) {
+			consumeCommentForwards();
+		} else {
+			stream.next();
+		}
+	}
+
+	if (!stream.eof()) {
+		endPosition = stream.pos;
+	}
+
+	stream.pos = position;
+	let openBracesToFind = 1;
+	let currentLine = position.line;
+	let exit = false;
+
+	// Go back until we found an opening brace. If we find a closing one, consume its pair and continue.
+	while (!exit && openBracesToFind > 0 && !stream.sof()) {
+		consumeLineCommentBackwards();
+
+		switch (stream.backUp(1)) {
+			case openBrace:
+				openBracesToFind--;
+				break;
+			case closeBrace:
+				if (isCSS) {
+					stream.next();
+					startPosition = stream.pos;
+					exit = true;
+				} else {
+					openBracesToFind++;
+				}
+				break;
+			case slash:
+				consumeBlockCommentBackwards();
+				break;
+			default:
+				break;
+		}
+
+		if (position.line - stream.pos.line > 100 || stream.pos.isBeforeOrEqual(limitPosition)) {
+			exit = true;
+		}
+	}
+
+	// We are at an opening brace. We need to include its selector.
+	currentLine = stream.pos.line;
+	openBracesToFind = 0;
+	let foundSelector = false;
+	while (!exit && !stream.sof() && !foundSelector && openBracesToFind >= 0) {
+
+		consumeLineCommentBackwards();
+
+		const ch = stream.backUp(1);
+		if (/\s/.test(String.fromCharCode(ch))) {
+			continue;
+		}
+
+		switch (ch) {
+			case slash:
+				consumeBlockCommentBackwards();
+				break;
+			case closeBrace:
+				openBracesToFind++;
+				break;
+			case openBrace:
+				openBracesToFind--;
+				break;
+			default:
+				if (!openBracesToFind) {
+					foundSelector = true;
+				}
+				break;
+		}
+
+		if (!stream.sof() && foundSelector) {
+			startPosition = stream.pos;
+		}
+	}
+
+	try {
+		return parseStylesheet(new DocumentStreamReader(document, startPosition, new vscode.Range(startPosition, endPosition)));
+	} catch (e) {
+
+	}
+}
+
+function findOpeningCommentBeforePosition(document: vscode.TextDocument, position: vscode.Position): vscode.Position | undefined {
+	let text = document.getText(new vscode.Range(0, 0, position.line, position.character));
+	let offset = text.lastIndexOf('/*');
+	if (offset === -1) {
+		return;
+	}
+	return document.positionAt(offset);
+}
+
+function findClosingCommentAfterPosition(document: vscode.TextDocument, position: vscode.Position): vscode.Position | undefined {
+	let text = document.getText(new vscode.Range(position.line, position.character, document.lineCount - 1, document.lineAt(document.lineCount - 1).text.length));
+	let offset = text.indexOf('*/');
+	if (offset === -1) {
+		return;
+	}
+	offset += 2 + document.offsetAt(position);
+	return document.positionAt(offset);
+}
+
 /**
  * Returns node corresponding to given position in the given root node
  */
@@ -317,7 +468,10 @@ export function getEmmetConfiguration(syntax: string) {
 			&& !syntaxProfiles[syntax].hasOwnProperty('self_closing_tag') // Old Emmet format
 			&& !syntaxProfiles[syntax].hasOwnProperty('selfClosingStyle') // Emmet 2.0 format
 		) {
-			syntaxProfiles[syntax]['selfClosingStyle'] = 'xml';
+			syntaxProfiles[syntax] = {
+				...syntaxProfiles[syntax],
+				selfClosingStyle: 'xml'
+			};
 		}
 	}
 
@@ -333,7 +487,7 @@ export function getEmmetConfiguration(syntax: string) {
 }
 
 /**
- * Itereates by each child, as well as nested child’ children, in their order
+ * Itereates by each child, as well as nested child's children, in their order
  * and invokes `fn` for each. If `fn` function returns `false`, iteration stops
  */
 export function iterateCSSToken(token: CssToken, fn: (x: any) => any) {
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index c3bc0c344cf..90db3c63673 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.2.tgz#3df10164b3ee040d90a5216d007fcabbf3e303c7"
+vscode-emmet-helper@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.6.tgz#6cc7293765af7136d409d0d62ef17c66e8b9cf45"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index b5feab96d7a..e5c502426c0 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -7,10 +7,6 @@
 	"engines": {
 		"vscode": "^1.4.0"
 	},
-	"categories": [
-		"Languages",
-		"Other"
-	],
 	"activationEvents": [
 		"onLanguage:json",
 		"onLanguage:markdown",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 8cbc306699a..f6d86f0a91b 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -878,7 +878,7 @@
           ],
           "description": "%config.path%",
           "default": null,
-          "isExecutable": true
+          "scope": "application"
         },
         "git.autoRepositoryDetection": {
           "type": "boolean",
@@ -1113,7 +1113,8 @@
     "byline": "^5.0.0",
     "file-type": "^7.2.0",
     "iconv-lite": "0.4.19",
-    "vscode-extension-telemetry": "0.0.15",
+    "jschardet": "^1.6.0",
+    "vscode-extension-telemetry": "0.0.16",
     "vscode-nls": "^3.2.1",
     "which": "^1.3.0"
   },
@@ -1125,4 +1126,4 @@
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 7cf5d096d7e..e37383c4932 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1205,7 +1205,7 @@ export class CommandCenter {
 
 			const message = localize('confirm force delete branch', "The branch '{0}' is not fully merged. Delete anyway?", name);
 			const yes = localize('delete branch', "Delete Branch");
-			const pick = await window.showWarningMessage(message, yes);
+			const pick = await window.showWarningMessage(message, { modal: true }, yes);
 
 			if (pick === yes) {
 				await run(true);
diff --git a/extensions/git/src/encoding.ts b/extensions/git/src/encoding.ts
new file mode 100644
index 00000000000..4396105567f
--- /dev/null
+++ b/extensions/git/src/encoding.ts
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as jschardet from 'jschardet';
+
+jschardet.Constants.MINIMUM_THRESHOLD = 0.2;
+
+function detectEncodingByBOM(buffer: NodeBuffer): string | null {
+	if (!buffer || buffer.length < 2) {
+		return null;
+	}
+
+	const b0 = buffer.readUInt8(0);
+	const b1 = buffer.readUInt8(1);
+
+	// UTF-16 BE
+	if (b0 === 0xFE && b1 === 0xFF) {
+		return 'utf16be';
+	}
+
+	// UTF-16 LE
+	if (b0 === 0xFF && b1 === 0xFE) {
+		return 'utf16le';
+	}
+
+	if (buffer.length < 3) {
+		return null;
+	}
+
+	const b2 = buffer.readUInt8(2);
+
+	// UTF-8
+	if (b0 === 0xEF && b1 === 0xBB && b2 === 0xBF) {
+		return 'utf8';
+	}
+
+	return null;
+}
+
+const IGNORE_ENCODINGS = [
+	'ascii',
+	'utf-8',
+	'utf-16',
+	'utf-32'
+];
+
+const JSCHARDET_TO_ICONV_ENCODINGS: { [name: string]: string } = {
+	'ibm866': 'cp866',
+	'big5': 'cp950'
+};
+
+export function detectEncoding(buffer: Buffer): string | null {
+	let result = detectEncodingByBOM(buffer);
+
+	if (result) {
+		return result;
+	}
+
+	const detected = jschardet.detect(buffer);
+
+	if (!detected || !detected.encoding) {
+		return null;
+	}
+
+	const encoding = detected.encoding;
+
+	// Ignore encodings that cannot guess correctly
+	// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
+	if (0 <= IGNORE_ENCODINGS.indexOf(encoding.toLowerCase())) {
+		return null;
+	}
+
+	const normalizedEncodingName = encoding.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+	const mapped = JSCHARDET_TO_ICONV_ENCODINGS[normalizedEncodingName];
+
+	return mapped || normalizedEncodingName;
+}
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 1ae77fd7072..dc4829808b4 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -15,6 +15,7 @@ import iconv = require('iconv-lite');
 import * as filetype from 'file-type';
 import { assign, uniqBy, groupBy, denodeify, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent } from './util';
 import { CancellationToken } from 'vscode';
+import { detectEncoding } from './encoding';
 
 const readfile = denodeify<string, string | null, string>(fs.readFile);
 
@@ -659,9 +660,16 @@ export class Repository {
 		return result.stdout;
 	}
 
-	async bufferString(object: string, encoding: string = 'utf8'): Promise<string> {
+	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
 		const stdout = await this.buffer(object);
-		return iconv.decode(stdout, iconv.encodingExists(encoding) ? encoding : 'utf8');
+
+		if (autoGuessEncoding) {
+			encoding = detectEncoding(stdout) || encoding;
+		}
+
+		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+
+		return iconv.decode(stdout, encoding);
 	}
 
 	async buffer(object: string): Promise<Buffer> {
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index 3ceb2dc3fc9..65036c93a7b 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -235,10 +235,9 @@ export class Model {
 			if (repository.submodules.length > submodulesLimit) {
 				window.showWarningMessage(localize('too many submodules', "The '{0}' repository has {1} submodules which won't be opened automatically. You can still open each one individually by opening a file within.", path.basename(repository.root), repository.submodules.length));
 				statusListener.dispose();
-				return;
 			}
 
-			this.scanSubmodules(repository);
+			this.scanSubmodules(repository, submodulesLimit);
 		};
 
 		const statusListener = repository.onDidRunGitStatus(checkForSubmodules);
@@ -260,7 +259,7 @@ export class Model {
 		this._onDidOpenRepository.fire(repository);
 	}
 
-	private scanSubmodules(repository: Repository): void {
+	private scanSubmodules(repository: Repository, limit: number): void {
 		const shouldScanSubmodules = workspace
 			.getConfiguration('git', Uri.file(repository.root))
 			.get<boolean>('detectSubmodules') === true;
@@ -270,6 +269,7 @@ export class Model {
 		}
 
 		repository.submodules
+			.slice(0, limit)
 			.map(r => path.join(repository.root, r.path))
 			.forEach(p => this.eventuallyScanPossibleGitRepository(p));
 	}
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 7586abee7eb..cca9f563060 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -811,24 +811,20 @@ export class Repository implements Disposable {
 	}
 
 	async show(ref: string, filePath: string): Promise<string> {
-		return await this.run(Operation.Show, async () => {
+		return this.run(Operation.Show, () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
 			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
-			const encoding = configFiles.get<string>('encoding');
+			const defaultEncoding = configFiles.get<string>('encoding');
+			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
 
-			// TODO@joao: Resource config api
-			return await this.repository.bufferString(`${ref}:${relativePath}`, encoding);
+			return this.repository.bufferString(`${ref}:${relativePath}`, defaultEncoding, autoGuessEncoding);
 		});
 	}
 
 	async buffer(ref: string, filePath: string): Promise<Buffer> {
-		return await this.run(Operation.Show, async () => {
+		return this.run(Operation.Show, () => {
 			const relativePath = path.relative(this.repository.root, filePath).replace(/\\/g, '/');
-			// const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
-			// const encoding = configFiles.get<string>('encoding');
-
-			// TODO@joao: REsource config api
-			return await this.repository.buffer(`${ref}:${relativePath}`);
+			return this.repository.buffer(`${ref}:${relativePath}`);
 		});
 	}
 
diff --git a/extensions/git/src/typings/jschardet.d.ts b/extensions/git/src/typings/jschardet.d.ts
new file mode 100644
index 00000000000..9c553b129eb
--- /dev/null
+++ b/extensions/git/src/typings/jschardet.d.ts
@@ -0,0 +1,11 @@
+declare module 'jschardet' {
+	export interface IDetectedMap {
+		encoding: string,
+		confidence: number
+	}
+	export function detect(buffer: NodeBuffer): IDetectedMap;
+
+	export const Constants: {
+		MINIMUM_THRESHOLD: number,
+	}
+}
\ No newline at end of file
diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock
index 747060bcb3f..06a4b992dbb 100644
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -145,6 +145,10 @@ isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
+jschardet@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
+
 json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
diff --git a/extensions/html-language-features/client/src/htmlMain.ts b/extensions/html-language-features/client/src/htmlMain.ts
index b90975f8b4a..6e25547a896 100644
--- a/extensions/html-language-features/client/src/htmlMain.ts
+++ b/extensions/html-language-features/client/src/htmlMain.ts
@@ -8,13 +8,13 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, FoldingRangeList, FoldingRange, FoldingContext } from 'vscode';
+import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, FoldingRangeKind, FoldingRange, FoldingContext } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams, Disposable, CancellationToken } from 'vscode-languageclient';
 import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
 import { activateTagClosing } from './tagClosing';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
-import { FoldingRangesRequest, FoldingRangeRequestParam } from 'vscode-languageserver-protocol-foldingprovider';
+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
@@ -64,6 +64,21 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('html', localize('htmlserver.name', 'HTML Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
+	client.registerFeature({
+		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
+			let textDocumentCap = capabilities.textDocument;
+			if (!textDocumentCap) {
+				textDocumentCap = capabilities.textDocument = {};
+			}
+			textDocumentCap.foldingRange = {
+				dynamicRegistration: false,
+				rangeLimit: 5000,
+				lineFoldingOnly: true
+			};
+		},
+		initialize(capabilities, documentSelector): void {
+		}
+	});
 
 	let disposable = client.start();
 	toDispose.push(disposable);
@@ -159,19 +174,30 @@ export function activate(context: ExtensionContext) {
 	});
 
 	function initFoldingProvider(): Disposable {
-		return languages.registerFoldingProvider(documentSelector, {
+		const kinds: { [value: string]: FoldingRangeKind } = Object.create(null);
+		function getKind(value: string | undefined) {
+			if (!value) {
+				return void 0;
+			}
+			let kind = kinds[value];
+			if (!kind) {
+				kind = new FoldingRangeKind(value);
+				kinds[value] = kind;
+			}
+			return kind;
+		}
+		return languages.registerFoldingRangeProvider(documentSelector, {
 			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
 				const param: FoldingRangeRequestParam = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-					maxRanges: context.maxRanges
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
 				};
-				return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
-					if (res && Array.isArray(res.ranges)) {
-						return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
+					if (Array.isArray(ranges)) {
+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
 					}
 					return null;
 				}, error => {
-					client.logFailedRequest(FoldingRangesRequest.type, error);
+					client.logFailedRequest(FoldingRangeRequest.type, error);
 					return null;
 				});
 			}
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index c36e609a75b..2de21c20bd7 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -21,6 +21,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+  "categories": [
+    "Programming Languages"
+  ],
   "contributes": {
     "configuration": {
       "id": "html",
@@ -169,9 +172,9 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.15",
+    "vscode-extension-telemetry": "0.0.16",
     "vscode-languageclient": "^4.0.0",
-    "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2",
     "vscode-nls": "^3.2.2"
   },
   "devDependencies": {
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 6db1fd11ba0..395b66b65b5 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -8,11 +8,11 @@
     "node": "*"
   },
   "dependencies": {
-    "vscode-css-languageservice": "^3.0.8",
-    "vscode-emmet-helper": "1.2.1",
-    "vscode-html-languageservice": "^2.1.1",
+    "vscode-css-languageservice": "^3.0.9-next.7",
+    "vscode-emmet-helper": "1.2.6",
+    "vscode-html-languageservice": "^2.1.3-next.2",
     "vscode-languageserver": "^4.0.0",
-    "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2",
     "vscode-languageserver-types": "^3.6.1",
     "vscode-nls": "^3.2.2",
     "vscode-uri": "^1.0.3"
diff --git a/extensions/html-language-features/server/src/htmlServerMain.ts b/extensions/html-language-features/server/src/htmlServerMain.ts
index aa1ce562f00..c054ca83845 100644
--- a/extensions/html-language-features/server/src/htmlServerMain.ts
+++ b/extensions/html-language-features/server/src/htmlServerMain.ts
@@ -20,8 +20,8 @@ import uri from 'vscode-uri';
 import { formatError, runSafe, runSafeAsync } from './utils/runner';
 import { doComplete as emmetDoComplete, updateExtensionsPath as updateEmmetExtensionsPath, getEmmetCompletionParticipants } from 'vscode-emmet-helper';
 
-import { FoldingRangesRequest, FoldingProviderServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
-import { getFoldingRegions } from './modes/htmlFolding';
+import { FoldingRangeRequest, FoldingRangeServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
+import { getFoldingRanges } from './modes/htmlFolding';
 
 namespace TagCloseRequest {
 	export const type: RequestType<TextDocumentPositionParams, string | null, any, any> = new RequestType('html/tag');
@@ -55,6 +55,7 @@ let clientSnippetSupport = false;
 let clientDynamicRegisterSupport = false;
 let scopedSettingsSupport = false;
 let workspaceFoldersSupport = false;
+let foldingRangeLimit = Number.MAX_VALUE;
 
 var globalSettings: Settings = {};
 let documentSettings: { [key: string]: Thenable<Settings> } = {};
@@ -81,8 +82,8 @@ let emmetSettings: any = {};
 let currentEmmetExtensionsPath: string;
 const emmetTriggerCharacters = ['!', '.', '}', ':', '*', '$', ']', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
 
-// After the server has started the client sends an initilize request. The server receives
-// in the passed params the rootPath of the workspace plus the client capabilites
+// After the server has started the client sends an initialize request. The server receives
+// in the passed params the rootPath of the workspace plus the client capabilities
 connection.onInitialize((params: InitializeParams): InitializeResult => {
 	let initializationOptions = params.initializationOptions;
 
@@ -106,19 +107,24 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		languageModes.dispose();
 	});
 
-	function hasClientCapability(...keys: string[]) {
-		let c = <any>params.capabilities;
+	function getClientCapability<T>(name: string, def: T) {
+		let keys = name.split('.');
+		let c: any = params.capabilities;
 		for (let i = 0; c && i < keys.length; i++) {
+			if (!c.hasOwnProperty(keys[i])) {
+				return def;
+			}
 			c = c[keys[i]];
 		}
-		return !!c;
+		return c;
 	}
 
-	clientSnippetSupport = hasClientCapability('textDocument', 'completion', 'completionItem', 'snippetSupport');
-	clientDynamicRegisterSupport = hasClientCapability('workspace', 'symbol', 'dynamicRegistration');
-	scopedSettingsSupport = hasClientCapability('workspace', 'configuration');
-	workspaceFoldersSupport = hasClientCapability('workspace', 'workspaceFolders');
-	let capabilities: ServerCapabilities & FoldingProviderServerCapabilities = {
+	clientSnippetSupport = getClientCapability('textDocument.completion.completionItem.snippetSupport', false);
+	clientDynamicRegisterSupport = getClientCapability('workspace.symbol.dynamicRegistration', false);
+	scopedSettingsSupport = getClientCapability('workspace.configuration', false);
+	workspaceFoldersSupport = getClientCapability('workspace.workspaceFolders', false);
+	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
+	let capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: [...emmetTriggerCharacters, '.', ':', '<', '"', '=', '/'] } : undefined,
@@ -131,7 +137,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		signatureHelpProvider: { triggerCharacters: ['('] },
 		referencesProvider: true,
 		colorProvider: true,
-		foldingProvider: true
+		foldingRangeProvider: true
 	};
 	return { capabilities };
 });
@@ -293,8 +299,9 @@ connection.onCompletion(async (textDocumentPosition, token) => {
 		let settings = await getDocumentSettings(document, () => doComplete.length > 2);
 		let result = doComplete(document, textDocumentPosition.position, settings, completionParticipants);
 		if (emmetCompletionList.isIncomplete) {
+			emmetCompletionList.items = emmetCompletionList.items || [];
 			cachedCompletionList = result;
-			if (hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
+			if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
 				emmetCompletionList.items.shift();
 			}
 			return CompletionList.create([...emmetCompletionList.items, ...result.items], emmetCompletionList.isIncomplete || result.isIncomplete);
@@ -460,11 +467,11 @@ connection.onRequest(TagCloseRequest.type, (params, token) => {
 	}, null, `Error while computing tag close actions for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(FoldingRangesRequest.type, (params, token) => {
+connection.onRequest(FoldingRangeRequest.type, (params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
-			return getFoldingRegions(languageModes, document, params.maxRanges, token);
+			return getFoldingRanges(languageModes, document, foldingRangeLimit, token);
 		}
 		return null;
 	}, null, `Error while computing folding regions for ${params.textDocument.uri}`, token);
diff --git a/extensions/html-language-features/server/src/modes/cssMode.ts b/extensions/html-language-features/server/src/modes/cssMode.ts
index 61f00efdbd5..1b40285ef0d 100644
--- a/extensions/html-language-features/server/src/modes/cssMode.ts
+++ b/extensions/html-language-features/server/src/modes/cssMode.ts
@@ -6,7 +6,7 @@
 
 import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
 import { TextDocument, Position, Range, CompletionList } from 'vscode-languageserver-types';
-import { getCSSLanguageService, Stylesheet, ICompletionParticipant } from 'vscode-css-languageservice';
+import { getCSSLanguageService, Stylesheet, ICompletionParticipant, FoldingRange } from 'vscode-css-languageservice';
 import { LanguageMode, Workspace } from './languageModes';
 import { HTMLDocumentRegions, CSS_STYLE_RULE } from './embeddedSupport';
 import { Color } from 'vscode-languageserver';
@@ -37,7 +37,7 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
 					if (typeof (<any>registeredCompletionParticipants[i]).getId === 'function' && (<any>registeredCompletionParticipants[i]).getId() === 'emmet') {
 						const extractedResults = extractAbbreviation(document, position, { lookAhead: false, syntax: 'css' });
 						if (extractedResults && extractedResults.abbreviation) {
-							registeredCompletionParticipants[i].onCssProperty({ propertyName: extractedResults.abbreviation, range: extractedResults.abbreviationRange });
+							registeredCompletionParticipants[i].onCssProperty!({ propertyName: extractedResults.abbreviation, range: extractedResults.abbreviationRange });
 						}
 					} else {
 						nonEmmetCompletionParticipants.push(registeredCompletionParticipants[i]);
@@ -75,6 +75,11 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
 			let embedded = embeddedCSSDocuments.get(document);
 			return cssLanguageService.getColorPresentations(embedded, cssStylesheets.get(embedded), color, range);
 		},
+		getFoldingRanges(document: TextDocument, range: Range): FoldingRange[] {
+			let embedded = embeddedCSSDocuments.get(document);
+			let ranges = cssLanguageService.getFoldingRanges(embedded, {});
+			return ranges.filter(r => r.startLine >= range.start.line && r.endLine < range.end.line);
+		},
 		onDocumentRemoved(document: TextDocument) {
 			embeddedCSSDocuments.onDocumentRemoved(document);
 			cssStylesheets.onDocumentRemoved(document);
diff --git a/extensions/html-language-features/server/src/modes/htmlFolding.ts b/extensions/html-language-features/server/src/modes/htmlFolding.ts
index e6ce75d8305..429dc3ac1a2 100644
--- a/extensions/html-language-features/server/src/modes/htmlFolding.ts
+++ b/extensions/html-language-features/server/src/modes/htmlFolding.ts
@@ -3,14 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
-import { TextDocument, CancellationToken, Position } from 'vscode-languageserver';
-import { LanguageService as HTMLLanguageService, TokenType, Range } from 'vscode-html-languageservice';
-
-import { FoldingRangeType, FoldingRange, FoldingRangeList } from 'vscode-languageserver-protocol-foldingprovider';
+import { TextDocument, CancellationToken, Position, Range } from 'vscode-languageserver';
+import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
 import { LanguageModes } from './languageModes';
-import { binarySearch } from '../utils/arrays';
 
-export function getFoldingRegions(languageModes: LanguageModes, document: TextDocument, maxRanges: number | undefined, cancellationToken: CancellationToken | null): FoldingRangeList {
+export function getFoldingRanges(languageModes: LanguageModes, document: TextDocument, maxRanges: number | undefined, cancellationToken: CancellationToken | null): FoldingRange[] {
 	let htmlMode = languageModes.getMode('html');
 	let range = Range.create(Position.create(0, 0), Position.create(document.lineCount, 0));
 	let ranges: FoldingRange[] = [];
@@ -27,7 +24,7 @@ export function getFoldingRegions(languageModes: LanguageModes, document: TextDo
 	if (maxRanges && ranges.length > maxRanges) {
 		ranges = limitRanges(ranges, maxRanges);
 	}
-	return { ranges };
+	return ranges;
 }
 
 function limitRanges(ranges: FoldingRange[], maxRanges: number) {
@@ -92,94 +89,3 @@ function limitRanges(ranges: FoldingRange[], maxRanges: number) {
 	}
 	return ranges.filter((r, index) => (typeof nestingLevels[index] === 'number') && nestingLevels[index] < maxLevel);
 }
-
-export const EMPTY_ELEMENTS: string[] = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'];
-
-export function isEmptyElement(e: string): boolean {
-	return !!e && binarySearch(EMPTY_ELEMENTS, e.toLowerCase(), (s1: string, s2: string) => s1.localeCompare(s2)) >= 0;
-}
-
-export function getHTMLFoldingRegions(htmlLanguageService: HTMLLanguageService, document: TextDocument, range: Range): FoldingRange[] {
-	const scanner = htmlLanguageService.createScanner(document.getText());
-	let token = scanner.scan();
-	let ranges: FoldingRange[] = [];
-	let stack: { startLine: number, tagName: string }[] = [];
-	let lastTagName = null;
-	let prevStart = -1;
-
-	function addRange(range: FoldingRange) {
-		ranges.push(range);
-		prevStart = range.startLine;
-	}
-
-	while (token !== TokenType.EOS) {
-		switch (token) {
-			case TokenType.StartTag: {
-				let tagName = scanner.getTokenText();
-				let startLine = document.positionAt(scanner.getTokenOffset()).line;
-				stack.push({ startLine, tagName });
-				lastTagName = tagName;
-				break;
-			}
-			case TokenType.EndTag: {
-				lastTagName = scanner.getTokenText();
-				break;
-			}
-			case TokenType.StartTagClose:
-				if (!lastTagName || !isEmptyElement(lastTagName)) {
-					break;
-				}
-			// fallthrough
-			case TokenType.EndTagClose:
-			case TokenType.StartTagSelfClose: {
-				let i = stack.length - 1;
-				while (i >= 0 && stack[i].tagName !== lastTagName) {
-					i--;
-				}
-				if (i >= 0) {
-					let stackElement = stack[i];
-					stack.length = i;
-					let line = document.positionAt(scanner.getTokenOffset()).line;
-					let startLine = stackElement.startLine;
-					let endLine = line - 1;
-					if (endLine > startLine && prevStart !== startLine) {
-						addRange({ startLine, endLine });
-					}
-				}
-				break;
-			}
-			case TokenType.Comment: {
-				let startLine = document.positionAt(scanner.getTokenOffset()).line;
-				let text = scanner.getTokenText();
-				let m = text.match(/^\s*#(region\b)|(endregion\b)/);
-				if (m) {
-					if (m[1]) { // start pattern match
-						stack.push({ startLine, tagName: '' }); // empty tagName marks region
-					} else {
-						let i = stack.length - 1;
-						while (i >= 0 && stack[i].tagName.length) {
-							i--;
-						}
-						if (i >= 0) {
-							let stackElement = stack[i];
-							stack.length = i;
-							let endLine = startLine;
-							startLine = stackElement.startLine;
-							if (endLine > startLine && prevStart !== startLine) {
-								addRange({ startLine, endLine, type: FoldingRangeType.Region });
-							}
-						}
-					}
-				} else {
-					let endLine = document.positionAt(scanner.getTokenOffset() + scanner.getTokenLength()).line;
-					if (startLine < endLine) {
-						addRange({ startLine, endLine, type: FoldingRangeType.Comment });
-					}
-				}
-				break;
-			}
-		}
-		token = scanner.scan();
-	}
-	return ranges;
-}
\ No newline at end of file
diff --git a/extensions/html-language-features/server/src/modes/htmlMode.ts b/extensions/html-language-features/server/src/modes/htmlMode.ts
index 0ee63c1fbba..d906ecde4ca 100644
--- a/extensions/html-language-features/server/src/modes/htmlMode.ts
+++ b/extensions/html-language-features/server/src/modes/htmlMode.ts
@@ -10,7 +10,6 @@ import { TextDocument, Position, Range, CompletionItem } from 'vscode-languagese
 import { LanguageMode, Workspace } from './languageModes';
 
 import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
-import { getHTMLFoldingRegions } from './htmlFolding';
 import { getPathCompletionParticipant } from './pathCompletion';
 
 export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace: Workspace): LanguageMode {
@@ -65,9 +64,9 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
 			return htmlLanguageService.format(document, range, formatSettings);
 		},
 		getFoldingRanges(document: TextDocument, range: Range): FoldingRange[] {
-			return getHTMLFoldingRegions(htmlLanguageService, document, range);
+			let ranges = htmlLanguageService.getFoldingRanges(document);
+			return ranges.filter(r => r.startLine >= range.start.line && r.endLine < range.end.line);
 		},
-
 		doAutoClose(document: TextDocument, position: Position) {
 			let offset = document.offsetAt(position);
 			let text = document.getText();
diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 8243399a8f0..8cbbfce39c8 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -12,14 +12,14 @@ import { HTMLDocumentRegions } from './embeddedSupport';
 
 import * as ts from 'typescript';
 import { join } from 'path';
-import { FoldingRange, FoldingRangeType } from 'vscode-languageserver-protocol-foldingprovider';
+import { FoldingRange, FoldingRangeKind } from 'vscode-languageserver-protocol-foldingprovider';
 
 const FILE_NAME = 'vscode://javascript/1';  // the same 'file' is used for all contents
 const JQUERY_D_TS = join(__dirname, '../../lib/jquery.d.ts');
 
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
 
-export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, workspace: Workspace): LanguageMode {
+export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, workspace: Workspace): LanguageMode {
 	let jsDocuments = getLanguageModelCache<TextDocument>(10, 60, document => documentRegions.get(document).getEmbeddedDocument('javascript'));
 
 	let compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es6.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic };
@@ -291,7 +291,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache<HTMLDocume
 					let foldingRange: FoldingRange = { startLine, endLine };
 					let match = document.getText(curr).match(/^\s*\/(?:(\/\s*#(?:end)?region\b)|(\*|\/))/);
 					if (match) {
-						foldingRange.type = match[1] ? FoldingRangeType.Region : FoldingRangeType.Comment;
+						foldingRange.kind = match[1] ? FoldingRangeKind.Region : FoldingRangeKind.Comment;
 					}
 					ranges.push(foldingRange);
 				}
diff --git a/extensions/html-language-features/server/src/modes/languageModes.ts b/extensions/html-language-features/server/src/modes/languageModes.ts
index 823d608fbae..13242925d5a 100644
--- a/extensions/html-language-features/server/src/modes/languageModes.ts
+++ b/extensions/html-language-features/server/src/modes/languageModes.ts
@@ -15,7 +15,7 @@ import { FoldingRange } from 'vscode-languageserver-protocol-foldingprovider';
 import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache';
 import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
 import { getCSSMode } from './cssMode';
-import { getJavascriptMode } from './javascriptMode';
+import { getJavaScriptMode } from './javascriptMode';
 import { getHTMLMode } from './htmlMode';
 
 export { ColorInformation, ColorPresentation, Color };
@@ -82,7 +82,7 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo
 		modes['css'] = getCSSMode(documentRegions, workspace);
 	}
 	if (supportedLanguages['javascript']) {
-		modes['javascript'] = getJavascriptMode(documentRegions, workspace);
+		modes['javascript'] = getJavaScriptMode(documentRegions, workspace);
 	}
 	return {
 		getModeAtPosition(document: TextDocument, position: Position): LanguageMode | undefined {
diff --git a/extensions/html-language-features/server/src/modes/pathCompletion.ts b/extensions/html-language-features/server/src/modes/pathCompletion.ts
index afb5089fbfd..9bb123dcaac 100644
--- a/extensions/html-language-features/server/src/modes/pathCompletion.ts
+++ b/extensions/html-language-features/server/src/modes/pathCompletion.ts
@@ -20,7 +20,7 @@ export function getPathCompletionParticipant(
 ): ICompletionParticipant {
 	return {
 		onHtmlAttributeValue: ({ tag, position, attribute, value: valueBeforeCursor, range }) => {
-			const fullValue = getFullValueWithoutQuotes(document, range);
+			const fullValue = stripQuotes(document.getText(range));
 
 			if (shouldDoPathCompletion(tag, attribute, fullValue)) {
 				if (workspaceFolders.length === 0) {
@@ -35,8 +35,7 @@ export function getPathCompletionParticipant(
 	};
 }
 
-function getFullValueWithoutQuotes(document: TextDocument, range: Range) {
-	const fullValue = document.getText(range);
+function stripQuotes(fullValue: string) {
 	if (startsWith(fullValue, `'`) || startsWith(fullValue, `"`)) {
 		return fullValue.slice(1, -1);
 	} else {
@@ -44,7 +43,7 @@ function getFullValueWithoutQuotes(document: TextDocument, range: Range) {
 	}
 }
 
-function shouldDoPathCompletion(tag: string, attr: string, value: string): boolean {
+function shouldDoPathCompletion(tag: string, attr: string, value: string) {
 	if (startsWith(value, 'http') || startsWith(value, 'https') || startsWith(value, '//')) {
 		return false;
 	}
@@ -69,20 +68,15 @@ function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?:
 	}
 
 	const lastIndexOfSlash = valueBeforeCursor.lastIndexOf('/');
-	let parentDir: string;
-	if (lastIndexOfSlash === -1) {
-		parentDir = path.resolve(root);
-	} else {
-		const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
+	const valueBeforeLastSlash = valueBeforeCursor.slice(0, lastIndexOfSlash + 1);
 
-		parentDir = startsWith(valueBeforeCursor, '/')
-			? path.resolve(root, '.' + valueBeforeLastSlash)
-			: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
-	}
+	const parentDir = startsWith(valueBeforeCursor, '/')
+		? path.resolve(root, '.' + valueBeforeLastSlash)
+		: path.resolve(activeDocFsPath, '..', valueBeforeLastSlash);
 
 	try {
 		return fs.readdirSync(parentDir).map(f => {
-			return fs.statSync(path.resolve(parentDir, f)).isDirectory()
+			return isDir(path.resolve(parentDir, f))
 				? f + '/'
 				: f;
 		});
@@ -91,6 +85,14 @@ function providePaths(valueBeforeCursor: string, activeDocFsPath: string, root?:
 	}
 }
 
+function isDir(p: string) {
+	try {
+		return fs.statSync(p).isDirectory();
+	} catch (e) {
+		return false;
+	}
+}
+
 function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: string, range: Range): CompletionItem {
 	const isDir = p[p.length - 1] === '/';
 
diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index 23b119eb826..7bc12b33731 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -76,7 +76,7 @@ export function testCompletionFor(value: string, expected: { count?: number, ite
 }
 
 suite('HTML Completion', () => {
-	test('HTML Javascript Completions', function (): any {
+	test('HTML JavaScript Completions', function (): any {
 		testCompletionFor('<html><script>window.|</script></html>', {
 			items: [
 				{ label: 'location', resultText: '<html><script>window.location</script></html>' },
@@ -166,6 +166,7 @@ suite('HTML Path Completion', () => {
 	});
 
 	test('Empty Path Value', () => {
+		// document: index.html
 		testCompletionFor('<script src="|">', {
 			items: [
 				{ label: 'about/', resultText: '<script src="about/">' },
@@ -173,8 +174,15 @@ suite('HTML Path Completion', () => {
 				{ label: 'src/', resultText: '<script src="src/">' },
 			]
 		}, indexHtmlUri);
+		// document: about.html
+		testCompletionFor('<script src="|">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri);
 	});
-
 	test('Incomplete Path', () => {
 		testCompletionFor('<script src="/src/f|">', {
 			items: [
@@ -192,6 +200,7 @@ suite('HTML Path Completion', () => {
 	});
 
 	test('No leading dot or slash', () => {
+		// document: index.html
 		testCompletionFor('<script src="s|">', {
 			items: [
 				{ label: 'about/', resultText: '<script src="about/">' },
@@ -213,9 +222,31 @@ suite('HTML Path Completion', () => {
 				{ label: 'test.js', resultText: '<script src="src/test.js">' },
 			]
 		}, indexHtmlUri, [fixtureWorkspace]);
+
+		// document: about.html
+		testCompletionFor('<script src="s|">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="media/|">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="media/f|">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
 	});
 
 	test('Trigger completion in middle of path', () => {
+		// document: index.html
 		testCompletionFor('<script src="src/f|eature.js">', {
 			items: [
 				{ label: 'feature.js', resultText: '<script src="src/feature.js">' },
@@ -230,8 +261,24 @@ suite('HTML Path Completion', () => {
 				{ label: 'src/', resultText: '<script src="src/">' },
 			]
 		}, indexHtmlUri, [fixtureWorkspace]);
+
+		// document: about.html
+		testCompletionFor('<script src="media/f|eature.js">', {
+			items: [
+				{ label: 'icon.pic', resultText: '<script src="media/icon.pic">' }
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
+
+		testCompletionFor('<script src="m|edia/feature.js">', {
+			items: [
+				{ label: 'about.css', resultText: '<script src="about.css">' },
+				{ label: 'about.html', resultText: '<script src="about.html">' },
+				{ label: 'media/', resultText: '<script src="media/">' },
+			]
+		}, aboutHtmlUri, [fixtureWorkspace]);
 	});
 
+
 	test('Trigger completion in middle of path and with whitespaces', () => {
 		testCompletionFor('<script src="./| about/about.html>', {
 			items: [
diff --git a/extensions/html-language-features/server/src/test/folding.test.ts b/extensions/html-language-features/server/src/test/folding.test.ts
index 3ab83ddab55..9fe39de7cdc 100644
--- a/extensions/html-language-features/server/src/test/folding.test.ts
+++ b/extensions/html-language-features/server/src/test/folding.test.ts
@@ -8,13 +8,13 @@
 import 'mocha';
 import * as assert from 'assert';
 import { TextDocument } from 'vscode-languageserver';
-import { getFoldingRegions } from '../modes/htmlFolding';
+import { getFoldingRanges } from '../modes/htmlFolding';
 import { getLanguageModes } from '../modes/languageModes';
 
 interface ExpectedIndentRange {
 	startLine: number;
 	endLine: number;
-	type?: string;
+	kind?: string;
 }
 
 function assertRanges(lines: string[], expected: ExpectedIndentRange[], message?: string, nRanges?: number): void {
@@ -24,90 +24,21 @@ function assertRanges(lines: string[], expected: ExpectedIndentRange[], message?
 		folders: [{ name: 'foo', uri: 'test://foo' }]
 	};
 	let languageModes = getLanguageModes({ css: true, javascript: true }, workspace);
-	let actual = getFoldingRegions(languageModes, document, nRanges, null)!.ranges;
+	let actual = getFoldingRanges(languageModes, document, nRanges, null);
 
 	let actualRanges = [];
 	for (let i = 0; i < actual.length; i++) {
-		actualRanges[i] = r(actual[i].startLine, actual[i].endLine, actual[i].type);
+		actualRanges[i] = r(actual[i].startLine, actual[i].endLine, actual[i].kind);
 	}
 	actualRanges = actualRanges.sort((r1, r2) => r1.startLine - r2.startLine);
 	assert.deepEqual(actualRanges, expected, message);
 }
 
-function r(startLine: number, endLine: number, type?: string): ExpectedIndentRange {
-	return { startLine, endLine, type };
+function r(startLine: number, endLine: number, kind?: string): ExpectedIndentRange {
+	return { startLine, endLine, kind };
 }
 
 suite('HTML Folding', () => {
-	test('Fold one level', () => {
-		let input = [
-			/*0*/'<html>',
-			/*1*/'Hello',
-			/*2*/'</html>'
-		];
-		assertRanges(input, [r(0, 1)]);
-	});
-
-	test('Fold two level', () => {
-		let input = [
-			/*0*/'<html>',
-			/*1*/'<head>',
-			/*2*/'Hello',
-			/*3*/'</head>',
-			/*4*/'</html>'
-		];
-		assertRanges(input, [r(0, 3), r(1, 2)]);
-	});
-
-	test('Fold siblings', () => {
-		let input = [
-			/*0*/'<html>',
-			/*1*/'<head>',
-			/*2*/'Head',
-			/*3*/'</head>',
-			/*4*/'<body class="f">',
-			/*5*/'Body',
-			/*6*/'</body>',
-			/*7*/'</html>'
-		];
-		assertRanges(input, [r(0, 6), r(1, 2), r(4, 5)]);
-	});
-
-	test('Fold self-closing tags', () => {
-		let input = [
-			/*0*/'<div>',
-			/*1*/'<a href="top"/>',
-			/*2*/'<img src="s">',
-			/*3*/'<br/>',
-			/*4*/'<br>',
-			/*5*/'<img class="c"',
-			/*6*/'     src="top"',
-			/*7*/'>',
-			/*8*/'</div>'
-		];
-		assertRanges(input, [r(0, 7), r(5, 6)]);
-	});
-
-	test('Fold commment', () => {
-		let input = [
-			/*0*/'<!--',
-			/*1*/' multi line',
-			/*2*/'-->',
-			/*3*/'<!-- some stuff',
-			/*4*/' some more stuff -->',
-		];
-		assertRanges(input, [r(0, 2, 'comment'), r(3, 4, 'comment')]);
-	});
-
-	test('Fold regions', () => {
-		let input = [
-			/*0*/'<!-- #region -->',
-			/*1*/'<!-- #region -->',
-			/*2*/'<!-- #endregion -->',
-			/*3*/'<!-- #endregion -->',
-		];
-		assertRanges(input, [r(0, 3, 'region'), r(1, 2, 'region')]);
-	});
 
 	test('Embedded JavaScript', () => {
 		let input = [
@@ -123,7 +54,7 @@ suite('HTML Folding', () => {
 		assertRanges(input, [r(0, 6), r(1, 5), r(2, 4), r(3, 4)]);
 	});
 
-	test('Embedded JavaScript - mutiple areas', () => {
+	test('Embedded JavaScript - multiple areas', () => {
 		let input = [
 			/* 0*/'<html>',
 			/* 1*/'<head>',
@@ -177,7 +108,62 @@ suite('HTML Folding', () => {
 		assertRanges(input, [r(0, 9), r(1, 8), r(2, 7), r(3, 7, 'region'), r(4, 6, 'region')]);
 	});
 
-	// test('Embedded JavaScript - mulit line comment', () => {
+	test('Embedded CSS', () => {
+		let input = [
+			/* 0*/'<html>',
+			/* 1*/'<head>',
+			/* 2*/'<style>',
+			/* 3*/'  foo {',
+			/* 4*/'   display: block;',
+			/* 5*/'   color: black;',
+			/* 6*/'  }',
+			/* 7*/'</style>',
+			/* 8*/'</head>',
+			/* 9*/'</html>',
+		];
+		assertRanges(input, [r(0, 8), r(1, 7), r(2, 6), r(3, 5)]);
+	});
+
+	test('Embedded CSS - multiple areas', () => {
+		let input = [
+			/* 0*/'<html>',
+			/* 1*/'<head style="color:red">',
+			/* 2*/'<style>',
+			/* 3*/'  /*',
+			/* 4*/'    foo: true,',
+			/* 5*/'    bar: {}',
+			/* 6*/'  */',
+			/* 7*/'</style>',
+			/* 8*/'<style>',
+			/* 9*/'  @keyframes mymove {',
+			/*10*/'    from {top: 0px;}',
+			/*11*/'  }',
+			/*12*/'</style>',
+			/*13*/'</head>',
+			/*14*/'</html>',
+		];
+		assertRanges(input, [r(0, 13), r(1, 12), r(2, 6), r(3, 6, 'comment'), r(8, 11), r(9, 10)]);
+	});
+
+	test('Embedded CSS - regions', () => {
+		let input = [
+			/* 0*/'<html>',
+			/* 1*/'<head>',
+			/* 2*/'<style>',
+			/* 3*/'  /* #region Lalala */',
+			/* 4*/'   /*  #region*/',
+			/* 5*/'   x = 9;',
+			/* 6*/'  /*  #endregion*/',
+			/* 7*/'  /* #endregion Lalala*/',
+			/* 8*/'</style>',
+			/* 9*/'</head>',
+			/*10*/'</html>',
+		];
+		assertRanges(input, [r(0, 9), r(1, 8), r(2, 7), r(3, 7, 'region'), r(4, 6, 'region')]);
+	});
+
+
+	// test('Embedded JavaScript - multi line comment', () => {
 	// 	let input = [
 	// 		/* 0*/'<html>',
 	// 		/* 1*/'<head>',
@@ -192,39 +178,6 @@ suite('HTML Folding', () => {
 	// 	assertRanges(input, [r(0, 7), r(1, 6), r(2, 5), r(3, 5, 'comment')]);
 	// });
 
-	test('Fold incomplete', () => {
-		let input = [
-			/*0*/'<body>',
-			/*1*/'<div></div>',
-			/*2*/'Hello',
-			/*3*/'</div>',
-			/*4*/'</body>',
-		];
-		assertRanges(input, [r(0, 3)]);
-	});
-
-	test('Fold incomplete 2', () => {
-		let input = [
-			/*0*/'<be><div>',
-			/*1*/'<!-- #endregion -->',
-			/*2*/'</div>',
-		];
-		assertRanges(input, [r(0, 1)]);
-	});
-
-	test('Fold intersecting region', () => {
-		let input = [
-			/*0*/'<body>',
-			/*1*/'<!-- #region -->',
-			/*2*/'Hello',
-			/*3*/'<div></div>',
-			/*4*/'</body>',
-			/*5*/'<!-- #endregion -->',
-		];
-		assertRanges(input, [r(0, 3)]);
-	});
-
-
 	test('Test limit', () => {
 		let input = [
 			/* 0*/'<div>',
diff --git a/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic b/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic
new file mode 100644
index 00000000000..adae63e647c
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/pathCompletionFixtures/about/media/icon.pic
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
\ No newline at end of file
diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock
index 2f661bfea88..8e5e816b1f5 100644
--- a/extensions/html-language-features/server/yarn.lock
+++ b/extensions/html-language-features/server/yarn.lock
@@ -18,24 +18,24 @@ jsonc-parser@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
 
-vscode-css-languageservice@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.8.tgz#dc27a2f6eefd191bc603be6b9c0a59232a4c2b9f"
+vscode-css-languageservice@^3.0.9-next.7:
+  version "3.0.9-next.7"
+  resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.7.tgz#1eb8deadaa6bfaf55187656ea6fb6b7e8d71cd7f"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
 
-vscode-emmet-helper@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.1.tgz#dc4a3c83a3f1d48f4e9e1a5cce0e63f24b6eb843"
+vscode-emmet-helper@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.2.6.tgz#6cc7293765af7136d409d0d62ef17c66e8b9cf45"
   dependencies:
     "@emmetio/extract-abbreviation" "0.1.6"
     jsonc-parser "^1.0.0"
     vscode-languageserver-types "^3.6.0-next.1"
 
-vscode-html-languageservice@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.1.tgz#11a4e307f3a983d566313039f99bb37656e86cce"
+vscode-html-languageservice@^2.1.3-next.2:
+  version "2.1.3-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.3-next.2.tgz#911821cada8a237bd6773569851658c733409d65"
   dependencies:
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
@@ -45,9 +45,9 @@ vscode-jsonrpc@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
-vscode-languageserver-protocol-foldingprovider@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
     vscode-languageserver-types "^3.6.0"
diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock
index 8adc0154a74..4c8da33fb9b 100644
--- a/extensions/html-language-features/yarn.lock
+++ b/extensions/html-language-features/yarn.lock
@@ -44,9 +44,9 @@ vscode-languageclient@^4.0.0:
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
 
-vscode-languageserver-protocol-foldingprovider@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
     vscode-languageserver-types "^3.6.0"
diff --git a/extensions/html/language-configuration.json b/extensions/html/language-configuration.json
index 79ce9f9ce41..191f54303f1 100644
--- a/extensions/html/language-configuration.json
+++ b/extensions/html/language-configuration.json
@@ -13,7 +13,8 @@
 		{ "open": "[", "close": "]"},
 		{ "open": "(", "close": ")" },
 		{ "open": "'", "close": "'" },
-		{ "open": "\"", "close": "\"" }
+		{ "open": "\"", "close": "\"" },
+		{ "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]}
 	],
 	"surroundingPairs": [
 		{ "open": "'", "close": "'" },
diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json
index e38054a4a80..066091d7c84 100644
--- a/extensions/javascript/package.json
+++ b/extensions/javascript/package.json
@@ -61,8 +61,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.js": "other",
-          "entity.name.function.tagged-template.js.jsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
@@ -78,8 +77,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.js": "other",
-          "entity.name.function.tagged-template.js.jsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
index b697edd0f75..578adfbc370 100644
--- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/3f27a794a2dbebf18714d7eaa799162fbadf7a11",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js",
 	"patterns": [
@@ -174,6 +174,9 @@
 				{
 					"include": "#arrow-function"
 				},
+				{
+					"include": "#paren-expression-possibly-arrow"
+				},
 				{
 					"include": "#cast"
 				},
@@ -288,7 +291,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js entity.name.function.js"
@@ -522,7 +525,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js"
@@ -748,7 +751,7 @@
 							"include": "#comment"
 						},
 						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 							"captures": {
 								"1": {
 									"name": "meta.definition.property.js entity.name.function.js"
@@ -1033,7 +1036,7 @@
 				},
 				{
 					"name": "meta.arrow.js",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js"
@@ -1106,27 +1109,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.js"
+					"name": "keyword.operator.type.modifier.js"
 				},
 				"2": {
-					"name": "meta.brace.square.js"
+					"name": "storage.modifier.js"
 				},
 				"3": {
-					"name": "entity.name.type.js"
+					"name": "meta.brace.square.js"
 				},
 				"4": {
+					"name": "entity.name.type.js"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.js"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.js"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.js"
+				},
+				"3": {
 					"name": "keyword.operator.optional.js"
 				}
 			},
@@ -1150,6 +1159,13 @@
 					"name": "punctuation.definition.parameters.end.js"
 				}
 			},
+			"patterns": [
+				{
+					"include": "#function-parameters-body"
+				}
+			]
+		},
+		"function-parameters-body": {
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1489,7 +1505,7 @@
 					"name": "storage.type.namespace.js"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1523,7 +1539,7 @@
 					"name": "entity.name.type.alias.js"
 				}
 			},
-			"end": "(?=[};]|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1699,7 +1715,7 @@
 							"name": "keyword.control.default.js"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#expression"
@@ -1714,7 +1730,7 @@
 							"name": "keyword.control.export.js"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -1859,18 +1875,44 @@
 									"name": "keyword.control.switch.js"
 								}
 							},
-							"end": ":",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.section.case-statement.js"
-								}
-							},
+							"end": "(?=:)",
 							"patterns": [
 								{
 									"include": "#expression"
 								}
 							]
 						},
+						{
+							"begin": "(:)\\s*(\\{)",
+							"beginCaptures": {
+								"1": {
+									"name": "case-clause.expr.js punctuation.definition.section.case-statement.js"
+								},
+								"2": {
+									"name": "meta.block.js punctuation.definition.block.js"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "meta.block.js punctuation.definition.block.js"
+								}
+							},
+							"contentName": "meta.block.js",
+							"patterns": [
+								{
+									"include": "#statements"
+								}
+							]
+						},
+						{
+							"match": "(:)",
+							"captures": {
+								"0": {
+									"name": "case-clause.expr.js punctuation.definition.section.case-statement.js"
+								}
+							}
+						},
 						{
 							"include": "#statements"
 						}
@@ -1943,7 +1985,7 @@
 		},
 		"after-operator-block-as-object-literal": {
 			"name": "meta.objectliteral.js",
-			"begin": "(?<!\\+\\+|--)(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+			"begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.block.js"
@@ -2033,7 +2075,7 @@
 				},
 				{
 					"name": "meta.object.member.js",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js"
@@ -2096,6 +2138,61 @@
 					},
 					"end": "(?=,|\\})",
 					"patterns": [
+						{
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js"
+								}
+							},
+							"end": "(?<=\\))",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.brace.round.js"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "meta.brace.round.js"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#expression-inside-possibly-arrow-parens"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js"
+								},
+								"2": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
 						{
 							"include": "#expression"
 						}
@@ -2113,9 +2210,9 @@
 					"name": "keyword.operator.ternary.js"
 				}
 			},
-			"end": "(:)",
+			"end": "\\s*(:)",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.operator.ternary.js"
 				}
 			},
@@ -2126,13 +2223,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2179,7 +2276,7 @@
 					"name": "keyword.operator.new.js"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#paren-expression"
@@ -2199,13 +2296,91 @@
 					"name": "keyword.operator.expression.instanceof.js"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:?]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#type"
 				}
 			]
 		},
+		"paren-expression-possibly-arrow": {
+			"patterns": [
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#type-parameters"
+						},
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js"
+						},
+						"2": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression-inside-possibly-arrow-parens"
+						}
+					]
+				},
+				{
+					"include": "#possibly-arrow-return-type"
+				}
+			]
+		},
+		"expression-inside-possibly-arrow-parens": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#function-parameters-body"
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
 		"paren-expression": {
 			"begin": "\\(",
 			"beginCaptures": {
@@ -2222,9 +2397,6 @@
 			"patterns": [
 				{
 					"include": "#expression"
-				},
-				{
-					"include": "#punctuation-comma"
 				}
 			]
 		},
@@ -2707,7 +2879,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js"
@@ -2893,6 +3065,28 @@
 				}
 			},
 			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"possibly-arrow-return-type": {
+			"begin": "(?<=\\))\\s*(:)(?=\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+\\s*=>)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.arrow.js meta.return.type.arrow.js keyword.operator.type.annotation.js"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"contentName": "meta.arrow.js meta.return.type.arrow.js",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"arrow-return-type-body": {
 			"patterns": [
 				{
 					"begin": "(?<=[:])(?=\\s*\\{)",
@@ -4252,8 +4446,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4456,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4483,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js"
diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
index 485fc113e79..f756aa5d6bf 100644
--- a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+++ b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/3f27a794a2dbebf18714d7eaa799162fbadf7a11",
 	"name": "JavaScript (with React support)",
 	"scopeName": "source.js.jsx",
 	"patterns": [
@@ -174,6 +174,9 @@
 				{
 					"include": "#arrow-function"
 				},
+				{
+					"include": "#paren-expression-possibly-arrow"
+				},
 				{
 					"include": "#cast"
 				},
@@ -288,7 +291,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.js.jsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.js.jsx entity.name.function.js.jsx"
@@ -522,7 +525,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.js.jsx"
@@ -748,7 +751,7 @@
 							"include": "#comment"
 						},
 						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 							"captures": {
 								"1": {
 									"name": "meta.definition.property.js.jsx entity.name.function.js.jsx"
@@ -1033,7 +1036,7 @@
 				},
 				{
 					"name": "meta.arrow.js.jsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.js.jsx"
@@ -1106,27 +1109,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.js.jsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.js.jsx"
+					"name": "keyword.operator.type.modifier.js.jsx"
 				},
 				"2": {
-					"name": "meta.brace.square.js.jsx"
+					"name": "storage.modifier.js.jsx"
 				},
 				"3": {
-					"name": "entity.name.type.js.jsx"
+					"name": "meta.brace.square.js.jsx"
 				},
 				"4": {
+					"name": "entity.name.type.js.jsx"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.js.jsx"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.js.jsx"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.js.jsx"
+				},
+				"3": {
 					"name": "keyword.operator.optional.js.jsx"
 				}
 			},
@@ -1150,6 +1159,13 @@
 					"name": "punctuation.definition.parameters.end.js.jsx"
 				}
 			},
+			"patterns": [
+				{
+					"include": "#function-parameters-body"
+				}
+			]
+		},
+		"function-parameters-body": {
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1489,7 +1505,7 @@
 					"name": "storage.type.namespace.js.jsx"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1523,7 +1539,7 @@
 					"name": "entity.name.type.alias.js.jsx"
 				}
 			},
-			"end": "(?=[};]|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1699,7 +1715,7 @@
 							"name": "keyword.control.default.js.jsx"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#expression"
@@ -1714,7 +1730,7 @@
 							"name": "keyword.control.export.js.jsx"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -1859,18 +1875,44 @@
 									"name": "keyword.control.switch.js.jsx"
 								}
 							},
-							"end": ":",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.section.case-statement.js.jsx"
-								}
-							},
+							"end": "(?=:)",
 							"patterns": [
 								{
 									"include": "#expression"
 								}
 							]
 						},
+						{
+							"begin": "(:)\\s*(\\{)",
+							"beginCaptures": {
+								"1": {
+									"name": "case-clause.expr.js.jsx punctuation.definition.section.case-statement.js.jsx"
+								},
+								"2": {
+									"name": "meta.block.js.jsx punctuation.definition.block.js.jsx"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "meta.block.js.jsx punctuation.definition.block.js.jsx"
+								}
+							},
+							"contentName": "meta.block.js.jsx",
+							"patterns": [
+								{
+									"include": "#statements"
+								}
+							]
+						},
+						{
+							"match": "(:)",
+							"captures": {
+								"0": {
+									"name": "case-clause.expr.js.jsx punctuation.definition.section.case-statement.js.jsx"
+								}
+							}
+						},
 						{
 							"include": "#statements"
 						}
@@ -1943,7 +1985,7 @@
 		},
 		"after-operator-block-as-object-literal": {
 			"name": "meta.objectliteral.js.jsx",
-			"begin": "(?<!\\+\\+|--)(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+			"begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.block.js.jsx"
@@ -2033,7 +2075,7 @@
 				},
 				{
 					"name": "meta.object.member.js.jsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.js.jsx"
@@ -2096,6 +2138,61 @@
 					},
 					"end": "(?=,|\\})",
 					"patterns": [
+						{
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js.jsx"
+								}
+							},
+							"end": "(?<=\\))",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.brace.round.js.jsx"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "meta.brace.round.js.jsx"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#expression-inside-possibly-arrow-parens"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.js.jsx"
+								},
+								"2": {
+									"name": "meta.brace.round.js.jsx"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js.jsx"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
 						{
 							"include": "#expression"
 						}
@@ -2113,9 +2210,9 @@
 					"name": "keyword.operator.ternary.js.jsx"
 				}
 			},
-			"end": "(:)",
+			"end": "\\s*(:)",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.operator.ternary.js.jsx"
 				}
 			},
@@ -2126,13 +2223,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.js.jsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2179,7 +2276,7 @@
 					"name": "keyword.operator.new.js.jsx"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#paren-expression"
@@ -2199,13 +2296,91 @@
 					"name": "keyword.operator.expression.instanceof.js.jsx"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:?]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#type"
 				}
 			]
 		},
+		"paren-expression-possibly-arrow": {
+			"patterns": [
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js.jsx"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#type-parameters"
+						},
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.brace.round.js.jsx"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.js.jsx"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.js.jsx"
+						},
+						"2": {
+							"name": "meta.brace.round.js.jsx"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.js.jsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression-inside-possibly-arrow-parens"
+						}
+					]
+				},
+				{
+					"include": "#possibly-arrow-return-type"
+				}
+			]
+		},
+		"expression-inside-possibly-arrow-parens": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#function-parameters-body"
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
 		"paren-expression": {
 			"begin": "\\(",
 			"beginCaptures": {
@@ -2222,9 +2397,6 @@
 			"patterns": [
 				{
 					"include": "#expression"
-				},
-				{
-					"include": "#punctuation-comma"
 				}
 			]
 		},
@@ -2707,7 +2879,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.js.jsx"
@@ -2893,6 +3065,28 @@
 				}
 			},
 			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"possibly-arrow-return-type": {
+			"begin": "(?<=\\))\\s*(:)(?=\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+\\s*=>)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx keyword.operator.type.annotation.js.jsx"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"contentName": "meta.arrow.js.jsx meta.return.type.arrow.js.jsx",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"arrow-return-type-body": {
 			"patterns": [
 				{
 					"begin": "(?<=[:])(?=\\s*\\{)",
@@ -4252,8 +4446,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4456,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.js.jsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4483,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.js.jsx"
diff --git a/extensions/json-language-features/client/src/jsonMain.ts b/extensions/json-language-features/client/src/jsonMain.ts
index 78126d24e6d..53c19c4c22f 100644
--- a/extensions/json-language-features/client/src/jsonMain.ts
+++ b/extensions/json-language-features/client/src/jsonMain.ts
@@ -8,11 +8,11 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { workspace, languages, ExtensionContext, extensions, Uri, LanguageConfiguration, TextDocument, FoldingRangeList, FoldingRange, Disposable, FoldingContext } from 'vscode';
+import { workspace, languages, ExtensionContext, extensions, Uri, LanguageConfiguration, TextDocument, FoldingRangeKind, FoldingRange, Disposable, FoldingContext } from 'vscode';
 import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification, CancellationToken } from 'vscode-languageclient';
 import TelemetryReporter from 'vscode-extension-telemetry';
 
-import { FoldingRangesRequest, FoldingRangeRequestParam } from 'vscode-languageserver-protocol-foldingprovider';
+import { FoldingRangeRequest, FoldingRangeRequestParam, FoldingRangeClientCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 
 import { hash } from './utils/hash';
 
@@ -97,6 +97,21 @@ export function activate(context: ExtensionContext) {
 	// Create the language client and start the client.
 	let client = new LanguageClient('json', localize('jsonserver.name', 'JSON Language Server'), serverOptions, clientOptions);
 	client.registerProposedFeatures();
+	client.registerFeature({
+		fillClientCapabilities(capabilities: FoldingRangeClientCapabilities): void {
+			let textDocumentCap = capabilities.textDocument;
+			if (!textDocumentCap) {
+				textDocumentCap = capabilities.textDocument = {};
+			}
+			textDocumentCap.foldingRange = {
+				dynamicRegistration: false,
+				rangeLimit: 5000,
+				lineFoldingOnly: true
+			};
+		},
+		initialize(capabilities, documentSelector): void {
+		}
+	});
 
 	let disposable = client.start();
 	toDispose.push(disposable);
@@ -141,19 +156,30 @@ export function activate(context: ExtensionContext) {
 	languages.setLanguageConfiguration('jsonc', languageConfiguration);
 
 	function initFoldingProvider(): Disposable {
-		return languages.registerFoldingProvider(documentSelector, {
+		const kinds: { [value: string]: FoldingRangeKind } = Object.create(null);
+		function getKind(value: string | undefined) {
+			if (!value) {
+				return void 0;
+			}
+			let kind = kinds[value];
+			if (!kind) {
+				kind = new FoldingRangeKind(value);
+				kinds[value] = kind;
+			}
+			return kind;
+		}
+		return languages.registerFoldingRangeProvider(documentSelector, {
 			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
 				const param: FoldingRangeRequestParam = {
-					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-					maxRanges: context.maxRanges
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
 				};
-				return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
-					if (res && Array.isArray(res.ranges)) {
-						return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
+				return client.sendRequest(FoldingRangeRequest.type, param, token).then(ranges => {
+					if (Array.isArray(ranges)) {
+						return ranges.map(r => new FoldingRange(r.startLine, r.endLine, getKind(r.kind)));
 					}
 					return null;
 				}, error => {
-					client.logFailedRequest(FoldingRangesRequest.type, error);
+					client.logFailedRequest(FoldingRangeRequest.type, error);
 					return null;
 				});
 			}
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index d7043cb3aa7..9d4028b62fc 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -20,6 +20,9 @@
     "postinstall": "cd server && yarn install",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
+  "categories": [
+    "Programming Languages"
+  ],
   "contributes": {
     "configuration": {
       "id": "json",
@@ -97,9 +100,9 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.15",
+    "vscode-extension-telemetry": "0.0.16",
     "vscode-languageclient": "^4.0.0",
-    "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2",
     "vscode-nls": "^3.2.2"
   },
   "devDependencies": {
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index db0d226fb21..3f4cc7718cc 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -13,9 +13,9 @@
   "dependencies": {
     "jsonc-parser": "^2.0.0-next.1",
     "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.0.12",
+    "vscode-json-languageservice": "^3.1.2-next.2",
     "vscode-languageserver": "^4.0.0",
-    "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
+    "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2",
     "vscode-nls": "^3.2.2",
     "vscode-uri": "^1.0.3"
   },
@@ -33,7 +33,6 @@
     "install-service-local": "yarn link vscode-json-languageservice",
     "install-server-next": "yarn add vscode-languageserver@next",
     "install-server-local": "yarn link vscode-languageserver-server",
-    "test": "npm run compile && ../../../node_modules/.bin/mocha",
     "version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"
   }
 }
diff --git a/extensions/json-language-features/server/src/jsonFolding.ts b/extensions/json-language-features/server/src/jsonFolding.ts
deleted file mode 100644
index 4625e721b24..00000000000
--- a/extensions/json-language-features/server/src/jsonFolding.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { TextDocument, Position, CancellationToken } from 'vscode-languageserver';
-import { createScanner, SyntaxKind, ScanError } from 'jsonc-parser';
-import { FoldingRangeType, FoldingRange, FoldingRangeList } from 'vscode-languageserver-protocol-foldingprovider';
-
-export function getFoldingRegions(document: TextDocument, maxRanges: number | undefined, cancellationToken: CancellationToken | null) {
-	let ranges: FoldingRange[] = [];
-	let nestingLevels: number[] = [];
-	let stack: FoldingRange[] = [];
-	let prevStart = -1;
-	let scanner = createScanner(document.getText(), false);
-	let token = scanner.scan();
-
-	function addRange(range: FoldingRange) {
-		ranges.push(range);
-		nestingLevels.push(stack.length);
-	}
-
-	while (token !== SyntaxKind.EOF) {
-		if (cancellationToken && cancellationToken.isCancellationRequested) {
-			return null;
-		}
-		switch (token) {
-			case SyntaxKind.OpenBraceToken:
-			case SyntaxKind.OpenBracketToken: {
-				let startLine = document.positionAt(scanner.getTokenOffset()).line;
-				let range = { startLine, endLine: startLine, type: token === SyntaxKind.OpenBraceToken ? 'object' : 'array' };
-				stack.push(range);
-				break;
-			}
-			case SyntaxKind.CloseBraceToken:
-			case SyntaxKind.CloseBracketToken: {
-				let type = token === SyntaxKind.CloseBraceToken ? 'object' : 'array';
-				if (stack.length > 0 && stack[stack.length - 1].type === type) {
-					let range = stack.pop();
-					let line = document.positionAt(scanner.getTokenOffset()).line;
-					if (range && line > range.startLine + 1 && prevStart !== range.startLine) {
-						range.endLine = line - 1;
-						addRange(range);
-						prevStart = range.startLine;
-					}
-				}
-				break;
-			}
-
-			case SyntaxKind.BlockCommentTrivia: {
-				let startLine = document.positionAt(scanner.getTokenOffset()).line;
-				let endLine = document.positionAt(scanner.getTokenOffset() + scanner.getTokenLength()).line;
-				if (scanner.getTokenError() === ScanError.UnexpectedEndOfComment && startLine + 1 < document.lineCount) {
-					scanner.setPosition(document.offsetAt(Position.create(startLine + 1, 0)));
-				} else {
-					if (startLine < endLine) {
-						addRange({ startLine, endLine, type: FoldingRangeType.Comment });
-						prevStart = startLine;
-					}
-				}
-				break;
-			}
-
-			case SyntaxKind.LineCommentTrivia: {
-				let text = document.getText().substr(scanner.getTokenOffset(), scanner.getTokenLength());
-				let m = text.match(/^\/\/\s*#(region\b)|(endregion\b)/);
-				if (m) {
-					let line = document.positionAt(scanner.getTokenOffset()).line;
-					if (m[1]) { // start pattern match
-						let range = { startLine: line, endLine: line, type: FoldingRangeType.Region };
-						stack.push(range);
-					} else {
-						let i = stack.length - 1;
-						while (i >= 0 && stack[i].type !== FoldingRangeType.Region) {
-							i--;
-						}
-						if (i >= 0) {
-							let range = stack[i];
-							stack.length = i;
-							if (line > range.startLine && prevStart !== range.startLine) {
-								range.endLine = line;
-								addRange(range);
-								prevStart = range.startLine;
-							}
-						}
-					}
-				}
-				break;
-			}
-
-		}
-		token = scanner.scan();
-	}
-	if (maxRanges && ranges.length > maxRanges) {
-		let counts: number[] = [];
-		for (let level of nestingLevels) {
-			if (level < 30) {
-				counts[level] = (counts[level] || 0) + 1;
-			}
-		}
-		let entries = 0;
-		let maxLevel = 0;
-		for (let i = 0; i < counts.length; i++) {
-			let n = counts[i];
-			if (n) {
-				if (n + entries > maxRanges) {
-					maxLevel = i;
-					break;
-				}
-				entries += n;
-			}
-		}
-		ranges = ranges.filter((r, index) => nestingLevels[index] < maxLevel);
-	}
-	return <FoldingRangeList>{ ranges };
-}
\ No newline at end of file
diff --git a/extensions/json-language-features/server/src/jsonServerMain.ts b/extensions/json-language-features/server/src/jsonServerMain.ts
index 79a9782ee9d..eb1587786b9 100644
--- a/extensions/json-language-features/server/src/jsonServerMain.ts
+++ b/extensions/json-language-features/server/src/jsonServerMain.ts
@@ -18,9 +18,8 @@ import { startsWith } from './utils/strings';
 import { formatError, runSafe, runSafeAsync } from './utils/runner';
 import { JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
-import { getFoldingRegions } from './jsonFolding';
 
-import { FoldingRangesRequest, FoldingProviderServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
+import { FoldingRangeRequest, FoldingRangeServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 
 interface ISchemaAssociations {
 	[pattern: string]: string[];
@@ -61,22 +60,28 @@ documents.listen(connection);
 
 let clientSnippetSupport = false;
 let clientDynamicRegisterSupport = false;
+let foldingRangeLimit = Number.MAX_VALUE;
 
-// After the server has started the client sends an initilize request. The server receives
+// After the server has started the client sends an initialize request. The server receives
 // in the passed params the rootPath of the workspace plus the client capabilities.
 connection.onInitialize((params: InitializeParams): InitializeResult => {
 
-	function hasClientCapability(...keys: string[]) {
-		let c = params.capabilities as any;
+	function getClientCapability<T>(name: string, def: T) {
+		let keys = name.split('.');
+		let c: any = params.capabilities;
 		for (let i = 0; c && i < keys.length; i++) {
+			if (!c.hasOwnProperty(keys[i])) {
+				return def;
+			}
 			c = c[keys[i]];
 		}
-		return !!c;
+		return c;
 	}
 
-	clientSnippetSupport = hasClientCapability('textDocument', 'completion', 'completionItem', 'snippetSupport');
-	clientDynamicRegisterSupport = hasClientCapability('workspace', 'symbol', 'dynamicRegistration');
-	let capabilities: ServerCapabilities & FoldingProviderServerCapabilities = {
+	clientSnippetSupport = getClientCapability('textDocument.completion.completionItem.snippetSupport', false);
+	clientDynamicRegisterSupport = getClientCapability('workspace.symbol.dynamicRegistration', false);
+	foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE);
+	let capabilities: ServerCapabilities & FoldingRangeServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: clientSnippetSupport ? { resolveProvider: true, triggerCharacters: ['"', ':'] } : void 0,
@@ -84,7 +89,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		documentSymbolProvider: true,
 		documentRangeFormattingProvider: false,
 		colorProvider: true,
-		foldingProvider: true
+		foldingRangeProvider: true
 	};
 
 	return { capabilities };
@@ -365,11 +370,11 @@ connection.onColorPresentation((params, token) => {
 	}, [], `Error while computing color presentations for ${params.textDocument.uri}`, token);
 });
 
-connection.onRequest(FoldingRangesRequest.type, (params, token) => {
+connection.onRequest(FoldingRangeRequest.type, (params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
-			return getFoldingRegions(document, params.maxRanges, token);
+			return languageService.getFoldingRanges(document, { rangeLimit: foldingRangeLimit });
 		}
 		return null;
 	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token);
diff --git a/extensions/json-language-features/server/src/test/folding.test.ts b/extensions/json-language-features/server/src/test/folding.test.ts
deleted file mode 100644
index e72244cfff2..00000000000
--- a/extensions/json-language-features/server/src/test/folding.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import 'mocha';
-import * as assert from 'assert';
-import { TextDocument } from 'vscode-languageserver';
-import { getFoldingRegions } from '../jsonFolding';
-
-interface ExpectedIndentRange {
-	startLine: number;
-	endLine: number;
-	type?: string;
-}
-
-function assertRanges(lines: string[], expected: ExpectedIndentRange[], nRanges?: number): void {
-	let document = TextDocument.create('test://foo/bar.json', 'json', 1, lines.join('\n'));
-	let actual = getFoldingRegions(document, nRanges, null)!.ranges;
-
-	let actualRanges = [];
-	for (let i = 0; i < actual.length; i++) {
-		actualRanges[i] = r(actual[i].startLine, actual[i].endLine, actual[i].type);
-	}
-	actualRanges = actualRanges.sort((r1, r2) => r1.startLine - r2.startLine);
-	assert.deepEqual(actualRanges, expected);
-}
-
-function r(startLine: number, endLine: number, type?: string): ExpectedIndentRange {
-	return { startLine, endLine, type };
-}
-
-suite('JSON Folding', () => {
-	test('Fold one level', () => {
-		let input = [
-			/*0*/'{',
-			/*1*/'"foo":"bar"',
-			/*2*/'}'
-		];
-		assertRanges(input, [r(0, 1, 'object')]);
-	});
-
-	test('Fold two level', () => {
-		let input = [
-			/*0*/'[',
-			/*1*/'{',
-			/*2*/'"foo":"bar"',
-			/*3*/'}',
-			/*4*/']'
-		];
-		assertRanges(input, [r(0, 3, 'array'), r(1, 2, 'object')]);
-	});
-
-	test('Fold Arrays', () => {
-		let input = [
-			/*0*/'[',
-			/*1*/'[',
-			/*2*/'],[',
-			/*3*/'1',
-			/*4*/']',
-			/*5*/']'
-		];
-		assertRanges(input, [r(0, 4, 'array'), r(2, 3, 'array')]);
-	});
-
-	test('Filter start on same line', () => {
-		let input = [
-			/*0*/'[[',
-			/*1*/'[',
-			/*2*/'],[',
-			/*3*/'1',
-			/*4*/']',
-			/*5*/']]'
-		];
-		assertRanges(input, [r(0, 4, 'array'), r(2, 3, 'array')]);
-	});
-
-	test('Fold commment', () => {
-		let input = [
-			/*0*/'/*',
-			/*1*/' multi line',
-			/*2*/'*/',
-		];
-		assertRanges(input, [r(0, 2, 'comment')]);
-	});
-
-	test('Incomplete commment', () => {
-		let input = [
-			/*0*/'/*',
-			/*1*/'{',
-			/*2*/'"foo":"bar"',
-			/*3*/'}',
-		];
-		assertRanges(input, [r(1, 2, 'object')]);
-	});
-
-	test('Fold regions', () => {
-		let input = [
-			/*0*/'// #region',
-			/*1*/'{',
-			/*2*/'}',
-			/*3*/'// #endregion',
-		];
-		assertRanges(input, [r(0, 3, 'region')]);
-	});
-
-	test('Test limit', () => {
-		let input = [
-			/* 0*/'[',
-			/* 1*/' [',
-			/* 2*/'  [',
-			/* 3*/'  ',
-			/* 4*/'  ],',
-			/* 5*/'  [',
-			/* 6*/'   [',
-			/* 7*/'  ',
-			/* 8*/'   ],',
-			/* 9*/'   [',
-			/*10*/'  ',
-			/*11*/'   ],',
-			/*12*/'  ],',
-			/*13*/'  [',
-			/*14*/'  ',
-			/*15*/'  ],',
-			/*16*/'  [',
-			/*17*/'  ',
-			/*18*/'  ]',
-			/*19*/' ]',
-			/*20*/']',
-		];
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(6, 7, 'array'), r(9, 10, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], void 0);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(6, 7, 'array'), r(9, 10, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 8);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 7);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array'), r(2, 3, 'array'), r(5, 11, 'array'), r(13, 14, 'array'), r(16, 17, 'array')], 6);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 5);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 4);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 3);
-		assertRanges(input, [r(0, 19, 'array'), r(1, 18, 'array')], 2);
-		assertRanges(input, [r(0, 19, 'array')], 1);
-	});
-
-});
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
index 1185dbc6a74..26fe2245dcd 100644
--- a/extensions/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -52,6 +52,10 @@ https-proxy-agent@2.1.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
+jsonc-parser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0.tgz#62ff087a7e753875febf3c55f1fc0cd737c36b5a"
+
 jsonc-parser@^2.0.0-next.1:
   version "2.0.0-next.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0-next.1.tgz#445a824f765a96abfbb286d759a9b1d226b18088"
@@ -68,11 +72,11 @@ request-light@^0.2.2:
     https-proxy-agent "2.1.1"
     vscode-nls "^2.0.2"
 
-vscode-json-languageservice@^3.0.12:
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.12.tgz#85258632f2f7718028fbdfbb95b4ad009107b821"
+vscode-json-languageservice@^3.1.2-next.2:
+  version "3.1.2-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.2-next.2.tgz#da5346e5c22edbce739f29c110eb41732d41dc2d"
   dependencies:
-    jsonc-parser "^2.0.0-next.1"
+    jsonc-parser "^2.0.0"
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
     vscode-uri "^1.0.3"
@@ -81,9 +85,9 @@ vscode-jsonrpc@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
-vscode-languageserver-protocol-foldingprovider@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
     vscode-languageserver-types "^3.6.0"
diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock
index 2db2da5dbe9..2a2706462ef 100644
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -44,9 +44,9 @@ vscode-languageclient@^4.0.0:
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
 
-vscode-languageserver-protocol-foldingprovider@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
+vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2:
+  version "2.0.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0"
   dependencies:
     vscode-languageserver-protocol "^3.6.0"
     vscode-languageserver-types "^3.6.0"
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json
index feeaf404803..090acf7bc69 100644
--- a/extensions/log/syntaxes/log.tmLanguage.json
+++ b/extensions/log/syntaxes/log.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/73d0058c4712dc93bb4f8f6ca3629d421da0651d",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/541479c15f46c5f3e504aafe058dd7b982ad932f",
 	"name": "Log file",
 	"scopeName": "text.log",
 	"patterns": [
@@ -69,7 +69,7 @@
 			"name": "string log.string"
 		},
 		{
-			"match": "'[^']*'",
+			"match": "(^|[^\\w])'[^']*'",
 			"name": "string log.string"
 		},
 		{
@@ -85,10 +85,6 @@
 			"match": "\\b(http|https|ftp|file)://\\S+\\b/?",
 			"name": "constant.language log.constant"
 		},
-		{
-			"match": "(([a-zA-Z]\\:)|(\\.\\.)|(\\.))?((/|\\\\)[\\w\\-\\.]*)",
-			"name": "constant.language log.constant"
-		},
 		{
 			"match": "\\b([\\w-]+\\.)+([\\w-])+\\b",
 			"name": "constant.language log.constant"
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
index d2425177be9..8583ba0c8bc 100644
--- a/extensions/markdown-basics/package.json
+++ b/extensions/markdown-basics/package.json
@@ -7,9 +7,6 @@
 	"engines": {
 		"vscode": "^1.20.0"
 	},
-	"categories": [
-		"Languages"
-	],
 	"contributes": {
 		"languages": [
 			{
diff --git a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
index 7d7d9a53914..820134b366a 100644
--- a/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
+++ b/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/07f55fa7c0dcdbfeb21b8970255e96dd9c00b6bb",
+	"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/e667795f83c83e36dc6f90bde14632a963c52e34",
 	"name": "Markdown",
 	"scopeName": "text.html.markdown",
 	"patterns": [
@@ -1668,14 +1668,103 @@
 					"name": "markup.fenced_code.block.markdown"
 				},
 				"heading": {
-					"begin": "(?:^|\\G)[ ]{0,3}(#{1,6})\\s*(?=[\\S[^#]])",
+					"match": "(?:^|\\G)[ ]{0,3}((#{1,6})\\s*(?=[\\S[^#]]).*?\\s*(#{1,6})?)$\\n?",
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.heading.markdown"
+							"patterns": [
+								{
+									"match": "(#{6})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.6.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								},
+								{
+									"match": "(#{5})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.5.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								},
+								{
+									"match": "(#{4})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.4.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								},
+								{
+									"match": "(#{3})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.3.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								},
+								{
+									"match": "(#{2})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.2.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								},
+								{
+									"match": "(#{1})\\s*(?=[\\S[^#]])(.*?)\\s*(\\s+#+)?$\\n?",
+									"name": "heading.1.markdown",
+									"captures": {
+										"1": {
+											"name": "punctuation.definition.heading.markdown"
+										},
+										"2": {
+											"name": "entity.name.section.markdown"
+										},
+										"3": {
+											"name": "punctuation.definition.heading.markdown"
+										}
+									}
+								}
+							]
 						}
 					},
-					"contentName": "entity.name.section.markdown",
-					"end": "\\s*(#{1,6})?$\\n?",
 					"name": "markup.heading.markdown",
 					"patterns": [
 						{
@@ -1933,7 +2022,7 @@
 					"name": "meta.other.valid-ampersand.markdown"
 				},
 				"bold": {
-					"begin": "(?x)\n (\\*\\*|__)(?=\\S)                # Open\n (?=\n   (\n     <[^>]*+>              # HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n     | \\[\n     (\n         (?<square>          # Named group\n           [^\\[\\]\\\\]        # Match most chars\n           | \\\\.            # Escaped chars\n           | \\[ \\g<square>*+ \\]    # Nested brackets\n         )*+\n       \\]\n       (\n         (              # Reference Link\n           [ ]?          # Optional space\n           \\[[^\\]]*+\\]        # Ref name\n         )\n         | (              # Inline Link\n           \\(            # Opening paren\n             [ \\t]*+        # Optional whitespace\n             <?(.*?)>?      # URL\n             [ \\t]*+        # Optional whitespace\n             (          # Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).            # Everything besides\n                       # style closer\n   )++\n   (?<=\\S)\\1                # Close\n )\n",
+					"begin": "(?x)\n ((?<!\\w)\\*\\*\\b|\\b__)(?=\\S)                # Open\n (?=\n   (\n     <[^>]*+>              # HTML tags\n     | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                       # Raw\n     | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n     | \\[\n     (\n         (?<square>          # Named group\n           [^\\[\\]\\\\]        # Match most chars\n           | \\\\.            # Escaped chars\n           | \\[ \\g<square>*+ \\]    # Nested brackets\n         )*+\n       \\]\n       (\n         (              # Reference Link\n           [ ]?          # Optional space\n           \\[[^\\]]*+\\]        # Ref name\n         )\n         | (              # Inline Link\n           \\(            # Opening paren\n             [ \\t]*+        # Optional whitespace\n             <?(.*?)>?      # URL\n             [ \\t]*+        # Optional whitespace\n             (          # Optional Title\n               (?<title>['\"])\n               (.*?)\n               \\k<title>\n             )?\n           \\)\n         )\n       )\n     )\n     | (?!(?<=\\S)\\1).            # Everything besides\n                       # style closer\n   )++\n   (?<=\\S)(?=__\\b|\\*\\*)\\1                # Close\n )\n",
 					"captures": {
 						"1": {
 							"name": "punctuation.definition.bold.markdown"
@@ -2075,7 +2164,7 @@
 					"name": "meta.image.reference.markdown"
 				},
 				"italic": {
-					"begin": "(?x) (\\*\\b|\\b_)(?=\\S)                # Open\n  (?=\n    (\n      <[^>]*+>              # HTML tags\n      | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                        # Raw\n      | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n      | \\[\n      (\n          (?<square>          # Named group\n            [^\\[\\]\\\\]        # Match most chars\n            | \\\\.            # Escaped chars\n            | \\[ \\g<square>*+ \\]    # Nested brackets\n          )*+\n        \\]\n        (\n          (              # Reference Link\n            [ ]?          # Optional space\n            \\[[^\\]]*+\\]        # Ref name\n          )\n          | (              # Inline Link\n            \\(            # Opening paren\n              [ \\t]*+        # Optional whtiespace\n              <?(.*?)>?      # URL\n              [ \\t]*+        # Optional whtiespace\n              (          # Optional Title\n                (?<title>['\"])\n                (.*?)\n                \\k<title>\n              )?\n            \\)\n          )\n        )\n      )\n      | \\1\\1                # Must be bold closer\n      | (?!(?<=\\S)\\1).            # Everything besides\n                        # style closer\n    )++\n    (?<=\\S)\\1                # Close\n  )\n",
+					"begin": "(?x) (\\*\\b|\\b_)(?=\\S)                # Open\n  (?=\n    (\n      <[^>]*+>              # HTML tags\n      | (?<raw>`+)([^`]|(?!(?<!`)\\k<raw>(?!`))`)*+\\k<raw>\n                        # Raw\n      | \\\\[\\\\`*_{}\\[\\]()#.!+\\->]?+      # Escapes\n      | \\[\n      (\n          (?<square>          # Named group\n            [^\\[\\]\\\\]        # Match most chars\n            | \\\\.            # Escaped chars\n            | \\[ \\g<square>*+ \\]    # Nested brackets\n          )*+\n        \\]\n        (\n          (              # Reference Link\n            [ ]?          # Optional space\n            \\[[^\\]]*+\\]        # Ref name\n          )\n          | (              # Inline Link\n            \\(            # Opening paren\n              [ \\t]*+        # Optional whtiespace\n              <?(.*?)>?      # URL\n              [ \\t]*+        # Optional whtiespace\n              (          # Optional Title\n                (?<title>['\"])\n                (.*?)\n                \\k<title>\n              )?\n            \\)\n          )\n        )\n      )\n      | \\1\\1                # Must be bold closer\n      | (?!(?<=\\S)\\1).            # Everything besides\n                        # style closer\n    )++\n    (?<=\\S)(?=_\\b|\\*)\\1                # Close\n  )\n",
 					"captures": {
 						"1": {
 							"name": "punctuation.definition.italic.markdown"
diff --git a/extensions/markdown-basics/test/colorize-results/test-33886_md.json b/extensions/markdown-basics/test/colorize-results/test-33886_md.json
index ed8d6a43aaa..185d172e8af 100644
--- a/extensions/markdown-basics/test/colorize-results/test-33886_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test-33886_md.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "h",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": "h",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": "h",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
diff --git a/extensions/markdown-basics/test/colorize-results/test_md.json b/extensions/markdown-basics/test/colorize-results/test_md.json
index a3dd8829dfe..eb09a71c815 100644
--- a/extensions/markdown-basics/test/colorize-results/test_md.json
+++ b/extensions/markdown-basics/test/colorize-results/test_md.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": "Header 1",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -33,19 +33,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
-		"r": {
-			"dark_plus": "markup.heading: #569CD6",
-			"light_plus": "markup.heading: #800000",
-			"dark_vs": "markup.heading: #569CD6",
-			"light_vs": "markup.heading: #800000",
-			"hc_black": "markup.heading: #6796E6"
-		}
-	},
-	{
-		"c": "#",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"c": " #",
+		"t": "text.html.markdown markup.heading.markdown heading.1.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -56,7 +45,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -67,7 +56,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -78,7 +67,7 @@
 	},
 	{
 		"c": "Header 2",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -88,19 +77,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
-		"r": {
-			"dark_plus": "markup.heading: #569CD6",
-			"light_plus": "markup.heading: #800000",
-			"dark_vs": "markup.heading: #569CD6",
-			"light_vs": "markup.heading: #800000",
-			"hc_black": "markup.heading: #6796E6"
-		}
-	},
-	{
-		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"c": " ##",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -111,7 +89,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -122,7 +100,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -133,7 +111,7 @@
 	},
 	{
 		"c": "Header 3 ###             (Hashes on right are optional)",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -144,7 +122,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -155,7 +133,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -166,7 +144,7 @@
 	},
 	{
 		"c": "Markdown plus h2 with a custom ID ##   {#id-goes-here}",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -243,7 +221,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -254,7 +232,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -265,7 +243,7 @@
 	},
 	{
 		"c": "Alternate heading styles:",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2025,7 +2003,7 @@
 	},
 	{
 		"c": "###",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2036,7 +2014,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2047,7 +2025,7 @@
 	},
 	{
 		"c": "Horizontal rules",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.3.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2201,7 +2179,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2212,7 +2190,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2223,7 +2201,7 @@
 	},
 	{
 		"c": "Markdown plus tables",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2233,19 +2211,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
-		"r": {
-			"dark_plus": "markup.heading: #569CD6",
-			"light_plus": "markup.heading: #800000",
-			"dark_vs": "markup.heading: #569CD6",
-			"light_vs": "markup.heading: #800000",
-			"hc_black": "markup.heading: #6796E6"
-		}
-	},
-	{
-		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"c": " ##",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2366,7 +2333,7 @@
 	},
 	{
 		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2377,7 +2344,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2388,7 +2355,7 @@
 	},
 	{
 		"c": "Markdown plus definition lists",
-		"t": "text.html.markdown markup.heading.markdown entity.name.section.markdown",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown entity.name.section.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
@@ -2398,19 +2365,8 @@
 		}
 	},
 	{
-		"c": " ",
-		"t": "text.html.markdown markup.heading.markdown",
-		"r": {
-			"dark_plus": "markup.heading: #569CD6",
-			"light_plus": "markup.heading: #800000",
-			"dark_vs": "markup.heading: #569CD6",
-			"light_vs": "markup.heading: #800000",
-			"hc_black": "markup.heading: #6796E6"
-		}
-	},
-	{
-		"c": "##",
-		"t": "text.html.markdown markup.heading.markdown punctuation.definition.heading.markdown",
+		"c": " ##",
+		"t": "text.html.markdown markup.heading.markdown heading.2.markdown punctuation.definition.heading.markdown",
 		"r": {
 			"dark_plus": "markup.heading: #569CD6",
 			"light_plus": "markup.heading: #800000",
diff --git a/extensions/markdown-language-features/media/index.js b/extensions/markdown-language-features/media/index.js
index d1abff530f4..567245df45d 100644
--- a/extensions/markdown-language-features/media/index.js
+++ b/extensions/markdown-language-features/media/index.js
@@ -698,7 +698,7 @@ document.addEventListener('dblclick', event => {
     const offset = event.pageY;
     const line = scroll_sync_1.getEditorLineNumberForPageOffset(offset);
     if (typeof line === 'number' && !isNaN(line)) {
-        messaging_1.postMessage('didClick', { line });
+        messaging_1.postMessage('didClick', { line: Math.floor(line) });
     }
 });
 document.addEventListener('click', event => {
@@ -940,4 +940,4 @@ exports.getSettings = getSettings;
 /***/ })
 
 /******/ });
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./node_modules/lodash.throttle/index.js","webpack:///(webpack)/buildin/global.js","webpack:///./preview-src/activeLineMarker.ts","webpack:///./preview-src/events.ts","webpack:///./preview-src/index.ts","webpack:///./preview-src/messaging.ts","webpack:///./preview-src/scroll-sync.ts","webpack:///./preview-src/settings.ts"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,OAAO;AAClB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA,8CAA8C,kBAAkB;AAChE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA,mDAAmD,oBAAoB;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,oBAAoB;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;;;;;;;;;;;;ACtbA;;AAEA;AACA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;;AAEA;AACA;AACA,4CAA4C;;AAE5C;;;;;;;;;;;;;;;ACnBA;;;gGAGgG;AAChG,+FAAyD;AAEzD;IAGC,8BAA8B,CAAC,IAAY;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,sCAAwB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,MAA+B;QACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,OAAgC;QACpD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,kBAAkB,CAAC,OAAgC;QAClD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,IAAI,mBAAmB,CAAC;IAC1C,CAAC;CACD;AA3BD,4CA2BC;;;;;;;;;;;;;;ACjCD;;;gGAGgG;;AAEhG,4BAAmC,CAAa;IAC/C,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC;QAClF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAAC,IAAI,CAAC,CAAC;QACP,CAAC,EAAE,CAAC;IACL,CAAC;AACF,CAAC;AAND,gDAMC;;;;;;;;;;;;;;ACXD;;;gGAGgG;;AAEhG,sFAAyC;AACzC,yFAAuD;AACvD,gFAA8C;AAC9C,+FAA2F;AAC3F,8GAAsD;AACtD,uGAA6C;AAE7C,IAAI,cAAc,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,GAAG,IAAI,mCAAgB,EAAE,CAAC;AACtC,MAAM,QAAQ,GAAG,sBAAW,EAAE,CAAC;AAE/B,2BAAkB,CAAC,GAAG,EAAE;IACvB,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACtC,UAAU,CAAC,GAAG,EAAE;YACf,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,cAAc,GAAG,IAAI,CAAC;gBACtB,sCAAwB,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;QACF,CAAC,EAAE,CAAC,CAAC,CAAC;IACP,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;IAC1B,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,IAAY,EAAE,EAAE;QAC1C,cAAc,GAAG,IAAI,CAAC;QACtB,sCAAwB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,CAAC,CAAC,IAAY,EAAE,QAAa,EAAE,EAAE;QACtC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtC,cAAc,GAAG,IAAI,CAAC;AACvB,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzB,KAAK,gCAAgC;YACpC,MAAM,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,KAAK,CAAC;QAEP,KAAK,YAAY;YAChB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACxC,KAAK,CAAC;IACR,CAAC;AACF,CAAC,EAAE,KAAK,CAAC,CAAC;AAEV,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;IAC7C,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,yBAAyB;IACzB,GAAG,CAAC,CAAC,IAAI,IAAI,GAAG,KAAK,CAAC,MAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,UAAyB,EAAE,CAAC;QAC1F,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC;QACR,CAAC;IACF,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAC3B,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,CAAC;IACtD,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,uBAAW,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACnC,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC;IACR,CAAC;IAED,IAAI,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC;IAC7B,OAAO,IAAI,EAAE,CAAC;QACb,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvD,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/C,KAAK,CAAC;YACP,CAAC;YACD,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjF,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC5F,uBAAW,CAAC,4BAA4B,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChE,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC;YACP,CAAC;YACD,KAAK,CAAC;QACP,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;AACF,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE;QAC/C,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACpB,cAAc,GAAG,KAAK,CAAC;QACxB,CAAC;QAAC,IAAI,CAAC,CAAC;YACP,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9D,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9C,uBAAW,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;IACF,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACT,CAAC;;;;;;;;;;;;;;ACpHD;;;gGAGgG;;AAEhG,sFAAyC;AAEzC;;GAEG;AACH,qBAA4B,IAAY,EAAE,IAAY;IACrD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;QACzB,IAAI;QACJ,MAAM,EAAE,sBAAW,EAAE,CAAC,MAAM;QAC5B,IAAI;KACJ,EAAE,GAAG,CAAC,CAAC;AACT,CAAC;AAND,kCAMC;AAED;;GAEG;AACH,qBAA4B,OAAe,EAAE,IAAW;IACvD,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC;AAFD,kCAEC;;;;;;;;;;;;;;ACvBD;;;gGAGgG;;AAEhG,sFAAyC;AAGzC,eAAe,GAAW,EAAE,GAAW,EAAE,KAAa;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,mBAAmB,IAAY;IAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAW,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAQD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE;IACjC,IAAI,QAA2B,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE;QACX,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAClC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAC5C,CAAC,OAAY,EAAE,EAAE;gBAChB,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC;IACjB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL;;;;;GAKG;AACH,kCAAyC,UAAkB;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAChC,GAAG,CAAC,CAAC,MAAM,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAC3B,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;QACD,QAAQ,GAAG,KAAK,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;AACrB,CAAC;AAdD,4DAcC;AAED;;GAEG;AACH,qCAA4C,MAAc;IACzD,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACZ,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAC1D,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC;YAC5C,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;QACD,IAAI,CAAC,CAAC;YACL,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;IACF,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAC3D,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAtBD,kEAsBC;AAED;;GAEG;AACH,kCAAyC,IAAY;IACpD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC1D,EAAE,CAAC,CAAC,QAAQ,IAAI,sBAAW,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACvD,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;QAC7B,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,8DAA8D;YAC9D,MAAM,eAAe,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,WAAW,CAAC;YAC7E,QAAQ,GAAG,WAAW,GAAG,eAAe,GAAG,aAAa,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,CAAC;YACL,QAAQ,GAAG,WAAW,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;IAC1D,CAAC;AACF,CAAC;AAjBD,4DAiBC;AAED,0CAAiD,MAAc;IAC9D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC/D,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACd,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAChE,MAAM,kBAAkB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAC1E,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,uBAAuB,GAAG,kBAAkB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YACrH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,uBAAuB,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnF,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,CAAC;YACL,MAAM,qBAAqB,GAAG,kBAAkB,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,qBAAqB,CAAC;YACnD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IACD,MAAM,CAAC,IAAI,CAAC;AACb,CAAC;AAjBD,4EAiBC;;;;;;;;;;;;;;AC9HD;;;gGAGgG;;AAYhG,IAAI,cAAc,GAAgC,SAAS,CAAC;AAE5D;IACC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC;IACvB,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,8BAA8B,CAAC,CAAC;IACxE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACb,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACnD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,cAAe,CAAC;QACxB,CAAC;IACF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC5C,CAAC;AAfD,kCAeC","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","/**\n * lodash (Custom Build) <https://lodash.com/>\n * Build: `lodash modularize exports=\"npm\" -o ./`\n * Copyright jQuery Foundation and other contributors <https://jquery.org/>\n * Released under MIT license <https://lodash.com/license>\n * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>\n * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n */\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/** Used as references for various `Number` constants. */\nvar NAN = 0 / 0;\n\n/** `Object#toString` result references. */\nvar symbolTag = '[object Symbol]';\n\n/** Used to match leading and trailing whitespace. */\nvar reTrim = /^\\s+|\\s+$/g;\n\n/** Used to detect bad signed hexadecimal string values. */\nvar reIsBadHex = /^[-+]0x[0-9a-f]+$/i;\n\n/** Used to detect binary string values. */\nvar reIsBinary = /^0b[01]+$/i;\n\n/** Used to detect octal string values. */\nvar reIsOctal = /^0o[0-7]+$/i;\n\n/** Built-in method references without a dependency on `root`. */\nvar freeParseInt = parseInt;\n\n/** Detect free variable `global` from Node.js. */\nvar freeGlobal = typeof global == 'object' && global && global.Object === Object && global;\n\n/** Detect free variable `self`. */\nvar freeSelf = typeof self == 'object' && self && self.Object === Object && self;\n\n/** Used as a reference to the global object. */\nvar root = freeGlobal || freeSelf || Function('return this')();\n\n/** Used for built-in method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the\n * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objectToString = objectProto.toString;\n\n/* Built-in method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max,\n    nativeMin = Math.min;\n\n/**\n * Gets the timestamp of the number of milliseconds that have elapsed since\n * the Unix epoch (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @since 2.4.0\n * @category Date\n * @returns {number} Returns the timestamp.\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => Logs the number of milliseconds it took for the deferred invocation.\n */\nvar now = function() {\n  return root.Date.now();\n};\n\n/**\n * Creates a debounced function that delays invoking `func` until after `wait`\n * milliseconds have elapsed since the last time the debounced function was\n * invoked. The debounced function comes with a `cancel` method to cancel\n * delayed `func` invocations and a `flush` method to immediately invoke them.\n * Provide `options` to indicate whether `func` should be invoked on the\n * leading and/or trailing edge of the `wait` timeout. The `func` is invoked\n * with the last arguments provided to the debounced function. Subsequent\n * calls to the debounced function return the result of the last `func`\n * invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the debounced function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.debounce` and `_.throttle`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to debounce.\n * @param {number} [wait=0] The number of milliseconds to delay.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=false]\n *  Specify invoking on the leading edge of the timeout.\n * @param {number} [options.maxWait]\n *  The maximum time `func` is allowed to be delayed before it's invoked.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new debounced function.\n * @example\n *\n * // Avoid costly calculations while the window size is in flux.\n * jQuery(window).on('resize', _.debounce(calculateLayout, 150));\n *\n * // Invoke `sendMail` when clicked, debouncing subsequent calls.\n * jQuery(element).on('click', _.debounce(sendMail, 300, {\n *   'leading': true,\n *   'trailing': false\n * }));\n *\n * // Ensure `batchLog` is invoked once after 1 second of debounced calls.\n * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });\n * var source = new EventSource('/stream');\n * jQuery(source).on('message', debounced);\n *\n * // Cancel the trailing debounced invocation.\n * jQuery(window).on('popstate', debounced.cancel);\n */\nfunction debounce(func, wait, options) {\n  var lastArgs,\n      lastThis,\n      maxWait,\n      result,\n      timerId,\n      lastCallTime,\n      lastInvokeTime = 0,\n      leading = false,\n      maxing = false,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  wait = toNumber(wait) || 0;\n  if (isObject(options)) {\n    leading = !!options.leading;\n    maxing = 'maxWait' in options;\n    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n\n  function invokeFunc(time) {\n    var args = lastArgs,\n        thisArg = lastThis;\n\n    lastArgs = lastThis = undefined;\n    lastInvokeTime = time;\n    result = func.apply(thisArg, args);\n    return result;\n  }\n\n  function leadingEdge(time) {\n    // Reset any `maxWait` timer.\n    lastInvokeTime = time;\n    // Start the timer for the trailing edge.\n    timerId = setTimeout(timerExpired, wait);\n    // Invoke the leading edge.\n    return leading ? invokeFunc(time) : result;\n  }\n\n  function remainingWait(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime,\n        result = wait - timeSinceLastCall;\n\n    return maxing ? nativeMin(result, maxWait - timeSinceLastInvoke) : result;\n  }\n\n  function shouldInvoke(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime;\n\n    // Either this is the first call, activity has stopped and we're at the\n    // trailing edge, the system time has gone backwards and we're treating\n    // it as the trailing edge, or we've hit the `maxWait` limit.\n    return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||\n      (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));\n  }\n\n  function timerExpired() {\n    var time = now();\n    if (shouldInvoke(time)) {\n      return trailingEdge(time);\n    }\n    // Restart the timer.\n    timerId = setTimeout(timerExpired, remainingWait(time));\n  }\n\n  function trailingEdge(time) {\n    timerId = undefined;\n\n    // Only invoke if we have `lastArgs` which means `func` has been\n    // debounced at least once.\n    if (trailing && lastArgs) {\n      return invokeFunc(time);\n    }\n    lastArgs = lastThis = undefined;\n    return result;\n  }\n\n  function cancel() {\n    if (timerId !== undefined) {\n      clearTimeout(timerId);\n    }\n    lastInvokeTime = 0;\n    lastArgs = lastCallTime = lastThis = timerId = undefined;\n  }\n\n  function flush() {\n    return timerId === undefined ? result : trailingEdge(now());\n  }\n\n  function debounced() {\n    var time = now(),\n        isInvoking = shouldInvoke(time);\n\n    lastArgs = arguments;\n    lastThis = this;\n    lastCallTime = time;\n\n    if (isInvoking) {\n      if (timerId === undefined) {\n        return leadingEdge(lastCallTime);\n      }\n      if (maxing) {\n        // Handle invocations in a tight loop.\n        timerId = setTimeout(timerExpired, wait);\n        return invokeFunc(lastCallTime);\n      }\n    }\n    if (timerId === undefined) {\n      timerId = setTimeout(timerExpired, wait);\n    }\n    return result;\n  }\n  debounced.cancel = cancel;\n  debounced.flush = flush;\n  return debounced;\n}\n\n/**\n * Creates a throttled function that only invokes `func` at most once per\n * every `wait` milliseconds. The throttled function comes with a `cancel`\n * method to cancel delayed `func` invocations and a `flush` method to\n * immediately invoke them. Provide `options` to indicate whether `func`\n * should be invoked on the leading and/or trailing edge of the `wait`\n * timeout. The `func` is invoked with the last arguments provided to the\n * throttled function. Subsequent calls to the throttled function return the\n * result of the last `func` invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the throttled function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.throttle` and `_.debounce`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to throttle.\n * @param {number} [wait=0] The number of milliseconds to throttle invocations to.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=true]\n *  Specify invoking on the leading edge of the timeout.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new throttled function.\n * @example\n *\n * // Avoid excessively updating the position while scrolling.\n * jQuery(window).on('scroll', _.throttle(updatePosition, 100));\n *\n * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.\n * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });\n * jQuery(element).on('click', throttled);\n *\n * // Cancel the trailing throttled invocation.\n * jQuery(window).on('popstate', throttled.cancel);\n */\nfunction throttle(func, wait, options) {\n  var leading = true,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  if (isObject(options)) {\n    leading = 'leading' in options ? !!options.leading : leading;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n  return debounce(func, wait, {\n    'leading': leading,\n    'maxWait': wait,\n    'trailing': trailing\n  });\n}\n\n/**\n * Checks if `value` is the\n * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)\n * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(_.noop);\n * // => true\n *\n * _.isObject(null);\n * // => false\n */\nfunction isObject(value) {\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\n/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\n/**\n * Checks if `value` is classified as a `Symbol` primitive or object.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.\n * @example\n *\n * _.isSymbol(Symbol.iterator);\n * // => true\n *\n * _.isSymbol('abc');\n * // => false\n */\nfunction isSymbol(value) {\n  return typeof value == 'symbol' ||\n    (isObjectLike(value) && objectToString.call(value) == symbolTag);\n}\n\n/**\n * Converts `value` to a number.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to process.\n * @returns {number} Returns the number.\n * @example\n *\n * _.toNumber(3.2);\n * // => 3.2\n *\n * _.toNumber(Number.MIN_VALUE);\n * // => 5e-324\n *\n * _.toNumber(Infinity);\n * // => Infinity\n *\n * _.toNumber('3.2');\n * // => 3.2\n */\nfunction toNumber(value) {\n  if (typeof value == 'number') {\n    return value;\n  }\n  if (isSymbol(value)) {\n    return NAN;\n  }\n  if (isObject(value)) {\n    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;\n    value = isObject(other) ? (other + '') : other;\n  }\n  if (typeof value != 'string') {\n    return value === 0 ? value : +value;\n  }\n  value = value.replace(reTrim, '');\n  var isBinary = reIsBinary.test(value);\n  return (isBinary || reIsOctal.test(value))\n    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)\n    : (reIsBadHex.test(value) ? NAN : +value);\n}\n\nmodule.exports = throttle;\n","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1, eval)(\"this\");\r\n} catch (e) {\r\n\t// This works if the window reference is available\r\n\tif (typeof window === \"object\") g = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nimport { getElementsForSourceLine } from './scroll-sync';\n\nexport class ActiveLineMarker {\n\tprivate _current: any;\n\n\tonDidChangeTextEditorSelection(line: number) {\n\t\tconst { previous } = getElementsForSourceLine(line);\n\t\tthis._update(previous && previous.element);\n\t}\n\n\t_update(before: HTMLElement | undefined) {\n\t\tthis._unmarkActiveElement(this._current);\n\t\tthis._markActiveElement(before);\n\t\tthis._current = before;\n\t}\n\n\t_unmarkActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className = element.className.replace(/\\bcode-active-line\\b/g, '');\n\t}\n\n\t_markActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className += ' code-active-line';\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport function onceDocumentLoaded(f: () => void) {\n\tif (document.readyState === 'loading' || document.readyState === 'uninitialized') {\n\t\tdocument.addEventListener('DOMContentLoaded', f);\n\t} else {\n\t\tf();\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\nimport { postCommand, postMessage } from './messaging';\nimport { onceDocumentLoaded } from './events';\nimport { getEditorLineNumberForPageOffset, scrollToRevealSourceLine } from './scroll-sync';\nimport { ActiveLineMarker } from './activeLineMarker';\nimport throttle = require('lodash.throttle');\n\nvar scrollDisabled = true;\nconst marker = new ActiveLineMarker();\nconst settings = getSettings();\n\nonceDocumentLoaded(() => {\n\tif (settings.scrollPreviewWithEditor) {\n\t\tsetTimeout(() => {\n\t\t\tconst initialLine = +settings.line;\n\t\t\tif (!isNaN(initialLine)) {\n\t\t\t\tscrollDisabled = true;\n\t\t\t\tscrollToRevealSourceLine(initialLine);\n\t\t\t}\n\t\t}, 0);\n\t}\n});\n\nconst onUpdateView = (() => {\n\tconst doScroll = throttle((line: number) => {\n\t\tscrollDisabled = true;\n\t\tscrollToRevealSourceLine(line);\n\t}, 50);\n\n\treturn (line: number, settings: any) => {\n\t\tif (!isNaN(line)) {\n\t\t\tsettings.line = line;\n\t\t\tdoScroll(line);\n\t\t}\n\t};\n})();\n\nwindow.addEventListener('resize', () => {\n\tscrollDisabled = true;\n}, true);\n\nwindow.addEventListener('message', event => {\n\tif (event.data.source !== settings.source) {\n\t\treturn;\n\t}\n\n\tswitch (event.data.type) {\n\t\tcase 'onDidChangeTextEditorSelection':\n\t\t\tmarker.onDidChangeTextEditorSelection(event.data.line);\n\t\t\tbreak;\n\n\t\tcase 'updateView':\n\t\t\tonUpdateView(event.data.line, settings);\n\t\t\tbreak;\n\t}\n}, false);\n\ndocument.addEventListener('dblclick', event => {\n\tif (!settings.doubleClickToSwitchToEditor) {\n\t\treturn;\n\t}\n\n\t// Ignore clicks on links\n\tfor (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {\n\t\tif (node.tagName === 'A') {\n\t\t\treturn;\n\t\t}\n\t}\n\n\tconst offset = event.pageY;\n\tconst line = getEditorLineNumberForPageOffset(offset);\n\tif (typeof line === 'number' && !isNaN(line)) {\n\t\tpostMessage('didClick', { line });\n\t}\n});\n\ndocument.addEventListener('click', event => {\n\tif (!event) {\n\t\treturn;\n\t}\n\n\tlet node: any = event.target;\n\twhile (node) {\n\t\tif (node.tagName && node.tagName === 'A' && node.href) {\n\t\t\tif (node.getAttribute('href').startsWith('#')) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (node.href.startsWith('file://') || node.href.startsWith('vscode-resource:')) {\n\t\t\t\tconst [path, fragment] = node.href.replace(/^(file:\\/\\/|vscode-resource:)/i, '').split('#');\n\t\t\t\tpostCommand('_markdown.openDocumentLink', [{ path, fragment }]);\n\t\t\t\tevent.preventDefault();\n\t\t\t\tevent.stopPropagation();\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tnode = node.parentNode;\n\t}\n}, true);\n\nif (settings.scrollEditorWithPreview) {\n\twindow.addEventListener('scroll', throttle(() => {\n\t\tif (scrollDisabled) {\n\t\t\tscrollDisabled = false;\n\t\t} else {\n\t\t\tconst line = getEditorLineNumberForPageOffset(window.scrollY);\n\t\t\tif (typeof line === 'number' && !isNaN(line)) {\n\t\t\t\tpostMessage('revealLine', { line });\n\t\t\t}\n\t\t}\n\t}, 50));\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n/**\n * Post a message to the markdown extension\n */\nexport function postMessage(type: string, body: object) {\n\twindow.parent.postMessage({\n\t\ttype,\n\t\tsource: getSettings().source,\n\t\tbody\n\t}, '*');\n}\n\n/**\n * Post a command to be executed to the markdown extension\n */\nexport function postCommand(command: string, args: any[]) {\n\tpostMessage('command', { command, args });\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n\nfunction clamp(min: number, max: number, value: number) {\n\treturn Math.min(max, Math.max(min, value));\n}\n\nfunction clampLine(line: number) {\n\treturn clamp(0, getSettings().lineCount - 1, line);\n}\n\n\nexport interface CodeLineElement {\n\telement: HTMLElement;\n\tline: number;\n}\n\nconst getCodeLineElements = (() => {\n\tlet elements: CodeLineElement[];\n\treturn () => {\n\t\tif (!elements) {\n\t\t\telements = Array.prototype.map.call(\n\t\t\t\tdocument.getElementsByClassName('code-line'),\n\t\t\t\t(element: any) => {\n\t\t\t\t\tconst line = +element.getAttribute('data-line');\n\t\t\t\t\treturn { element, line };\n\t\t\t\t})\n\t\t\t\t.filter((x: any) => !isNaN(x.line));\n\t\t}\n\t\treturn elements;\n\t};\n})();\n\n/**\n * Find the html elements that map to a specific target line in the editor.\n *\n * If an exact match, returns a single element. If the line is between elements,\n * returns the element prior to and the element after the given line.\n */\nexport function getElementsForSourceLine(targetLine: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lineNumber = Math.floor(targetLine);\n\tconst lines = getCodeLineElements();\n\tlet previous = lines[0] || null;\n\tfor (const entry of lines) {\n\t\tif (entry.line === lineNumber) {\n\t\t\treturn { previous: entry, next: undefined };\n\t\t}\n\t\telse if (entry.line > lineNumber) {\n\t\t\treturn { previous, next: entry };\n\t\t}\n\t\tprevious = entry;\n\t}\n\treturn { previous };\n}\n\n/**\n * Find the html elements that are at a specific pixel offset on the page.\n */\nexport function getLineElementsAtPageOffset(offset: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lines = getCodeLineElements();\n\tconst position = offset - window.scrollY;\n\tlet lo = -1;\n\tlet hi = lines.length - 1;\n\twhile (lo + 1 < hi) {\n\t\tconst mid = Math.floor((lo + hi) / 2);\n\t\tconst bounds = lines[mid].element.getBoundingClientRect();\n\t\tif (bounds.top + bounds.height >= position) {\n\t\t\thi = mid;\n\t\t}\n\t\telse {\n\t\t\tlo = mid;\n\t\t}\n\t}\n\tconst hiElement = lines[hi];\n\tconst hiBounds = hiElement.element.getBoundingClientRect();\n\tif (hi >= 1 && hiBounds.top > position) {\n\t\tconst loElement = lines[lo];\n\t\treturn { previous: loElement, next: hiElement };\n\t}\n\treturn { previous: hiElement };\n}\n\n/**\n * Attempt to reveal the element for a source line in the editor.\n */\nexport function scrollToRevealSourceLine(line: number) {\n\tconst { previous, next } = getElementsForSourceLine(line);\n\tif (previous && getSettings().scrollPreviewWithEditor) {\n\t\tlet scrollTo = 0;\n\t\tconst rect = previous.element.getBoundingClientRect();\n\t\tconst previousTop = rect.top;\n\t\tif (next && next.line !== previous.line) {\n\t\t\t// Between two elements. Go to percentage offset between them.\n\t\t\tconst betweenProgress = (line - previous.line) / (next.line - previous.line);\n\t\t\tconst elementOffset = next.element.getBoundingClientRect().top - previousTop;\n\t\t\tscrollTo = previousTop + betweenProgress * elementOffset;\n\t\t}\n\t\telse {\n\t\t\tscrollTo = previousTop;\n\t\t}\n\t\twindow.scroll(0, Math.max(1, window.scrollY + scrollTo));\n\t}\n}\n\nexport function getEditorLineNumberForPageOffset(offset: number) {\n\tconst { previous, next } = getLineElementsAtPageOffset(offset);\n\tif (previous) {\n\t\tconst previousBounds = previous.element.getBoundingClientRect();\n\t\tconst offsetFromPrevious = (offset - window.scrollY - previousBounds.top);\n\t\tif (next) {\n\t\t\tconst progressBetweenElements = offsetFromPrevious / (next.element.getBoundingClientRect().top - previousBounds.top);\n\t\t\tconst line = previous.line + progressBetweenElements * (next.line - previous.line);\n\t\t\treturn clampLine(line);\n\t\t}\n\t\telse {\n\t\t\tconst progressWithinElement = offsetFromPrevious / (previousBounds.height);\n\t\t\tconst line = previous.line + progressWithinElement;\n\t\t\treturn clampLine(line);\n\t\t}\n\t}\n\treturn null;\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport interface PreviewSettings {\n\tsource: string;\n\tline: number;\n\tlineCount: number;\n\tscrollPreviewWithEditor?: boolean;\n\tscrollEditorWithPreview: boolean;\n\tdisableSecurityWarnings: boolean;\n\tdoubleClickToSwitchToEditor: boolean;\n}\n\nlet cachedSettings: PreviewSettings | undefined = undefined;\n\nexport function getSettings(): PreviewSettings {\n\tif (cachedSettings) {\n\t\treturn cachedSettings;\n\t}\n\n\tconst element = document.getElementById('vscode-markdown-preview-data');\n\tif (element) {\n\t\tconst data = element.getAttribute('data-settings');\n\t\tif (data) {\n\t\t\tcachedSettings = JSON.parse(data);\n\t\t\treturn cachedSettings!;\n\t\t}\n\t}\n\n\tthrow new Error('Could not load settings');\n}\n"],"sourceRoot":""}
\ No newline at end of file
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./node_modules/lodash.throttle/index.js","webpack:///(webpack)/buildin/global.js","webpack:///./preview-src/activeLineMarker.ts","webpack:///./preview-src/events.ts","webpack:///./preview-src/index.ts","webpack:///./preview-src/messaging.ts","webpack:///./preview-src/scroll-sync.ts","webpack:///./preview-src/settings.ts"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA,yDAAiD,cAAc;AAC/D;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;;AAGA;AACA;;;;;;;;;;;;ACnEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,OAAO;AAClB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,IAAI;AACJ;AACA;AACA,8CAA8C,kBAAkB;AAChE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,SAAS;AACpB,WAAW,OAAO;AAClB,WAAW,OAAO,YAAY;AAC9B,WAAW,QAAQ;AACnB;AACA,WAAW,QAAQ;AACnB;AACA,aAAa,SAAS;AACtB;AACA;AACA;AACA;AACA;AACA;AACA,mDAAmD,oBAAoB;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GAAG;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,gBAAgB;AAChB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA,oBAAoB;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,QAAQ;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAW,EAAE;AACb,aAAa,OAAO;AACpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;;;;;;;;;;;;ACtbA;;AAEA;AACA;AACA;AACA,CAAC;;AAED;AACA;AACA;AACA,CAAC;AACD;AACA;AACA;;AAEA;AACA;AACA,4CAA4C;;AAE5C;;;;;;;;;;;;;;;ACnBA;;;gGAGgG;AAChG,+FAAyD;AAEzD;IAGC,8BAA8B,CAAC,IAAY;QAC1C,MAAM,EAAE,QAAQ,EAAE,GAAG,sCAAwB,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,MAA+B;QACtC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,oBAAoB,CAAC,OAAgC;QACpD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,kBAAkB,CAAC,OAAgC;QAClD,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACd,MAAM,CAAC;QACR,CAAC;QACD,OAAO,CAAC,SAAS,IAAI,mBAAmB,CAAC;IAC1C,CAAC;CACD;AA3BD,4CA2BC;;;;;;;;;;;;;;ACjCD;;;gGAGgG;;AAEhG,4BAAmC,CAAa;IAC/C,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC;QAClF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAAC,IAAI,CAAC,CAAC;QACP,CAAC,EAAE,CAAC;IACL,CAAC;AACF,CAAC;AAND,gDAMC;;;;;;;;;;;;;;ACXD;;;gGAGgG;;AAEhG,sFAAyC;AACzC,yFAAuD;AACvD,gFAA8C;AAC9C,+FAA2F;AAC3F,8GAAsD;AACtD,uGAA6C;AAE7C,IAAI,cAAc,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,GAAG,IAAI,mCAAgB,EAAE,CAAC;AACtC,MAAM,QAAQ,GAAG,sBAAW,EAAE,CAAC;AAE/B,2BAAkB,CAAC,GAAG,EAAE;IACvB,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACtC,UAAU,CAAC,GAAG,EAAE;YACf,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,cAAc,GAAG,IAAI,CAAC;gBACtB,sCAAwB,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;QACF,CAAC,EAAE,CAAC,CAAC,CAAC;IACP,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;IAC1B,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,IAAY,EAAE,EAAE;QAC1C,cAAc,GAAG,IAAI,CAAC;QACtB,sCAAwB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,CAAC,CAAC,IAAY,EAAE,QAAa,EAAE,EAAE;QACtC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtC,cAAc,GAAG,IAAI,CAAC;AACvB,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzB,KAAK,gCAAgC;YACpC,MAAM,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,KAAK,CAAC;QAEP,KAAK,YAAY;YAChB,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACxC,KAAK,CAAC;IACR,CAAC;AACF,CAAC,EAAE,KAAK,CAAC,CAAC;AAEV,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE;IAC7C,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC;IACR,CAAC;IAED,yBAAyB;IACzB,GAAG,CAAC,CAAC,IAAI,IAAI,GAAG,KAAK,CAAC,MAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,UAAyB,EAAE,CAAC;QAC1F,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC;YAC1B,MAAM,CAAC;QACR,CAAC;IACF,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;IAC3B,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,CAAC;IACtD,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,uBAAW,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;IAC1C,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACZ,MAAM,CAAC;IACR,CAAC;IAED,IAAI,IAAI,GAAQ,KAAK,CAAC,MAAM,CAAC;IAC7B,OAAO,IAAI,EAAE,CAAC;QACb,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACvD,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/C,KAAK,CAAC;YACP,CAAC;YACD,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBACjF,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC5F,uBAAW,CAAC,4BAA4B,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBAChE,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,KAAK,CAAC;YACP,CAAC;YACD,KAAK,CAAC;QACP,CAAC;QACD,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;AACF,CAAC,EAAE,IAAI,CAAC,CAAC;AAET,EAAE,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACtC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE;QAC/C,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACpB,cAAc,GAAG,KAAK,CAAC;QACxB,CAAC;QAAC,IAAI,CAAC,CAAC;YACP,MAAM,IAAI,GAAG,8CAAgC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9D,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9C,uBAAW,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YACrC,CAAC;QACF,CAAC;IACF,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACT,CAAC;;;;;;;;;;;;;;ACpHD;;;gGAGgG;;AAEhG,sFAAyC;AAEzC;;GAEG;AACH,qBAA4B,IAAY,EAAE,IAAY;IACrD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;QACzB,IAAI;QACJ,MAAM,EAAE,sBAAW,EAAE,CAAC,MAAM;QAC5B,IAAI;KACJ,EAAE,GAAG,CAAC,CAAC;AACT,CAAC;AAND,kCAMC;AAED;;GAEG;AACH,qBAA4B,OAAe,EAAE,IAAW;IACvD,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC3C,CAAC;AAFD,kCAEC;;;;;;;;;;;;;;ACvBD;;;gGAGgG;;AAEhG,sFAAyC;AAGzC,eAAe,GAAW,EAAE,GAAW,EAAE,KAAa;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,mBAAmB,IAAY;IAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAW,EAAE,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AACpD,CAAC;AAQD,MAAM,mBAAmB,GAAG,CAAC,GAAG,EAAE;IACjC,IAAI,QAA2B,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE;QACX,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAClC,QAAQ,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAC5C,CAAC,OAAY,EAAE,EAAE;gBAChB,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC;IACjB,CAAC,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL;;;;;GAKG;AACH,kCAAyC,UAAkB;IAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAChC,GAAG,CAAC,CAAC,MAAM,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAC3B,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;QACD,QAAQ,GAAG,KAAK,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;AACrB,CAAC;AAdD,4DAcC;AAED;;GAEG;AACH,qCAA4C,MAAc;IACzD,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IACzC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACZ,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAC1D,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC;YAC5C,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;QACD,IAAI,CAAC,CAAC;YACL,EAAE,GAAG,GAAG,CAAC;QACV,CAAC;IACF,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAC3D,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5B,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACjD,CAAC;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AAChC,CAAC;AAtBD,kEAsBC;AAED;;GAEG;AACH,kCAAyC,IAAY;IACpD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC1D,EAAE,CAAC,CAAC,QAAQ,IAAI,sBAAW,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACvD,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;QAC7B,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACzC,8DAA8D;YAC9D,MAAM,eAAe,GAAG,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,WAAW,CAAC;YAC7E,QAAQ,GAAG,WAAW,GAAG,eAAe,GAAG,aAAa,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,CAAC;YACL,QAAQ,GAAG,WAAW,CAAC;QACxB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;IAC1D,CAAC;AACF,CAAC;AAjBD,4DAiBC;AAED,0CAAiD,MAAc;IAC9D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC/D,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACd,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAChE,MAAM,kBAAkB,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAC1E,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,MAAM,uBAAuB,GAAG,kBAAkB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YACrH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,uBAAuB,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnF,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,CAAC;YACL,MAAM,qBAAqB,GAAG,kBAAkB,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC3E,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,qBAAqB,CAAC;YACnD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;IACD,MAAM,CAAC,IAAI,CAAC;AACb,CAAC;AAjBD,4EAiBC;;;;;;;;;;;;;;AC9HD;;;gGAGgG;;AAYhG,IAAI,cAAc,GAAgC,SAAS,CAAC;AAE5D;IACC,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC;IACvB,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,8BAA8B,CAAC,CAAC;IACxE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACb,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;QACnD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACV,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,CAAC,cAAe,CAAC;QACxB,CAAC;IACF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC5C,CAAC;AAfD,kCAeC","file":"index.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./preview-src/index.ts\");\n","/**\n * lodash (Custom Build) <https://lodash.com/>\n * Build: `lodash modularize exports=\"npm\" -o ./`\n * Copyright jQuery Foundation and other contributors <https://jquery.org/>\n * Released under MIT license <https://lodash.com/license>\n * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>\n * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors\n */\n\n/** Used as the `TypeError` message for \"Functions\" methods. */\nvar FUNC_ERROR_TEXT = 'Expected a function';\n\n/** Used as references for various `Number` constants. */\nvar NAN = 0 / 0;\n\n/** `Object#toString` result references. */\nvar symbolTag = '[object Symbol]';\n\n/** Used to match leading and trailing whitespace. */\nvar reTrim = /^\\s+|\\s+$/g;\n\n/** Used to detect bad signed hexadecimal string values. */\nvar reIsBadHex = /^[-+]0x[0-9a-f]+$/i;\n\n/** Used to detect binary string values. */\nvar reIsBinary = /^0b[01]+$/i;\n\n/** Used to detect octal string values. */\nvar reIsOctal = /^0o[0-7]+$/i;\n\n/** Built-in method references without a dependency on `root`. */\nvar freeParseInt = parseInt;\n\n/** Detect free variable `global` from Node.js. */\nvar freeGlobal = typeof global == 'object' && global && global.Object === Object && global;\n\n/** Detect free variable `self`. */\nvar freeSelf = typeof self == 'object' && self && self.Object === Object && self;\n\n/** Used as a reference to the global object. */\nvar root = freeGlobal || freeSelf || Function('return this')();\n\n/** Used for built-in method references. */\nvar objectProto = Object.prototype;\n\n/**\n * Used to resolve the\n * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)\n * of values.\n */\nvar objectToString = objectProto.toString;\n\n/* Built-in method references for those with the same name as other `lodash` methods. */\nvar nativeMax = Math.max,\n    nativeMin = Math.min;\n\n/**\n * Gets the timestamp of the number of milliseconds that have elapsed since\n * the Unix epoch (1 January 1970 00:00:00 UTC).\n *\n * @static\n * @memberOf _\n * @since 2.4.0\n * @category Date\n * @returns {number} Returns the timestamp.\n * @example\n *\n * _.defer(function(stamp) {\n *   console.log(_.now() - stamp);\n * }, _.now());\n * // => Logs the number of milliseconds it took for the deferred invocation.\n */\nvar now = function() {\n  return root.Date.now();\n};\n\n/**\n * Creates a debounced function that delays invoking `func` until after `wait`\n * milliseconds have elapsed since the last time the debounced function was\n * invoked. The debounced function comes with a `cancel` method to cancel\n * delayed `func` invocations and a `flush` method to immediately invoke them.\n * Provide `options` to indicate whether `func` should be invoked on the\n * leading and/or trailing edge of the `wait` timeout. The `func` is invoked\n * with the last arguments provided to the debounced function. Subsequent\n * calls to the debounced function return the result of the last `func`\n * invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the debounced function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.debounce` and `_.throttle`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to debounce.\n * @param {number} [wait=0] The number of milliseconds to delay.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=false]\n *  Specify invoking on the leading edge of the timeout.\n * @param {number} [options.maxWait]\n *  The maximum time `func` is allowed to be delayed before it's invoked.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new debounced function.\n * @example\n *\n * // Avoid costly calculations while the window size is in flux.\n * jQuery(window).on('resize', _.debounce(calculateLayout, 150));\n *\n * // Invoke `sendMail` when clicked, debouncing subsequent calls.\n * jQuery(element).on('click', _.debounce(sendMail, 300, {\n *   'leading': true,\n *   'trailing': false\n * }));\n *\n * // Ensure `batchLog` is invoked once after 1 second of debounced calls.\n * var debounced = _.debounce(batchLog, 250, { 'maxWait': 1000 });\n * var source = new EventSource('/stream');\n * jQuery(source).on('message', debounced);\n *\n * // Cancel the trailing debounced invocation.\n * jQuery(window).on('popstate', debounced.cancel);\n */\nfunction debounce(func, wait, options) {\n  var lastArgs,\n      lastThis,\n      maxWait,\n      result,\n      timerId,\n      lastCallTime,\n      lastInvokeTime = 0,\n      leading = false,\n      maxing = false,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  wait = toNumber(wait) || 0;\n  if (isObject(options)) {\n    leading = !!options.leading;\n    maxing = 'maxWait' in options;\n    maxWait = maxing ? nativeMax(toNumber(options.maxWait) || 0, wait) : maxWait;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n\n  function invokeFunc(time) {\n    var args = lastArgs,\n        thisArg = lastThis;\n\n    lastArgs = lastThis = undefined;\n    lastInvokeTime = time;\n    result = func.apply(thisArg, args);\n    return result;\n  }\n\n  function leadingEdge(time) {\n    // Reset any `maxWait` timer.\n    lastInvokeTime = time;\n    // Start the timer for the trailing edge.\n    timerId = setTimeout(timerExpired, wait);\n    // Invoke the leading edge.\n    return leading ? invokeFunc(time) : result;\n  }\n\n  function remainingWait(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime,\n        result = wait - timeSinceLastCall;\n\n    return maxing ? nativeMin(result, maxWait - timeSinceLastInvoke) : result;\n  }\n\n  function shouldInvoke(time) {\n    var timeSinceLastCall = time - lastCallTime,\n        timeSinceLastInvoke = time - lastInvokeTime;\n\n    // Either this is the first call, activity has stopped and we're at the\n    // trailing edge, the system time has gone backwards and we're treating\n    // it as the trailing edge, or we've hit the `maxWait` limit.\n    return (lastCallTime === undefined || (timeSinceLastCall >= wait) ||\n      (timeSinceLastCall < 0) || (maxing && timeSinceLastInvoke >= maxWait));\n  }\n\n  function timerExpired() {\n    var time = now();\n    if (shouldInvoke(time)) {\n      return trailingEdge(time);\n    }\n    // Restart the timer.\n    timerId = setTimeout(timerExpired, remainingWait(time));\n  }\n\n  function trailingEdge(time) {\n    timerId = undefined;\n\n    // Only invoke if we have `lastArgs` which means `func` has been\n    // debounced at least once.\n    if (trailing && lastArgs) {\n      return invokeFunc(time);\n    }\n    lastArgs = lastThis = undefined;\n    return result;\n  }\n\n  function cancel() {\n    if (timerId !== undefined) {\n      clearTimeout(timerId);\n    }\n    lastInvokeTime = 0;\n    lastArgs = lastCallTime = lastThis = timerId = undefined;\n  }\n\n  function flush() {\n    return timerId === undefined ? result : trailingEdge(now());\n  }\n\n  function debounced() {\n    var time = now(),\n        isInvoking = shouldInvoke(time);\n\n    lastArgs = arguments;\n    lastThis = this;\n    lastCallTime = time;\n\n    if (isInvoking) {\n      if (timerId === undefined) {\n        return leadingEdge(lastCallTime);\n      }\n      if (maxing) {\n        // Handle invocations in a tight loop.\n        timerId = setTimeout(timerExpired, wait);\n        return invokeFunc(lastCallTime);\n      }\n    }\n    if (timerId === undefined) {\n      timerId = setTimeout(timerExpired, wait);\n    }\n    return result;\n  }\n  debounced.cancel = cancel;\n  debounced.flush = flush;\n  return debounced;\n}\n\n/**\n * Creates a throttled function that only invokes `func` at most once per\n * every `wait` milliseconds. The throttled function comes with a `cancel`\n * method to cancel delayed `func` invocations and a `flush` method to\n * immediately invoke them. Provide `options` to indicate whether `func`\n * should be invoked on the leading and/or trailing edge of the `wait`\n * timeout. The `func` is invoked with the last arguments provided to the\n * throttled function. Subsequent calls to the throttled function return the\n * result of the last `func` invocation.\n *\n * **Note:** If `leading` and `trailing` options are `true`, `func` is\n * invoked on the trailing edge of the timeout only if the throttled function\n * is invoked more than once during the `wait` timeout.\n *\n * If `wait` is `0` and `leading` is `false`, `func` invocation is deferred\n * until to the next tick, similar to `setTimeout` with a timeout of `0`.\n *\n * See [David Corbacho's article](https://css-tricks.com/debouncing-throttling-explained-examples/)\n * for details over the differences between `_.throttle` and `_.debounce`.\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Function\n * @param {Function} func The function to throttle.\n * @param {number} [wait=0] The number of milliseconds to throttle invocations to.\n * @param {Object} [options={}] The options object.\n * @param {boolean} [options.leading=true]\n *  Specify invoking on the leading edge of the timeout.\n * @param {boolean} [options.trailing=true]\n *  Specify invoking on the trailing edge of the timeout.\n * @returns {Function} Returns the new throttled function.\n * @example\n *\n * // Avoid excessively updating the position while scrolling.\n * jQuery(window).on('scroll', _.throttle(updatePosition, 100));\n *\n * // Invoke `renewToken` when the click event is fired, but not more than once every 5 minutes.\n * var throttled = _.throttle(renewToken, 300000, { 'trailing': false });\n * jQuery(element).on('click', throttled);\n *\n * // Cancel the trailing throttled invocation.\n * jQuery(window).on('popstate', throttled.cancel);\n */\nfunction throttle(func, wait, options) {\n  var leading = true,\n      trailing = true;\n\n  if (typeof func != 'function') {\n    throw new TypeError(FUNC_ERROR_TEXT);\n  }\n  if (isObject(options)) {\n    leading = 'leading' in options ? !!options.leading : leading;\n    trailing = 'trailing' in options ? !!options.trailing : trailing;\n  }\n  return debounce(func, wait, {\n    'leading': leading,\n    'maxWait': wait,\n    'trailing': trailing\n  });\n}\n\n/**\n * Checks if `value` is the\n * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)\n * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)\n *\n * @static\n * @memberOf _\n * @since 0.1.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is an object, else `false`.\n * @example\n *\n * _.isObject({});\n * // => true\n *\n * _.isObject([1, 2, 3]);\n * // => true\n *\n * _.isObject(_.noop);\n * // => true\n *\n * _.isObject(null);\n * // => false\n */\nfunction isObject(value) {\n  var type = typeof value;\n  return !!value && (type == 'object' || type == 'function');\n}\n\n/**\n * Checks if `value` is object-like. A value is object-like if it's not `null`\n * and has a `typeof` result of \"object\".\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is object-like, else `false`.\n * @example\n *\n * _.isObjectLike({});\n * // => true\n *\n * _.isObjectLike([1, 2, 3]);\n * // => true\n *\n * _.isObjectLike(_.noop);\n * // => false\n *\n * _.isObjectLike(null);\n * // => false\n */\nfunction isObjectLike(value) {\n  return !!value && typeof value == 'object';\n}\n\n/**\n * Checks if `value` is classified as a `Symbol` primitive or object.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to check.\n * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.\n * @example\n *\n * _.isSymbol(Symbol.iterator);\n * // => true\n *\n * _.isSymbol('abc');\n * // => false\n */\nfunction isSymbol(value) {\n  return typeof value == 'symbol' ||\n    (isObjectLike(value) && objectToString.call(value) == symbolTag);\n}\n\n/**\n * Converts `value` to a number.\n *\n * @static\n * @memberOf _\n * @since 4.0.0\n * @category Lang\n * @param {*} value The value to process.\n * @returns {number} Returns the number.\n * @example\n *\n * _.toNumber(3.2);\n * // => 3.2\n *\n * _.toNumber(Number.MIN_VALUE);\n * // => 5e-324\n *\n * _.toNumber(Infinity);\n * // => Infinity\n *\n * _.toNumber('3.2');\n * // => 3.2\n */\nfunction toNumber(value) {\n  if (typeof value == 'number') {\n    return value;\n  }\n  if (isSymbol(value)) {\n    return NAN;\n  }\n  if (isObject(value)) {\n    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;\n    value = isObject(other) ? (other + '') : other;\n  }\n  if (typeof value != 'string') {\n    return value === 0 ? value : +value;\n  }\n  value = value.replace(reTrim, '');\n  var isBinary = reIsBinary.test(value);\n  return (isBinary || reIsOctal.test(value))\n    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)\n    : (reIsBadHex.test(value) ? NAN : +value);\n}\n\nmodule.exports = throttle;\n","var g;\r\n\r\n// This works in non-strict mode\r\ng = (function() {\r\n\treturn this;\r\n})();\r\n\r\ntry {\r\n\t// This works if eval is allowed (see CSP)\r\n\tg = g || Function(\"return this\")() || (1, eval)(\"this\");\r\n} catch (e) {\r\n\t// This works if the window reference is available\r\n\tif (typeof window === \"object\") g = window;\r\n}\r\n\r\n// g can still be undefined, but nothing to do about it...\r\n// We return undefined, instead of nothing here, so it's\r\n// easier to handle this case. if(!global) { ...}\r\n\r\nmodule.exports = g;\r\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\nimport { getElementsForSourceLine } from './scroll-sync';\n\nexport class ActiveLineMarker {\n\tprivate _current: any;\n\n\tonDidChangeTextEditorSelection(line: number) {\n\t\tconst { previous } = getElementsForSourceLine(line);\n\t\tthis._update(previous && previous.element);\n\t}\n\n\t_update(before: HTMLElement | undefined) {\n\t\tthis._unmarkActiveElement(this._current);\n\t\tthis._markActiveElement(before);\n\t\tthis._current = before;\n\t}\n\n\t_unmarkActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className = element.className.replace(/\\bcode-active-line\\b/g, '');\n\t}\n\n\t_markActiveElement(element: HTMLElement | undefined) {\n\t\tif (!element) {\n\t\t\treturn;\n\t\t}\n\t\telement.className += ' code-active-line';\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport function onceDocumentLoaded(f: () => void) {\n\tif (document.readyState === 'loading' || document.readyState === 'uninitialized') {\n\t\tdocument.addEventListener('DOMContentLoaded', f);\n\t} else {\n\t\tf();\n\t}\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\nimport { postCommand, postMessage } from './messaging';\nimport { onceDocumentLoaded } from './events';\nimport { getEditorLineNumberForPageOffset, scrollToRevealSourceLine } from './scroll-sync';\nimport { ActiveLineMarker } from './activeLineMarker';\nimport throttle = require('lodash.throttle');\n\nvar scrollDisabled = true;\nconst marker = new ActiveLineMarker();\nconst settings = getSettings();\n\nonceDocumentLoaded(() => {\n\tif (settings.scrollPreviewWithEditor) {\n\t\tsetTimeout(() => {\n\t\t\tconst initialLine = +settings.line;\n\t\t\tif (!isNaN(initialLine)) {\n\t\t\t\tscrollDisabled = true;\n\t\t\t\tscrollToRevealSourceLine(initialLine);\n\t\t\t}\n\t\t}, 0);\n\t}\n});\n\nconst onUpdateView = (() => {\n\tconst doScroll = throttle((line: number) => {\n\t\tscrollDisabled = true;\n\t\tscrollToRevealSourceLine(line);\n\t}, 50);\n\n\treturn (line: number, settings: any) => {\n\t\tif (!isNaN(line)) {\n\t\t\tsettings.line = line;\n\t\t\tdoScroll(line);\n\t\t}\n\t};\n})();\n\nwindow.addEventListener('resize', () => {\n\tscrollDisabled = true;\n}, true);\n\nwindow.addEventListener('message', event => {\n\tif (event.data.source !== settings.source) {\n\t\treturn;\n\t}\n\n\tswitch (event.data.type) {\n\t\tcase 'onDidChangeTextEditorSelection':\n\t\t\tmarker.onDidChangeTextEditorSelection(event.data.line);\n\t\t\tbreak;\n\n\t\tcase 'updateView':\n\t\t\tonUpdateView(event.data.line, settings);\n\t\t\tbreak;\n\t}\n}, false);\n\ndocument.addEventListener('dblclick', event => {\n\tif (!settings.doubleClickToSwitchToEditor) {\n\t\treturn;\n\t}\n\n\t// Ignore clicks on links\n\tfor (let node = event.target as HTMLElement; node; node = node.parentNode as HTMLElement) {\n\t\tif (node.tagName === 'A') {\n\t\t\treturn;\n\t\t}\n\t}\n\n\tconst offset = event.pageY;\n\tconst line = getEditorLineNumberForPageOffset(offset);\n\tif (typeof line === 'number' && !isNaN(line)) {\n\t\tpostMessage('didClick', { line: Math.floor(line) });\n\t}\n});\n\ndocument.addEventListener('click', event => {\n\tif (!event) {\n\t\treturn;\n\t}\n\n\tlet node: any = event.target;\n\twhile (node) {\n\t\tif (node.tagName && node.tagName === 'A' && node.href) {\n\t\t\tif (node.getAttribute('href').startsWith('#')) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (node.href.startsWith('file://') || node.href.startsWith('vscode-resource:')) {\n\t\t\t\tconst [path, fragment] = node.href.replace(/^(file:\\/\\/|vscode-resource:)/i, '').split('#');\n\t\t\t\tpostCommand('_markdown.openDocumentLink', [{ path, fragment }]);\n\t\t\t\tevent.preventDefault();\n\t\t\t\tevent.stopPropagation();\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tbreak;\n\t\t}\n\t\tnode = node.parentNode;\n\t}\n}, true);\n\nif (settings.scrollEditorWithPreview) {\n\twindow.addEventListener('scroll', throttle(() => {\n\t\tif (scrollDisabled) {\n\t\t\tscrollDisabled = false;\n\t\t} else {\n\t\t\tconst line = getEditorLineNumberForPageOffset(window.scrollY);\n\t\t\tif (typeof line === 'number' && !isNaN(line)) {\n\t\t\t\tpostMessage('revealLine', { line });\n\t\t\t}\n\t\t}\n\t}, 50));\n}","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n/**\n * Post a message to the markdown extension\n */\nexport function postMessage(type: string, body: object) {\n\twindow.parent.postMessage({\n\t\ttype,\n\t\tsource: getSettings().source,\n\t\tbody\n\t}, '*');\n}\n\n/**\n * Post a command to be executed to the markdown extension\n */\nexport function postCommand(command: string, args: any[]) {\n\tpostMessage('command', { command, args });\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { getSettings } from './settings';\n\n\nfunction clamp(min: number, max: number, value: number) {\n\treturn Math.min(max, Math.max(min, value));\n}\n\nfunction clampLine(line: number) {\n\treturn clamp(0, getSettings().lineCount - 1, line);\n}\n\n\nexport interface CodeLineElement {\n\telement: HTMLElement;\n\tline: number;\n}\n\nconst getCodeLineElements = (() => {\n\tlet elements: CodeLineElement[];\n\treturn () => {\n\t\tif (!elements) {\n\t\t\telements = Array.prototype.map.call(\n\t\t\t\tdocument.getElementsByClassName('code-line'),\n\t\t\t\t(element: any) => {\n\t\t\t\t\tconst line = +element.getAttribute('data-line');\n\t\t\t\t\treturn { element, line };\n\t\t\t\t})\n\t\t\t\t.filter((x: any) => !isNaN(x.line));\n\t\t}\n\t\treturn elements;\n\t};\n})();\n\n/**\n * Find the html elements that map to a specific target line in the editor.\n *\n * If an exact match, returns a single element. If the line is between elements,\n * returns the element prior to and the element after the given line.\n */\nexport function getElementsForSourceLine(targetLine: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lineNumber = Math.floor(targetLine);\n\tconst lines = getCodeLineElements();\n\tlet previous = lines[0] || null;\n\tfor (const entry of lines) {\n\t\tif (entry.line === lineNumber) {\n\t\t\treturn { previous: entry, next: undefined };\n\t\t}\n\t\telse if (entry.line > lineNumber) {\n\t\t\treturn { previous, next: entry };\n\t\t}\n\t\tprevious = entry;\n\t}\n\treturn { previous };\n}\n\n/**\n * Find the html elements that are at a specific pixel offset on the page.\n */\nexport function getLineElementsAtPageOffset(offset: number): { previous: CodeLineElement; next?: CodeLineElement; } {\n\tconst lines = getCodeLineElements();\n\tconst position = offset - window.scrollY;\n\tlet lo = -1;\n\tlet hi = lines.length - 1;\n\twhile (lo + 1 < hi) {\n\t\tconst mid = Math.floor((lo + hi) / 2);\n\t\tconst bounds = lines[mid].element.getBoundingClientRect();\n\t\tif (bounds.top + bounds.height >= position) {\n\t\t\thi = mid;\n\t\t}\n\t\telse {\n\t\t\tlo = mid;\n\t\t}\n\t}\n\tconst hiElement = lines[hi];\n\tconst hiBounds = hiElement.element.getBoundingClientRect();\n\tif (hi >= 1 && hiBounds.top > position) {\n\t\tconst loElement = lines[lo];\n\t\treturn { previous: loElement, next: hiElement };\n\t}\n\treturn { previous: hiElement };\n}\n\n/**\n * Attempt to reveal the element for a source line in the editor.\n */\nexport function scrollToRevealSourceLine(line: number) {\n\tconst { previous, next } = getElementsForSourceLine(line);\n\tif (previous && getSettings().scrollPreviewWithEditor) {\n\t\tlet scrollTo = 0;\n\t\tconst rect = previous.element.getBoundingClientRect();\n\t\tconst previousTop = rect.top;\n\t\tif (next && next.line !== previous.line) {\n\t\t\t// Between two elements. Go to percentage offset between them.\n\t\t\tconst betweenProgress = (line - previous.line) / (next.line - previous.line);\n\t\t\tconst elementOffset = next.element.getBoundingClientRect().top - previousTop;\n\t\t\tscrollTo = previousTop + betweenProgress * elementOffset;\n\t\t}\n\t\telse {\n\t\t\tscrollTo = previousTop;\n\t\t}\n\t\twindow.scroll(0, Math.max(1, window.scrollY + scrollTo));\n\t}\n}\n\nexport function getEditorLineNumberForPageOffset(offset: number) {\n\tconst { previous, next } = getLineElementsAtPageOffset(offset);\n\tif (previous) {\n\t\tconst previousBounds = previous.element.getBoundingClientRect();\n\t\tconst offsetFromPrevious = (offset - window.scrollY - previousBounds.top);\n\t\tif (next) {\n\t\t\tconst progressBetweenElements = offsetFromPrevious / (next.element.getBoundingClientRect().top - previousBounds.top);\n\t\t\tconst line = previous.line + progressBetweenElements * (next.line - previous.line);\n\t\t\treturn clampLine(line);\n\t\t}\n\t\telse {\n\t\t\tconst progressWithinElement = offsetFromPrevious / (previousBounds.height);\n\t\t\tconst line = previous.line + progressWithinElement;\n\t\t\treturn clampLine(line);\n\t\t}\n\t}\n\treturn null;\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nexport interface PreviewSettings {\n\tsource: string;\n\tline: number;\n\tlineCount: number;\n\tscrollPreviewWithEditor?: boolean;\n\tscrollEditorWithPreview: boolean;\n\tdisableSecurityWarnings: boolean;\n\tdoubleClickToSwitchToEditor: boolean;\n}\n\nlet cachedSettings: PreviewSettings | undefined = undefined;\n\nexport function getSettings(): PreviewSettings {\n\tif (cachedSettings) {\n\t\treturn cachedSettings;\n\t}\n\n\tconst element = document.getElementById('vscode-markdown-preview-data');\n\tif (element) {\n\t\tconst data = element.getAttribute('data-settings');\n\t\tif (data) {\n\t\t\tcachedSettings = JSON.parse(data);\n\t\t\treturn cachedSettings!;\n\t\t}\n\t}\n\n\tthrow new Error('Could not load settings');\n}\n"],"sourceRoot":""}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index e02fb758ba2..54338021532 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -12,7 +12,7 @@
 	},
 	"main": "./out/extension",
 	"categories": [
-		"Languages"
+		"Programming Languages"
 	],
 	"activationEvents": [
 		"onLanguage:markdown",
@@ -22,7 +22,8 @@
 		"onCommand:markdown.showPreviewToSide",
 		"onCommand:markdown.showLockedPreviewToSide",
 		"onCommand:markdown.showSource",
-		"onCommand:markdown.showPreviewSecuritySelector"
+		"onCommand:markdown.showPreviewSecuritySelector",
+		"onView:markdown.preview"
 	],
 	"contributes": {
 		"commands": [
@@ -287,7 +288,7 @@
 		"highlight.js": "9.5.0",
 		"markdown-it": "^8.4.0",
 		"markdown-it-named-headers": "0.0.4",
-		"vscode-extension-telemetry": "0.0.15",
+		"vscode-extension-telemetry": "0.0.16",
 		"vscode-nls": "^3.2.1"
 	},
 	"devDependencies": {
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 85d3f87fed8..5bce7230b85 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -75,7 +75,7 @@ document.addEventListener('dblclick', event => {
 	const offset = event.pageY;
 	const line = getEditorLineNumberForPageOffset(offset);
 	if (typeof line === 'number' && !isNaN(line)) {
-		postMessage('didClick', { line });
+		postMessage('didClick', { line: Math.floor(line) });
 	}
 });
 
diff --git a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
index 5b49d7f7c54..2e520415ebc 100644
--- a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
+++ b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
@@ -18,13 +18,13 @@ export class ShowPreviewSecuritySelectorCommand implements Command {
 	) { }
 
 	public execute(resource: string | undefined) {
-		if (resource) {
-			const source = vscode.Uri.parse(resource).query;
-			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.Uri.parse(source));
+		if (this.previewManager.activePreviewResource) {
+			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
+		} else if (resource) {
+			const source = vscode.Uri.parse(resource);
+			this.previewSecuritySelector.showSecutitySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);
 		} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
 			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.window.activeTextEditor.document.uri);
-		} else if (this.previewManager.activePreviewResource) {
-			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts
index 53e0c6286e1..e260737797b 100644
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -14,6 +14,7 @@ import { loadDefaultTelemetryReporter } from './telemetryReporter';
 import { getMarkdownExtensionContributions } from './markdownExtensions';
 import LinkProvider from './features/documentLinkProvider';
 import MDDocumentSymbolProvider from './features/documentSymbolProvider';
+import MarkdownWorkspaceSymbolProvider from './features/workspaceSymbolProvider';
 import { MarkdownContentProvider } from './features/previewContentProvider';
 import { MarkdownPreviewManager } from './features/previewManager';
 import MarkdownFoldingProvider from './features/foldingProvider';
@@ -32,13 +33,14 @@ export function activate(context: vscode.ExtensionContext) {
 	const selector = 'markdown';
 
 	const contentProvider = new MarkdownContentProvider(engine, context, cspArbiter, contributions, logger);
-
+	const symbolProvider = new MDDocumentSymbolProvider(engine);
 	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions);
 	context.subscriptions.push(previewManager);
 
-	context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(selector, new MDDocumentSymbolProvider(engine)));
+	context.subscriptions.push(vscode.languages.registerDocumentSymbolProvider(selector, symbolProvider));
 	context.subscriptions.push(vscode.languages.registerDocumentLinkProvider(selector, new LinkProvider()));
-	context.subscriptions.push(vscode.languages.registerFoldingProvider(selector, new MarkdownFoldingProvider(engine)));
+	context.subscriptions.push(vscode.languages.registerFoldingRangeProvider(selector, new MarkdownFoldingProvider(engine)));
+	context.subscriptions.push(vscode.languages.registerWorkspaceSymbolProvider(new MarkdownWorkspaceSymbolProvider(symbolProvider)));
 
 	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
 
diff --git a/extensions/markdown-language-features/src/features/foldingProvider.ts b/extensions/markdown-language-features/src/features/foldingProvider.ts
index 637cdb11d14..236908a1f1f 100644
--- a/extensions/markdown-language-features/src/features/foldingProvider.ts
+++ b/extensions/markdown-language-features/src/features/foldingProvider.ts
@@ -8,7 +8,9 @@ import * as vscode from 'vscode';
 import { MarkdownEngine } from '../markdownEngine';
 import { TableOfContentsProvider } from '../tableOfContentsProvider';
 
-export default class MarkdownFoldingProvider implements vscode.FoldingProvider {
+const rangeLimit = 5000;
+
+export default class MarkdownFoldingProvider implements vscode.FoldingRangeProvider {
 
 	constructor(
 		private readonly engine: MarkdownEngine
@@ -16,13 +18,13 @@ export default class MarkdownFoldingProvider implements vscode.FoldingProvider {
 
 	public async provideFoldingRanges(
 		document: vscode.TextDocument,
-		context: vscode.FoldingContext,
+		_: vscode.FoldingContext,
 		_token: vscode.CancellationToken
-	): Promise<vscode.FoldingRangeList> {
+	): Promise<vscode.FoldingRange[]> {
 		const tocProvider = new TableOfContentsProvider(this.engine, document);
 		let toc = await tocProvider.getToc();
-		if (context.maxRanges && toc.length > context.maxRanges) {
-			toc = toc.slice(0, context.maxRanges);
+		if (toc.length > rangeLimit) {
+			toc = toc.slice(0, rangeLimit);
 		}
 
 		const foldingRanges = toc.map((entry, startIndex) => {
@@ -43,6 +45,6 @@ export default class MarkdownFoldingProvider implements vscode.FoldingProvider {
 		});
 
 
-		return new vscode.FoldingRangeList(foldingRanges);
+		return foldingRanges;
 	}
 }
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
index 1002bcf0fc5..067d0c11085 100644
--- a/extensions/markdown-language-features/src/features/preview.ts
+++ b/extensions/markdown-language-features/src/features/preview.ts
@@ -14,50 +14,107 @@ import * as nls from 'vscode-nls';
 import { getVisibleLine, MarkdownFileTopmostLineMonitor } from '../util/topmostLineMonitor';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
 import { MarkdownContributions } from '../markdownExtensions';
+import { isMarkdownFile } from '../util/file';
 const localize = nls.loadMessageBundle();
 
 export class MarkdownPreview {
 
-	public static previewViewType = 'markdown.preview';
+	public static viewType = 'markdown.preview';
 
-	private readonly webview: vscode.Webview;
+	private _resource: vscode.Uri;
+	private _locked: boolean;
+
+	private readonly editor: vscode.WebviewPanel;
 	private throttleTimer: any;
-	private initialLine: number | undefined = undefined;
+	private line: number | undefined = undefined;
 	private readonly disposables: vscode.Disposable[] = [];
 	private firstUpdate = true;
 	private currentVersion?: { resource: vscode.Uri, version: number };
 	private forceUpdate = false;
 	private isScrolling = false;
+	private _disposed: boolean = false;
 
-	constructor(
-		private _resource: vscode.Uri,
+
+	public static async revive(
+		webview: vscode.WebviewPanel,
+		state: any,
+		contentProvider: MarkdownContentProvider,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: Logger,
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+	): Promise<MarkdownPreview> {
+		const resource = vscode.Uri.parse(state.resource);
+		const locked = state.locked;
+		const line = state.line;
+
+		const preview = new MarkdownPreview(
+			webview,
+			resource,
+			locked,
+			contentProvider,
+			previewConfigurations,
+			logger,
+			topmostLineMonitor);
+
+		if (!isNaN(line)) {
+			preview.line = line;
+		}
+		await preview.doUpdate();
+		return preview;
+	}
+
+	public static create(
+		resource: vscode.Uri,
 		previewColumn: vscode.ViewColumn,
-		public locked: boolean,
-		private readonly contentProvider: MarkdownContentProvider,
-		private readonly previewConfigurations: MarkdownPreviewConfigurationManager,
-		private readonly logger: Logger,
+		locked: boolean,
+		contentProvider: MarkdownContentProvider,
+		previewConfigurations: MarkdownPreviewConfigurationManager,
+		logger: Logger,
 		topmostLineMonitor: MarkdownFileTopmostLineMonitor,
-		private readonly contributions: MarkdownContributions
-	) {
-		this.webview = vscode.window.createWebview(
-			MarkdownPreview.previewViewType,
-			this.getPreviewTitle(this._resource),
+		contributions: MarkdownContributions
+	): MarkdownPreview {
+		const webview = vscode.window.createWebviewPanel(
+			MarkdownPreview.viewType,
+			MarkdownPreview.getPreviewTitle(resource, locked),
 			previewColumn, {
 				enableScripts: true,
 				enableCommandUris: true,
 				enableFindWidget: true,
-				localResourceRoots: this.getLocalResourceRoots(_resource)
+				localResourceRoots: MarkdownPreview.getLocalResourceRoots(resource, contributions)
 			});
 
-		this.webview.onDidDispose(() => {
+		return new MarkdownPreview(
+			webview,
+			resource,
+			locked,
+			contentProvider,
+			previewConfigurations,
+			logger,
+			topmostLineMonitor);
+	}
+
+	private constructor(
+		webview: vscode.WebviewPanel,
+		resource: vscode.Uri,
+		locked: boolean,
+		private readonly _contentProvider: MarkdownContentProvider,
+		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
+		private readonly _logger: Logger,
+		topmostLineMonitor: MarkdownFileTopmostLineMonitor
+	) {
+		this._resource = resource;
+		this._locked = locked;
+		this.editor = webview;
+
+		this.editor.onDidDispose(() => {
 			this.dispose();
 		}, null, this.disposables);
 
-		this.webview.onDidChangeViewState(e => {
+		this.editor.onDidChangeViewState(e => {
 			this._onDidChangeViewStateEmitter.fire(e);
 		}, null, this.disposables);
 
-		this.webview.onDidReceiveMessage(e => {
+		this.editor.webview.onDidReceiveMessage(e => {
 			if (e.source !== this._resource.toString()) {
 				return;
 			}
@@ -92,31 +149,50 @@ export class MarkdownPreview {
 
 		vscode.window.onDidChangeTextEditorSelection(event => {
 			if (this.isPreviewOf(event.textEditor.document.uri)) {
-				this.webview.postMessage({
+				this.postMessage({
 					type: 'onDidChangeTextEditorSelection',
 					line: event.selections[0].active.line,
 					source: this.resource.toString()
 				});
 			}
 		}, null, this.disposables);
+
+		vscode.window.onDidChangeActiveTextEditor(editor => {
+			if (editor && isMarkdownFile(editor.document) && !this._locked) {
+				this.update(editor.document.uri);
+			}
+		}, null, this.disposables);
 	}
 
 	private readonly _onDisposeEmitter = new vscode.EventEmitter<void>();
 	public readonly onDispose = this._onDisposeEmitter.event;
 
-	private readonly _onDidChangeViewStateEmitter = new vscode.EventEmitter<vscode.WebViewOnDidChangeViewStateEvent>();
+	private readonly _onDidChangeViewStateEmitter = new vscode.EventEmitter<vscode.WebviewPanelOnDidChangeViewStateEvent>();
 	public readonly onDidChangeViewState = this._onDidChangeViewStateEmitter.event;
 
 	public get resource(): vscode.Uri {
 		return this._resource;
 	}
 
+	public get state() {
+		return {
+			resource: this.resource.toString(),
+			locked: this._locked,
+			line: this.line
+		};
+	}
+
 	public dispose() {
+		if (this._disposed) {
+			return;
+		}
+
+		this._disposed = true;
 		this._onDisposeEmitter.fire();
 
 		this._onDisposeEmitter.dispose();
 		this._onDidChangeViewStateEmitter.dispose();
-		this.webview.dispose();
+		this.editor.dispose();
 
 		disposeAll(this.disposables);
 	}
@@ -124,9 +200,7 @@ export class MarkdownPreview {
 	public update(resource: vscode.Uri) {
 		const editor = vscode.window.activeTextEditor;
 		if (editor && editor.document.uri.fsPath === resource.fsPath) {
-			this.initialLine = getVisibleLine(editor);
-		} else {
-			this.initialLine = undefined;
+			this.line = getVisibleLine(editor);
 		}
 
 		// If we have changed resources, cancel any pending updates
@@ -156,29 +230,29 @@ export class MarkdownPreview {
 	}
 
 	public updateConfiguration() {
-		if (this.previewConfigurations.hasConfigurationChanged(this._resource)) {
+		if (this._previewConfigurations.hasConfigurationChanged(this._resource)) {
 			this.refresh();
 		}
 	}
 
-	public get viewColumn(): vscode.ViewColumn | undefined {
-		return this.webview.viewColumn;
+	public get position(): vscode.ViewColumn | undefined {
+		return this.editor.viewColumn;
 	}
 
-	public isPreviewOf(resource: vscode.Uri): boolean {
-		return this._resource.fsPath === resource.fsPath;
+	public isWebviewOf(webview: vscode.WebviewPanel): boolean {
+		return this.editor === webview;
 	}
 
 	public matchesResource(
 		otherResource: vscode.Uri,
-		otherViewColumn: vscode.ViewColumn | undefined,
+		otherPosition: vscode.ViewColumn | undefined,
 		otherLocked: boolean
 	): boolean {
-		if (this.viewColumn !== otherViewColumn) {
+		if (this.position !== otherPosition) {
 			return false;
 		}
 
-		if (this.locked) {
+		if (this._locked) {
 			return otherLocked && this.isPreviewOf(otherResource);
 		} else {
 			return !otherLocked;
@@ -186,20 +260,24 @@ export class MarkdownPreview {
 	}
 
 	public matches(otherPreview: MarkdownPreview): boolean {
-		return this.matchesResource(otherPreview._resource, otherPreview.viewColumn, otherPreview.locked);
+		return this.matchesResource(otherPreview._resource, otherPreview.position, otherPreview._locked);
 	}
 
 	public reveal(viewColumn: vscode.ViewColumn) {
-		this.webview.reveal(viewColumn);
+		this.editor.reveal(viewColumn);
 	}
 
 	public toggleLock() {
-		this.locked = !this.locked;
-		this.webview.title = this.getPreviewTitle(this._resource);
+		this._locked = !this._locked;
+		this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
 	}
 
-	private getPreviewTitle(resource: vscode.Uri): string {
-		return this.locked
+	private isPreviewOf(resource: vscode.Uri): boolean {
+		return this._resource.fsPath === resource.fsPath;
+	}
+
+	private static getPreviewTitle(resource: vscode.Uri, locked: boolean): string {
+		return locked
 			? localize('lockedPreviewTitle', '[Preview] {0}', path.basename(resource.fsPath))
 			: localize('previewTitle', 'Preview {0}', path.basename(resource.fsPath));
 	}
@@ -215,9 +293,9 @@ export class MarkdownPreview {
 		}
 
 		if (typeof topLine === 'number') {
-			this.logger.log('updateForView', { markdownFile: resource });
-			this.initialLine = topLine;
-			this.webview.postMessage({
+			this._logger.log('updateForView', { markdownFile: resource });
+			this.line = topLine;
+			this.postMessage({
 				type: 'updateView',
 				line: topLine,
 				source: resource.toString()
@@ -225,6 +303,12 @@ export class MarkdownPreview {
 		}
 	}
 
+	private postMessage(msg: any) {
+		if (!this._disposed) {
+			this.editor.webview.postMessage(msg);
+		}
+	}
+
 	private async doUpdate(): Promise<void> {
 		const resource = this._resource;
 
@@ -233,25 +317,26 @@ export class MarkdownPreview {
 
 		const document = await vscode.workspace.openTextDocument(resource);
 		if (!this.forceUpdate && this.currentVersion && this.currentVersion.resource.fsPath === resource.fsPath && this.currentVersion.version === document.version) {
-			if (this.initialLine) {
-				this.updateForView(resource, this.initialLine);
+			if (this.line) {
+				this.updateForView(resource, this.line);
 			}
 			return;
 		}
 		this.forceUpdate = false;
 
 		this.currentVersion = { resource, version: document.version };
-		this.contentProvider.provideTextDocumentContent(document, this.previewConfigurations, this.initialLine)
-			.then(content => {
-				if (this._resource === resource) {
-					this.webview.title = this.getPreviewTitle(this._resource);
-					this.webview.html = content;
-				}
-			});
+		const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line);
+		if (this._resource === resource) {
+			this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
+			this.editor.webview.html = content;
+		}
 	}
 
-	private getLocalResourceRoots(resource: vscode.Uri): vscode.Uri[] {
-		const baseRoots = this.contributions.previewResourceRoots;
+	private static getLocalResourceRoots(
+		resource: vscode.Uri,
+		contributions: MarkdownContributions
+	): vscode.Uri[] {
+		const baseRoots = contributions.previewResourceRoots;
 
 		const folder = vscode.workspace.getWorkspaceFolder(resource);
 		if (folder) {
@@ -266,6 +351,7 @@ export class MarkdownPreview {
 	}
 
 	private onDidScrollPreview(line: number) {
+		this.line = line;
 		for (const editor of vscode.window.visibleTextEditors) {
 			if (!this.isPreviewOf(editor.document.uri)) {
 				continue;
@@ -291,6 +377,8 @@ export class MarkdownPreview {
 				return;
 			}
 		}
+
+		vscode.workspace.openTextDocument(this._resource).then(vscode.window.showTextDocument);
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/features/previewContentProvider.ts b/extensions/markdown-language-features/src/features/previewContentProvider.ts
index 7652d5aa3cb..e2cbae775bf 100644
--- a/extensions/markdown-language-features/src/features/previewContentProvider.ts
+++ b/extensions/markdown-language-features/src/features/previewContentProvider.ts
@@ -164,6 +164,9 @@ export class MarkdownContentProvider {
 			case MarkdownPreviewSecurityLevel.AllowInsecureContent:
 				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: http: https: data:; media-src vscode-resource: http: https: data:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:; font-src vscode-resource: http: https: data:;">`;
 
+			case MarkdownPreviewSecurityLevel.AllowInsecureLocalContent:
+				return `<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; media-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' https: data: http://localhost:* http://127.0.0.1:*; font-src vscode-resource: https: data: http://localhost:* http://127.0.0.1:*;">`;
+
 			case MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent:
 				return '';
 
diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts
index 61fee517b43..ec59ba12f3b 100644
--- a/extensions/markdown-language-features/src/features/previewManager.ts
+++ b/extensions/markdown-language-features/src/features/previewManager.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
 import { Logger } from '../logger';
-import { MarkdownContentProvider } from './previewContentProvider';
-import { MarkdownPreview, PreviewSettings } from './preview';
+import { MarkdownContributions } from '../markdownExtensions';
 import { disposeAll } from '../util/dispose';
 import { MarkdownFileTopmostLineMonitor } from '../util/topmostLineMonitor';
-import { isMarkdownFile } from '../util/file';
+import { MarkdownPreview, PreviewSettings } from './preview';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
-import { MarkdownContributions } from '../markdownExtensions';
+import { MarkdownContentProvider } from './previewContentProvider';
 
-export class MarkdownPreviewManager {
+
+export class MarkdownPreviewManager implements vscode.WebviewPanelSerializer {
 	private static readonly markdownPreviewActiveContextKey = 'markdownPreviewFocus';
 
 	private readonly topmostLineMonitor = new MarkdownFileTopmostLineMonitor();
@@ -28,16 +27,7 @@ export class MarkdownPreviewManager {
 		private readonly logger: Logger,
 		private readonly contributions: MarkdownContributions
 	) {
-		vscode.window.onDidChangeActiveTextEditor(editor => {
-			if (editor) {
-				if (isMarkdownFile(editor.document)) {
-					for (const preview of this.previews.filter(preview => !preview.locked)) {
-						preview.update(editor.document.uri);
-					}
-				}
-			}
-		}, null, this.disposables);
-
+		this.disposables.push(vscode.window.registerWebviewPanelSerializer(MarkdownPreview.viewType, this));
 	}
 
 	public dispose(): void {
@@ -66,7 +56,6 @@ export class MarkdownPreviewManager {
 			preview.reveal(previewSettings.previewColumn);
 		} else {
 			preview = this.createNewPreview(resource, previewSettings);
-			this.previews.push(preview);
 		}
 
 		preview.update(resource);
@@ -90,6 +79,28 @@ export class MarkdownPreviewManager {
 		}
 	}
 
+	public async deserializeWebviewPanel(
+		webview: vscode.WebviewPanel,
+		state: any
+	): Promise<void> {
+		const preview = await MarkdownPreview.revive(
+			webview,
+			state,
+			this.contentProvider,
+			this.previewConfigurations,
+			this.logger,
+			this.topmostLineMonitor);
+
+		this.registerPreview(preview);
+	}
+
+	public async serializeWebviewPanel(
+		webview: vscode.WebviewPanel,
+	): Promise<any> {
+		const preview = this.previews.find(preview => preview.isWebviewOf(webview));
+		return preview ? preview.state : undefined;
+	}
+
 	private getExistingPreview(
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
@@ -101,8 +112,8 @@ export class MarkdownPreviewManager {
 	private createNewPreview(
 		resource: vscode.Uri,
 		previewSettings: PreviewSettings
-	) {
-		const preview = new MarkdownPreview(
+	): MarkdownPreview {
+		const preview = MarkdownPreview.create(
 			resource,
 			previewSettings.previewColumn,
 			previewSettings.locked,
@@ -112,6 +123,14 @@ export class MarkdownPreviewManager {
 			this.topmostLineMonitor,
 			this.contributions);
 
+		return this.registerPreview(preview);
+	}
+
+	private registerPreview(
+		preview: MarkdownPreview
+	): MarkdownPreview {
+		this.previews.push(preview);
+
 		preview.onDispose(() => {
 			const existing = this.previews.indexOf(preview!);
 			if (existing >= 0) {
@@ -119,13 +138,13 @@ export class MarkdownPreviewManager {
 			}
 		});
 
-		preview.onDidChangeViewState(({ active }) => {
+		preview.onDidChangeViewState(({ webviewPanel }) => {
 			disposeAll(this.previews.filter(otherPreview => preview !== otherPreview && preview!.matches(otherPreview)));
 
 			vscode.commands.executeCommand('setContext', MarkdownPreviewManager.markdownPreviewActiveContextKey,
-				active);
+				webviewPanel.visible);
 
-			this.activePreview = active ? preview : undefined;
+			this.activePreview = webviewPanel.visible ? preview : undefined;
 		});
 
 		return preview;
diff --git a/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
new file mode 100644
index 00000000000..ecf6f1b2140
--- /dev/null
+++ b/extensions/markdown-language-features/src/features/workspaceSymbolProvider.ts
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { disposeAll } from '../util/dispose';
+import { isMarkdownFile } from '../util/file';
+import { Lazy, lazy } from '../util/lazy';
+import MDDocumentSymbolProvider from './documentSymbolProvider';
+
+export interface WorkspaceMarkdownDocumentProvider {
+	getAllMarkdownDocuments(): Thenable<vscode.TextDocument[]>;
+
+	readonly onDidChangeMarkdownDocument: vscode.Event<vscode.TextDocument>;
+	readonly onDidCreateMarkdownDocument: vscode.Event<vscode.TextDocument>;
+	readonly onDidDeleteMarkdownDocument: vscode.Event<vscode.Uri>;
+}
+
+class VSCodeWorkspaceMarkdownDocumentProvider implements WorkspaceMarkdownDocumentProvider {
+
+	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.TextDocument>();
+	private readonly _onDidCreateMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.TextDocument>();
+	private readonly _onDidDeleteMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.Uri>();
+
+	private _watcher: vscode.FileSystemWatcher | undefined;
+	private _disposables: vscode.Disposable[] = [];
+
+	public dispose() {
+		this._onDidChangeMarkdownDocumentEmitter.dispose();
+		this._onDidDeleteMarkdownDocumentEmitter.dispose();
+
+		if (this._watcher) {
+			this._watcher.dispose();
+		}
+
+		disposeAll(this._disposables);
+	}
+
+	async getAllMarkdownDocuments() {
+		const resources = await vscode.workspace.findFiles('**/*.md');
+		const documents = await Promise.all(
+			resources.map(resource => vscode.workspace.openTextDocument(resource).then(x => x, () => undefined)));
+		return documents.filter(doc => doc && isMarkdownFile(doc)) as vscode.TextDocument[];
+	}
+
+	public get onDidChangeMarkdownDocument() {
+		this.ensureWatcher();
+		return this._onDidChangeMarkdownDocumentEmitter.event;
+	}
+
+	public get onDidCreateMarkdownDocument() {
+		this.ensureWatcher();
+		return this._onDidCreateMarkdownDocumentEmitter.event;
+	}
+
+	public get onDidDeleteMarkdownDocument() {
+		this.ensureWatcher();
+		return this._onDidDeleteMarkdownDocumentEmitter.event;
+	}
+
+	private ensureWatcher(): void {
+		if (this._watcher) {
+			return;
+		}
+
+		this._watcher = vscode.workspace.createFileSystemWatcher('**/*.md');
+
+		this._watcher.onDidChange(async resource => {
+			const document = await vscode.workspace.openTextDocument(resource);
+			if (isMarkdownFile(document)) {
+				this._onDidChangeMarkdownDocumentEmitter.fire(document);
+			}
+		}, this, this._disposables);
+
+		this._watcher.onDidCreate(async resource => {
+			const document = await vscode.workspace.openTextDocument(resource);
+			if (isMarkdownFile(document)) {
+				this._onDidCreateMarkdownDocumentEmitter.fire(document);
+			}
+		}, this, this._disposables);
+
+		this._watcher.onDidDelete(async resource => {
+			this._onDidDeleteMarkdownDocumentEmitter.fire(resource);
+		}, this, this._disposables);
+	}
+}
+
+
+export default class MarkdownWorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
+	private _symbolCache = new Map<string, Lazy<Thenable<vscode.SymbolInformation[]>>>();
+	private _symbolCachePopulated: boolean = false;
+	private _disposables: vscode.Disposable[] = [];
+
+	public constructor(
+		private _symbolProvider: MDDocumentSymbolProvider,
+		private _workspaceMarkdownDocumentProvider: WorkspaceMarkdownDocumentProvider = new VSCodeWorkspaceMarkdownDocumentProvider()
+	) { }
+
+	public async provideWorkspaceSymbols(query: string): Promise<vscode.SymbolInformation[]> {
+		if (!this._symbolCachePopulated) {
+			await this.populateSymbolCache();
+			this._symbolCachePopulated = true;
+
+			this._workspaceMarkdownDocumentProvider.onDidChangeMarkdownDocument(this.onDidChangeDocument, this, this._disposables);
+			this._workspaceMarkdownDocumentProvider.onDidCreateMarkdownDocument(this.onDidChangeDocument, this, this._disposables);
+			this._workspaceMarkdownDocumentProvider.onDidDeleteMarkdownDocument(this.onDidDeleteDocument, this, this._disposables);
+		}
+
+		const allSymbolsSets = await Promise.all(Array.from(this._symbolCache.values()).map(x => x.value));
+		const allSymbols: vscode.SymbolInformation[] = Array.prototype.concat.apply([], allSymbolsSets);
+		return allSymbols.filter(symbolInformation => symbolInformation.name.toLowerCase().indexOf(query.toLowerCase()) !== -1);
+	}
+
+	public async populateSymbolCache(): Promise<void> {
+		const markDownDocumentUris = await this._workspaceMarkdownDocumentProvider.getAllMarkdownDocuments();
+		for (const document of markDownDocumentUris) {
+			this._symbolCache.set(document.fileName, this.getSymbols(document));
+		}
+	}
+
+	public dispose(): void {
+		disposeAll(this._disposables);
+	}
+
+	private getSymbols(document: vscode.TextDocument): Lazy<Thenable<vscode.SymbolInformation[]>> {
+		return lazy(async () => {
+			return this._symbolProvider.provideDocumentSymbols(document);
+		});
+	}
+
+	private onDidChangeDocument(document: vscode.TextDocument) {
+		this._symbolCache.set(document.fileName, this.getSymbols(document));
+	}
+
+	private onDidDeleteDocument(resource: vscode.Uri) {
+		this._symbolCache.delete(resource.fsPath);
+	}
+}
\ No newline at end of file
diff --git a/extensions/markdown-language-features/src/security.ts b/extensions/markdown-language-features/src/security.ts
index ef04896bec3..a09ce1f538a 100644
--- a/extensions/markdown-language-features/src/security.ts
+++ b/extensions/markdown-language-features/src/security.ts
@@ -14,7 +14,8 @@ const localize = nls.loadMessageBundle();
 export enum MarkdownPreviewSecurityLevel {
 	Strict = 0,
 	AllowInsecureContent = 1,
-	AllowScriptsAndAllContent = 2
+	AllowScriptsAndAllContent = 2,
+	AllowInsecureLocalContent = 3
 }
 
 export interface ContentSecurityPolicyArbiter {
@@ -109,6 +110,10 @@ export class PreviewSecuritySelector {
 					type: MarkdownPreviewSecurityLevel.Strict,
 					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.Strict) + localize('strict.title', 'Strict'),
 					description: localize('strict.description', 'Only load secure content'),
+				}, {
+					type: MarkdownPreviewSecurityLevel.AllowInsecureLocalContent,
+					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureLocalContent) + localize('insecureLocalContent.title', 'Allow insecure local content'),
+					description: localize('insecureLocalContent.description', 'Enable loading content over http served from localhost'),
 				}, {
 					type: MarkdownPreviewSecurityLevel.AllowInsecureContent,
 					label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureContent) + localize('insecureContent.title', 'Allow insecure content'),
@@ -133,7 +138,6 @@ export class PreviewSecuritySelector {
 					'preview.showPreviewSecuritySelector.title',
 					'Select security settings for Markdown previews in this workspace'),
 			});
-
 		if (!selection) {
 			return;
 		}
diff --git a/extensions/markdown-language-features/src/tableOfContentsProvider.ts b/extensions/markdown-language-features/src/tableOfContentsProvider.ts
index 1211e731e82..cca46aae81a 100644
--- a/extensions/markdown-language-features/src/tableOfContentsProvider.ts
+++ b/extensions/markdown-language-features/src/tableOfContentsProvider.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { MarkdownEngine } from './markdownEngine';
 
 export class Slug {
-	private static specialChars: any = { 'à': 'a', 'ä': 'a', 'ã': 'a', 'á': 'a', 'â': 'a', 'æ': 'a', 'å': 'a', 'ë': 'e', 'è': 'e', 'é': 'e', 'ê': 'e', 'î': 'i', 'ï': 'i', 'ì': 'i', 'í': 'i', 'ò': 'o', 'ó': 'o', 'ö': 'o', 'ô': 'o', 'ø': 'o', 'ù': 'o', 'ú': 'u', 'ü': 'u', 'û': 'u', 'ñ': 'n', 'ç': 'c', 'ß': 's', 'ÿ': 'y', 'œ': 'o', 'ŕ': 'r', 'ś': 's', 'ń': 'n', 'ṕ': 'p', 'ẃ': 'w', 'ǵ': 'g', 'ǹ': 'n', 'ḿ': 'm', 'ǘ': 'u', 'ẍ': 'x', 'ź': 'z', 'ḧ': 'h', '·': '-', '/': '-', '_': '-', ',': '-', ':': '-', ';': '-' };
+	private static specialChars: any = { 'à': 'a', 'ä': 'a', 'ã': 'a', 'á': 'a', 'â': 'a', 'æ': 'a', 'å': 'a', 'ë': 'e', 'è': 'e', 'é': 'e', 'ê': 'e', 'î': 'i', 'ï': 'i', 'ì': 'i', 'í': 'i', 'ò': 'o', 'ó': 'o', 'ö': 'o', 'ô': 'o', 'ø': 'o', 'ù': 'o', 'ú': 'u', 'ü': 'u', 'û': 'u', 'ñ': 'n', 'ç': 'c', 'ß': 's', 'ÿ': 'y', 'œ': 'o', 'ŕ': 'r', 'ś': 's', 'ń': 'n', 'ṕ': 'p', 'ẃ': 'w', 'ǵ': 'g', 'ǹ': 'n', 'ḿ': 'm', 'ǘ': 'u', 'ẍ': 'x', 'ź': 'z', 'ḧ': 'h', '·': '-', '/': '-', '_': '-', ',': '-', ':': '-', ';': '-', 'З': '3', 'з': '3' };
 
 	public static fromHeading(heading: string): Slug {
 		const slugifiedHeading = encodeURI(heading.trim()
diff --git a/extensions/markdown-language-features/src/test/engine.ts b/extensions/markdown-language-features/src/test/engine.ts
new file mode 100644
index 00000000000..a7a30a89ce0
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/engine.ts
@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { MarkdownEngine } from '../markdownEngine';
+import { MarkdownContributions } from '../markdownExtensions';
+
+export function createNewMarkdownEngine(): MarkdownEngine {
+	return new MarkdownEngine(new class implements MarkdownContributions {
+		readonly previewScripts: vscode.Uri[] = [];
+		readonly previewStyles: vscode.Uri[] = [];
+		readonly previewResourceRoots: vscode.Uri[] = [];
+		readonly markdownItPlugins: Promise<(md: any) => any>[] = [];
+	});
+}
+
diff --git a/extensions/markdown-language-features/src/test/foldingProvider.test.ts b/extensions/markdown-language-features/src/test/foldingProvider.test.ts
index 5474b7a8146..44c570d64d4 100644
--- a/extensions/markdown-language-features/src/test/foldingProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/foldingProvider.test.ts
@@ -7,17 +7,16 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import 'mocha';
 
-import { MarkdownEngine } from '../markdownEngine';
-import { MarkdownContributions } from '../markdownExtensions';
 import MarkdownFoldingProvider from '../features/foldingProvider';
 import { InMemoryDocument } from './inMemoryDocument';
+import { createNewMarkdownEngine } from './engine';
 
 const testFileName = vscode.Uri.parse('test.md');
 
 suite('markdown.FoldingProvider', () => {
 	test('Should not return anything for empty document', async () => {
 		const folds = await getFoldsForDocument(``);
-		assert.strictEqual(folds.ranges.length, 0);
+		assert.strictEqual(folds.length, 0);
 	});
 
 	test('Should not return anything for document without headers', async () => {
@@ -25,7 +24,7 @@ suite('markdown.FoldingProvider', () => {
 **b** afas
 a#b
 a`);
-		assert.strictEqual(folds.ranges.length, 0);
+		assert.strictEqual(folds.length, 0);
 	});
 
 	test('Should fold from header to end of document', async () => {
@@ -33,10 +32,10 @@ a`);
 # b
 c
 d`);
-		assert.strictEqual(folds.ranges.length, 1);
-		const firstFold = folds.ranges[0];
-		assert.strictEqual(firstFold.startLine, 1);
-		assert.strictEqual(firstFold.endLine, 3);
+		assert.strictEqual(folds.length, 1);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 3);
 	});
 
 	test('Should leave single newline before next header', async () => {
@@ -46,10 +45,10 @@ x
 
 # b
 y`);
-		assert.strictEqual(folds.ranges.length, 2);
-		const firstFold = folds.ranges[0];
-		assert.strictEqual(firstFold.startLine, 1);
-		assert.strictEqual(firstFold.endLine, 3);
+		assert.strictEqual(folds.length, 2);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 3);
 	});
 
 	test('Should collapse multuple newlines to single newline before next header', async () => {
@@ -61,10 +60,10 @@ x
 
 # b
 y`);
-		assert.strictEqual(folds.ranges.length, 2);
-		const firstFold = folds.ranges[0];
-		assert.strictEqual(firstFold.startLine, 1);
-		assert.strictEqual(firstFold.endLine, 5);
+		assert.strictEqual(folds.length, 2);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 5);
 	});
 
 	test('Should not collapse if there is no newline before next header', async () => {
@@ -73,10 +72,10 @@ y`);
 x
 # b
 y`);
-		assert.strictEqual(folds.ranges.length, 2);
-		const firstFold = folds.ranges[0];
-		assert.strictEqual(firstFold.startLine, 1);
-		assert.strictEqual(firstFold.endLine, 2);
+		assert.strictEqual(folds.length, 2);
+		const firstFold = folds[0];
+		assert.strictEqual(firstFold.start, 1);
+		assert.strictEqual(firstFold.end, 2);
 	});
 
 });
@@ -84,16 +83,6 @@ y`);
 
 async function getFoldsForDocument(contents: string) {
 	const doc = new InMemoryDocument(testFileName, contents);
-	const provider = new MarkdownFoldingProvider(newEngine());
+	const provider = new MarkdownFoldingProvider(createNewMarkdownEngine());
 	return await provider.provideFoldingRanges(doc, {}, new vscode.CancellationTokenSource().token);
 }
-
-function newEngine(): MarkdownEngine {
-	return new MarkdownEngine(new class implements MarkdownContributions {
-		readonly previewScripts: vscode.Uri[] = [];
-		readonly previewStyles: vscode.Uri[] = [];
-		readonly previewResourceRoots: vscode.Uri[] = [];
-		readonly markdownItPlugins: Promise<(md: any) => any>[]  = [];
-	});
-}
-
diff --git a/extensions/markdown-language-features/src/test/inMemoryDocument.ts b/extensions/markdown-language-features/src/test/inMemoryDocument.ts
index f2cf2cf5e99..60ff91f15f1 100644
--- a/extensions/markdown-language-features/src/test/inMemoryDocument.ts
+++ b/extensions/markdown-language-features/src/test/inMemoryDocument.ts
@@ -15,7 +15,7 @@ export class InMemoryDocument implements vscode.TextDocument {
 		this._lines = this._contents.split(/\n/g);
 	}
 
-	fileName: string = '';
+
 	isUntitled: boolean = false;
 	languageId: string = '';
 	version: number = 1;
@@ -23,6 +23,10 @@ export class InMemoryDocument implements vscode.TextDocument {
 	isClosed: boolean = false;
 	eol: vscode.EndOfLine = vscode.EndOfLine.LF;
 
+	get fileName(): string {
+		return this.uri.fsPath;
+	}
+
 	get lineCount(): number {
 		return this._lines.length;
 	}
diff --git a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
index 0a2b2350f58..d2f6c180b69 100644
--- a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
+++ b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts
@@ -8,16 +8,15 @@ import * as vscode from 'vscode';
 import 'mocha';
 
 import { TableOfContentsProvider } from '../tableOfContentsProvider';
-import { MarkdownEngine } from '../markdownEngine';
-import { MarkdownContributions } from '../markdownExtensions';
 import { InMemoryDocument } from './inMemoryDocument';
+import { createNewMarkdownEngine } from './engine';
 
 const testFileName = vscode.Uri.parse('test.md');
 
 suite('markdown.TableOfContentsProvider', () => {
 	test('Lookup should not return anything for empty document', async () => {
 		const doc = new InMemoryDocument(testFileName, '');
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		assert.strictEqual(await provider.lookup(''), undefined);
 		assert.strictEqual(await provider.lookup('foo'), undefined);
@@ -25,7 +24,7 @@ suite('markdown.TableOfContentsProvider', () => {
 
 	test('Lookup should not return anything for document with no headers', async () => {
 		const doc = new InMemoryDocument(testFileName, 'a *b*\nc');
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		assert.strictEqual(await provider.lookup(''), undefined);
 		assert.strictEqual(await provider.lookup('foo'), undefined);
@@ -35,7 +34,7 @@ suite('markdown.TableOfContentsProvider', () => {
 
 	test('Lookup should return basic #header', async () => {
 		const doc = new InMemoryDocument(testFileName, `# a\nx\n# c`);
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		{
 			const entry = await provider.lookup('a');
@@ -54,7 +53,7 @@ suite('markdown.TableOfContentsProvider', () => {
 
 	test('Lookups should be case in-sensitive', async () => {
 		const doc = new InMemoryDocument(testFileName, `# fOo\n`);
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		assert.strictEqual((await provider.lookup('fOo'))!.line, 0);
 		assert.strictEqual((await provider.lookup('foo'))!.line, 0);
@@ -63,7 +62,7 @@ suite('markdown.TableOfContentsProvider', () => {
 
 	test('Lookups should ignore leading and trailing white-space, and collapse internal whitespace', async () => {
 		const doc = new InMemoryDocument(testFileName, `#      f o  o    \n`);
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		assert.strictEqual((await provider.lookup('f o  o'))!.line, 0);
 		assert.strictEqual((await provider.lookup('  f o  o'))!.line, 0);
@@ -78,19 +77,16 @@ suite('markdown.TableOfContentsProvider', () => {
 
 	test('should normalize special characters #44779', async () => {
 		const doc = new InMemoryDocument(testFileName, `# Indentação\n`);
-		const provider = new TableOfContentsProvider(newEngine(), doc);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
 		assert.strictEqual((await provider.lookup('indentacao'))!.line, 0);
 	});
-});
 
-function newEngine(): MarkdownEngine {
-	return new MarkdownEngine(new class implements MarkdownContributions {
-		readonly previewScripts: vscode.Uri[] = [];
-		readonly previewStyles: vscode.Uri[] = [];
-		readonly previewResourceRoots: vscode.Uri[] = [];
-		readonly markdownItPlugins: Promise<(md: any) => any>[]  = [];
+	test('should map special З, #37079', async () => {
+		const doc = new InMemoryDocument(testFileName, `### Заголовок Header 3`);
+		const provider = new TableOfContentsProvider(createNewMarkdownEngine(), doc);
 
+		assert.strictEqual((await provider.lookup('Заголовок-header-3'))!.line, 0);
+		assert.strictEqual((await provider.lookup('3аголовок-header-3'))!.line, 0);
 	});
-}
-
+});
diff --git a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
new file mode 100644
index 00000000000..2ee12a7979c
--- /dev/null
+++ b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import 'mocha';
+import * as vscode from 'vscode';
+import MDDocumentSymbolProvider from '../features/documentSymbolProvider';
+import MarkdownWorkspaceSymbolProvider, { WorkspaceMarkdownDocumentProvider } from '../features/workspaceSymbolProvider';
+import { createNewMarkdownEngine } from './engine';
+import { InMemoryDocument } from './inMemoryDocument';
+
+
+const symbolProvider = new MDDocumentSymbolProvider(createNewMarkdownEngine());
+
+suite('markdown.WorkspaceSymbolProvider', () => {
+	test('Should not return anything for empty workspace', async () => {
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider([]));
+
+		assert.deepEqual(await provider.provideWorkspaceSymbols(''), []);
+	});
+
+	test('Should return symbols from workspace with one markdown file', async () => {
+		const testFileName = vscode.Uri.parse('test.md');
+
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider([
+			new InMemoryDocument(testFileName, `# header1\nabc\n## header2`)
+		]));
+
+		const symbols = await provider.provideWorkspaceSymbols('');
+		assert.strictEqual(symbols.length, 2);
+		assert.strictEqual(symbols[0].name, '# header1');
+		assert.strictEqual(symbols[1].name, '## header2');
+	});
+
+	test('Should return all content  basic workspace', async () => {
+		const fileNameCount = 10;
+		const files: vscode.TextDocument[] = [];
+		for (let i = 0; i < fileNameCount; ++i) {
+			const testFileName = vscode.Uri.parse(`test${i}.md`);
+			files.push(new InMemoryDocument(testFileName, `# common\nabc\n## header${i}`));
+		}
+
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider(files));
+
+		const symbols = await provider.provideWorkspaceSymbols('');
+		assert.strictEqual(symbols.length, fileNameCount * 2);
+	});
+
+	test('Should update results when markdown file changes symbols', async () => {
+		const testFileName = vscode.Uri.parse('test.md');
+
+		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
+			new InMemoryDocument(testFileName, `# header1`)
+		]);
+
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
+
+		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
+
+		// Update file
+		workspaceFileProvider.updateDocument(new InMemoryDocument(testFileName, `# new header\nabc\n## header2`));
+		const newSymbols = await provider.provideWorkspaceSymbols('');
+		assert.strictEqual(newSymbols.length, 2);
+		assert.strictEqual(newSymbols[0].name, '# new header');
+		assert.strictEqual(newSymbols[1].name, '## header2');
+	});
+
+	test('Should remove results when file is deleted', async () => {
+		const testFileName = vscode.Uri.parse('test.md');
+
+		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
+			new InMemoryDocument(testFileName, `# header1`)
+		]);
+
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
+		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
+
+		// delete file
+		workspaceFileProvider.deleteDocument(testFileName);
+		const newSymbols = await provider.provideWorkspaceSymbols('');
+		assert.strictEqual(newSymbols.length, 0);
+	});
+
+	test('Should update results when markdown file is created', async () => {
+		const testFileName = vscode.Uri.parse('test.md');
+
+		const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([
+			new InMemoryDocument(testFileName, `# header1`)
+		]);
+
+		const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, workspaceFileProvider);
+		assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1);
+
+		// Creat file
+		workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.parse('test2.md'), `# new header\nabc\n## header2`));
+		const newSymbols = await provider.provideWorkspaceSymbols('');
+		assert.strictEqual(newSymbols.length, 3);
+	});
+});
+
+
+class InMemoryWorkspaceMarkdownDocumentProvider implements WorkspaceMarkdownDocumentProvider {
+	private readonly _documents = new Map<string, vscode.TextDocument>();
+
+	constructor(documents: vscode.TextDocument[]) {
+		for( const doc of documents) {
+			this._documents.set(doc.fileName, doc);
+		}
+	}
+
+	async getAllMarkdownDocuments() {
+		return Array.from(this._documents.values());
+	}
+
+	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.TextDocument>();
+	public onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocumentEmitter.event;
+
+	private readonly _onDidCreateMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.TextDocument>();
+	public onDidCreateMarkdownDocument = this._onDidCreateMarkdownDocumentEmitter.event;
+
+	private readonly _onDidDeleteMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.Uri>();
+	public onDidDeleteMarkdownDocument = this._onDidDeleteMarkdownDocumentEmitter.event;
+
+	public updateDocument(document: vscode.TextDocument) {
+		this._documents.set(document.fileName, document);
+		this._onDidChangeMarkdownDocumentEmitter.fire(document);
+	}
+
+	public createDocument(document: vscode.TextDocument) {
+		assert.ok(!this._documents.has(document.uri.fsPath));
+
+		this._documents.set(document.uri.fsPath, document);
+		this._onDidCreateMarkdownDocumentEmitter.fire(document);
+	}
+
+	public deleteDocument(resource: vscode.Uri) {
+		this._documents.delete(resource.fsPath);
+		this._onDidDeleteMarkdownDocumentEmitter.fire(resource);
+	}
+}
diff --git a/extensions/markdown-language-features/src/util/lazy.ts b/extensions/markdown-language-features/src/util/lazy.ts
new file mode 100644
index 00000000000..aa5effd3d31
--- /dev/null
+++ b/extensions/markdown-language-features/src/util/lazy.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface Lazy<T> {
+	readonly value: T;
+	readonly hasValue: boolean;
+	map<R>(f: (x: T) => R): Lazy<R>;
+}
+
+class LazyValue<T> implements Lazy<T> {
+	private _hasValue: boolean = false;
+	private _value?: T;
+
+	constructor(
+		private readonly _getValue: () => T
+	) { }
+
+	get value(): T {
+		if (!this._hasValue) {
+			this._hasValue = true;
+			this._value = this._getValue();
+		}
+		return this._value!;
+	}
+
+	get hasValue(): boolean {
+		return this._hasValue;
+	}
+
+	public map<R>(f: (x: T) => R): Lazy<R> {
+		return new LazyValue(() => f(this.value));
+	}
+}
+
+export function lazy<T>(getValue: () => T): Lazy<T> {
+	return new LazyValue<T>(getValue);
+}
\ No newline at end of file
diff --git a/extensions/npm/src/features/bowerJSONContribution.ts b/extensions/npm/src/features/bowerJSONContribution.ts
index 13d6ccd29ee..a00f347078c 100644
--- a/extensions/npm/src/features/bowerJSONContribution.ts
+++ b/extensions/npm/src/features/bowerJSONContribution.ts
@@ -29,7 +29,7 @@ export class BowerJSONContribution implements IJSONContribution {
 	}
 
 	public getDocumentSelector(): DocumentSelector {
-		return [{ language: 'json', pattern: '**/bower.json' }, { language: 'json', pattern: '**/.bower.json' }];
+		return [{ language: 'json', scheme: '*', pattern: '**/bower.json' }, { language: 'json', scheme: '*', pattern: '**/.bower.json' }];
 	}
 
 	public collectDefaultSuggestions(_resource: string, collector: ISuggestionsCollector): Thenable<any> {
diff --git a/extensions/npm/src/features/packageJSONContribution.ts b/extensions/npm/src/features/packageJSONContribution.ts
index e4b35802ecd..8b967a6ace8 100644
--- a/extensions/npm/src/features/packageJSONContribution.ts
+++ b/extensions/npm/src/features/packageJSONContribution.ts
@@ -30,7 +30,7 @@ export class PackageJSONContribution implements IJSONContribution {
 	private knownScopes = ['@types', '@angular'];
 
 	public getDocumentSelector(): DocumentSelector {
-		return [{ language: 'json', pattern: '**/package.json' }];
+		return [{ language: 'json', scheme: '*', pattern: '**/package.json' }];
 	}
 
 	public constructor(private xhr: XHRRequest) {
diff --git a/extensions/package.json b/extensions/package.json
index 76e6cdf5cd7..d3693f49712 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.8.0-insiders.20180320"
+    "typescript": "2.8.3"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index da6ccc93199..dc2332a328f 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -12,9 +12,9 @@
 		"onLanguage:php"
 	],
 	"main": "./out/phpMain",
-	"dependencies": {
-		"vscode-nls": "^3.2.1"
-	},
+	"categories": [
+		"Programming Languages"
+	],
 	"contributes": {
 		"configuration": {
 			"title": "%configuration.title%",
@@ -76,6 +76,9 @@
 		"compile": "gulp compile-extension:php",
 		"watch": "gulp watch-extension:php"
 	},
+	"dependencies": {
+		"vscode-nls": "^3.2.1"
+	},
 	"devDependencies": {
 		"@types/node": "7.0.43"
 	}
diff --git a/extensions/php/package.nls.json b/extensions/php/package.nls.json
index b6170bf3b9a..95897a72dec 100644
--- a/extensions/php/package.nls.json
+++ b/extensions/php/package.nls.json
@@ -1,4 +1,4 @@
 {
-	"displayName": "PHP Language Features",
+	"displayName": "PHP Language Basics",
 	"description": "Provides syntax highlighting and bracket matching for PHP files."
 }
\ No newline at end of file
diff --git a/extensions/powershell/language-configuration.json b/extensions/powershell/language-configuration.json
index 29445c790a3..02e7a9ddec4 100644
--- a/extensions/powershell/language-configuration.json
+++ b/extensions/powershell/language-configuration.json
@@ -14,7 +14,6 @@
 		["(", ")"],
 		{ "open": "\"", "close": "\"", "notIn": ["string"]},
 		{ "open": "'", "close": "'", "notIn": ["string", "comment"]},
-		["/**", " */"],
 		["<#", "#>"]
 	],
 	"surroundingPairs": [
diff --git a/extensions/powershell/package.json b/extensions/powershell/package.json
index 37ab53991f6..5fcb928726d 100644
--- a/extensions/powershell/package.json
+++ b/extensions/powershell/package.json
@@ -10,6 +10,7 @@
 			"id": "powershell",
 			"extensions": [ ".ps1", ".psm1", ".psd1", ".pssc", ".psrc" ],
 			"aliases": [ "PowerShell", "powershell", "ps", "ps1" ],
+			"firstLine": "^#!/.*\\bpwsh\\b",
 			"configuration": "./language-configuration.json"
 		}],
 		"grammars": [{
@@ -25,4 +26,4 @@
 	"scripts": {
 		"update-grammar": "node ../../build/npm/update-grammar.js PowerShell/EditorSyntax PowerShellSyntax.tmLanguage ./syntaxes/powershell.tmLanguage.json"
 	}
-}
\ No newline at end of file
+}
diff --git a/extensions/python/language-configuration.json b/extensions/python/language-configuration.json
index c2c4aabc862..4717d09750b 100644
--- a/extensions/python/language-configuration.json
+++ b/extensions/python/language-configuration.json
@@ -43,8 +43,8 @@
 	"folding": {
 		"offSide": true,
 		"markers": {
-			"start": "^\\s*#region\\b",
-			"end": "^\\s*#endregion\\b"
+			"start": "^\\s*#\\s*region\\b",
+			"end": "^\\s*#\\s*endregion\\b"
 		}
 	}
 }
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index d9d295d626f..db37b8421fe 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Ikuyadeu/vscode-R/commit/b3ef459a3999160d97ea28f4754fda810417f99f",
+	"version": "https://github.com/Ikuyadeu/vscode-R/commit/1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff",
 	"name": "R",
 	"scopeName": "source.r",
 	"patterns": [
@@ -168,6 +168,10 @@
 					"match": "(\\-|\\+|\\*|\\/|%\\/%|%%|%\\*%|%o%|%x%|\\^)",
 					"name": "keyword.operator.arithmetic.r"
 				},
+				{
+					"match": "<=|>=",
+					"name": "keyword.operator.comparison.r"
+				},
 				{
 					"match": "==",
 					"name": "keyword.operator.comarison.r"
@@ -177,7 +181,7 @@
 					"name": "keyword.operator.assignment.r"
 				},
 				{
-					"match": "(!=|<>|<|>|<=|>=|%in%)",
+					"match": "(!=|<>|<|>|%in%)",
 					"name": "keyword.operator.comparison.r"
 				},
 				{
diff --git a/extensions/theme-abyss/themes/abyss-color-theme.json b/extensions/theme-abyss/themes/abyss-color-theme.json
index 25d88261148..85f5f9a4a9e 100644
--- a/extensions/theme-abyss/themes/abyss-color-theme.json
+++ b/extensions/theme-abyss/themes/abyss-color-theme.json
@@ -309,10 +309,11 @@
 		"editor.lineHighlightBackground": "#082050",
 		"editor.selectionBackground": "#770811",
 		"editorIndentGuide.background": "#002952",
+		"editorIndentGuide.activeBackground": "#204972",
 		"editorHoverWidget.background": "#000c38",
 		"editorHoverWidget.border": "#004c18",
 		"editorLineNumber.foreground": "#406385",
-		"editorActiveLineNumber.foreground": "#80a2c2",
+		"editorLineNumber.activeForeground": "#80a2c2",
 		"editorMarkerNavigation.background": "#060621",
 		"editorMarkerNavigationError.background": "#AB395B",
 		"editorMarkerNavigationWarning.background": "#5B7E7A",
diff --git a/extensions/theme-defaults/themes/dark_defaults.json b/extensions/theme-defaults/themes/dark_defaults.json
index e15677c62c8..cb9e20066b5 100644
--- a/extensions/theme-defaults/themes/dark_defaults.json
+++ b/extensions/theme-defaults/themes/dark_defaults.json
@@ -6,6 +6,7 @@
 		"editor.foreground": "#D4D4D4",
 		"editor.inactiveSelectionBackground": "#3A3D41",
 		"editorIndentGuide.background": "#404040",
+		"editorIndentGuide.activeBackground": "#707070",
 		"editor.selectionHighlightBackground": "#ADD6FF26",
 		"list.dropBackground": "#383B3D",
 		"activityBarBadge.background": "#007ACC",
diff --git a/extensions/theme-defaults/themes/hc_black_defaults.json b/extensions/theme-defaults/themes/hc_black_defaults.json
index 8833ff32c1f..4acf07cd7ab 100644
--- a/extensions/theme-defaults/themes/hc_black_defaults.json
+++ b/extensions/theme-defaults/themes/hc_black_defaults.json
@@ -5,6 +5,7 @@
 		"editor.background": "#000000",
 		"editor.foreground": "#FFFFFF",
 		"editorIndentGuide.background": "#FFFFFF",
+		"editorIndentGuide.activeBackground": "#FFFFFF",
 		"sideBarTitle.foreground": "#FFFFFF"
 	},
 	"settings": [
diff --git a/extensions/theme-defaults/themes/light_defaults.json b/extensions/theme-defaults/themes/light_defaults.json
index 4e50029e23c..2ee46debb3a 100644
--- a/extensions/theme-defaults/themes/light_defaults.json
+++ b/extensions/theme-defaults/themes/light_defaults.json
@@ -6,6 +6,7 @@
 		"editor.foreground": "#000000",
 		"editor.inactiveSelectionBackground": "#E5EBF1",
 		"editorIndentGuide.background": "#D3D3D3",
+		"editorIndentGuide.activeBackground": "#939393",
 		"editor.selectionHighlightBackground": "#ADD6FF4D",
 		"editorSuggestWidget.background": "#F3F3F3",
 		"activityBarBadge.background": "#007ACC",
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index d9c98d09157..ebcf0341dc8 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -20,7 +20,7 @@
 		"editorHoverWidget.background": "#221a14",
 		"editorGroupHeader.tabsBackground": "#131510",
 		"editorGroup.background": "#0f0c08",
-		"editorActiveLineNumber.foreground": "#adadad",
+		"editorLineNumber.activeForeground": "#adadad",
 		"tab.inactiveBackground": "#131510",
 		"titleBar.activeBackground": "#423523",
 		"statusBar.background": "#423523",
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index 1ac4adbc7f4..20f12faee09 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -13,12 +13,13 @@
 		"editor.selectionBackground": "#676b7180",
 		"editor.selectionHighlightBackground": "#575b6180",
 		"editor.lineHighlightBackground": "#303030",
-		"editorActiveLineNumber.foreground": "#949494",
+		"editorLineNumber.activeForeground": "#949494",
 		"editor.wordHighlightBackground": "#4747a180",
         "editor.wordHighlightStrongBackground": "#6767ce80",
 		"editorCursor.foreground": "#c07020",
 		"editorWhitespace.foreground": "#505037",
 		"editorIndentGuide.background": "#505037",
+		"editorIndentGuide.activeBackground": "#707057",
 		"editorGroupHeader.tabsBackground": "#282828",
 		"editorGroup.background": "#1e1e1e",
 		"tab.inactiveBackground": "#404040",
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index d0c7c7e8437..439ed05190e 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -24,10 +24,11 @@
         "editor.wordHighlightBackground": "#4a4a7680",
         "editor.wordHighlightStrongBackground": "#6a6a9680",
 		"editor.lineHighlightBackground": "#3e3d32",
-		"editorActiveLineNumber.foreground": "#c2c2bf",
+		"editorLineNumber.activeForeground": "#c2c2bf",
 		"editorCursor.foreground": "#f8f8f0",
 		"editorWhitespace.foreground": "#464741",
 		"editorIndentGuide.background": "#464741",
+		"editorIndentGuide.activeBackground": "#767771",
 		"editorGroupHeader.tabsBackground": "#1e1f1c",
 		"editorGroup.dropBackground": "#41433980",
 		"tab.inactiveBackground": "#414339",
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 9a947168714..3e1ad56f8ad 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -494,7 +494,7 @@
 		"editor.background": "#F5F5F5",
 		"editorWhitespace.foreground": "#AAAAAA",
 		"editor.lineHighlightBackground": "#E4F6D4",
-		"editorActiveLineNumber.foreground": "#9769dc",
+		"editorLineNumber.activeForeground": "#9769dc",
 		"editor.selectionBackground": "#C9D0D9",
 		"panel.background": "#F5F5F5",
 		"sideBar.background": "#F2F2F2",
diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json
index 43eaa9b6414..8d69156514c 100644
--- a/extensions/theme-red/themes/Red-color-theme.json
+++ b/extensions/theme-red/themes/Red-color-theme.json
@@ -21,7 +21,7 @@
 		"editorWhitespace.foreground": "#c10000",
 		"editor.selectionBackground": "#750000",
 		"editorLineNumber.foreground": "#ff777788",
-		"editorActiveLineNumber.foreground": "#ffbbbb88",
+		"editorLineNumber.activeForeground": "#ffbbbb88",
 		"editorWidget.background": "#300000",
 		"editorHoverWidget.background": "#300000",
 		"editorSuggestWidget.background": "#300000",
diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
index e0c5df0f187..7d77408d2e7 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -355,9 +355,10 @@
 		"editorCursor.foreground": "#D30102",
 		"editorWhitespace.foreground": "#93A1A180",
 		"editor.lineHighlightBackground": "#073642",
-		"editorActiveLineNumber.foreground": "#949494",
+		"editorLineNumber.activeForeground": "#949494",
 		"editor.selectionBackground": "#073642",
-		// "editorIndentGuide.background": "",
+		"editorIndentGuide.background": "#93A1A180",
+		"editorIndentGuide.activeBackground": "#C3E1E180",
 		"editorHoverWidget.background": "#004052",
 		// "editorHoverWidget.border": "",
 		// "editorLineNumber.foreground": "",
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index 0d5b202ea12..588e21e8933 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -352,9 +352,10 @@
 		"editorWhitespace.foreground": "#586E7580",
 		"editor.lineHighlightBackground": "#EEE8D5",
 		"editor.selectionBackground": "#EEE8D5",
-		// "editorIndentGuide.background": "",
+		"editorIndentGuide.background": "#586E7580",
+		"editorIndentGuide.activeBackground": "#081E2580",
 		"editorHoverWidget.background": "#CCC4B0",
-		"editorActiveLineNumber.foreground": "#567983",
+		"editorLineNumber.activeForeground": "#567983",
 		// "editorHoverWidget.border": "",
 		// "editorLineNumber.foreground": "",
 		// "editorMarkerNavigation.background": "",
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
index 0b89e5b9e6c..de15bf88bc8 100644
--- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
+++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-theme.json
@@ -15,7 +15,7 @@
 		"editor.foreground": "#ffffff",
 		"editor.selectionBackground": "#003f8e",
         "editor.lineHighlightBackground": "#00346e",
-        "editorActiveLineNumber.foreground": "#949494",
+        "editorLineNumber.activeForeground": "#949494",
 		"editorCursor.foreground": "#ffffff",
 		"editorWhitespace.foreground": "#404f7d",
 		"editorWidget.background": "#001c40",
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
index 691ad1631b6..870b3e7fa81 100644
--- a/extensions/typescript-basics/package.json
+++ b/extensions/typescript-basics/package.json
@@ -45,8 +45,7 @@
         "path": "./syntaxes/TypeScript.tmLanguage.json",
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.ts": "other",
-          "entity.name.function.tagged-template.tsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       },
@@ -62,8 +61,7 @@
         },
         "tokenTypes": {
           "entity.name.type.instance.jsdoc": "other",
-          "entity.name.function.tagged-template.ts": "other",
-          "entity.name.function.tagged-template.tsx": "other",
+          "entity.name.function.tagged-template": "other",
           "meta.import string.quoted": "other"
         }
       }
diff --git a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
index 723570e8d51..33f6319b5c3 100644
--- a/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/3f27a794a2dbebf18714d7eaa799162fbadf7a11",
 	"name": "TypeScript",
 	"scopeName": "source.ts",
 	"patterns": [
@@ -171,6 +171,9 @@
 				{
 					"include": "#arrow-function"
 				},
+				{
+					"include": "#paren-expression-possibly-arrow"
+				},
 				{
 					"include": "#cast"
 				},
@@ -285,7 +288,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.ts",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.ts entity.name.function.ts"
@@ -519,7 +522,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.ts"
@@ -745,7 +748,7 @@
 							"include": "#comment"
 						},
 						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 							"captures": {
 								"1": {
 									"name": "meta.definition.property.ts entity.name.function.ts"
@@ -1030,7 +1033,7 @@
 				},
 				{
 					"name": "meta.arrow.ts",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.ts"
@@ -1103,27 +1106,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.ts",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.ts"
+					"name": "keyword.operator.type.modifier.ts"
 				},
 				"2": {
-					"name": "meta.brace.square.ts"
+					"name": "storage.modifier.ts"
 				},
 				"3": {
-					"name": "entity.name.type.ts"
+					"name": "meta.brace.square.ts"
 				},
 				"4": {
+					"name": "entity.name.type.ts"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.ts"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.ts"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.ts"
+				},
+				"3": {
 					"name": "keyword.operator.optional.ts"
 				}
 			},
@@ -1147,6 +1156,13 @@
 					"name": "punctuation.definition.parameters.end.ts"
 				}
 			},
+			"patterns": [
+				{
+					"include": "#function-parameters-body"
+				}
+			]
+		},
+		"function-parameters-body": {
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1486,7 +1502,7 @@
 					"name": "storage.type.namespace.ts"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1520,7 +1536,7 @@
 					"name": "entity.name.type.alias.ts"
 				}
 			},
-			"end": "(?=[};]|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1696,7 +1712,7 @@
 							"name": "keyword.control.default.ts"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#expression"
@@ -1711,7 +1727,7 @@
 							"name": "keyword.control.export.ts"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -1856,18 +1872,44 @@
 									"name": "keyword.control.switch.ts"
 								}
 							},
-							"end": ":",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.section.case-statement.ts"
-								}
-							},
+							"end": "(?=:)",
 							"patterns": [
 								{
 									"include": "#expression"
 								}
 							]
 						},
+						{
+							"begin": "(:)\\s*(\\{)",
+							"beginCaptures": {
+								"1": {
+									"name": "case-clause.expr.ts punctuation.definition.section.case-statement.ts"
+								},
+								"2": {
+									"name": "meta.block.ts punctuation.definition.block.ts"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "meta.block.ts punctuation.definition.block.ts"
+								}
+							},
+							"contentName": "meta.block.ts",
+							"patterns": [
+								{
+									"include": "#statements"
+								}
+							]
+						},
+						{
+							"match": "(:)",
+							"captures": {
+								"0": {
+									"name": "case-clause.expr.ts punctuation.definition.section.case-statement.ts"
+								}
+							}
+						},
 						{
 							"include": "#statements"
 						}
@@ -1940,7 +1982,7 @@
 		},
 		"after-operator-block-as-object-literal": {
 			"name": "meta.objectliteral.ts",
-			"begin": "(?<!\\+\\+|--)(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+			"begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.block.ts"
@@ -2030,7 +2072,7 @@
 				},
 				{
 					"name": "meta.object.member.ts",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.ts"
@@ -2093,6 +2135,61 @@
 					},
 					"end": "(?=,|\\})",
 					"patterns": [
+						{
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.ts"
+								}
+							},
+							"end": "(?<=\\))",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.brace.round.ts"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "meta.brace.round.ts"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#expression-inside-possibly-arrow-parens"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.ts"
+								},
+								"2": {
+									"name": "meta.brace.round.ts"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.ts"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
 						{
 							"include": "#expression"
 						}
@@ -2110,9 +2207,9 @@
 					"name": "keyword.operator.ternary.ts"
 				}
 			},
-			"end": "(:)",
+			"end": "\\s*(:)",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.operator.ternary.ts"
 				}
 			},
@@ -2123,13 +2220,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.ts",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2176,7 +2273,7 @@
 					"name": "keyword.operator.new.ts"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#paren-expression"
@@ -2196,13 +2293,91 @@
 					"name": "keyword.operator.expression.instanceof.ts"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:?]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#type"
 				}
 			]
 		},
+		"paren-expression-possibly-arrow": {
+			"patterns": [
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.ts"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#type-parameters"
+						},
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.brace.round.ts"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.ts"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.ts"
+						},
+						"2": {
+							"name": "meta.brace.round.ts"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.ts"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression-inside-possibly-arrow-parens"
+						}
+					]
+				},
+				{
+					"include": "#possibly-arrow-return-type"
+				}
+			]
+		},
+		"expression-inside-possibly-arrow-parens": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#function-parameters-body"
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
 		"paren-expression": {
 			"begin": "\\(",
 			"beginCaptures": {
@@ -2219,9 +2394,6 @@
 			"patterns": [
 				{
 					"include": "#expression"
-				},
-				{
-					"include": "#punctuation-comma"
 				}
 			]
 		},
@@ -2741,7 +2913,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?[\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.ts"
@@ -2927,6 +3099,28 @@
 				}
 			},
 			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"possibly-arrow-return-type": {
+			"begin": "(?<=\\))\\s*(:)(?=\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+\\s*=>)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"contentName": "meta.arrow.ts meta.return.type.arrow.ts",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"arrow-return-type-body": {
 			"patterns": [
 				{
 					"begin": "(?<=[:])(?=\\s*\\{)",
diff --git a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
index a230668f744..a956c527775 100644
--- a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+++ b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/e375f754b1e6d35133b933131121c634ff6a0aeb",
+	"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/3f27a794a2dbebf18714d7eaa799162fbadf7a11",
 	"name": "TypeScriptReact",
 	"scopeName": "source.tsx",
 	"patterns": [
@@ -174,6 +174,9 @@
 				{
 					"include": "#arrow-function"
 				},
+				{
+					"include": "#paren-expression-possibly-arrow"
+				},
 				{
 					"include": "#cast"
 				},
@@ -288,7 +291,7 @@
 			"patterns": [
 				{
 					"name": "meta.var-single-variable.expr.tsx",
-					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.definition.variable.tsx entity.name.function.tsx"
@@ -522,7 +525,7 @@
 					}
 				},
 				{
-					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)(?=\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"1": {
 							"name": "storage.modifier.tsx"
@@ -748,7 +751,7 @@
 							"include": "#comment"
 						},
 						{
-							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+							"match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(\\?)?(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n  (<) |\n  ([(]\\s*(\n    ([)]) |\n    (\\.\\.\\.) |\n    ([_$[:alnum:]]+\\s*(\n      ([:,?=])|\n      ([)]\\s*=>)\n    ))\n  ))\n)) |\n(:\\s*(=>|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 							"captures": {
 								"1": {
 									"name": "meta.definition.property.tsx entity.name.function.tsx"
@@ -1033,7 +1036,7 @@
 				},
 				{
 					"name": "meta.arrow.tsx",
-					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
+					"begin": "(?x) (?:\n  (?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(\\basync)\n)? ((?<![})!\\]])\\s*\n  (?=\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  )\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.modifier.async.tsx"
@@ -1106,27 +1109,33 @@
 		},
 		"indexer-mapped-type-declaration": {
 			"name": "meta.indexer.mappedtype.declaration.tsx",
-			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
+			"begin": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([+-])?(readonly)\\s*)?(\\[)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s+(in)\\s+",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.modifier.tsx"
+					"name": "keyword.operator.type.modifier.tsx"
 				},
 				"2": {
-					"name": "meta.brace.square.tsx"
+					"name": "storage.modifier.tsx"
 				},
 				"3": {
-					"name": "entity.name.type.tsx"
+					"name": "meta.brace.square.tsx"
 				},
 				"4": {
+					"name": "entity.name.type.tsx"
+				},
+				"5": {
 					"name": "keyword.operator.expression.in.tsx"
 				}
 			},
-			"end": "(\\])\\s*(\\?\\s*)?|$",
+			"end": "(\\])([+-])?\\s*(\\?\\s*)?|$",
 			"endCaptures": {
 				"1": {
 					"name": "meta.brace.square.tsx"
 				},
 				"2": {
+					"name": "keyword.operator.type.modifier.tsx"
+				},
+				"3": {
 					"name": "keyword.operator.optional.tsx"
 				}
 			},
@@ -1150,6 +1159,13 @@
 					"name": "punctuation.definition.parameters.end.tsx"
 				}
 			},
+			"patterns": [
+				{
+					"include": "#function-parameters-body"
+				}
+			]
+		},
+		"function-parameters-body": {
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1489,7 +1505,7 @@
 					"name": "storage.type.namespace.tsx"
 				}
 			},
-			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?<=\\})|(?=;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1523,7 +1539,7 @@
 					"name": "entity.name.type.alias.tsx"
 				}
 			},
-			"end": "(?=[};]|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+			"end": "(?=\\}|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 			"patterns": [
 				{
 					"include": "#comment"
@@ -1699,7 +1715,7 @@
 							"name": "keyword.control.default.tsx"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#expression"
@@ -1714,7 +1730,7 @@
 							"name": "keyword.control.export.tsx"
 						}
 					},
-					"end": "(?=;|$|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\btype\\b|\\bvar\\b)",
+					"end": "(?=$|;|\\babstract\\b|\\basync\\b|\\bclass\\b|\\bconst\\b|\\bdeclare\\b|\\benum\\b|\\bexport\\b|\\bfunction\\b|\\bimport\\b|\\binterface\\b|\\blet\\b|\\bmodule\\b|\\bnamespace\\b|\\breturn\\b|\\btype\\b|\\bvar\\b)",
 					"patterns": [
 						{
 							"include": "#import-export-declaration"
@@ -1859,18 +1875,44 @@
 									"name": "keyword.control.switch.tsx"
 								}
 							},
-							"end": ":",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.section.case-statement.tsx"
-								}
-							},
+							"end": "(?=:)",
 							"patterns": [
 								{
 									"include": "#expression"
 								}
 							]
 						},
+						{
+							"begin": "(:)\\s*(\\{)",
+							"beginCaptures": {
+								"1": {
+									"name": "case-clause.expr.tsx punctuation.definition.section.case-statement.tsx"
+								},
+								"2": {
+									"name": "meta.block.tsx punctuation.definition.block.tsx"
+								}
+							},
+							"end": "\\}",
+							"endCaptures": {
+								"0": {
+									"name": "meta.block.tsx punctuation.definition.block.tsx"
+								}
+							},
+							"contentName": "meta.block.tsx",
+							"patterns": [
+								{
+									"include": "#statements"
+								}
+							]
+						},
+						{
+							"match": "(:)",
+							"captures": {
+								"0": {
+									"name": "case-clause.expr.tsx punctuation.definition.section.case-statement.tsx"
+								}
+							}
+						},
 						{
 							"include": "#statements"
 						}
@@ -1943,7 +1985,7 @@
 		},
 		"after-operator-block-as-object-literal": {
 			"name": "meta.objectliteral.tsx",
-			"begin": "(?<!\\+\\+|--)(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
+			"begin": "(?<!\\+\\+|--)(?<=[:=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.block.tsx"
@@ -2033,7 +2075,7 @@
 				},
 				{
 					"name": "meta.object.member.tsx",
-					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
+					"match": "(?x)(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n)))",
 					"captures": {
 						"0": {
 							"name": "meta.object-literal.key.tsx"
@@ -2096,6 +2138,61 @@
 					},
 					"end": "(?=,|\\})",
 					"patterns": [
+						{
+							"begin": "(?<=:)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.tsx"
+								}
+							},
+							"end": "(?<=\\))",
+							"patterns": [
+								{
+									"include": "#type-parameters"
+								},
+								{
+									"begin": "\\(",
+									"beginCaptures": {
+										"0": {
+											"name": "meta.brace.round.tsx"
+										}
+									},
+									"end": "\\)",
+									"endCaptures": {
+										"0": {
+											"name": "meta.brace.round.tsx"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#expression-inside-possibly-arrow-parens"
+										}
+									]
+								}
+							]
+						},
+						{
+							"begin": "(?<=:)\\s*(async)?\\s*(\\()(?=\\s*$)",
+							"beginCaptures": {
+								"1": {
+									"name": "storage.modifier.async.tsx"
+								},
+								"2": {
+									"name": "meta.brace.round.tsx"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.tsx"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						},
 						{
 							"include": "#expression"
 						}
@@ -2113,9 +2210,9 @@
 					"name": "keyword.operator.ternary.tsx"
 				}
 			},
-			"end": "(:)",
+			"end": "\\s*(:)",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.operator.ternary.tsx"
 				}
 			},
@@ -2126,13 +2223,13 @@
 			]
 		},
 		"function-call": {
-			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
-			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+			"end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 			"patterns": [
 				{
 					"name": "meta.function-call.tsx",
 					"begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))",
-					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
+					"end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()",
 					"patterns": [
 						{
 							"include": "#literal"
@@ -2179,7 +2276,7 @@
 					"name": "keyword.operator.new.tsx"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))new(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#paren-expression"
@@ -2199,13 +2296,91 @@
 					"name": "keyword.operator.expression.instanceof.tsx"
 				}
 			},
-			"end": "(?<=\\))|(?=[;),}\\]:]|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
+			"end": "(?<=\\))|(?=[;),}\\]:?]|\\|\\||\\&\\&|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))function((\\s+[_$[:alpha:]][_$[:alnum:]]*)|(\\s*[\\(]))))",
 			"patterns": [
 				{
 					"include": "#type"
 				}
 			]
 		},
+		"paren-expression-possibly-arrow": {
+			"patterns": [
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?(?=\\s*(<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)\\(\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.tsx"
+						}
+					},
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#type-parameters"
+						},
+						{
+							"begin": "\\(",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.brace.round.tsx"
+								}
+							},
+							"end": "\\)",
+							"endCaptures": {
+								"0": {
+									"name": "meta.brace.round.tsx"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#expression-inside-possibly-arrow-parens"
+								}
+							]
+						}
+					]
+				},
+				{
+					"begin": "(?<=[(=,]|=>)\\s*(async)?\\s*(\\()(?=\\s*$)",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.async.tsx"
+						},
+						"2": {
+							"name": "meta.brace.round.tsx"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "meta.brace.round.tsx"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#expression-inside-possibly-arrow-parens"
+						}
+					]
+				},
+				{
+					"include": "#possibly-arrow-return-type"
+				}
+			]
+		},
+		"expression-inside-possibly-arrow-parens": {
+			"patterns": [
+				{
+					"include": "#expressionWithoutIdentifiers"
+				},
+				{
+					"include": "#function-parameters-body"
+				},
+				{
+					"include": "#identifiers"
+				},
+				{
+					"include": "#expressionPunctuations"
+				}
+			]
+		},
 		"paren-expression": {
 			"begin": "\\(",
 			"beginCaptures": {
@@ -2222,9 +2397,6 @@
 			"patterns": [
 				{
 					"include": "#expression"
-				},
-				{
-					"include": "#punctuation-comma"
 				}
 			]
 		},
@@ -2707,7 +2879,7 @@
 					"include": "#object-identifiers"
 				},
 				{
-					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    # sure shot arrow functions even if => is on new line\n(\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                      # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
+					"match": "(?x)(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*(\n  ((async\\s+)?(\n    (function\\s*[(<*]) |\n    (function\\s+) |\n    ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n  )) |\n  ((async\\s*)?(\n    ([\\(]\\s*$) |\n    # sure shot arrow functions even if => is on new line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?\n  [(]\\s*\n  (\n    ([)]\\s*:) |                                                                                       # ():\n    ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)                                                                  # [(]param: | [(]...param:\n  )\n) |\n(\n  [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>]                                                              # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n  (<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^=<>]|=[^<])*\\>)*>\\s*)?                                                                                 # typeparameters\n  \\(\\s*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\]))([^()]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\)))*)?\\)   # parameters\n  (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)?                                                                        # return type\n  \\s*=>                                                                                               # arrow operator\n)\n  ))\n))",
 					"captures": {
 						"1": {
 							"name": "punctuation.accessor.tsx"
@@ -2893,6 +3065,28 @@
 				}
 			},
 			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"possibly-arrow-return-type": {
+			"begin": "(?<=\\))\\s*(:)(?=\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+\\s*=>)",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.arrow.tsx meta.return.type.arrow.tsx keyword.operator.type.annotation.tsx"
+				}
+			},
+			"end": "(?==>|\\{|(^\\s*(export|function|class|interface|let|var|const|import|enum|namespace|module|type|abstract|declare)\\s+))",
+			"contentName": "meta.arrow.tsx meta.return.type.arrow.tsx",
+			"patterns": [
+				{
+					"include": "#arrow-return-type-body"
+				}
+			]
+		},
+		"arrow-return-type-body": {
 			"patterns": [
 				{
 					"begin": "(?<=[:])(?=\\s*\\{)",
@@ -4252,8 +4446,8 @@
 			]
 		},
 		"jsx-tag-in-expression": {
-			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
-			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?x)\n  (?<!\\+\\+|--)(?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n  (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n  (?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"end": "(?!(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"patterns": [
 				{
 					"include": "#jsx-tag"
@@ -4262,7 +4456,7 @@
 		},
 		"jsx-tag": {
 			"name": "meta.tag.tsx",
-			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
+			"begin": "(?=(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>))",
 			"end": "(/>)|(?:(</)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))?\\s*(>))",
 			"endCaptures": {
 				"1": {
@@ -4289,7 +4483,7 @@
 			},
 			"patterns": [
 				{
-					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,]|=>|&(?!&)|\\|(?!\\|)))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
+					"begin": "(<)\\s*(?:([_$a-zA-Z][-$\\w.]*)(?<!\\.|-)(:))?((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?<!\\.|-))(?=(<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{[^\\{\\}]*\\}))*\\})|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(\\[([^\\[\\]]|(\\[[^\\[\\]]*\\]))*\\])|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\([^\\(\\)]*\\)))*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>)?\\s+(?!\\?)|\\/?>)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.tag.begin.tsx"
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 1f6d72c3a9a..64a2132a32c 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -12,9 +12,12 @@
   "engines": {
     "vscode": "*"
   },
+	"categories": [
+		"Programming Languages"
+	],
   "dependencies": {
     "semver": "4.3.6",
-    "vscode-extension-telemetry": "0.0.15",
+    "vscode-extension-telemetry": "0.0.16",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
@@ -36,7 +39,6 @@
     "onCommand:javascript.goToProjectConfig",
     "onCommand:typescript.goToProjectConfig",
     "onCommand:typescript.openTsServerLog",
-    "onCommand:typescript.organizeImports",
     "onCommand:workbench.action.tasks.runTask"
   ],
   "main": "./out/extension",
@@ -68,8 +70,7 @@
           ],
           "default": null,
           "description": "%typescript.npm%",
-          "isExecutable": true,
-          "scope": "window"
+          "scope": "application"
         },
         "typescript.check.npmIsInstalled": {
           "type": "boolean",
@@ -115,8 +116,7 @@
           },
           "default": [],
           "description": "%typescript.tsserver.pluginPaths%",
-          "scope": "window",
-          "isExecutable": true
+          "scope": "application"
         },
         "typescript.tsserver.trace": {
           "type": "string",
@@ -411,8 +411,20 @@
         },
         "typescript.experimental.syntaxFolding": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "%typescript.experimental.syntaxFolding%"
+        },
+        "javascript.suggestionActions.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%javascript.suggestionActions.enabled%",
+          "scope": "window"
+        },
+        "typescript.suggestionActions.enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "%typescript.suggestionActions.enabled%",
+          "scope": "window"
         }
       }
     },
@@ -451,18 +463,6 @@
         "command": "typescript.restartTsServer",
         "title": "%typescript.restartTsServer%",
         "category": "TypeScript"
-      },
-      {
-        "command": "typescript.organizeImports",
-        "title": "%typescript.organizeImports%",
-        "category": "TypeScript"
-      }
-    ],
-    "keybindings": [
-      {
-        "command": "typescript.organizeImports",
-        "key": "shift+alt+o",
-        "when": "typescript.isManagedFile && typescript.canOrganizeImports"
       }
     ],
     "menus": {
@@ -510,10 +510,6 @@
         {
           "command": "typescript.restartTsServer",
           "when": "typescript.isManagedFile"
-        },
-        {
-          "command": "typescript.organizeImports",
-          "when": "typescript.isManagedFile && typescript.canOrganizeImports"
         }
       ]
     },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index a63addb4483..18ab9fadd9a 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -21,9 +21,9 @@
 	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Defines space handling after keywords in a control flow statement.",
 	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Defines space handling after function keyword for anonymous functions.",
 	"format.insertSpaceBeforeFunctionParenthesis": "Defines space handling before function argument parentheses. Requires TypeScript >= 2.1.5.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Defines space handling after opening and before closing non empty parenthesis.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Defines space handling after opening and before closing non empty brackets.",
-	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Defines space handling after opening and before closing non empty braces. Requires TypeScript >= 2.3.0.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Defines space handling after opening and before closing non-empty parenthesis.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Defines space handling after opening and before closing non-empty brackets.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Defines space handling after opening and before closing non-empty braces. Requires TypeScript >= 2.3.0.",
 	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Defines space handling after opening and before closing template string braces. Requires TypeScript >= 2.0.6.",
 	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Defines space handling after opening and before closing JSX expression braces. Requires TypeScript >= 2.0.6.",
 	"format.insertSpaceAfterTypeAssertion": "Defines space handling after type assertions in TypeScript. Requires TypeScript >= 2.4.",
@@ -53,5 +53,6 @@
 	"typescript.autoImportSuggestions.enabled": "Enable/disable auto import suggestions. Requires TypeScript >=2.6.1",
 	"typescript.experimental.syntaxFolding": "Enables/disables syntax aware folding markers.",
 	"taskDefinition.tsconfig.description": "The tsconfig file that defines the TS build.",
-	"typescript.organizeImports": "Organize Imports"
+	"javascript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for JavaScript files in the editor. Requires TypeScript >= 2.8",
+	"typescript.suggestionActions.enabled": "Enable/disable suggestion diagnostics for TypeScript files in the editor. Requires TypeScript >= 2.8."
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/extension.ts b/extensions/typescript-language-features/src/extension.ts
index ac33918d1c2..960296b0491 100644
--- a/extensions/typescript-language-features/src/extension.ts
+++ b/extensions/typescript-language-features/src/extension.ts
@@ -19,7 +19,6 @@ import ManagedFileContextManager from './utils/managedFileContext';
 import { lazy, Lazy } from './utils/lazy';
 import * as fileSchemes from './utils/fileSchemes';
 import LogDirectoryProvider from './utils/logDirectoryProvider';
-import { OrganizeImportsCommand, OrganizeImportsContextManager } from './features/organizeImports';
 
 export function activate(
 	context: vscode.ExtensionContext
@@ -74,11 +73,6 @@ function createLazyClientHost(
 
 		context.subscriptions.push(clientHost);
 
-		const organizeImportsContext = new OrganizeImportsContextManager();
-		clientHost.serviceClient.onTsServerStarted(api => {
-			organizeImportsContext.onDidChangeApiVersion(api);
-		}, null, context.subscriptions);
-
 		clientHost.serviceClient.onReady(() => {
 			context.subscriptions.push(
 				ProjectStatus.create(
@@ -103,7 +97,6 @@ function registerCommands(
 	commandManager.register(new commands.RestartTsServerCommand(lazyClientHost));
 	commandManager.register(new commands.TypeScriptGoToProjectConfigCommand(lazyClientHost));
 	commandManager.register(new commands.JavaScriptGoToProjectConfigCommand(lazyClientHost));
-	commandManager.register(new OrganizeImportsCommand(lazyClientHost));
 }
 
 function isSupportedDocument(
diff --git a/extensions/typescript-language-features/src/features/completionItemProvider.ts b/extensions/typescript-language-features/src/features/completionItemProvider.ts
index 2a2c58cab04..6b155ccfdd2 100644
--- a/extensions/typescript-language-features/src/features/completionItemProvider.ts
+++ b/extensions/typescript-language-features/src/features/completionItemProvider.ts
@@ -519,7 +519,7 @@ export default class TypeScriptCompletionItemProvider implements vscode.Completi
 
 		const snippet = new vscode.SnippetString();
 		const methodName = detail.displayParts.find(part => part.kind === 'methodName');
-		snippet.appendText((methodName && methodName.text) || item.label || item.insertText as string);
+		snippet.appendText((item.insertText as string) || (methodName && methodName.text) || item.label);
 		snippet.appendText('(');
 
 		let parenCount = 0;
diff --git a/extensions/typescript-language-features/src/features/diagnostics.ts b/extensions/typescript-language-features/src/features/diagnostics.ts
index d1e6fae809a..1bde0c8353e 100644
--- a/extensions/typescript-language-features/src/features/diagnostics.ts
+++ b/extensions/typescript-language-features/src/features/diagnostics.ts
@@ -38,28 +38,29 @@ const allDiagnosticKinds = [DiagnosticKind.Syntax, DiagnosticKind.Semantic, Diag
 
 export class DiagnosticsManager {
 
-	private readonly diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
-	private readonly currentDiagnostics: vscode.DiagnosticCollection;
+	private readonly _diagnostics = new Map<DiagnosticKind, DiagnosticSet>();
+	private readonly _currentDiagnostics: vscode.DiagnosticCollection;
 	private _validate: boolean = true;
+	private _enableSuggestions: boolean = true;
 
 	constructor(
 		language: string
 	) {
 		for (const kind of allDiagnosticKinds) {
-			this.diagnostics.set(kind, new DiagnosticSet());
+			this._diagnostics.set(kind, new DiagnosticSet());
 		}
 
-		this.currentDiagnostics = vscode.languages.createDiagnosticCollection(language);
+		this._currentDiagnostics = vscode.languages.createDiagnosticCollection(language);
 	}
 
 	public dispose() {
-		this.currentDiagnostics.dispose();
+		this._currentDiagnostics.dispose();
 	}
 
 	public reInitialize(): void {
-		this.currentDiagnostics.clear();
+		this._currentDiagnostics.clear();
 
-		for (const diagnosticSet of this.diagnostics.values()) {
+		for (const diagnosticSet of this._diagnostics.values()) {
 			diagnosticSet.clear();
 		}
 	}
@@ -68,9 +69,21 @@ export class DiagnosticsManager {
 		if (this._validate === value) {
 			return;
 		}
+
 		this._validate = value;
 		if (!value) {
-			this.currentDiagnostics.clear();
+			this._currentDiagnostics.clear();
+		}
+	}
+
+	public set enableSuggestions(value: boolean) {
+		if (this._enableSuggestions === value) {
+			return;
+		}
+
+		this._enableSuggestions = value;
+		if (!value) {
+			this._currentDiagnostics.clear();
 		}
 	}
 
@@ -79,7 +92,7 @@ export class DiagnosticsManager {
 		file: vscode.Uri,
 		syntaxDiagnostics: vscode.Diagnostic[]
 	): void {
-		const diagnostics = this.diagnostics.get(kind);
+		const diagnostics = this._diagnostics.get(kind);
 		if (diagnostics) {
 			diagnostics.set(file, syntaxDiagnostics);
 			this.updateCurrentDiagnostics(file);
@@ -87,11 +100,11 @@ export class DiagnosticsManager {
 	}
 
 	public configFileDiagnosticsReceived(file: vscode.Uri, diagnostics: vscode.Diagnostic[]): void {
-		this.currentDiagnostics.set(file, diagnostics);
+		this._currentDiagnostics.set(file, diagnostics);
 	}
 
 	public delete(resource: vscode.Uri): void {
-		this.currentDiagnostics.delete(resource);
+		this._currentDiagnostics.delete(resource);
 	}
 
 	private updateCurrentDiagnostics(file: vscode.Uri) {
@@ -99,14 +112,16 @@ export class DiagnosticsManager {
 			return;
 		}
 
-		const allDiagnostics = allDiagnosticKinds.reduce((sum, kind) => {
-			sum.push(...this.diagnostics.get(kind)!.get(file));
-			return sum;
-		}, [] as vscode.Diagnostic[]);
-		this.currentDiagnostics.set(file, allDiagnostics);
+		const allDiagnostics: vscode.Diagnostic[] = [];
+		allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Syntax)!.get(file));
+		allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Semantic)!.get(file));
+		if (this._enableSuggestions) {
+			allDiagnostics.push(...this._diagnostics.get(DiagnosticKind.Suggestion)!.get(file));
+		}
+		this._currentDiagnostics.set(file, allDiagnostics);
 	}
 
 	public getDiagnostics(file: vscode.Uri): vscode.Diagnostic[] {
-		return this.currentDiagnostics.get(file) || [];
+		return this._currentDiagnostics.get(file) || [];
 	}
 }
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/folderingProvider.ts b/extensions/typescript-language-features/src/features/foldingProvider.ts
similarity index 78%
rename from extensions/typescript-language-features/src/features/folderingProvider.ts
rename to extensions/typescript-language-features/src/features/foldingProvider.ts
index 6c11adb069b..20c1ec40647 100644
--- a/extensions/typescript-language-features/src/features/folderingProvider.ts
+++ b/extensions/typescript-language-features/src/features/foldingProvider.ts
@@ -9,7 +9,7 @@ import * as Proto from '../protocol';
 import * as typeConverters from '../utils/typeConverters';
 import { ITypeScriptServiceClient } from '../typescriptService';
 
-export default class TypeScriptFoldingProvider implements vscode.FoldingProvider {
+export default class TypeScriptFoldingProvider implements vscode.FoldingRangeProvider {
 	public constructor(
 		private readonly client: ITypeScriptServiceClient
 	) { }
@@ -18,7 +18,7 @@ export default class TypeScriptFoldingProvider implements vscode.FoldingProvider
 		document: vscode.TextDocument,
 		_context: vscode.FoldingContext,
 		token: vscode.CancellationToken
-	): Promise<vscode.FoldingRangeList | undefined> {
+	): Promise<vscode.FoldingRange[] | undefined> {
 		if (!this.client.apiVersion.has280Features()) {
 			return;
 		}
@@ -34,9 +34,13 @@ export default class TypeScriptFoldingProvider implements vscode.FoldingProvider
 			return;
 		}
 
-		return new vscode.FoldingRangeList(response.body.map(span => {
+		return response.body.map(span => {
 			const range = typeConverters.Range.fromTextSpan(span.textSpan);
+			// workaround for #47240
+			if (range.end.character > 0 && document.getText(new vscode.Range(range.end.translate(0, -1), range.end)) === '}') {
+				return new vscode.FoldingRange(range.start.line, Math.max(range.end.line - 1, range.start.line));
+			}
 			return new vscode.FoldingRange(range.start.line, range.end.line);
-		}));
+		});
 	}
 }
diff --git a/extensions/typescript-language-features/src/features/organizeImports.ts b/extensions/typescript-language-features/src/features/organizeImports.ts
index 3f53aa29f1a..2fe5f9e71d2 100644
--- a/extensions/typescript-language-features/src/features/organizeImports.ts
+++ b/extensions/typescript-language-features/src/features/organizeImports.ts
@@ -4,32 +4,27 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-
+import * as nls from 'vscode-nls';
 import * as Proto from '../protocol';
-import { Command } from '../utils/commandManager';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import { Command, CommandManager } from '../utils/commandManager';
+import { isSupportedLanguageMode } from '../utils/languageModeIds';
 import * as typeconverts from '../utils/typeConverters';
 
-import { isSupportedLanguageMode } from '../utils/languageModeIds';
-import API from '../utils/api';
-import { Lazy } from '../utils/lazy';
-import TypeScriptServiceClientHost from '../typeScriptServiceClientHost';
+const localize = nls.loadMessageBundle();
 
-export class OrganizeImportsCommand implements Command {
-	public static readonly ID = 'typescript.organizeImports';
-	public readonly id = OrganizeImportsCommand.ID;
+
+class OrganizeImportsCommand implements Command {
+	public static readonly Id = '_typescript.organizeImports';
+
+	public readonly id = OrganizeImportsCommand.Id;
 
 	constructor(
-		private readonly lazyClientHost: Lazy<TypeScriptServiceClientHost>
+		private readonly client: ITypeScriptServiceClient
 	) { }
 
 	public async execute(): Promise<boolean> {
-		// Don't force activation
-		if (!this.lazyClientHost.hasValue) {
-			return false;
-		}
-
-		const client = this.lazyClientHost.value.serviceClient;
-		if (!client.apiVersion.has280Features()) {
+		if (!this.client.apiVersion.has280Features()) {
 			return false;
 		}
 
@@ -38,7 +33,7 @@ export class OrganizeImportsCommand implements Command {
 			return false;
 		}
 
-		const file = client.normalizePath(editor.document.uri);
+		const file = this.client.normalizePath(editor.document.uri);
 		if (!file) {
 			return false;
 		}
@@ -51,35 +46,42 @@ export class OrganizeImportsCommand implements Command {
 				}
 			}
 		};
-		const response = await client.execute('organizeImports', args);
+		const response = await this.client.execute('organizeImports', args);
 		if (!response || !response.success) {
 			return false;
 		}
 
-		const edits = typeconverts.WorkspaceEdit.fromFromFileCodeEdits(client, response.body);
+		const edits = typeconverts.WorkspaceEdit.fromFromFileCodeEdits(this.client, response.body);
 		return await vscode.workspace.applyEdit(edits);
 	}
 }
 
-/**
- * When clause context set when the ts version supports organize imports.
- */
-const contextName = 'typescript.canOrganizeImports';
-
-export class OrganizeImportsContextManager {
-
-	private currentValue: boolean = false;
-
-	public onDidChangeApiVersion(apiVersion: API): any {
-		this.updateContext(apiVersion.has280Features());
+export class OrganizeImportsCodeActionProvider implements vscode.CodeActionProvider {
+	public constructor(
+		private readonly client: ITypeScriptServiceClient,
+		commandManager: CommandManager
+	) {
+		commandManager.register(new OrganizeImportsCommand(client));
 	}
 
-	private updateContext(newValue: boolean) {
-		if (newValue === this.currentValue) {
-			return;
+	public readonly metadata: vscode.CodeActionProviderMetadata = {
+		providedCodeActionKinds: [vscode.CodeActionKind.SourceOrganizeImports]
+	};
+
+	public provideCodeActions(
+		_document: vscode.TextDocument,
+		_range: vscode.Range,
+		_context: vscode.CodeActionContext,
+		_token: vscode.CancellationToken
+	): vscode.CodeAction[] {
+		if (!this.client.apiVersion.has280Features()) {
+			return [];
 		}
 
-		vscode.commands.executeCommand('setContext', contextName, newValue);
-		this.currentValue = newValue;
+		const action = new vscode.CodeAction(
+			localize('oraganizeImportsAction.title', "Organize Imports"),
+			vscode.CodeActionKind.SourceOrganizeImports);
+		action.command = { title: '', command: OrganizeImportsCommand.Id };
+		return [action];
 	}
-}
+}
\ No newline at end of file
diff --git a/extensions/typescript-language-features/src/features/quickFixProvider.ts b/extensions/typescript-language-features/src/features/quickFixProvider.ts
index a85e78e7b6e..d4197bfeabb 100644
--- a/extensions/typescript-language-features/src/features/quickFixProvider.ts
+++ b/extensions/typescript-language-features/src/features/quickFixProvider.ts
@@ -110,7 +110,7 @@ class SupportedCodeActionProvider {
 
 	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise<vscode.Diagnostic[]> {
 		const supportedActions = await this.supportedCodeActions;
-		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+diagnostic.code)));
+		const fixableDiagnostics = DiagnosticsSet.from(context.diagnostics.filter(diagnostic => supportedActions.has(+(diagnostic.code!))));
 		return Array.from(fixableDiagnostics.values);
 	}
 
@@ -184,7 +184,7 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 	): Promise<Iterable<vscode.CodeAction>> {
 		const args: Proto.CodeFixRequestArgs = {
 			...typeConverters.Range.toFileRangeRequestArgs(file, diagnostic.range),
-			errorCodes: [+diagnostic.code]
+			errorCodes: [+(diagnostic.code!)]
 		};
 		const codeFixesResponse = await this.client.execute('getCodeFixes', args, token);
 		if (codeFixesResponse.body) {
diff --git a/extensions/typescript-language-features/src/features/refactorProvider.ts b/extensions/typescript-language-features/src/features/refactorProvider.ts
index 17cb2d66f2f..352108ed58c 100644
--- a/extensions/typescript-language-features/src/features/refactorProvider.ts
+++ b/extensions/typescript-language-features/src/features/refactorProvider.ts
@@ -96,6 +96,10 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 		commandManager.register(new SelectRefactorCommand(doRefactoringCommand));
 	}
 
+	public readonly metadata: vscode.CodeActionProviderMetadata = {
+		providedCodeActionKinds: [vscode.CodeActionKind.Refactor]
+	};
+
 	public async provideCodeActions(
 		document: vscode.TextDocument,
 		_range: vscode.Range,
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 193fb0ce9c0..b2cdbf56456 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -22,6 +22,7 @@ import { memoize } from './utils/memoize';
 import { disposeAll } from './utils/dipose';
 
 const validateSetting = 'validate.enable';
+const suggestionSetting = 'suggestionActions.enabled';
 const foldingSetting = 'typescript.experimental.syntaxFolding';
 
 export default class LanguageProvider {
@@ -32,6 +33,7 @@ export default class LanguageProvider {
 	private readonly toUpdateOnConfigurationChanged: ({ updateConfiguration: () => void })[] = [];
 
 	private _validate: boolean = true;
+	private _enableSuggestionDiagnostics: boolean = true;
 
 	private readonly disposables: Disposable[] = [];
 	private readonly versionDependentDisposables: Disposable[] = [];
@@ -41,7 +43,7 @@ export default class LanguageProvider {
 	constructor(
 		private readonly client: TypeScriptServiceClient,
 		private readonly description: LanguageDescription,
-		commandManager: CommandManager,
+		private readonly commandManager: CommandManager,
 		typingsStatus: TypingsStatus
 	) {
 		this.formattingOptionsManager = new FormattingConfigurationManager(client);
@@ -117,7 +119,9 @@ export default class LanguageProvider {
 		this.disposables.push(languages.registerSignatureHelpProvider(selector, new (await import('./features/signatureHelpProvider')).default(client), '(', ','));
 		this.disposables.push(languages.registerRenameProvider(selector, new (await import('./features/renameProvider')).default(client)));
 		this.disposables.push(languages.registerCodeActionsProvider(selector, new (await import('./features/quickFixProvider')).default(client, this.formattingOptionsManager, commandManager, this.diagnosticsManager, this.bufferSyncSupport)));
-		this.disposables.push(languages.registerCodeActionsProvider(selector, new (await import('./features/refactorProvider')).default(client, this.formattingOptionsManager, commandManager)));
+
+		const refactorProvider = new (await import('./features/refactorProvider')).default(client, this.formattingOptionsManager, commandManager);
+		this.disposables.push(languages.registerCodeActionsProvider(selector, refactorProvider, refactorProvider.metadata));
 
 		await this.initFoldingProvider();
 		this.disposables.push(workspace.onDidChangeConfiguration(c => {
@@ -150,9 +154,9 @@ export default class LanguageProvider {
 
 	private async initFoldingProvider(): Promise<void> {
 		let enable = workspace.getConfiguration().get(foldingSetting, false);
-		if (enable) {
+		if (enable && this.client.apiVersion.has280Features()) {
 			if (!this.foldingProviderRegistration) {
-				this.foldingProviderRegistration = languages.registerFoldingProvider(this.documentSelector, new (await import('./features/folderingProvider')).default(this.client));
+				this.foldingProviderRegistration = languages.registerFoldingRangeProvider(this.documentSelector, new (await import('./features/foldingProvider')).default(this.client));
 			}
 		} else {
 			if (this.foldingProviderRegistration) {
@@ -165,6 +169,7 @@ export default class LanguageProvider {
 	private configurationChanged(): void {
 		const config = workspace.getConfiguration(this.id);
 		this.updateValidate(config.get(validateSetting, true));
+		this.updateSuggestionDiagnostics(config.get(suggestionSetting, true));
 
 		for (const toUpdate of this.toUpdateOnConfigurationChanged) {
 			toUpdate.updateConfiguration();
@@ -204,6 +209,18 @@ export default class LanguageProvider {
 		}
 	}
 
+	private updateSuggestionDiagnostics(value: boolean) {
+		if (this._enableSuggestionDiagnostics === value) {
+			return;
+		}
+
+		this._enableSuggestionDiagnostics = value;
+		this.diagnosticsManager.enableSuggestions = value;
+		if (value) {
+			this.triggerAllDiagnostics();
+		}
+	}
+
 	public reInitialize(): void {
 		this.diagnosticsManager.reInitialize();
 		this.bufferSyncSupport.reOpenDocuments();
@@ -227,6 +244,11 @@ export default class LanguageProvider {
 		if (this.client.apiVersion.has213Features()) {
 			this.versionDependentDisposables.push(languages.registerTypeDefinitionProvider(selector, new (await import('./features/typeDefinitionProvider')).default(this.client)));
 		}
+
+		if (this.client.apiVersion.has280Features()) {
+			const organizeImportsProvider = new (await import('./features/organizeImports')).OrganizeImportsCodeActionProvider(this.client, this.commandManager);
+			this.versionDependentDisposables.push(languages.registerCodeActionsProvider(selector, organizeImportsProvider, organizeImportsProvider.metadata));
+		}
 	}
 
 	public triggerAllDiagnostics(): void {
diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
index 7e3b170d968..8c8ba8aea01 100644
--- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
+++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts
@@ -255,7 +255,10 @@ export default class TypeScriptServiceClientHost {
 	}
 
 	private getDiagnosticSeverity(diagnostic: Proto.Diagnostic): DiagnosticSeverity {
-		if (this.reportStyleCheckAsWarnings && this.isStyleCheckDiagnostic(diagnostic.code)) {
+		if (this.reportStyleCheckAsWarnings
+			&& this.isStyleCheckDiagnostic(diagnostic.code)
+			&& diagnostic.category === PConst.DiagnosticCategory.error
+		) {
 			return DiagnosticSeverity.Warning;
 		}
 
diff --git a/extensions/typescript-language-features/src/utils/commandManager.ts b/extensions/typescript-language-features/src/utils/commandManager.ts
index 359d5b9ca96..7bf1d7e33aa 100644
--- a/extensions/typescript-language-features/src/utils/commandManager.ts
+++ b/extensions/typescript-language-features/src/utils/commandManager.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 
 export interface Command {
-	readonly id: string;
+	readonly id: string | string[];
 
 	execute(...args: any[]): void;
 }
@@ -22,7 +22,9 @@ export class CommandManager {
 	}
 
 	public register<T extends Command>(command: T): T {
-		this.registerCommand(command.id, command.execute, command);
+		for (const id of Array.isArray(command.id) ? command.id : [command.id]) {
+			this.registerCommand(id, command.execute, command);
+		}
 		return command;
 	}
 
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts
index e385d5287fd..de2769092e7 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts
@@ -12,8 +12,32 @@ import {
 	CompletionList, CompletionItem, CompletionItemKind, TextDocument, Position
 } from 'vscode';
 
+
 suite('languages namespace tests', () => {
 
+	test('diagnostics, read & event', function () {
+		let uri = Uri.file('/foo/bar.txt');
+		let col1 = languages.createDiagnosticCollection('foo1');
+		col1.set(uri, [new Diagnostic(new Range(0, 0, 0, 12), 'error1')]);
+
+		let col2 = languages.createDiagnosticCollection('foo2');
+		col2.set(uri, [new Diagnostic(new Range(0, 0, 0, 12), 'error1')]);
+
+		let diag = languages.getDiagnostics(uri);
+		assert.equal(diag.length, 2);
+
+		let tuples = languages.getDiagnostics();
+		let found = false;
+		for (let [thisUri,] of tuples) {
+			if (thisUri.toString() === uri.toString()) {
+				found = true;
+				break;
+			}
+		}
+		assert.ok(tuples.length >= 1);
+		assert.ok(found);
+	});
+
 	test('diagnostics & CodeActionProvider', function () {
 
 		class D2 extends Diagnostic {
diff --git a/extensions/yaml/language-configuration.json b/extensions/yaml/language-configuration.json
index 010d773d3f3..16dc5a02e86 100644
--- a/extensions/yaml/language-configuration.json
+++ b/extensions/yaml/language-configuration.json
@@ -22,7 +22,11 @@
 		["'", "'"]
 	],
 	"folding": {
-		"offSide": true
+		"offSide": true,
+		"markers": {
+			"start": "^\\s*#\\s*region\\b",
+			"end": "^\\s*#\\s*endregion\\b"
+		}
 	},
 	"indentationRules": {
 		"increaseIndentPattern": "^\\s*.*(:|-) ?(&amp;\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$",
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 08072f51476..504d8abd96d 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.8.0-insiders.20180320:
-  version "2.8.0-insiders.20180320"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.0-insiders.20180320.tgz#30fb1dd0230a271a9b174820feafdc9d8da2497d"
+typescript@2.8.3:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
diff --git a/gulpfile.js b/gulpfile.js
index 70aab71c296..db6d924ae73 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -28,8 +28,8 @@ gulp.task('default', ['compile']);
 
 // All
 gulp.task('clean', ['clean-client', 'clean-extensions']);
-gulp.task('compile', ['compile-client', 'compile-extensions']);
-gulp.task('watch', ['watch-client', 'watch-extensions']);
+gulp.task('compile', ['monaco-typecheck', 'compile-client', 'compile-extensions']);
+gulp.task('watch', [/* 'monaco-typecheck-watch', */ 'watch-client', 'watch-extensions']);
 
 // All Build
 gulp.task('clean-build', ['clean-client-build', 'clean-extensions-build']);
@@ -74,4 +74,4 @@ if (runningEditorTasks) {
 	const build = path.join(__dirname, 'build');
 	require('glob').sync('gulpfile.*.js', { cwd: build })
 		.forEach(f => require(`./build/${f}`));
-}
\ No newline at end of file
+}
diff --git a/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..bbb5b917ca9
--- /dev/null
+++ b/i18n/chs/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS 语言服务器",
+	"folding.start": "折叠区域开始",
+	"folding.end": "折叠区域结束"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css-language-features/package.i18n.json b/i18n/chs/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..e35e92e1f84
--- /dev/null
+++ b/i18n/chs/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS 语言功能",
+	"description": "为 CSS、LESS 和 SCSS 文件提供丰富的语言支持。",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"css.lint.emptyRules.desc": "不要使用空规则集",
+	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"css.lint.importStatement.desc": "Import 语句不会并行加载",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"css.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"css.lint.unknownProperties.desc": "未知的属性。",
+	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"css.lint.zeroUnits.desc": "零不需要单位",
+	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
+	"css.validate.title": "控制 CSS 验证和问题严重性。",
+	"css.validate.desc": "启用或禁用所有验证",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"less.lint.emptyRules.desc": "不要使用空规则集",
+	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"less.lint.importStatement.desc": "Import 语句不会并行加载",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"less.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"less.lint.unknownProperties.desc": "未知的属性。",
+	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"less.lint.zeroUnits.desc": "零不需要单位",
+	"less.validate.title": "控制 LESS 验证和问题严重性。",
+	"less.validate.desc": "启用或禁用所有验证",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
+	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
+	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
+	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
+	"scss.lint.emptyRules.desc": "不要使用空规则集",
+	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
+	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
+	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
+	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
+	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
+	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
+	"scss.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
+	"scss.lint.unknownProperties.desc": "未知的属性。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
+	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
+	"scss.lint.zeroUnits.desc": "零不需要单位",
+	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
+	"scss.validate.desc": "启用或禁用所有验证",
+	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
+	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
+	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/css/package.i18n.json b/i18n/chs/extensions/css/package.i18n.json
index 7648b17fe69..52369e22e58 100644
--- a/i18n/chs/extensions/css/package.i18n.json
+++ b/i18n/chs/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 语言功能",
-	"description": "为 CSS、LESS 和 SCSS 文件提供丰富的语言支持。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"css.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"css.lint.emptyRules.desc": "不要使用空规则集",
-	"css.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"css.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"css.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"css.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"css.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"css.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"css.lint.importStatement.desc": "Import 语句不会并行加载",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"css.lint.universalSelector.desc": "通配选择符 (*) 运行效率低",
-	"css.lint.unknownProperties.desc": "未知的属性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"css.lint.zeroUnits.desc": "零不需要单位",
-	"css.trace.server.desc": "跟踪 VS Code 与 CSS 语言服务器之间的通信。",
-	"css.validate.title": "控制 CSS 验证和问题严重性。",
-	"css.validate.desc": "启用或禁用所有验证",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"less.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"less.lint.emptyRules.desc": "不要使用空规则集",
-	"less.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"less.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"less.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"less.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"less.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"less.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"less.lint.importStatement.desc": "Import 语句不会并行加载",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"less.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-	"less.lint.unknownProperties.desc": "未知的属性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"less.lint.zeroUnits.desc": "零不需要单位",
-	"less.validate.title": "控制 LESS 验证和问题严重性。",
-	"less.validate.desc": "启用或禁用所有验证",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
-	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
-	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
-	"scss.lint.duplicateProperties.desc": "不要使用重复的样式定义",
-	"scss.lint.emptyRules.desc": "不要使用空规则集",
-	"scss.lint.float.desc": "避免使用“float”。浮动会带来脆弱的 CSS，如果布局的某一方面更改，将很容易破坏 CSS。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 规则必须定义 \"src\" 和 \"font-family\" 属性",
-	"scss.lint.hexColorLength.desc": "十六进制颜色必须由三个或六个十六进制数字组成",
-	"scss.lint.idSelector.desc": "选择器不应包含 ID，因为这些规则与 HTML 的耦合过于紧密。",
-	"scss.lint.ieHack.desc": "仅当支持 IE7 及更低版本时，才需要 IE hack",
-	"scss.lint.important.desc": "避免使用 !important。它表明整个 CSS 的特异性已经失去控制且需要重构。",
-	"scss.lint.importStatement.desc": "Import 语句不会并行加载",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "因显示而忽略属性。例如，使用 \"display: inline\"时，宽度、高度、上边距、下边距和 float 属性将不起作用",
-	"scss.lint.universalSelector.desc": "已知通配选择符 (*) 慢",
-	"scss.lint.unknownProperties.desc": "未知的属性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的供应商特定属性。",
-	"scss.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
-	"scss.lint.zeroUnits.desc": "零不需要单位",
-	"scss.validate.title": "控制 SCSS 验证和问题严重性。",
-	"scss.validate.desc": "启用或禁用所有验证",
-	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"css.colorDecorators.enable.deprecationMessage": "已弃用设置 \"css.colorDecorators.enabl\"，请改用 \"editor.colorDecorators\"。",
-	"scss.colorDecorators.enable.deprecationMessage": "已弃用设置 \"scss.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-	"less.colorDecorators.enable.deprecationMessage": "已弃用设置 \"less.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+	"displayName": "CSS 语言基础功能",
+	"description": "为 CSS、LESS 和 SCSS 文件中提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/emmet/package.i18n.json b/i18n/chs/extensions/emmet/package.i18n.json
index 091b728c40a..5cf0382870f 100644
--- a/i18n/chs/extensions/emmet/package.i18n.json
+++ b/i18n/chs/extensions/emmet/package.i18n.json
@@ -35,7 +35,7 @@
 	"emmetExtensionsPath": "包含 Emmet 配置文件与代码片段的文件夹路径。",
 	"emmetShowExpandedAbbreviation": "在建议中显示展开的 Emmet 缩写。\n选择 \"inMarkupAndStylesheetFilesOnly\" 选项将仅应用于 html、haml、jade、slim、xml、xsl、css、scss、sass、less 和 stylus 文件。\n选择 \"always\" 选项将应用于所有适用文件不限于标记或 CSS 的所有部分。",
 	"emmetShowAbbreviationSuggestions": "显示可能的 Emmet 缩写作为建议。在样式表中或当 emmet.showExpandedAbbreviation 设置为 \"never\" 时不适用。",
-	"emmetIncludeLanguages": "在默认不支持 Emmet 的语言中启用 Emmet 缩写功能。在此添加该语言与支持 Emmet 的语言之间的映射。\n示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetIncludeLanguages": "在默认不支持 Emmet 的语言中启用 Emmet 缩写功能。在此添加该语言与受支持的语言间的映射。\n示例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "用于 Emmet 代码片段的变量",
 	"emmetTriggerExpansionOnTab": "启用后，按下 TAB 键，将展开 Emmet 缩写。",
 	"emmetPreferences": "用于修改 Emmet 某些操作和解析程序的行为的首选项。",
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"webkit\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"webkit\" 前缀，请设为空字符串。",
 	"emmetPreferencesCssMozProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"moz\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"moz\" 前缀，请设为空字符串。",
 	"emmetPreferencesCssOProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"o\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"o\" 前缀，请设为空字符串。",
-	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。"
+	"emmetPreferencesCssMsProperties": "Emmet 缩写中使用的由 \"-\" 打头有 \"ms\" 前缀的 CSS 属性，使用半角逗号 (\",\") 进行分隔。若要始终避免 \"ms\" 前缀，请设为空字符串。",
+	"emmetPreferencesCssFuzzySearchMinScore": "显示的缩写模糊匹配应达到的最低分数 (0 到 1 之间)。较低的值可能使匹配错误变多，较高的值可能将不会显示应有的匹配项。",
+	"emmetOptimizeStylesheetParsing": "当设置为 false 时，将分析整个文件并确定当前位置能否展开 Emmet 缩写。当设置为 true 时，则仅在 CSS/SCSS/LESS 文件中进行分析。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/commands.i18n.json b/i18n/chs/extensions/git/out/commands.i18n.json
index 6276a473d55..d4f3c5641f1 100644
--- a/i18n/chs/extensions/git/out/commands.i18n.json
+++ b/i18n/chs/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "确定",
 	"push with tags success": "已成功带标签进行推送。",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
-	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
+	"sync is unpredictable": "此操作将推送提交至“{0}/{1}”，并从中拉取提交。",
 	"never again": "确定，且不再显示",
 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
 	"no changes stash": "没有要储藏的更改。",
diff --git a/i18n/chs/extensions/git/out/main.i18n.json b/i18n/chs/extensions/git/out/main.i18n.json
index 64d8ce0c2ee..3af01415f05 100644
--- a/i18n/chs/extensions/git/out/main.i18n.json
+++ b/i18n/chs/extensions/git/out/main.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"looking": "在 {0} 查找 Git 中",
-	"using git": "使用 {1} 中的 Git {0}",
+	"looking": "正在查找 Git: {0}",
+	"using git": "将使用位于 {1} 的 Git {0}",
 	"downloadgit": "下载 Git",
 	"neverShowAgain": "不再显示",
 	"notfound": "未找到 Git。请安装 Git，或在 \"git.path\" 设置中配置。",
diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json
index b59e2baae07..1ffec732d41 100644
--- a/i18n/chs/extensions/git/package.i18n.json
+++ b/i18n/chs/extensions/git/package.i18n.json
@@ -62,10 +62,10 @@
 	"config.autorefresh": "是否启用自动刷新",
 	"config.autofetch": "是否启用自动拉取",
 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
-	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
+	"config.confirmSync": "同步 Git 存储库前进行确认",
 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
 	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
-	"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
+	"config.ignoreLegacyWarning": "忽略“旧版 Git”警告",
 	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
 	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
 	"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
 	"config.inputValidation": "控制何时显示提交消息输入验证。",
 	"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
+	"config.detectSubmodulesLimit": "控制可检测到的 Git 子模块的限制。",
 	"colors.modified": "已修改资源的颜色。",
 	"colors.deleted": "已删除资源的颜色。",
 	"colors.untracked": "未跟踪资源的颜色。",
diff --git a/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9df9ff90438
--- /dev/null
+++ b/i18n/chs/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML 语言服务器",
+	"folding.start": "折叠区域开始",
+	"folding.end": "折叠区域结束"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html-language-features/package.i18n.json b/i18n/chs/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..10478bc7fed
--- /dev/null
+++ b/i18n/chs/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML 语言功能",
+	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
+	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
+	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
+	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
+	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
+	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
+	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
+	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
+	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
+	"html.format.endWithNewline.desc": "以新行结束。",
+	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
+	"html.format.wrapAttributes.desc": "对属性进行换行。",
+	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
+	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
+	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
+	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
+	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
+	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
+	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
+	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
+	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
+	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
+	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/html/package.i18n.json b/i18n/chs/extensions/html/package.i18n.json
index 3f12dd7154e..ba42e46c478 100644
--- a/i18n/chs/extensions/html/package.i18n.json
+++ b/i18n/chs/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 语言功能",
-	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
-	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
-	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
-	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
-	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
-	"html.format.indentInnerHtml.desc": "缩进 <head> 和 <body> 部分。",
-	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
-	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
-	"html.format.indentHandlebars.desc": "格式和缩进 {{#foo}} 和 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行结束。",
-	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
-	"html.format.wrapAttributes.desc": "对属性进行换行。",
-	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
-	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
-	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
-	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
-	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
-	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
-	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
-	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
-	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
-	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
-	"html.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
-	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
+	"displayName": "HTML 语言基础功能",
+	"description": "在 HTML 文件中提供语法高亮、括号匹配和代码片段功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..dac0ceb960a
--- /dev/null
+++ b/i18n/chs/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON 语言服务器"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json-language-features/package.i18n.json b/i18n/chs/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..340eded0989
--- /dev/null
+++ b/i18n/chs/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON 语言功能",
+	"description": "为 JSON 文件提供丰富的语言支持",
+	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
+	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
+	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
+	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
+	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
+	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
+	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
+	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
+	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/json/package.i18n.json b/i18n/chs/extensions/json/package.i18n.json
index baafcd7474e..6138d8e11f1 100644
--- a/i18n/chs/extensions/json/package.i18n.json
+++ b/i18n/chs/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 语言功能",
-	"description": "为 JSON 文件提供丰富的语言支持",
-	"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
-	"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
-	"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时，用于匹配的一组文件模式。",
-	"json.schemas.fileMatch.item.desc": "将 JSON 文件解析到架构时，用于匹配的可以包含 \"*\" 的文件模式。",
-	"json.schemas.schema.desc": "给定 URL 的架构定义。只需提供该架构以避免对架构 URL 的访问。",
-	"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
-	"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
-	"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
-	"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\"，请改用 \"editor.colorDecorators\"。",
-	"json.experimental.syntaxFolding": "启用或禁用语法折叠标记。"
+	"displayName": "JSON 语言基础功能",
+	"description": "在 JSON 文件中提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..d0a2ce8701e
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "无法加载“markdown.styles”：{0}"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..479e1e30f0b
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[预览] {0}",
+	"previewTitle": "预览 {0}"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..6a53189d1b3
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "已禁用此文档中的部分内容",
+	"preview.securityMessage.title": "已禁用此 Markdown 预览中的可能不安全的内容。更改 Markdown 预览安全设置以允许不安全内容或启用脚本。",
+	"preview.securityMessage.label": "已禁用内容安全警告"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/out/security.i18n.json b/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..43ddb78737c
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "严格",
+	"strict.description": "仅载入安全内容",
+	"insecureLocalContent.title": "允许不安全的本地内容",
+	"insecureLocalContent.description": "允许通过 http 载入来自 localhost 的内容",
+	"insecureContent.title": "允许不安全内容",
+	"insecureContent.description": "允许通过 http 载入内容",
+	"disable.title": "禁用",
+	"disable.description": "允许所有内容，执行所有脚本。不推荐",
+	"moreInfo.title": "详细信息",
+	"enableSecurityWarning.title": "在此工作区中启用预览安全警告",
+	"disableSecurityWarning.title": "在此工作区中取消预览安全警告",
+	"toggleSecurityWarning.description": "不影响内容安全级别",
+	"preview.showPreviewSecuritySelector.title": "选择此工作区中 Markdown 预览的安全设置"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/markdown-language-features/package.i18n.json b/i18n/chs/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..6790472bfc0
--- /dev/null
+++ b/i18n/chs/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown 语言功能",
+	"description": "为 Markdown 提供丰富的语言支持。",
+	"markdown.preview.breaks.desc": "设置换行符如何在 markdown 预览中呈现。将其设置为 \"true\" 会为每一个新行创建一个 <br>。",
+	"markdown.preview.linkify": "在 Markdown 预览中启用或禁用将类似 URL 的文本转换为链接。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中双击切换到编辑器。",
+	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
+	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
+	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",
+	"markdown.preview.markEditorSelection.desc": "在 Markdown 预览中标记当前的编辑器选定内容。",
+	"markdown.preview.scrollEditorWithPreview.desc": "滚动 Markdown 预览时，更新其编辑器视图。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "滚动 Markdown 编辑器时，更新其预览视图。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[弃用] 滚动 Markdown 预览以显示编辑器当前所选行。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此设置已被 \"markdown.preview.scrollPreviewWithEditor\" 替换且不再有任何效果。",
+	"markdown.preview.title": "打开预览",
+	"markdown.previewFrontMatter.dec": "设置如何在 Markdown 预览中呈现 YAML 扉页。“隐藏”会删除扉页。否则，扉页则被视为 Markdown 内容。",
+	"markdown.previewSide.title": "打开侧边预览",
+	"markdown.showLockedPreviewToSide.title": "在侧边打开锁定的预览",
+	"markdown.showSource.title": "显示源",
+	"markdown.styles.dec": "要在 Markdown 预览中使用的 CSS 样式表的 URL 或本地路径列表。相对路径被解释为相对于资源管理器中打开的文件夹。如果没有任何打开的文件夹，则会被解释为相对于 Markdown 文件的位置。所有的 \"\\\" 需写为 \"\\\\\"。",
+	"markdown.showPreviewSecuritySelector.title": "更改预览安全设置",
+	"markdown.trace.desc": "对 Markdown 扩展启用调试日志记录。",
+	"markdown.preview.refresh.title": "刷新预览",
+	"markdown.preview.toggleLock.title": "切换开关锁定预览"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..c5281f10087
--- /dev/null
+++ b/i18n/chs/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "是否允许执行 {0} (定义为工作区设置)以进行 PHP 文件的 lint 操作?",
+	"php.yes": "Allow",
+	"php.no": "不允许",
+	"wrongExecutable": "无法验证，因为 {0} 不是有效的 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
+	"noExecutable": "无法验证，因为未设置任何 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
+	"unknownReason": "使用路径运行 php 失败: {0}。原因未知。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php-language-features/package.i18n.json b/i18n/chs/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..0871582ebd7
--- /dev/null
+++ b/i18n/chs/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
+	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
+	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
+	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
+	"displayName": "PHP 语言功能",
+	"description": "为 PHP 文件提供丰富的语言支持。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/php/package.i18n.json b/i18n/chs/extensions/php/package.i18n.json
index 8385016844b..f946b5c8649 100644
--- a/i18n/chs/extensions/php/package.i18n.json
+++ b/i18n/chs/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
-	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
-	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
-	"configuration.validate.run": "决定 linter 是在保存时还是输入时运行。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 验证程序(定义为工作区设置)",
-	"displayName": "PHP 语言功能",
-	"description": "为 PHP 文件提供 IntelliSense、lint 和语言基础功能。"
+	"displayName": "PHP 语言基础功能",
+	"description": "为 PHP 文件提供语法高亮和括号匹配功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json b/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..71f03151b6f
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
+	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型",
+	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
+	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目。点击[这里]({0})了解更多。",
+	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目。点击[这里]({0})了解更多。",
+	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..cec1f8a1e0a
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "选择要应用的代码操作",
+	"acquiringTypingsLabel": "正在获取 typings...",
+	"acquiringTypingsDetail": "获取 IntelliSense 的 typings 定义。",
+	"autoImportLabel": "从 {0} 自动导入"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..0e60e3412a4
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "在 JavaScript 文件中启用语义检查。必须在文件顶部。",
+	"ts-nocheck": "在 JavaScript 文件中禁用语义检查。必须在文件顶部。",
+	"ts-ignore": "取消文件下一行的 @ts-check 错误提示。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..021db468b54
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 个实现",
+	"manyImplementationLabel": "{0} 个实现",
+	"implementationsErrorLabel": "无法确定实现"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..1d385873b11
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc 注释"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..77f30b069ab
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "整理 import 语句"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..d22ade03db1
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (修复文件中所有)"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..5410b680677
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 个引用",
+	"manyReferenceLabel": "{0} 个引用",
+	"referenceErrorLabel": "无法确定引用"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..cd6842c9ce3
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "构建 - {0}",
+	"buildAndWatchTscLabel": "监视 - {0}"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..d4107581eba
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "路径 {0} 未指向有效的 tsserver 安装。请回退到捆绑的 TypeScript 版本。",
+	"serverCouldNotBeStarted": "无法启动 TypeScript 语言服务器。错误消息为: {0}",
+	"typescript.openTsServerLog.notSupported": "TS 服务器日志记录需要 TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "TS 服务器日志记录已关闭。请设置 \"typescript.tsserver.log\" 并重启\n TS 服务器以启用日志记录",
+	"typescript.openTsServerLog.enableAndReloadOption": "启用日志记录并重启 TS 服务器",
+	"typescript.openTsServerLog.noLogFile": "TS 服务器尚未启动日志记录。",
+	"openTsServerLog.openFileFailedFailed": "无法打开 TS 服务器日志文件",
+	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。",
+	"serverDiedReportIssue": "使用英文报告问题",
+	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..006fe312258
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "无效版本"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..cd5096356f3
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
+	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
+	"large.label": "配置排除",
+	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..fe9128f40d0
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "提取数据以实现更好的 TypeScript IntelliSense",
+	"typesInstallerInitializationFailed.title": "无法为 JavaScript 语言功能安装 typings 文件。请确认 NPM 已安装，或在你的用户设置中配置 “typescript.npm”。点击[这里]({0})了解更多。",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "不再显示"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..c9f87e17e81
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "使用 VS Code 的版本",
+	"useWorkspaceVersionOption": "使用工作区版本",
+	"learnMore": "了解详细信息",
+	"selectTsVersion": "选择用于 JavaScript 和 TypeScript 语言功能的 TypeScript 版本"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..4bb999f00f5
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "无法获取此目录 TypeScript 的版本",
+	"noBundledServerFound": "VS Code 的 tsserver 已被其他应用程序(例如运行异常的病毒检测工具)删除。请重新安装 VS Code。"
+}
\ No newline at end of file
diff --git a/i18n/chs/extensions/typescript-language-features/package.i18n.json b/i18n/chs/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..d12cc2e3f75
--- /dev/null
+++ b/i18n/chs/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,65 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JavaScript 和 TypeScript 的语言功能",
+	"description": "为 JavaScript 和 TypeScript 提供丰富的语言支持。",
+	"typescript.reloadProjects.title": "重载项目",
+	"javascript.reloadProjects.title": "重载项目",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "完成函数的参数签名。",
+	"typescript.tsdk.desc": "指定包含要使用的 tsserver 和 lib*.d.ts 文件的文件夹路径。",
+	"typescript.disableAutomaticTypeAcquisition": "禁用自动获取类型。需要 TypeScript >= 2.0.6。",
+	"typescript.tsserver.log": "将 TS 服务器的日志保存到一个文件。此日志可用于诊断 TS 服务器问题。日志可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
+	"typescript.tsserver.pluginPaths": "其他可搜索 TypeScript 语言服务插件的路径。需要 TypeScript >= 2.3.0。",
+	"typescript.tsserver.pluginPaths.item": "相对或绝对路径。相对路径将根据工作区文件夹进行解析。",
+	"typescript.tsserver.trace": "对发送到 TS 服务器的消息启用跟踪。此跟踪信息可用于诊断 TS 服务器问题。 跟踪信息可能包含你的项目中的文件路径、源代码和其他可能敏感的信息。",
+	"typescript.validate.enable": "启用/禁用 TypeScript 验证。",
+	"typescript.format.enable": "启用/禁用默认 TypeScript 格式化程序。",
+	"javascript.format.enable": "启用/禁用 JavaScript 格式化程序。",
+	"format.insertSpaceAfterCommaDelimiter": "定义逗号分隔符后面的空格处理。",
+	"format.insertSpaceAfterConstructor": "定义构造器关键字后的空格处理。要求 TypeScript >= 2.3.0。",
+	"format.insertSpaceAfterSemicolonInForStatements": "在 For 语句中，定义分号后面的空格处理。",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "定义二进制运算符后面的空格处理",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定义控制流语句中关键字后面的空格处理。",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定义匿名函数的函数关键字后面的空格处理。",
+	"format.insertSpaceBeforeFunctionParenthesis": "在函数参数括号前定义空格处理。需要 TypeScript >= 2.1.5。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定义非空小括号的左括号后和右括号前的空格处理方式。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定义非空中括号的左括号后和右括号前的空格处理方式。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "定义非空大括号的左括号后和右括号前的空格处理方式。要求 TypeScript >= 2.3.0。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定义模板字符串的左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定义 JSX 表达式左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
+	"format.insertSpaceAfterTypeAssertion": "定义 TypeScript 中类型断言后的空格处理。要求 TypeScript >= 2.4。",
+	"format.placeOpenBraceOnNewLineForFunctions": "定义函数的左大括号是否放置在新的一行。",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "定义控制块的左括号是否放置在新的一行。",
+	"javascript.validate.enable": "启用/禁用 JavaScript 验证。",
+	"typescript.goToProjectConfig.title": "转到项目配置",
+	"javascript.goToProjectConfig.title": "转到项目配置",
+	"javascript.referencesCodeLens.enabled": "启用/禁用在 JavaScript 文件中引用 CodeLens。",
+	"typescript.referencesCodeLens.enabled": "启用/禁用在 TypeScript 文件中引用 CodeLens。要求 TypeScript >= 2.0.6。",
+	"typescript.implementationsCodeLens.enabled": "启用/禁用实现 CodeLens。要求 TypeScript >= 2.2.0。",
+	"typescript.openTsServerLog.title": "打开 TS 服务器日志",
+	"typescript.restartTsServer": "重启 TS 服务器",
+	"typescript.selectTypeScriptVersion.title": "选择 TypeScript 版本",
+	"typescript.reportStyleChecksAsWarnings": "将风格检查问题报告为警告",
+	"jsDocCompletion.enabled": "启用/禁用自动 JSDoc 注释",
+	"javascript.implicitProjectConfig.checkJs": "启用/禁用 JavaScript 文件的语义检查。现有的 jsconfig.json 或\n tsconfig.json 文件会覆盖此设置。要求 TypeScript >=2.3.1。",
+	"typescript.npm": "指定用于自动获取类型的 NPM 可执行文件的路径。要求 TypeScript >= 2.3.4。",
+	"typescript.check.npmIsInstalled": "检查是否安装了 NPM 以自动获取类型。",
+	"javascript.nameSuggestions": "启用/禁用在 JavaScript 建议列表中包含文件中的唯一名称。",
+	"typescript.tsc.autoDetect": "控制 tsc 任务的自动检测。\"off\" 关闭此功能。\"build\" 仅创建单次运行编译任务。\"watch\" 仅创建编译及监视任务。\"on\" 创建构建及监视任务。默认值为 \"on\"。",
+	"typescript.problemMatchers.tsc.label": "TypeScript 问题",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript 问题(观看模式)",
+	"typescript.quickSuggestionsForPaths": "当输入导入路径时启用或禁用快速建议。",
+	"typescript.locale": "设置报告 TypeScript 错误时使用的区域设置。要求 TypeScript >= 2.6.0。默认 (\"null\") 将使用 VS Code 的区域设置。",
+	"javascript.implicitProjectConfig.experimentalDecorators": "对不属于任何工程的 JavaScript 文件启用或禁用 \"experimentalDecorators\" 设置。现有的 jsconfig.json 或\n tsconfig.json 文件会覆盖此设置。要求 TypeScript >=2.3.1。",
+	"typescript.autoImportSuggestions.enabled": "启用或禁用自动导入建议。要求 TypeScript >= 2.6.1",
+	"typescript.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
+	"taskDefinition.tsconfig.description": "定义 TS 生成的 tsconfig 文件。",
+	"javascript.suggestionActions.enabled": "在 JavaScript 文件中启用或禁用编辑器的建议诊断。需要 TypeScript >= 2.8",
+	"typescript.suggestionActions.enabled": "在 TypeScript 文件中启用或禁用编辑器的建议诊断。需要 TypeScript >= 2.8"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/node/processes.i18n.json b/i18n/chs/src/vs/base/node/processes.i18n.json
index a3eb373eac7..35229bd6699 100644
--- a/i18n/chs/src/vs/base/node/processes.i18n.json
+++ b/i18n/chs/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "无法对 UNC 驱动器执行 shell 命令。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/base/node/zip.i18n.json b/i18n/chs/src/vs/base/node/zip.i18n.json
index ac2caa975de..15ef1807072 100644
--- a/i18n/chs/src/vs/base/node/zip.i18n.json
+++ b/i18n/chs/src/vs/base/node/zip.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"incompleteExtract": "解压不完整。提取了 {0} / {1} 个项目",
 	"notFound": "在 Zip 中找不到 {0}。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 7980ba2eb43..5bdbd842cb2 100644
--- a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "在 GitHub 中预览",
 	"loadingData": "正在加载数据...",
+	"rateLimited": "超出 GitHub 查询限制。请稍候。",
 	"similarIssues": "类似的问题",
 	"open": "开放",
 	"closed": "已关闭",
-	"noResults": "未找到结果",
+	"noSimilarIssues": "没有找到类似问题",
 	"settingsSearchIssue": "设置搜索的问题",
 	"bugReporter": "问题报告",
-	"performanceIssue": "性能问题",
 	"featureRequest": "功能请求",
+	"performanceIssue": "性能问题",
 	"stepsToReproduce": "重现步骤",
 	"bugDescription": "请分享能稳定重现此问题的必要步骤，并包含实际和预期的结果。我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
 	"performanceIssueDesciption": "这个性能问题是在什么时候发生的? 是在启动时，还是在一系列特定的操作之后? 我们支持 GitHub 版的 Markdown。您将能在 GitHub 上预览时编辑这个问题并添加截图。",
diff --git a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index e66e99336b1..e0e39df949d 100644
--- a/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/chs/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -6,8 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"completeInEnglish": "请使用英文填写表单。",
+	"completeInEnglish": "请使用英文进行填写。",
 	"issueTypeLabel": "这是一个",
+	"issueSourceLabel": "提交到",
+	"vscode": "Visual Studio Code",
+	"extension": "扩展",
+	"disableExtensionsLabelText": "请试着在{0}之后重现问题。如果此问题仅在扩展运行时才能重现，那么这可能是一个扩展的问题。",
+	"disableExtensions": "禁用所有扩展并重新加载窗口",
+	"chooseExtension": "扩展",
 	"issueTitleLabel": "标题",
 	"issueTitleRequired": "请输入标题。",
 	"titleLengthValidation": "标题太长。",
@@ -18,13 +24,6 @@
 	"extensions": "我的扩展",
 	"searchedExtensions": "已搜索的扩展",
 	"settingsSearchDetails": "设置搜索的详细信息",
-	"tryDisablingExtensions": "能否在禁用扩展后重现此问题?",
-	"yes": "是",
-	"no": "否",
-	"disableExtensionsLabelText": "尝试在{0}之后重现问题。",
-	"disableExtensions": "禁用所有扩展并重新加载窗口",
-	"showRunningExtensionsLabelText": "如果您怀疑这是扩展的问题，请{0}并进行报告。",
-	"showRunningExtensions": "查看所有运行中的扩展",
 	"details": "请输入详细信息。",
 	"loadingData": "正在加载数据..."
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..fd812926a90
--- /dev/null
+++ b/i18n/chs/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "CPU %",
+	"memory": "内存 (MB)",
+	"pid": "PID",
+	"name": "名称",
+	"killProcess": "结束进程",
+	"forceKillProcess": "强制结束进程"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/code/electron-main/menus.i18n.json b/i18n/chs/src/vs/code/electron-main/menus.i18n.json
index ba4e0d03653..4f71710a76a 100644
--- a/i18n/chs/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/chs/src/vs/code/electron-main/menus.i18n.json
@@ -161,6 +161,7 @@
 	"mMergeAllWindows": "合并所有窗口",
 	"miToggleDevTools": "切换开发人员工具(&&T)",
 	"miAccessibilityOptions": "辅助功能选项(&&O)",
+	"miOpenProcessExplorerer": "打开进程管理器(&&P)",
 	"miReportIssue": "使用英文报告问题(&&I)",
 	"miWelcome": "欢迎使用(&&W)",
 	"miInteractivePlayground": "交互式演练场(&&I)",
diff --git a/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json
index 46a0d879f13..2397f44f074 100644
--- a/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/chs/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "关闭",
-	"header": "第 {0} 个差异(共 {1} 个): 未修改 {2}, {3} 行，已修改 {4}, {5} 行",
 	"blankLine": "空白",
 	"equalLine": "未修改 {0}，已修改 {1}: {2}",
 	"insertLine": "+ 已修改 {0}: {1}",
diff --git a/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..c66c25ea99c
--- /dev/null
+++ b/i18n/chs/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cursors.maximum": "光标数量被限制为 {0}。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 60f9a85b4bf..f3c51a42e64 100644
--- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
 	"multiCursorModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
 	"multiCursorModifier": "在通过鼠标添加多个光标时使用的修改键。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“转到定义”和“打开链接”功能所需的鼠标动作将会相应调整，不与多光标修改键冲突。",
+	"multiCursorMergeOverlapping": "当多个光标重叠时进行合并。",
 	"quickSuggestions.strings": "在字符串内启用快速建议。",
 	"quickSuggestions.comments": "在注释内启用快速建议。",
 	"quickSuggestions.other": "在字符串和注释外启用快速建议。",
@@ -57,7 +58,7 @@
 	"formatOnPaste": "控制编辑器是否应自动设置粘贴内容的格式。格式化程序必须可用并且能设置文档中某一范围的格式。",
 	"autoIndent": "控制编辑器是否在用户键入、粘贴或移动行时自动调整缩进。语言的缩进规则必须可用。",
 	"suggestOnTriggerCharacters": "控制键入触发器字符时是否应自动显示建议",
-	"acceptSuggestionOnEnter": "控制按“Enter”键是否像按“Tab”键一样接受建议。这能帮助避免“插入新行”和“接受建议”之间的歧义。值为“smart”时表示，仅当文字改变时，按“Enter”键才能接受建议",
+	"acceptSuggestionOnEnter": "控制按下 \"Enter\" 键是否像 \"Tab\" 键一样接受建议。这能减少“插入新行”和“接受建议”命令之间的歧义。若此项的值为 \"smart\"，则仅在文字改变时，\"Enter\" 键才能接受建议",
 	"acceptSuggestionOnCommitCharacter": "控制是否应在遇到提交字符时接受建议。例如，在 JavaScript 中，分号(\";\")可以为提交字符，可接受建议并键入该字符。",
 	"snippetSuggestions.top": "在其他建议上方显示代码片段建议。",
 	"snippetSuggestions.bottom": "在其他建议下方显示代码片段建议。",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "控制编辑器应如何呈现当前行突出显示，可能为“无”、“装订线”、“线”和“全部”。",
 	"codeLens": "控制编辑器是否显示 CodeLens",
 	"folding": "控制编辑器是否启用代码折叠功能",
+	"foldingStrategyAuto": "若语言特定的折叠策略可用，将直接使用；否则，将回退到基于缩进的折叠策略。",
+	"foldingStrategyIndentation": "始终使用基于缩进的折叠策略",
+	"foldingStrategy": "控制折叠范围的计算方式。\"auto\" 将使用语言特定的折叠策略 (若可用)。\"indentation\" 将强制使用基于缩进的折叠策略。",
 	"showFoldingControls": "控制是否自动隐藏导航线上的折叠控件。",
 	"matchBrackets": "当选择其中一项时，将突出显示匹配的括号。",
 	"glyphMargin": "控制编辑器是否应呈现垂直字形边距。字形边距最常用于调试。",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "控制是否支持 Linux 主剪贴板。",
 	"sideBySide": "控制 Diff 编辑器以并排或内联形式显示差异",
 	"ignoreTrimWhitespace": "控制差异编辑器是否将对前导空格或尾随空格的更改显示为差异",
+	"largeFileSize": "控制以字节为单位的文件大小阈值，大于此值时将应用特殊的优化规则",
+	"largeFileLineCount": "控制文件行数的阈值，大于此值时将应用特殊的优化规则",
 	"renderIndicators": "控制差异编辑器是否为已添加/删除的更改显示 +/- 指示符号"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 522811eea83..30fcc2ac988 100644
--- a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "编辑器缩进参考线的颜色。",
 	"editorLineNumbers": "编辑器行号的颜色。",
 	"editorActiveLineNumber": "编辑器活动行号的颜色",
+	"deprecatedEditorActiveLineNumber": "\"Id\" 已被弃用，请改用 \"editorLineNumber.activeForeground\"。",
 	"editorRuler": "编辑器标尺的颜色。",
 	"editorCodeLensForeground": "编辑器 CodeLens 的前景色",
 	"editorBracketMatchBackground": "匹配括号的背景色",
@@ -28,7 +29,9 @@
 	"warningBorder": "编辑器中警告波浪线的边框颜色。",
 	"infoForeground": "编辑器中信息波浪线的前景色。",
 	"infoBorder": "编辑器中信息波浪线的边框颜色。",
-	"overviewRulerRangeHighlight": "概述范围突出显示的标尺标记颜色。",
+	"hintForeground": "编辑器中提示波浪线的前景色。",
+	"hintBorder": "编辑器中提示波浪线的边框颜色。",
+	"overviewRulerRangeHighlight": "概览标尺中高亮范围的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
 	"overviewRuleError": "概述错误的标尺标记颜色。",
 	"overviewRuleWarning": "概述警告的标尺标记颜色。",
 	"overviewRuleInfo": "概述信息的标尺标记颜色。"
diff --git a/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..e3436f18367
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "显示修补程序({0})",
+	"quickFix": "显示修补程序",
+	"quickfix.trigger.label": "快速修复...",
+	"editor.action.quickFix.noneMessage": "没有可用的代码操作",
+	"refactor.label": "重构...",
+	"editor.action.refactor.noneMessage": "没有可用的重构操作",
+	"source.label": "源代码操作...",
+	"editor.action.source.noneMessage": "没有可用的源代码操作",
+	"organizeImports.label": "整理 import 语句"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json b/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json
index 7339816bb64..3d18cdf8a9e 100644
--- a/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/find/findController.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"startFindAction": "查找",
+	"startFindWithSelectionAction": "查找选定内容",
 	"findNextMatchAction": "查找下一个",
 	"findPreviousMatchAction": "查找上一个",
 	"nextSelectionMatchFindAction": "查找下一个选择",
diff --git a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
index 9e2c4fd733b..11f63183173 100644
--- a/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/find/findWidget.i18n.json
@@ -18,6 +18,6 @@
 	"label.replaceAllButton": "全部替换",
 	"label.toggleReplaceButton": "切换替换模式",
 	"title.matchesCountLimit": "仅高亮了前 {0} 个结果，但所有查找操作均针对全文。",
-	"label.matchesLocation": "第 {0} 个(共 {1} 个)",
+	"label.matchesLocation": "{0} / {1}",
 	"label.noResults": "无结果"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 8cd97dfccb1..52c19604c8e 100644
--- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "转到下一个问题 (错误、警告、信息)",
-	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
-	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
-	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
-	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
-	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
+	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..321c1e11989
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
+	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
+	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
+	"editorMarkerNavigationBackground": "编辑器标记导航小组件背景色。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/links/links.i18n.json b/i18n/chs/src/vs/editor/contrib/links/links.i18n.json
index 40e284cf659..587ed84ae6a 100644
--- a/i18n/chs/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "按住 Ctrl 并单击可访问链接",
 	"links.command.mac": "Cmd + 单击以执行命令",
 	"links.command": "Ctrl + 单击以执行命令",
+	"links.navigate.al.mac": "按住 Option 并单击可访问链接",
 	"links.navigate.al": "按住 Alt 并单击可访问链接",
+	"links.command.al.mac": "按住 Option 并单击可执行命令",
 	"links.command.al": "Alt + 单击以执行命令",
 	"invalid.url": "此链接格式不正确，无法打开: {0}",
 	"missing.url": "此链接目标已丢失，无法打开。",
diff --git a/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..4729c703440
--- /dev/null
+++ b/i18n/chs/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "星期日",
+	"Monday": "星期一",
+	"Tuesday": "星期二",
+	"Wednesday": "星期三",
+	"Thursday": "星期四",
+	"Friday": "星期五",
+	"Saturday": "星期六",
+	"SundayShort": "周日",
+	"MondayShort": "周一",
+	"TuesdayShort": "周二",
+	"WednesdayShort": "周三",
+	"ThursdayShort": "周四",
+	"FridayShort": "周五",
+	"SaturdayShort": "周六",
+	"January": "一月",
+	"February": "二月",
+	"March": "三月",
+	"April": "四月",
+	"May": "五月",
+	"June": "六月",
+	"July": "七月",
+	"August": "八月",
+	"September": "九月",
+	"October": "十月",
+	"November": "十一月",
+	"December": "十二月",
+	"JanuaryShort": "1月",
+	"FebruaryShort": "2月",
+	"MarchShort": "3月",
+	"AprilShort": "4月",
+	"MayShort": "5月",
+	"JuneShort": "6月",
+	"JulyShort": "7月",
+	"AugustShort": "8月",
+	"SeptemberShort": "9月",
+	"OctoberShort": "10月",
+	"NovemberShort": "11月",
+	"DecemberShort": "12月"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 9b8693d941b..1340c8a0009 100644
--- a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "符号在进行写入访问操作时的背景颜色，例如写入变量时。颜色必须透明，使其不会挡住下方的其他元素。",
 	"wordHighlightBorder": "符号在进行读取访问操作时的边框颜色，例如读取变量。",
 	"wordHighlightStrongBorder": "符号在进行写入访问操作时的边框颜色，例如写入变量。",
-	"overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。",
-	"overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。",
+	"overviewRulerWordHighlightForeground": "概览标尺中符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
+	"overviewRulerWordHighlightStrongForeground": "概览标尺中写入访问符号高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
 	"wordHighlight.next.label": "转到下一个突出显示的符号",
 	"wordHighlight.previous.label": "转到上一个突出显示的符号"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..d31cf13c73b
--- /dev/null
+++ b/i18n/chs/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 个其他文件未显示",
+	"moreFiles": "...{0} 个其他文件未显示"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..7667b941599
--- /dev/null
+++ b/i18n/chs/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "取消"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json
index e97406a614d..53a94cfbcad 100644
--- a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
 	"prof-startup": "启动期间运行 CPU 探查器",
 	"disableExtensions": "禁用所有已安装的扩展。",
-	"inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
-	"inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。",
 	"disableGPU": "禁用 GPU 硬件加速。",
 	"uploadLogs": "将当前会话的日志上传到安全端点。",
 	"maxMemory": "单个窗口最大内存大小 (单位为 MB)。",
diff --git a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index f27f13cb3e4..4405f580f16 100644
--- a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "安装依赖项时出错。{0}",
 	"MarketPlaceDisabled": "商店未启用",
 	"removeError": "删除扩展时出错: {0}。请重启 VS Code，然后重试。",
-	"Not Market place extension": "只能重新安装商店中的扩展",
+	"Not a Marketplace extension": "只能重新安装商店中的扩展",
 	"notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。",
 	"malicious extension": "无法安装此扩展，它被报告存在问题。",
 	"notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。",
 	"quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
 	"exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。",
 	"uninstallDependeciesConfirmation": "要仅卸载“{0}”或者其依赖项也一起卸载?",
-	"uninstallOnly": "仅",
-	"uninstallAll": "全部",
+	"uninstallOnly": "仅此扩展",
+	"uninstallAll": "全部卸载",
 	"uninstallConfirmation": "是否确定要卸载“{0}”?",
 	"ok": "确定",
 	"singleDependentError": "无法卸载扩展程序“{0}”。扩展程序“{1}”依赖于此。",
diff --git a/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json
index aed6a75a1f7..ee27fc55d23 100644
--- a/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/chs/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "无法分析 \"engines.vscode\" 值 {0}。例如请使用: ^0.10.0、^1.2.3、^0.11.0、^0.10.x 等。",
+	"versionSyntax": "无法解析 \"engines.vscode\" 的值 {0}。请改为如 ^1.22.0, ^1.22.x 等。",
 	"versionSpecificity1": "\"engines.vscode\" ({0}) 中指定的版本不够具体。对于 1.0.0 之前的 vscode 版本，请至少定义主要和次要想要的版本。例如: ^0.10.0、0.10.x、0.11.0 等。",
 	"versionSpecificity2": "\"engines.vscode\" ({0}) 中指定的版本不够具体。对于 1.0.0 之后的 vscode 版本，请至少定义主要想要的版本。例如: ^1.10.0、1.10.x、1.x.x、2.x.x 等。",
 	"versionMismatch": "扩展与 Code {0} 不兼容。扩展需要: {1}。"
diff --git a/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 8d2d09183ec..ab22eb3b5eb 100644
--- a/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "{0} 安装似乎损坏。请重新安装。",
 	"integrity.moreInformation": "详细信息",
-	"integrity.dontShowAgain": "不再显示",
-	"integrity.prompt": "{0} 安装似乎损坏。请重新安装。"
+	"integrity.dontShowAgain": "不再显示"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json
index 5d2b8cde0c8..6e606ef5354 100644
--- a/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ b/i18n/chs/src/vs/platform/issue/electron-main/issueService.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"issueReporter": "问题报告程序"
+	"issueReporter": "问题报告程序",
+	"processExplorer": "进程管理器"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
index 9131b6edaea..eaaf335f684 100644
--- a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json
@@ -9,8 +9,9 @@
 	"workbenchConfigurationTitle": "工作台",
 	"multiSelectModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)",
 	"multiSelectModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)",
-	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“打开到侧边”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
+	"multiSelectModifier": "在通过鼠标多选树和列表条目时使用的修改键 (例如资资源管理器、打开的编辑器和源代码管理视图)。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“在侧边打开”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。",
 	"openMode.singleClick": "在鼠标单击时打开项目。",
 	"openMode.doubleClick": "在鼠标双击时打开项目。",
-	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。"
+	"openModeModifier": "控制如何在受支持的树和列表中使用鼠标来打开项目。设置为 \"singleClick\" 可单击打开项目，\"doubleClick\" 仅可双击打开项目。对于树中含子节点的节点，此设置将控制使用单击还是双击来展开他们。注意，某些不适用此项的树或列表可能会忽略此设置。",
+	"horizontalScrolling setting": "控制工作台中的树控件是否支持水平滚动。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/markers/common/markers.i18n.json b/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..3112dd48a98
--- /dev/null
+++ b/i18n/chs/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "错误",
+	"sev.warning": "警告",
+	"sev.info": "信息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
index 598112affdf..c7001f8f909 100644
--- a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。",
 	"overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。",
 	"overviewRulerCommonContentForeground": "内联合并冲突中共同祖先区域的概览标尺前景色。",
-	"overviewRulerFindMatchForeground": "概述查找匹配项的标尺标记颜色。",
-	"overviewRulerSelectionHighlightForeground": "概述选择突出显示的标尺标记颜色。"
+	"overviewRulerFindMatchForeground": "概览标尺中查找匹配项的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。",
+	"overviewRulerSelectionHighlightForeground": "概览标尺中选择高亮的标记颜色。颜色必须透明，使其不会挡住下方的其他元素。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..962583508c2
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "属性“{0}”是必要属性，其类型必须是 \"string\"",
+	"showViewlet": "显示 {0}",
+	"view": "查看"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index a34d566c750..e6fa52bd0f9 100644
--- a/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/chs/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "向编辑器提供视图",
 	"views.explorer": "资源管理器视图",
 	"views.debug": "调试视图",
-	"locationId.invalid": "“{0}”为无效视图位置",
 	"duplicateView1": "无法在位置“{1}”注册多个 ID 同为“{0}”的视图。",
 	"duplicateView2": "ID 为“{0}”的视图在位置“{1}”已被注册"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index f32f968237d..7481ffd0270 100644
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "在 {0}ms 后终止了保存时进行的格式设置",
+	"timeout.onWillSave": "在 1750ms 后终止了 onWillSaveTextDocument 事件",
 	"saveParticipants": "正在运行保存参与程序..."
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index de275d5e951..a9a4a765557 100644
--- a/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"webview.editor.label": "webview 编辑器"
+	"errorMessage": "还原视图时出错: {0}"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..07256b420b4
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (扩展)"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 1a0a450a870..d88886a3538 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "聚焦于下一个组",
 	"openToSide": "打开到侧边",
 	"closeEditor": "关闭编辑器",
+	"closeOneEditor": "关闭",
 	"revertAndCloseActiveEditor": "还原并关闭编辑器",
 	"closeEditorsToTheLeft": "关闭左侧编辑器",
 	"closeAllEditors": "关闭所有编辑器",
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 4e5c5c77028..885d0713a18 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,7 @@
 	"screenReaderDetectedExtra": "如果你没有使用屏幕阅读器，请将设置中的“editor.accessibilitySupport”改为“off”。",
 	"disableTabMode": "禁用辅助功能模式",
 	"gotoLine": "转到行",
-	"indentation": "缩进",
+	"selectIndentation": "选择缩进",
 	"selectEncoding": "选择编码",
 	"selectEOL": "选择行尾序列",
 	"selectLanguageMode": "选择语言模式",
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 4962fa0f678..041d404a5fb 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,11 @@
 	"sizeMB": "{0} MB",
 	"sizeGB": "{0} GB",
 	"sizeTB": "{0} TB",
-	"largeImageError": "图像文件太大 (>1 MB)，无法在编辑器中显示。",
+	"largeImageError": "图片太大，无法在编辑器中显示 ({0})。 ",
 	"resourceOpenExternalButton": "使用外部程序打开图片？",
-	"nativeBinaryError": "因为此文件是二进制文件，或文件过大，或使用了不受支持的文本编码，将不会在编辑器中显示。",
+	"nativeFileTooLargeError": "文件太大，无法在编辑器中显示 ({0})。",
+	"nativeBinaryError": "此文件是二进制文件或使用了不支持的文本编码，无法在编辑器中显示。",
+	"openAsText": "是否仍要打开?",
 	"zoom.action.fit.label": "整个图像",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 6d4f38ad836..928aff21e49 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "关闭",
 	"araLabelEditorActions": "编辑器操作"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 5a636ad8868..de6818efc1d 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "没有新通知",
 	"notifications": "通知",
 	"notificationsToolbar": "通知中心操作",
 	"notificationsList": "通知列表"
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..47373efa523
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInput.countSelected": "已选 {0} 项",
+	"ok": "确定"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..a968ba2efad
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInputBox.ariaLabel": "在此输入可缩小结果范围。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
index 55cd77d54ee..c8466983eb9 100644
--- a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json
@@ -32,6 +32,7 @@
 	"openRecent": "打开最近的文件…",
 	"quickOpenRecent": "快速打开最近的文件…",
 	"reportIssueInEnglish": "使用英文报告问题",
+	"openProcessExplorer": "打开进程管理器",
 	"reportPerformanceIssue": "报告性能问题",
 	"keybindingsReference": "键盘快捷方式参考",
 	"openDocumentationUrl": "文档",
diff --git a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 7644ead4a4b..9a315eae3a8 100644
--- a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "窗口",
 	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
 	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-	"window.openFilesInNewWindow.default": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非通过平台或从查找程序(仅限 macOS)打开",
-	"openFilesInNewWindow": "控制是否应在新窗口中打开文件。\n- default: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非该文件通过平台或从查找程序(仅限 macOS)打开\n- on: 文件将在新窗口中打开\n- off: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开\n注意，可能仍会存在忽略此设置的情况(例如当使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"window.openFilesInNewWindow.defaultMac": "在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开",
+	"window.openFilesInNewWindow.default": "除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开",
+	"openFilesInNewWindowMac": "控制是否在新窗口中打开文件。\n- default: 在不通过“程序坞”(Dock) 或“访达”(Finder) 打开的情况下，文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"openFilesInNewWindow": "控制是否在新窗口中打开文件。\n- default: 除了从软件内部选择的文件 (如，从“文件”菜单选择)，其他所有文件都将在新窗口中打开\n- on: 文件将在新窗口中打开\n- off: 文件将在其所在文件夹的已有窗口中打开，或在上一个活动窗口中打开\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
 	"window.openFoldersInNewWindow.on": "文件夹将在新窗口中打开",
 	"window.openFoldersInNewWindow.off": "文件夹将替换上一个活动窗口",
 	"window.openFoldersInNewWindow.default": "文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
 	"openFoldersInNewWindow": "控制文件夹应在新窗口中打开还是替换上一活动窗口。\n- default: 文件夹将在新窗口中打开，除非文件是从应用程序内选取的(例如通过“文件”菜单)\n- on: 文件夹将在新窗口中打开\n- off: 文件夹将替换上一活动窗口\n注意，可能仍会存在忽略此设置的情况(例如当使用 -new-window 或 -reuse-window 命令行选项时)。",
+	"window.openWithoutArgumentsInNewWindow.on": "打开一个新的空窗口",
+	"window.openWithoutArgumentsInNewWindow.off": "聚焦于最后活动的运行实例",
+	"openWithoutArgumentsInNewWindow": "控制在另一实例无参启动时打开新的空窗口或是聚焦到最后运行的实例\n- on: 打开新的空窗口\n- off: 最后活动的运行实例将获得焦点\n注意，此设置可能会被忽略 (例如，在使用 -new-window 或 -reuse-window 命令行选项时)。",
 	"window.reopenFolders.all": "重新打开所有窗口。",
 	"window.reopenFolders.folders": "重新打开所有文件夹。空工作区将不会被恢复。",
 	"window.reopenFolders.one": "重新打开上一个活动窗口。",
@@ -58,7 +63,7 @@
 	"restoreWindows": "控制重启后重新打开窗口的方式。选择 \"none\" 则永远在启动时打开一个空工作区，\"one\" 则重新打开最后使用的窗口，\"folders\" 则重新打开所有含有文件夹的窗口，\"all\" 则重新打开上次会话的所有窗口。",
 	"restoreFullscreen": "如果窗口已退出全屏模式，控制其是否应还原为全屏模式。",
 	"zoomLevel": "调整窗口的缩放级别。原始大小是 0，每次递增(例如 1)或递减(例如 -1)表示放大或缩小 20%。也可以输入小数以便以更精细的粒度调整缩放级别。",
-	"title": "根据活动编辑器控制窗口标题。变量基于上下文进行替换:\n${activeEditorShort}: 文件名 (如 myFile.txt)\n${activeEditorMedium}: 相对于工作区文件夹的文件路径 (如 myFolder/myFile.txt)\n${activeEditorLong}: 文件的完整路径 (如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 文件所在工作区文件夹名称 (如 myFolder)\n${folderPath}: 文件所在工作区文件夹路径 (如 /Users/Development/myFolder)\n${rootName}: 工作区名称 (如 myFolder 或 myWorkspace)\n${rootPath}: 工作区路径 (如 /Users/Development/myWorkspace)\n${appName}: 如 VS Code\n${dirty}: 活动编辑器有更新时显示的更新指示器\n${separator}: 仅在被有值变量包围时显示的分隔符 (\" - \")",
+	"title": "根据活动编辑器控制窗口标题。变量基于上下文进行替换:\n${activeEditorShort}: 文件名 (如 myFile.txt)\n${activeEditorMedium}: 相对于工作区文件夹的文件路径 (如 myFolder/myFile.txt)\n${activeEditorLong}: 文件的完整路径 (如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 文件所在工作区文件夹名称 (如 myFolder)\n${folderPath}: 文件所在工作区文件夹路径 (如 /Users/Development/myFolder)\n${rootName}: 工作区名称 (如 myFolder 或 myWorkspace)\n${rootPath}: 工作区路径 (如 /Users/Development/myWorkspace)\n${appName}: 如 VS Code\n${dirty}: 活动编辑器有更新时显示的更新指示器\n${separator}: 仅在被有值变量或静态文本包围时显示的分隔符 (\" - \")",
 	"window.newWindowDimensions.default": "在屏幕中心打开新窗口。",
 	"window.newWindowDimensions.inherit": "以与上一个活动窗口相同的尺寸打开新窗口。",
 	"window.newWindowDimensions.maximized": "打开最大化的新窗口。",
@@ -74,6 +79,8 @@
 	"autoDetectHighContrast": "如果已启用，将自动更改为高对比度主题；如果 Windows 正在使用高对比度主题，则当离开 Windows 高对比度主题时会更改为深色主题。",
 	"titleBarStyle": "调整窗口标题栏的外观。更改需要在完全重启后才能应用。",
 	"window.nativeTabs": "\n启用macOS Sierra窗口选项卡。请注意，更改需要完全重新启动程序才能生效。如果配置此选项，本机选项卡将禁用自定义标题栏样式。",
+	"window.smoothScrollingWorkaround": "启用解决方案来修复还原最小化的 VS Code 窗口后平滑滚动消失的问题。这个滚动的卡顿问题出现在拥有精确式触控板的设备上，比如来自 Microsoft 的 Surface 设备(https://github.com/Microsoft/vscode/issues/13612)。如果启用这个解决方案，窗口布局可能会在从最小化状态中还原后有些许闪烁，其他方面则无大碍。",
+	"window.clickThroughInactive": "启用后，点击非活动窗口后将在激活窗口的同时触发光标之下的元素 (若可点击)。禁用后，点击非活动窗口仅能激活窗口，再次点击才能触发元素。",
 	"zenModeConfigurationTitle": "Zen 模式",
 	"zenMode.fullScreen": "控制打开 Zen Mode 是否也会将工作台置于全屏模式。",
 	"zenMode.centerLayout": "控制是否在 Zen 模式中启用居中布局",
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
index dc3cfbfb4b8..e5e6d7d0f1c 100644
--- a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json
@@ -18,9 +18,9 @@
 	"configuredOn": "编辑器被配置为对屏幕阅读器的使用进行永久优化 — 你可以编辑设置中的“editor.accessibilitySupport”以改变此行为。",
 	"configuredOff": "编辑器被配置为不对屏幕阅读器的使用进行优化。",
 	"tabFocusModeOnMsg": "在当前编辑器中按 Tab 会将焦点移动到下一个可聚焦的元素。按 {0} 来切换此行为。",
-	"tabFocusModeOnMsgNoKb": "在当前编辑器中按 Tab 会将焦点移动到下一个可聚焦的元素。当前无法通过键绑定触发命令 {0}。",
+	"tabFocusModeOnMsgNoKb": "若在当前编辑器中按 Tab 键，将移动焦点到下一个可聚焦的元素。当前无法通过按键绑定触发命令 {0}。",
 	"tabFocusModeOffMsg": "在当前编辑器中按 Tab 将插入制表符。按 {0} 来切换此行为。",
-	"tabFocusModeOffMsgNoKb": "在当前编辑器中按 Tab 会插入制表符。当前无法通过键绑定触发命令 {0}。",
+	"tabFocusModeOffMsgNoKb": "若在当前编辑器中按 Tab 键，将插入制表符。当前无法通过按键绑定触发命令 {0}。",
 	"openDocMac": "按 Command+H 以打开浏览器窗口，其中包含更多有关 VS Code 辅助功能的信息。",
 	"openDocWinLinux": "按 Ctrl+H 以打开浏览器窗口，其中包含更多有关 VS Code 辅助功能的信息。",
 	"outroMsg": "你可以按 Esc 或 Shift+Esc 消除此工具提示并返回到编辑器。",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 1ea6ff1c848..ab823eb2338 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "编辑断点...",
+	"breakpoint": "断点",
 	"functionBreakpointsNotSupported": "此调试类型不支持函数断点",
 	"functionBreakpointPlaceholder": "要断开的函数",
 	"functionBreakPointInputAriaLabel": "键入函数断点",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "未验证的断点",
 	"functionBreakpointUnsupported": "不受此调试类型支持的函数断点",
 	"breakpointDirtydHover": "未验证的断点。对文件进行了修改，请重启调试会话。",
+	"logBreakpointUnsupported": "不受此调试类型支持的记录点",
 	"conditionalBreakpointUnsupported": "不受此调试类型支持的条件断点",
 	"hitBreakpointUnsupported": "命中不受此调试类型支持的条件断点"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 02039decac5..13779c68478 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "重新启动框架",
 	"removeBreakpoint": "删除断点",
 	"removeAllBreakpoints": "删除所有断点",
-	"enableBreakpoint": "启用断点",
-	"disableBreakpoint": "禁用断点",
 	"enableAllBreakpoints": "启用所有断点",
 	"disableAllBreakpoints": "禁用所有断点",
 	"activateBreakpoints": "激活断点",
 	"deactivateBreakpoints": "停用断点",
 	"reapplyAllBreakpoints": "重新应用所有断点",
 	"addFunctionBreakpoint": "添加函数断点",
-	"addConditionalBreakpoint": "添加条件断点...",
-	"editConditionalBreakpoint": "编辑断点...",
 	"setValue": "设置值",
 	"addWatchExpression": "添加表达式",
 	"editWatchExpression": "编辑表达式",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 7d2c3c69973..0502fc22efb 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "调试: 切换断点",
 	"conditionalBreakpointEditorAction": "调试: 添加条件断点...",
+	"logPointEditorAction": "调试: 添加记录点...",
 	"runToCursor": "运行到光标处",
 	"debugEvaluate": "调试: 求值",
 	"debugAddToWatch": "调试: 添加到监视",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
index 49488144659..710d5957387 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/linkDetector.i18n.json
@@ -6,6 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"fileLinkMac": "点击以跟进(Cmd + 点击打开到侧边)",
-	"fileLink": "点击以跟进(Ctrl + 点击打开到侧边))"
+	"fileLinkMac": "单击打开 (按住 Cmd 键并单击在侧边打开)",
+	"fileLink": "单击打开 (按住 Ctrl 键并单击在侧边打开)"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..b5164359e2a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "断点命中时记录的消息。{} 内的表达式将被替换。“Enter”键确认，“Esc”键取消。",
+	"breakpointWidgetHitCountPlaceholder": "在满足命中次数条件时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
+	"breakpointWidgetExpressionPlaceholder": "在表达式计算结果为 true 时中断。按 \"Enter\" 表示接受，\"Esc\" 表示取消。",
+	"expression": "表达式",
+	"hitCount": "命中次数",
+	"logMessage": "记录消息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index f853c73cc83..9c53ac4e9d4 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -27,5 +27,6 @@
 	"onFirstSessionStart": "仅于第一次启动调试后在状态栏中显示调试",
 	"showInStatusBar": "控制何时显示调试状态栏",
 	"openDebug": "控制是否在调试会话开始时打开调试视图。",
-	"launch": "全局的调试启动配置。应用作跨工作区共享的 \"launch.json\" 的替代。"
+	"launch": "全局的调试启动配置。应用作跨工作区共享的 \"launch.json\" 的替代。",
+	"extensionHostDebugAdapter": "在扩展主机中运行调试适配器"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index be1deb32604..63d4c153cfe 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,7 @@
 	"useUniqueNames": "配置名称必须唯一。",
 	"app.launch.json.compound.folder": "复合项所在的文件夹的名称。",
 	"app.launch.json.compounds.configurations": "将作为此复合的一部分启动的配置名称。",
-	"debugNoType": "不可省略调试适配器“类型”，其类型必须是“字符串”。",
+	"debugNoType": "不可省略调试器的 \"type\" 属性，且其类型必须是 \"string\" 。",
 	"selectDebug": "选择环境",
 	"DebugConfig.failed": "无法在 \".vscode\" 文件夹({0})内创建 \"launch.json\" 文件。",
 	"workspace": "工作区",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 62dad9c4bce..d32e1d3481b 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "断点",
 	"removeBreakpoints": "删除断点",
 	"removeBreakpointOnColumn": "在列 {0} 上删除断点",
 	"removeLineBreakpoint": "删除行断点",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "在列 {0} 上启用断点",
 	"enableBreakpointOnLine": "启用行断点",
 	"addBreakpoint": "添加断点",
+	"addConditionalBreakpoint": "添加条件断点...",
+	"addLogPoint": "添加记录点...",
+	"cancel": "取消",
 	"addConfiguration": "添加配置..."
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 5b3c6a5614e..d713b18f9f7 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "显示错误",
 	"noFolderWorkspaceDebugError": "无法调试活动文件。请确保它保存在磁盘上，并确保已为该文件类型安装了调试扩展。",
 	"cancel": "取消",
-	"DebugTaskNotFound": "找不到 preLaunchTask“{0}”。",
-	"taskNotTracked": "无法跟踪 preLaunchTask “{0}”。"
+	"DebugTaskNotFound": "找不到任务“{0}”。",
+	"taskNotTracked": "无法跟踪任务“{0}”。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 8f802a6783e..3a56b23d721 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "详细信息",
-	"unableToLaunchDebugAdapter": "无法从“{0}”启动调试适配器。",
-	"unableToLaunchDebugAdapterNoArgs": "无法启动调试适配器。",
-	"stoppingDebugAdapter": "{0}。正在停止调试适配器。",
 	"debugAdapterCrash": "调试适配器进程已意外终止"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index c5cb1601362..cd5c87160d6 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "调试适配器可执行的“{0}”不存在。",
 	"debugAdapterCannotDetermineExecutable": "无法确定调试适配器“{0}”的可执行文件。",
-	"launch.config.comment1": "使用 IntelliSense 了解相关属性。 ",
-	"launch.config.comment2": "悬停以查看现有属性的描述。",
-	"launch.config.comment3": "欲了解更多信息，请访问: {0}",
-	"debugType": "配置类型。",
-	"debugTypeNotRecognised": "无法识别此调试类型。确保已经安装并启用相应的调试扩展。",
-	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将 \"protocol\" 属性设为 \"inspector\"。",
-	"debugName": "配置名称；在启动配置下拉菜单中显示。",
-	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
-	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
-	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
-	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
-	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
-	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
-	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。"
+	"unableToLaunchDebugAdapter": "无法从“{0}”启动调试适配器。",
+	"unableToLaunchDebugAdapterNoArgs": "无法启动调试适配器。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..d94c69e8e71
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "使用 IntelliSense 了解相关属性。 ",
+	"launch.config.comment2": "悬停以查看现有属性的描述。",
+	"launch.config.comment3": "欲了解更多信息，请访问: {0}",
+	"debugType": "配置类型。",
+	"debugTypeNotRecognised": "无法识别此调试类型。确保已经安装并启用相应的调试扩展。",
+	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将 \"protocol\" 属性设为 \"inspector\"。",
+	"debugName": "配置名称；在启动配置下拉菜单中显示。",
+	"debugRequest": "请求配置类型。可以是“启动”或“附加”。",
+	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
+	"debugPrelaunchTask": "调试会话开始前要运行的任务。",
+	"debugPostDebugTask": "调试会话结束后运行的任务。",
+	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
+	"debugOSXConfiguration": "特定于 OS X 的启动配置属性。",
+	"debugLinuxConfiguration": "特定于 Linux 的启动配置属性。",
+	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..87183ec39c7
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code 控制台",
+	"mac.terminal.script.failed": "脚本“{0}”失败，退出代码为 {1}",
+	"mac.terminal.type.not.supported": "不支持“{0}”",
+	"press.any.key": "按任意键继续...",
+	"linux.term.failed": "“{0}”失败，退出代码为 {1}"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 383bbbf1ba0..2a4e9d7f43f 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "配置建议的扩展(工作区文件夹)",
 	"malicious tooltip": "此扩展被报告存在问题。",
 	"malicious": "恶意扩展",
+	"disabled": "已禁用",
+	"disabled globally": "已禁用",
+	"disabled workspace": "已在此工作区禁用",
 	"disableAll": "禁用所有已安装的扩展",
 	"disableAllWorkspace": "禁用此工作区的所有已安装的扩展",
 	"enableAll": "启用所有扩展",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..9b363a90786
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "扩展名",
+	"extension id": "扩展标识符",
+	"preview": "预览版",
+	"builtin": "内置",
+	"publisher": "发布服务器名称",
+	"install count": "安装计数",
+	"rating": "评级",
+	"repository": "存储库",
+	"license": "许可证",
+	"details": "详细信息",
+	"contributions": "发布内容",
+	"changelog": "更改日志",
+	"dependencies": "依赖项",
+	"noReadme": "无可用自述文件。",
+	"noChangelog": "无可用的更改日志。",
+	"noContributions": "没有发布内容",
+	"noDependencies": "没有依赖项",
+	"settings": "设置({0})",
+	"setting name": "名称",
+	"description": "描述",
+	"default": "默认",
+	"debuggers": "调试程序({0})",
+	"debugger name": "名称",
+	"debugger type": "类型",
+	"views": "视图 ({0})",
+	"view id": "ID",
+	"view name": "名称",
+	"view location": "位置",
+	"localizations": "本地化 ({0})",
+	"localizations language id": "语言 ID",
+	"localizations language name": "语言名称",
+	"localizations localized language name": "语言本地名称",
+	"colorThemes": "颜色主题 ({0})",
+	"iconThemes": "图标主题 ({0})",
+	"colors": "颜色 ({0})",
+	"colorId": "ID",
+	"defaultDark": "深色默认",
+	"defaultLight": "浅色默认",
+	"defaultHC": "高对比度默认",
+	"JSON Validation": "JSON 验证({0})",
+	"fileMatch": "匹配文件",
+	"schema": "结构",
+	"commands": "命令({0})",
+	"command name": "名称",
+	"keyboard shortcuts": "键盘快捷方式",
+	"menuContexts": "菜单上下文",
+	"languages": "语言({0})",
+	"language id": "ID",
+	"language name": "名称",
+	"file extensions": "文件扩展名",
+	"grammar": "语法",
+	"snippets": "代码片段"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 35b4eb3a0e8..4cf0194eb30 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -7,7 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"neverShowAgain": "不再显示",
-	"searchMarketplace": "搜索应用商店",
+	"searchMarketplace": "搜索商店",
 	"showLanguagePackExtensions": "商店中有可以将 VS Code 本地化为“{0}”语言的扩展。",
 	"dynamicWorkspaceRecommendation": "您可能会对这个扩展感兴趣，它在 {0} 存储库的用户间流行。",
 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
 	"reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。",
 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
-	"showRecommendations": "显示建议",
 	"install": "安装",
+	"showRecommendations": "显示建议",
 	"showLanguageExtensions": "商店中有可以对 \".{0}\" 文件提供帮助的扩展。",
 	"workspaceRecommended": "此工作区具有扩展建议。",
 	"installAll": "全部安装",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 60280263286..7b7f8b2905f 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -6,9 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"disableOtherKeymapsConfirmation": "禁用其他键映射 ({0}) 以避免键绑定之间的冲突？",
+	"disableOtherKeymapsConfirmation": "是否禁用其他按键映射扩展 ({0})，从而避免按键绑定之间的冲突？",
 	"yes": "是",
-	"no": "否",
-	"betterMergeDisabled": "现已内置 Better Merge 扩展。此扩展已被安装并禁用，且能被卸载。",
-	"uninstall": "卸载"
+	"no": "否"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 186eff5c175..64a4ac691b3 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "推荐",
 	"otherRecommendedExtensions": "其他推荐",
 	"workspaceRecommendedExtensions": "工作区推荐",
-	"builtInExtensions": "内置",
+	"builtInExtensions": "功能",
+	"builtInThemesExtensions": "主题",
+	"builtInBasicsExtensions": "编程语言",
 	"searchExtensions": "在商店中搜索扩展",
 	"sort by installs": "排序依据: 安装计数",
 	"sort by rating": "排序依据: 分级",
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index 0eaa7947445..97c7ad980da 100644
--- a/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "文本文件编辑器",
 	"createFile": "创建文件",
+	"relaunchWithIncreasedMemoryLimit": "以 {0} MB 重启",
+	"configureMemoryLimit": "配置内存限制",
 	"fileEditorWithInputAriaLabel": "{0}。文本文件编辑器。",
 	"fileEditorAriaLabel": "文本文件编辑器。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index a7491087b48..f82464e4491 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -17,7 +17,7 @@
 	"compareActiveWithSaved": "比较活动与已保存的文件",
 	"closeEditor": "关闭编辑器",
 	"view": "查看",
-	"openToSide": "打开到侧边",
+	"openToSide": "在侧边打开",
 	"revealInWindows": "在资源管理器中显示",
 	"revealInMac": "在 Finder 中显示",
 	"openContainer": "打开所在的文件夹",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index b5a25dbf287..e836660825f 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,11 @@
 	"confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?",
 	"confirmDeleteMessageFile": "是否确定要永久删除“{0}”?",
 	"irreversible": "此操作不可逆!",
-	"cancel": "取消",
-	"permDelete": "永久删除",
-	"importFiles": "导入文件",
+	"binFailed": "无法删除到回收站。是否永久删除？",
+	"trashFailed": "无法删除到废纸篓。是否永久删除？",
+	"deletePermanentlyButtonLabel": "永久删除(&&D)",
+	"retryButtonLabel": "重试(&&R)",
+	"addFiles": "添加文件",
 	"confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?",
 	"replaceButtonLabel": "替换(&&R)",
 	"fileIsAncestor": "粘贴的项目是目标文件夹的上级",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 341096873d5..b5dc3e0f2f8 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -30,13 +30,15 @@
 	"autoSaveDelay": "控制在多少毫秒后自动保存更改过的文件。仅在“files.autoSave”设置为“{0}”时适用。",
 	"watcherExclude": "配置文件路径的 glob 模式以从文件监视排除。模式必须在绝对路径上匹配(例如 ** 前缀或完整路径需正确匹配)。更改此设置需要重启。如果在启动时遇到 Code 消耗大量 CPU 时间，则可以排除大型文件夹以减少初始加载。",
 	"hotExit.off": "禁用热退出。",
-	"hotExit.onExit": "应用程序关闭时将触发热退出。在 Windows/Linux 上关闭最后一个窗口或触发 workbench.action.quit 命令（命令托盘、键绑定、菜单）会引起应用程序关闭。下次启动时将还原所有已备份的窗口。",
-	"hotExit.onExitAndWindowClose": "应用程序关闭时将触发热退出。在 Windows/Linux 上关闭最后一个窗口、触发 workbench.action.quit 命令（命令托盘、键绑定、菜单）会引起应用程序关闭。对于任何有文件夹打开的窗口，则不论该窗口是否是最后一个窗口。下次启动时将还原所有未打开文件夹的窗口。若要还原打开有文件夹的窗口，请将“window.restoreWindows”设置为“all”。",
+	"hotExit.onExit": "应用程序关闭时将自动保留未保存内容 (热退出)。关闭的定义为，在 Windows/Linux 上关闭最后一个窗口或者在全平台触发 workbench.action.quit 命令 (命令托盘、键绑定、菜单)。下次启动时将还原所有已备份的窗口。",
+	"hotExit.onExitAndWindowClose": "应用程序关闭时将自动保留未保存内容 (热退出)。关闭的定义为，在 Windows/Linux 上关闭最后一个窗口，在全平台触发 workbench.action.quit 命令 (命令托盘、键绑定、菜单)，对于任何打开有文件夹的窗口，则不论该窗口是否是最后一个窗口。下次启动时将还原所有未打开文件夹的窗口。若要还原打开有文件夹的窗口，请将“window.restoreWindows”设置为“all”。",
 	"hotExit": "控制是否在会话间记住未保存的文件，以允许在退出编辑器时跳过保存提示。",
 	"useExperimentalFileWatcher": "使用新的试验文件观察程序。",
 	"defaultLanguage": "分配给新文件的默认语言模式。",
+	"maxMemoryForLargeFilesMB": "在打开大型文件时，控制 VS Code 可在重启后使用的内存。在命令行中指定“--max-memory=新的大小”参数可达到相同效果。",
 	"editorConfigurationTitle": "编辑器",
 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
+	"formatOnSaveTimeout": "在保存时格式化操作的超时时间。为 formatOnSave 命令指定时间限制 (单位: 毫秒)。运行超过设定时间的命令将被取消。",
 	"explorerConfigurationTitle": "文件资源管理器",
 	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index a9f0a0ac95a..805d10ae124 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "键入文件名。按 Enter 以确认或按 Esc 以取消。",
-	"constructedPath": "在 **{1}** 创建{0}",
 	"filesExplorerViewerAriaLabel": "{0}，文件资源管理器",
 	"dropFolders": "你是否要将文件夹添加到工作区?",
 	"dropFolder": "你是否要将文件夹添加到工作区?",
 	"addFolders": "添加文件夹(&&A)",
 	"addFolder": "添加文件夹(&&A)",
+	"confirmRootsMove": "是否确定要更改工作区中多个根文件夹的顺序?",
 	"confirmMultiMove": "是否确定要移动以下 {0} 个文件?",
+	"confirmRootMove": "是否确定要更改工作区中根文件夹“{0}”的顺序?",
 	"confirmMove": "是否确实要移动“{0}”?",
 	"doNotAskAgain": "不再询问",
 	"moveButtonLabel": "移动(&&M)",
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..f094961018a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "HTML 预览"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..3cbb0b9c0cb
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "编辑器输入无效。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4602f031212
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "开发者"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..bad27cc286a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "打开 Webview 开发工具",
+	"refreshWebviewLabel": "重新加载 Webview"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 42ca809e58b..3654ab60cb3 100644
--- a/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,7 +6,11 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"JsonSchema.locale": "要使用的 UI 语言。",
+	"updateLocale": "是否将 VS Code 的界面语言更换为 {0} 并重新启动?",
+	"yes": "是",
+	"no": "否",
+	"neverAgain": "不再显示",
+	"JsonSchema.locale": "使用的界面语言。",
 	"vscode.extension.contributes.localizations": "向编辑器提供本地化内容",
 	"vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。",
 	"vscode.extension.contributes.localizations.languageName": "语言的英文名称。",
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..04a7e7edc85
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "复制",
+	"copyMessage": "复制消息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..f53a9ecd185
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "总计 {0} 个问题"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..f4c0a38ab65
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "问题",
+	"tooltip.1": "此文件存在 1 个问题",
+	"tooltip.N": "此文件存在 {0} 个问题",
+	"markers.showOnFile": "显示关于文件与文件夹的错误与警告。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..1a1f6eea1b6
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"disableFilesExclude": "禁用文件排除。",
+	"clearFilter": "清除筛选。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..30ef269d07d
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"showing filtered problems": "显示 {0} / {1}"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..86939d328ca
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,48 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "查看",
+	"problems.view.toggle.label": "切换问题 (错误、警告、信息) 视图",
+	"problems.view.focus.label": "聚焦于问题 (错误、警告、信息) 视图",
+	"problems.panel.configuration.title": "问题预览",
+	"problems.panel.configuration.autoreveal": "控制问题预览是否应在打开文件时自动显示它们。",
+	"markers.panel.title.problems": "问题",
+	"markers.panel.aria.label.problems.tree": "按文件分组的问题",
+	"markers.panel.no.problems.build": "目前尚未在工作区检测到问题。",
+	"markers.panel.no.problems.filters": "在给定的筛选条件下，没有找到结果。",
+	"markers.panel.no.problems.file.exclusions": "在启用排除筛选器的情况下，所有问题已隐藏。",
+	"markers.panel.action.useFilesExclude": "使用文件排除设置进行筛选",
+	"markers.panel.action.donotUseFilesExclude": "不使用文件排除设置",
+	"markers.panel.action.filter": "筛选器问题",
+	"markers.panel.filter.ariaLabel": "筛选器问题",
+	"markers.panel.filter.placeholder": "筛选。例: text, **/*.ts, !**/node_modules/**",
+	"markers.panel.filter.errors": "错误",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "信息",
+	"markers.panel.single.error.label": "1 个错误",
+	"markers.panel.multiple.errors.label": "{0} 个错误",
+	"markers.panel.single.warning.label": "1 条警告",
+	"markers.panel.multiple.warnings.label": "{0} 条警告",
+	"markers.panel.single.info.label": "1 条信息",
+	"markers.panel.multiple.infos.label": "{0} 条信息",
+	"markers.panel.single.unknown.label": "1 个未知",
+	"markers.panel.multiple.unknowns.label": "{0} 个未知",
+	"markers.panel.at.ln.col.number": "({0}，{1})",
+	"problems.tree.aria.label.resource": "含有 {1} 问题的 {0}",
+	"problems.tree.aria.label.marker.relatedInformation": "此问题包含对 {0} 个位置的引用。",
+	"problems.tree.aria.label.error.marker": "{0} 生成的错误: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.error.marker.nosource": "错误: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.warning.marker": "{0} 生成的警告: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "警告: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.info.marker": "{0} 生成的信息: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.info.marker.nosource": "信息: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.marker": "{0} 生成的问题: {2} 行 {3} 列，{1}。{4}",
+	"problems.tree.aria.label.marker.nosource": "问题: {1} 行 {2} 列，{0}。{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{3} 的 {1} 行 {2} 列，{0}",
+	"errors.warnings.show.label": "显示错误和警告"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index bd4378d469a..d1ae5895425 100644
--- a/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "切换输出",
 	"clearOutput": "清除输出",
 	"toggleOutputScrollLock": "切换输出 Scroll Lock",
-	"switchToOutput.label": "切换到输出"
+	"switchToOutput.label": "切换到输出",
+	"openInLogViewer": "打开日志文件"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 13510a5cdd7..3a4c87eda4f 100644
--- a/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "输出",
 	"logViewer": "日志查看器",
 	"viewCategory": "查看",
-	"clearOutput.label": "清除输出"
+	"clearOutput.label": "清除输出",
+	"openActiveLogOutputFile": "查看: 打开活动日志输出文件"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index c1ce0fdc7a2..03b2d9ae25a 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,33 +6,34 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "键盘快捷方式",
-	"SearchKeybindings.AriaLabel": "搜索键绑定",
-	"SearchKeybindings.Placeholder": "搜索键绑定",
+	"showDefaultKeybindings": "显示默认按键绑定",
+	"showUserKeybindings": "显示用户按键绑定",
+	"SearchKeybindings.AriaLabel": "搜索按键绑定",
+	"SearchKeybindings.Placeholder": "搜索按键绑定",
 	"sortByPrecedene": "按优先级排序",
 	"header-message": "高级自定义请打开和编辑",
 	"keybindings-file-name": "keybindings.json",
-	"keybindingsLabel": "键绑定",
-	"changeLabel": "更改键绑定",
-	"addLabel": "添加键绑定",
+	"keybindingsLabel": "按键绑定",
+	"changeLabel": "更改按键绑定",
+	"addLabel": "添加按键绑定",
 	"removeLabel": "删除键绑定",
-	"resetLabel": "重置键绑定",
-	"showSameKeybindings": "显示相同的键绑定",
+	"resetLabel": "重置按键绑定",
+	"showSameKeybindings": "显示相同的按键绑定",
 	"copyLabel": "复制",
 	"copyCommandLabel": "拷贝命令",
-	"error": "编辑键绑定时发生错误“{0}”。请打开 \"keybindings.json\" 文件并检查错误。",
+	"error": "编辑按键绑定时发生错误“{0}”。请打开 \"keybindings.json\" 文件并检查错误。",
 	"command": "命令",
-	"keybinding": "键绑定",
+	"keybinding": "按键绑定",
 	"source": "来源",
 	"when": "何时",
-	"editKeybindingLabelWithKey": "更改键绑定{0}",
+	"editKeybindingLabelWithKey": "更改按键绑定 {0}",
 	"editKeybindingLabel": "更改键绑定",
-	"addKeybindingLabelWithKey": "添加键绑定",
+	"addKeybindingLabelWithKey": "添加按键绑定 {0}",
 	"addKeybindingLabel": "添加键绑定",
 	"title": "{0} ({1})",
 	"commandAriaLabel": "命令为 {0}。",
-	"keybindingAriaLabel": "键绑定为 {0}。",
-	"noKeybinding": "未分配键绑定。",
+	"keybindingAriaLabel": "按键绑定为 {0}。",
+	"noKeybinding": "没有绑定按键。",
 	"sourceAriaLabel": "源为 {0}。",
 	"whenAriaLabel": "时间为 {0}。",
 	"noWhen": "没有时间上下文。"
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
index 0459db1c2d2..78e022fe03f 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"defineKeybinding.start": "定义键绑定",
+	"defineKeybinding.start": "定义按键绑定",
 	"defineKeybinding.kbLayoutErrorMessage": "在当前键盘布局下无法生成此组合键。",
 	"defineKeybinding.kbLayoutLocalAndUSMessage": "在你的键盘布局上为 **{0}**（美国标准布局上为 **{1}**）。",
 	"defineKeybinding.kbLayoutLocalMessage": "在你的键盘布局上为 **{0}**。"
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index 4195d289c28..630c1ad7278 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "打开默认设置原始文档",
+	"openSettings": "打开设置",
 	"openGlobalSettings": "打开用户设置",
 	"openGlobalKeybindings": "打开键盘快捷方式",
 	"openGlobalKeybindingsFile": "打开键盘快捷方式文件",
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index b8c1759906a..2a65e037066 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "默认设置",
 	"SearchSettingsWidget.AriaLabel": "搜索设置",
 	"SearchSettingsWidget.Placeholder": "搜索设置",
 	"noSettingsFound": "无结果",
@@ -16,6 +15,8 @@
 	"nlpResult": "自然语言结果",
 	"filterResult": "筛选结果",
 	"defaultSettings": "默认设置",
+	"defaultUserSettings": "默认用户设置",
+	"defaultWorkspaceSettings": "默认工作区设置",
 	"defaultFolderSettings": "默认文件夹设置",
 	"defaultEditorReadonly": "在右侧编辑器中编辑以覆盖默认值。",
 	"preferencesAriaLabel": "默认首选项。只读文本编辑器。"
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 31db168fde9..9fc53ead3b4 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "显示扩展“{0}”",
 	"editTtile": "编辑",
 	"replaceDefaultValue": "在设置中替换",
-	"copyDefaultValue": "复制到设置",
-	"unsupportedPHPExecutablePathSetting": "此设置必须是“用户设置”。若要为工作区配置 PHP，请打开 PHP 文件并单击状态栏中的“PHP 路径”。",
-	"unsupportedWorkspaceSetting": "此设置必须是“用户设置”。",
-	"unsupportedWorkbenchSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。",
-	"unsupportedWorkbenchSettingDevMode": "当前无法应用此设置。将你在注册时定义其作用域为 \"resource\"，或是直接打开此文件夹时应用。"
+	"copyDefaultValue": "复制到设置"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
index ef63a56a1b7..4afe48715b2 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.i18n.json
@@ -7,6 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"defaultPreferencesEditor": "默认首选项编辑器",
-	"keybindingsEditor": "键绑定编辑器",
+	"keybindingsEditor": "按键绑定编辑器",
 	"preferences": "首选项"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
index 3f7880867ff..295e4c52d56 100644
--- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.i18n.json
@@ -10,7 +10,7 @@
 	"gotoLineLabelEmptyWithLimit": "键入要导航到的介于 1 和 {0} 之间的行号",
 	"gotoLineLabelEmpty": "键入要导航到的行号",
 	"gotoLineColumnLabel": "转到行 {0} 和字符 {1}",
-	"gotoLineLabel": "转至行 {0}",
+	"gotoLineLabel": "转至第 {0} 行",
 	"gotoLineHandlerAriaLabel": "键入要导航到的行号。",
 	"cannotRunGotoLine": "首先打开文本文件以转到行"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 8c1111d5098..72a33d59853 100644
--- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "安装其他源代码管理提供程序...",
 	"no open repo": "没有活动的源代码管理提供程序。",
 	"source control": "源代码管理",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "隐藏"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 8f8fcaf653e..76dc7862437 100644
--- a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "显示上一个搜索排除模式",
 	"nextSearchTerm": "显示下一个搜索词",
 	"previousSearchTerm": "显示上一个搜索词",
-	"showSearchViewlet": "显示搜索",
 	"findInFiles": "在文件中查找",
 	"replaceInFiles": "在文件中替换",
 	"RefreshAction.label": "刷新",
diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index b45279594d3..a48247a7489 100644
--- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,15 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "搜索",
+	"copyMatchLabel": "复制",
+	"copyPathLabel": "复制路径",
+	"copyAllLabel": "全部复制",
+	"toggleSearchViewPositionLabel": "切换搜索视图位置",
 	"findInFolder": "在文件夹中查找...",
 	"findInWorkspace": "在工作区中查找...",
 	"showTriggerActions": "转到工作区中的符号...",
 	"name": "搜索",
-	"search": "搜索",
 	"showSearchViewl": "显示搜索",
 	"view": "查看",
 	"findInFiles": "在文件中查找",
@@ -26,5 +30,5 @@
 	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。",
 	"search.smartCase": "若搜索词全为小写，则不区分大小写进行搜索，否则区分大小写进行搜索",
 	"search.globalFindClipboard": "控制“搜索”视图是否读取或修改 macOS 的共享查找剪贴板",
-	"search.location": "预览: 控制搜索功能显示在侧边栏还是水平空间更大的面板区域。我们将在下个版本优化面板中搜索的水平布局，之后这将不再是一个预览功能。"
+	"search.location": "控制搜索功能显示在侧边栏还是水平空间更大的面板区域。我们将在下个版本中优化面板搜索的水平布局，此后，这将不再是一个预览功能。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index d5ec61330df..8f54754adc7 100644
--- a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "帮助我们改善对 {0} 的支持",
 	"takeShortSurvey": "参与小调查",
 	"remindLater": "稍后提醒",
-	"neverAgain": "不再显示",
-	"helpUs": "帮助我们改善对 {0} 的支持"
+	"neverAgain": "不再显示"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 79f86172895..5f305836c67 100644
--- a/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "您愿意参与一次简短的反馈调查吗？",
 	"takeSurvey": "参与调查",
 	"remindLater": "稍后提醒",
-	"neverAgain": "不再显示",
-	"surveyQuestion": "您愿意参与一次简短的反馈调查吗？"
+	"neverAgain": "不再显示"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index a87c2006c20..ba6cda60d7e 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "问题模式或者所提供或预定义问题模式的名称。如果已指定基准，则可以省略。",
 	"ProblemMatcherSchema.base": "要使用的基问题匹配程序的名称。",
 	"ProblemMatcherSchema.owner": "代码内问题的所有者。如果指定了基准，则可省略。如果省略，并且未指定基准，则默认值为“外部”。",
+	"ProblemMatcherSchema.source": "描述此诊断信息来源的人类可读字符串。如，\"typescript\" 或 \"super lint\"。",
 	"ProblemMatcherSchema.severity": "捕获问题的默认严重性。如果模式未定义严重性的匹配组，则使用。",
 	"ProblemMatcherSchema.applyTo": "控制文本文档上报告的问题是否仅应用于打开、关闭或所有文档。",
 	"ProblemMatcherSchema.fileLocation": "定义应如何解释问题模式中报告的文件名。",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index f4a7949ce43..bb8dcf133ba 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "将任务分配为没有组",
 	"JsonSchema.tasks.group": "定义此任务属于的执行组。它支持 \"build\" 以将其添加到生成组，也支持 \"test\" 以将其添加到测试组。",
 	"JsonSchema.tasks.type": "定义任务是被作为进程运行还是在 shell 中作为命令运行。",
+	"JsonSchema.command.quotedString.value": "实际命令值",
+	"JsonSchema.tasks.quoting.escape": "使用 Shell 的转义字符来转义文本 (如，PowerShell 下的 ` 和 bash 下的 \\ )",
+	"JsonSchema.tasks.quoting.strong": "使用 Shell 的强引用字符来引用参数 (如，在 PowerShell 和 bash 下的 \" )。",
+	"JsonSchema.tasks.quoting.weak": "使用 Shell 的弱引用字符来引用参数 (如，在 PowerShell 和 bash 下的 ' )。",
+	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
+	"JsonSchema.command": "要执行的命令。可以是外部程序或 shell 命令。",
+	"JsonSchema.args.quotedString.value": "实际参数值",
+	"JsonSchema.args.quotesString.quote": "如何引用参数值。",
+	"JsonSchema.tasks.args": "在调用此任务时传递给命令的参数。",
 	"JsonSchema.tasks.label": "任务的用户界面标签",
 	"JsonSchema.version": "配置的版本号。",
 	"JsonSchema.tasks.identifier": "用于在 launch.json 或 dependsOn 子句中引用任务的用户定义标识符。",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 9a6438ad8f5..41326098874 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "任务",
 	"ConfigureTaskRunnerAction.label": "配置任务",
+	"totalErrors": "{0} 个错误",
+	"totalWarnings": "{0} 条警告",
+	"totalInfos": "{0} 条信息",
 	"problems": "问题",
 	"building": "正在生成...",
-	"manyMarkers": "99+",
+	"manyProblems": "1万+",
 	"runningTasks": "显示运行中的任务",
 	"tasks": "任务",
 	"TaskSystem.noHotSwap": "在有活动任务运行时更换任务执行引擎需要重新加载窗口",
@@ -28,8 +31,10 @@
 	"selectProblemMatcher": "选择针对何种错误和警告扫描任务输出",
 	"customizeParseErrors": "当前任务配置存在错误。请先更正错误，再自定义任务。",
 	"moreThanOneBuildTask": "当前 tasks.json 中定义了多个生成任务。正在执行第一个。\n",
-	"TaskSystem.activeSame.background": "任务 \"{0}\" 已激活并处于后台模式。若要终止任务，请选择“任务”菜单中的“终止任务...”。",
-	"TaskSystem.activeSame.noBackground": "任务 \"{0}\" 已处于活动状态。若要终止任务，请选择“任务”菜单中的“终止任务...”。",
+	"TaskSystem.activeSame.background": "任务“{0}”已激活，并且处于后台模式。",
+	"TaskSystem.activeSame.noBackground": "任务“{0}”已处于活动状态。",
+	"terminateTask": "终止任务",
+	"restartTask": "重启任务",
 	"TaskSystem.active": "当前已有任务正在运行。请先终止它，然后再执行另一项任务。",
 	"TaskSystem.restartFailed": "未能终止并重启任务 {0}",
 	"TaskService.noConfiguration": "错误: {0} 任务检测没有提供拥有下列配置的任务:\n{1}\n将忽略此任务。\n",
diff --git a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index e9405d899ae..eff1b3e65f3 100644
--- a/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "警告: options.cwd 必须属于字符串类型。正在忽略值 {0}\n",
+	"ConfigurationParser.inValidArg": "错误: 命令参数必须是字符串或有效引用的字符串。提供的值为: {0}",
 	"ConfigurationParser.noargs": "错误: 命令参数必须是字符串数组。提供的值为:\n{0}",
 	"ConfigurationParser.noShell": "警告: 仅当在终端中执行任务时支持 shell 配置。",
 	"ConfigurationParser.noName": "错误: 声明范围内的问题匹配程序必须具有名称:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "错误: 任务配置“{0}”缺失必要属性“{1}”。将忽略该任务。",
 	"ConfigurationParser.notCustom": "错误: 任务未声明为自定义任务。将忽略配置。\n{0}\n",
 	"ConfigurationParser.noTaskName": "错误: 任务必须提供 label 属性。将忽略该任务。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 任务“{0}”是 shell 命令，而且其中一个参数可能含有未转义的空格。若要确保命令行引用正确，请将参数合并到该命令。",
 	"taskConfiguration.noCommandOrDependsOn": "错误：任务“{0}”既不指定命令，也不指定 dependsOn 属性。将忽略该任务。其定义为:\n{1}",
 	"taskConfiguration.noCommand": "错误: 任务“{0}”未定义命令。将忽略该任务。其定义为:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "任务版本 2.0.0 不支持全局操作系统特定任务。请将他们转换为含有操作系统特定命令的任务。受影响的任务有:\n{0}"
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..1c55c29463d
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "终端的背景颜色，允许终端的颜色与面板不同。",
+	"terminal.foreground": "终端的前景颜色。",
+	"terminalCursor.foreground": "终端光标的前景色。",
+	"terminalCursor.background": "终端光标的背景色。允许自定义被 block 光标遮住的字符的颜色。",
+	"terminal.selectionBackground": "终端选中内容的背景颜色。",
+	"terminal.border": "分隔终端中拆分窗格的边框的颜色。默认值为 panel.border 的颜色",
+	"terminal.ansiColor": "终端中的 ANSI 颜色“{0}”。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 89fbf231d71..e381f21cfa1 100644
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -21,6 +21,7 @@
 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
 	"workbench.action.terminal.newInActiveWorkspace": "新建集成终端 (活动工作区)",
 	"workbench.action.terminal.split": "拆分终端",
+	"workbench.action.terminal.splitInActiveWorkspace": "拆分终端 (活动工作区)",
 	"workbench.action.terminal.focusPreviousPane": "聚焦于上一个窗格",
 	"workbench.action.terminal.focusNextPane": "聚焦于下一个窗格",
 	"workbench.action.terminal.resizePaneLeft": "向左调整窗格大小",
@@ -43,6 +44,7 @@
 	"workbench.action.terminal.scrollUpPage": "向上滚动(页)",
 	"workbench.action.terminal.scrollToTop": "滚动到顶部",
 	"workbench.action.terminal.clear": "清除",
+	"workbench.action.terminal.clearSelection": "清除选定内容",
 	"workbench.action.terminal.allowWorkspaceShell": "允许配置工作区 Shell",
 	"workbench.action.terminal.disallowWorkspaceShell": "禁止配置工作区 Shell",
 	"workbench.action.terminal.rename": "重命名",
@@ -51,5 +53,9 @@
 	"workbench.action.terminal.hideFindWidget": "隐藏查找小组件",
 	"nextTerminalFindTerm": "显示下一个搜索结果",
 	"previousTerminalFindTerm": "显示上一个搜索结果",
-	"quickOpenTerm": "切换活动终端"
+	"quickOpenTerm": "切换活动终端",
+	"workbench.action.terminal.scrollToPreviousCommand": "滚动到上一条命令",
+	"workbench.action.terminal.scrollToNextCommand": "滚动到下一条命令",
+	"workbench.action.terminal.selectToPreviousCommand": "选择上一条命令所有内容",
+	"workbench.action.terminal.selectToNextCommand": "选择下一条命令所有内容"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 243d3f06aeb..074d8bdd681 100644
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "复制",
+	"split": "拆分",
 	"paste": "粘贴",
 	"selectAll": "全选",
-	"clear": "清除",
-	"split": "拆分"
+	"clear": "清除"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index a03f33d6630..226ce4dc16f 100644
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"terminal.integrated.chooseWindowsShellInfo": "可通过选择“自定义”按钮来更改默认的终端 shell。",
+	"terminal.integrated.chooseWindowsShellInfo": "你可以按下“自定义”按钮并更换默认终端 Shell。",
 	"customize": "自定义",
 	"never again": "不再显示",
 	"terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改",
diff --git a/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index 8b074252bc9..05f2427856b 100644
--- a/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "此工作区包含仅可在“用户设置”中配置的设置 ({0})。单击[这里]({1})了解更多信息。",
 	"openWorkspaceSettings": "打开工作区设置",
-	"dontShowAgain": "不再显示",
-	"unsupportedWorkspaceSettings": "此工作区包含仅可在“用户设置”中配置的设置 ({0})。单击[这里]({1})了解更多信息。"
+	"dontShowAgain": "不再显示"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..7f372029862
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "发行说明: {0}",
+	"unassigned": "未分配"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 9dda0b0a236..0020728737d 100644
--- a/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "稍后",
-	"unassigned": "未分配",
 	"releaseNotes": "发行说明",
 	"showReleaseNotes": "显示发行说明",
 	"read the release notes": "欢迎使用 {0} v{1}! 是否要阅读发布说明?",
@@ -17,13 +15,14 @@
 	"updateIsReady": "有新的 {0} 的更新可用。",
 	"noUpdatesAvailable": "当前没有可用的更新。",
 	"ok": "确定",
-	"download now": "立即下载",
 	"thereIsUpdateAvailable": "存在可用更新。",
+	"download now": "立即下载",
+	"later": "稍后",
+	"updateAvailable": "现有更新可用: {0} {1}",
 	"installUpdate": "安装更新",
-	"updateAvailable": "存在可用更新: {0} {1}",
 	"updateInstalling": "{0} {1} 正在后台安装，我们会在完成后通知您。",
+	"updateAvailableAfterRestart": "重新启动 {0} 即可应用最新更新。",
 	"updateNow": "立即更新",
-	"updateAvailableAfterRestart": "{0} 将在重启后更新。",
 	"commandPalette": "命令面板...",
 	"settings": "设置",
 	"keyboardShortcuts": "键盘快捷方式",
diff --git a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..2de51221fc9
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "webview 编辑器",
+	"developer": "开发者"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..bad27cc286a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "打开 Webview 开发工具",
+	"refreshWebviewLabel": "重新加载 Webview"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..4230b0cfc3a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择退出]({1})。",
+	"telemetryOptOut.optInNotice": "帮助改善 VS Code，允许 Microsoft 收集使用数据。请阅读我们的[隐私声明]({0})并了解如何[选择加入]({1})。",
+	"telemetryOptOut.readMore": "了解详细信息"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
index 0340660b904..3f4b053f902 100644
--- a/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
@@ -13,6 +13,7 @@
 	"welcomeOverlay.extensions": "管理扩展",
 	"welcomeOverlay.problems": "查看错误和警告",
 	"welcomeOverlay.commandPalette": "查找并运行所有命令",
+	"welcomeOverlay.notifications": "显示通知",
 	"welcomeOverlay": "用户界面概览",
 	"hideWelcomeOverlay": "隐藏界面概览",
 	"help": "帮助"
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 96a695ce8bd..ce47605351f 100644
--- a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,8 @@
 	"welcomePage.installExtensionPacks": "工具和语言",
 	"welcomePage.installExtensionPacksDescription": "安装对 {0} 和 {1} 的支持",
 	"welcomePage.moreExtensions": "更多",
-	"welcomePage.installKeymapDescription": "安装键盘快捷方式",
-	"welcomePage.installKeymapExtension": "安装 {0} 和 {1} 的键盘快捷方式",
+	"welcomePage.installKeymapDescription": "设置与按键绑定",
+	"welcomePage.installKeymapExtension": "安装 {0} 和 {1} 的设置和快捷键",
 	"welcomePage.others": "其他",
 	"welcomePage.colorTheme": "颜色主题",
 	"welcomePage.colorThemeDescription": "使编辑器和代码呈现你喜欢的外观",
diff --git a/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
index aee4d86d554..4f7c3efb7aa 100644
--- a/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/actions/electron-browser/menusExtensionPoint.i18n.json
@@ -32,9 +32,9 @@
 	"requireStringOrObject": "属性“{0}”是必要属性，其类型必须是 \"string\" 或 \"object\"",
 	"requirestrings": "属性“{0}”和“{1}”是必要属性，其类型必须是 \"string\"",
 	"vscode.extension.contributes.commandType.command": "要执行的命令的标识符",
-	"vscode.extension.contributes.commandType.title": "在 UI 中依据其表示命令的标题",
-	"vscode.extension.contributes.commandType.category": "(可选)类别字符串按命令在 UI 中分组",
-	"vscode.extension.contributes.commandType.icon": "(可选)在 UI 中用来表示命令的图标。文件路径或者主题配置",
+	"vscode.extension.contributes.commandType.title": "在界面中显示的命令名称",
+	"vscode.extension.contributes.commandType.category": "(可选) 类别字符串，命令在界面中根据此项分组",
+	"vscode.extension.contributes.commandType.icon": "(可选) 在界面中显示的命令图标。可为文件路径或主题配置",
 	"vscode.extension.contributes.commandType.icon.light": "使用浅色主题时的图标路径",
 	"vscode.extension.contributes.commandType.icon.dark": "使用深色主题时的图标路径",
 	"vscode.extension.contributes.commands": "对命令面板提供命令。",
diff --git a/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
index 8ae0d8347fb..43e4308fb70 100644
--- a/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"vscode.extension.contributes.configuration.title": "设置摘要。此标签将在设置文件中用作分隔注释。",
 	"vscode.extension.contributes.configuration.properties": "配置属性的描述。",
+	"scope.application.description": "特定于应用的配置，仅可在“用户”设置中配置。",
 	"scope.window.description": "特定于窗口的配置，可在“用户”或“工作区”设置中配置。",
 	"scope.resource.description": "特定于资源的配置，可在“用户”、“工作区”或“文件夹”设置中配置。",
 	"scope.description": "配置适用的范围。可用范围有“窗口”和“资源”。",
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
index 5a029ae777e..5acf3a0fa36 100644
--- a/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
@@ -11,6 +11,7 @@
 	"open": "打开设置",
 	"saveAndRetry": "保存并重试",
 	"errorUnknownKey": "没有注册配置 {1}，因此无法写入 {0}。",
+	"errorInvalidWorkspaceConfigurationApplication": "无法将 {0} 写入“工作区设置”。此设置只能写于“用户设置”。",
 	"errorInvalidFolderConfiguration": "{0} 不支持文件夹资源域，因此无法写入\"文件夹设置\"。",
 	"errorInvalidUserTarget": "{0} 不支持全局域，因此无法写入\"用户设置\"。",
 	"errorInvalidWorkspaceTarget": "{0} 不在多文件夹工作区环境下支持工作区作用域，因此无法写入“工作区设置”。",
diff --git a/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..96542629007
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedApplicationSetting": "此设置仅可应用于“用户设置”",
+	"unsupportedWindowSetting": "当前无法应用此设置。将在直接打开此文件夹时应用。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..a6ae2efb80f
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "无法在多文件夹工作区中解析 \"${workspaceFolder}\"。使用 \":\" 和工作区文件夹名称来限定此变量的作用域。",
+	"canNotResolveWorkspaceFolder": "无法解析 \"${workspaceFolder}\"。请打开一个文件夹。",
+	"canNotResolveFolderBasenameMultiRoot": "无法在多文件夹工作区中解析 \"${workspaceFolderBasename}\"。使用 \":\" 和工作区文件夹名称来限定此变量的作用域。",
+	"canNotResolveFolderBasename": "无法解析 \"${workspaceFolderBasename}\"。请打开一个文件夹。",
+	"canNotResolveLineNumber": "无法解析 \"${lineNumber}\"。请打开一个编辑器。",
+	"canNotResolveSelectedText": "无法解析 \"${selectedText}\"。请打开一个编辑器。",
+	"canNotResolveFile": "无法解析 \"${file}\"。请打开一个编辑器。",
+	"canNotResolveRelativeFile": "无法解析 \"${relativeFile}\"。请打开一个编辑器。",
+	"canNotResolveFileDirname": "无法解析 \"${fileDirname}\"。请打开一个编辑器。",
+	"canNotResolveFileExtname": "无法解析 \"${fileExtname}\"。请打开一个编辑器。",
+	"canNotResolveFileBasename": "无法解析 \"${fileBasename}\"。请打开一个编辑器。",
+	"canNotResolveFileBasenameNoExtension": "无法解析 \"${fileBasenameNoExtension}\"。请打开一个编辑器。"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..e3294fd3329
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "是(&&Y)",
+	"cancelButton": "取消"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
index 57b5dd7d36a..ff684f7426b 100644
--- a/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
@@ -6,10 +6,12 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"vscode.extension.engines": "引擎兼容性。",
 	"vscode.extension.engines.vscode": "对于 VS Code 扩展，指定与其兼容的 VS Code 版本。不能为 *。 例如: ^0.10.5 表示最低兼容 VS Code 版本 0.10.5。",
 	"vscode.extension.publisher": "VS Code 扩展的发布者。",
 	"vscode.extension.displayName": "VS Code 库中使用的扩展的显示名称。",
 	"vscode.extension.categories": "VS Code 库用于对扩展进行分类的类别。",
+	"vscode.extension.category.languages.deprecated": "请改用 \"Programming Languages\"",
 	"vscode.extension.galleryBanner": "VS Code 商城使用的横幅。",
 	"vscode.extension.galleryBanner.color": "VS Code 商城页标题上的横幅颜色。",
 	"vscode.extension.galleryBanner.theme": "横幅文字的颜色主题。",
@@ -28,6 +30,8 @@
 	"vscode.extension.badges.url": "徽章图像 URL。",
 	"vscode.extension.badges.href": "徽章链接。",
 	"vscode.extension.badges.description": "徽章说明。",
+	"vscode.extension.markdown": "控制商店中使用的 Markdown 渲染引擎。可为 \"github\" (默认) 或 \"standard\" (标准)。",
+	"vscode.extension.qna": "控制市场中的“问与答”(Q&A)链接。设置为 \"marketplace\" 可启用市场的默认“问与答”页面。设置为其他字符串可指向自定义的“问与答”页面。设置为 \"false\" 可完全禁用“问与答”。",
 	"vscode.extension.extensionDependencies": "其他扩展的依赖关系。扩展的标识符始终是 ${publisher}.${name}。例如: vscode.csharp。",
 	"vscode.extension.scripts.prepublish": "包作为 VS Code 扩展发布前执行的脚本。",
 	"vscode.extension.scripts.uninstall": "VS Code 扩展的卸载钩子。在扩展从 VS Code 卸载且 VS Code 重启 (关闭后开启) 后执行的脚本。仅支持 Node 脚本。",
diff --git a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index f38c68b8cf3..53d5f14ef4a 100644
--- a/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -6,9 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionsDisabled": "已禁用所有扩展。",
 	"extensionHostProcess.crash": "扩展宿主意外终止。",
 	"extensionHostProcess.unresponsiveCrash": "扩展宿主因没有响应而被终止。",
-	"devTools": "开发人员工具",
+	"devTools": "打开开发人员工具",
 	"restart": "重启扩展宿主",
 	"overwritingExtension": "使用扩展程序 {1} 覆盖扩展程序 {0}。",
 	"extensionUnderDevelopment": "正在 {0} 处加载开发扩展程序",
diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 9ffcc94311f..2c68f58f2bb 100644
--- a/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,24 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "需要 Microsoft .NET Framework 4.5。请访问链接安装它。",
 	"installNet": "下载 .NET Framework 4.5",
 	"neverShowAgain": "不再显示",
-	"netVersionError": "需要 Microsoft .NET Framework 4.5。请访问链接安装它。",
+	"enospcError": "{0} 无法监视这个大型工作区的文件变化。请访问说明链接解决此问题。",
 	"learnMore": "说明",
-	"enospcError": "{0} 的文件句柄已用完。 请按照说明解决此问题。",
+	"fileInvalidPath": "无效的文件资源({0})",
+	"fileIsDirectoryError": "文件是目录",
+	"fileNotModifiedError": "自以下时间未修改的文件:",
+	"fileTooLargeForHeapError": "若要打开此大小的文件，需要重新启动 VS Code，并允许其使用更多内存",
+	"fileTooLargeError": "文件太大，无法打开",
+	"fileNotFoundError": "找不到文件({0})",
+	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
+	"filePermission": "写入文件时权限被拒绝 ({0})",
+	"fileExists": "已存在要创建的文件 ({0})",
+	"fileModifiedError": "自以下时间已修改的文件:",
+	"fileReadOnlyError": "文件为只读文件",
+	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。",
+	"unableToMoveCopyError": "无法移动/复制。文件将替换其所在的文件夹。",
 	"binFailed": "未能将“{0}”移动到回收站",
 	"trashFailed": "未能将“{0}”移动到废纸篓"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index c5303d62f77..9cc3a9437e2 100644
--- a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "找不到文件({0})",
 	"fileIsDirectoryError": "文件是目录",
 	"fileNotModifiedError": "自以下时间未修改的文件:",
 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开"
diff --git a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
index 2f1e460ba31..c2cd87e923e 100644
--- a/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "无效的文件资源({0})",
 	"fileIsDirectoryError": "文件是目录",
 	"fileNotModifiedError": "自以下时间未修改的文件:",
-	"fileTooLargeForHeapError": "文件大小超过窗口内存限制，请尝试运行 code --max-memory=[新的大小]",
+	"fileTooLargeForHeapError": "文件大小超过默认内存限制。您可以使用更高的限制重新启动，当前限制为 {0}MB",
 	"fileTooLargeError": "文件太大，无法打开",
 	"fileNotFoundError": "找不到文件({0})",
 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
diff --git a/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json b/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
index c4dacad57b2..d566302d24d 100644
--- a/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/keybinding/common/keybindingEditing.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"errorKeybindingsFileDirty": "键绑定配置文件已变更，无法写入。请先保存此文件，然后重试。",
-	"parseErrors": "无法写入键绑定配置文件。请打开文件并更正错误或警告，然后重试。",
-	"errorInvalidConfiguration": "无法写入键绑定配置文件。文件内含有不是数组类型的对象。请打开文件进行清理，然后重试。",
+	"errorKeybindingsFileDirty": "按键绑定配置文件已变更，现在无法写入。请先保存此文件，然后重试。",
+	"parseErrors": "无法写入按键绑定配置文件。请打开文件并更正错误或警告，然后重试。",
+	"errorInvalidConfiguration": "无法写入按键绑定配置文件。文件内含有非数组类型对象。请打开文件进行清理，然后重试。",
 	"emptyKeybindingsHeader": "将键绑定放入此文件中以覆盖默认值"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
index 17e2dcc8f30..79efaf75e8d 100644
--- a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
@@ -9,16 +9,16 @@
 	"nonempty": "应为非空值。",
 	"requirestring": "属性“{0}”是必需的，其类型必须是“字符串”",
 	"optstring": "属性“{0}”可以省略，或者其类型必须是“字符串”",
-	"vscode.extension.contributes.keybindings.command": "要在触发键绑定时运行的命令的标识符。",
+	"vscode.extension.contributes.keybindings.command": "触发按键绑定时运行的命令的标识符。",
 	"vscode.extension.contributes.keybindings.key": "按键或按键序列。用加号分隔按键，用空格分隔序列。例如，Ctrl+O 和 Ctrl+L L（连续按键）。",
 	"vscode.extension.contributes.keybindings.mac": "Mac 特定的键或键序列。",
 	"vscode.extension.contributes.keybindings.linux": "Linux 特定的键或键序列。",
 	"vscode.extension.contributes.keybindings.win": "Windows 特定的键或键序列。",
 	"vscode.extension.contributes.keybindings.when": "键处于活动状态时的条件。",
-	"vscode.extension.contributes.keybindings": "用于键绑定。",
+	"vscode.extension.contributes.keybindings": "提供按键绑定。",
 	"invalid.keybindings": "无效的“contributes.{0}”: {1}",
 	"unboundCommands": "以下是其他可用命令:",
-	"keybindings.json.title": "键绑定配置",
+	"keybindings.json.title": "按键绑定配置",
 	"keybindings.json.key": "键或键序列(用空格分隔)",
 	"keybindings.json.command": "要执行的命令的名称",
 	"keybindings.json.when": "键处于活动状态时的条件。",
diff --git a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..2ac63294841 100644
--- a/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "取消"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 4a5227e1f24..b3351c5e331 100644
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 文件所用的 textmate 范围名称。",
 	"vscode.extension.contributes.grammars.path": "tmLanguage 文件的路径。该路径是相对于扩展文件夹，通常以 \"./syntaxes/\" 开头。",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此语法包含嵌入式语言，则为作用域名称到语言 ID 的映射。",
+	"vscode.extension.contributes.grammars.tokenTypes": "从作用域名到标记类型的映射。",
 	"vscode.extension.contributes.grammars.injectTo": "此语法注入到的语言范围名称列表。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 8d7273e1ad7..47ffc41e0ba 100644
--- a/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
 	"invalid.injectTo": "\"contributes.{0}.injectTo\" 中的值无效。必须为语言范围名称数组。提供的值: {1}",
 	"invalid.embeddedLanguages": "\"contributes.{0}.embeddedLanguages\" 中的值无效。必须为从作用域名称到语言的对象映射。提供的值: {1}",
+	"invalid.tokenTypes": "“contributes.{0}.tokenTypes”的值无效。其必须为从作用域名到标记类型的对象映射。当前值: {1}",
 	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
 	"no-tm-grammar": "没有注册这种语言的 TM 语法。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
index e14af982802..d77c2cc06df 100644
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/themes/electron-browser/colorThemeStore.i18n.json
@@ -8,7 +8,7 @@
 	],
 	"vscode.extension.contributes.themes": "请提供 TextMate 颜色主题。",
 	"vscode.extension.contributes.themes.id": "用户设置中使用的图标主题的 ID。",
-	"vscode.extension.contributes.themes.label": "显示在 UI 中的颜色主题标签。",
+	"vscode.extension.contributes.themes.label": "颜色主题在界面中的显示名称。",
 	"vscode.extension.contributes.themes.uiTheme": "用于定义编辑器周围颜色的基本主题: \"vs\" 是浅色主题，\"vs-dark\" 是深色主题。\"hc-black\" 是深色高对比度主题。",
 	"vscode.extension.contributes.themes.path": "tmTheme 文件的路径。该路径相对于扩展文件夹，通常为 \"./themes/themeFile.tmTheme\"。",
 	"reqarray": "扩展点“{0}”必须是一个数组。",
diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
index 0690cd68ce9..a8fabec9ee1 100644
--- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/themes/electron-browser/fileIconThemeStore.i18n.json
@@ -8,7 +8,7 @@
 	],
 	"vscode.extension.contributes.iconThemes": "提供文件图标主题。",
 	"vscode.extension.contributes.iconThemes.id": "用户设置中使用的图标主题的 ID。",
-	"vscode.extension.contributes.iconThemes.label": "UI 中显示的图标主题的标签。",
+	"vscode.extension.contributes.iconThemes.label": "在界面中显示的图标主题名称 ",
 	"vscode.extension.contributes.iconThemes.path": "图标主题定义文件的路径。该路径相对于扩展文件夹，通常是 \"./icons/awesome-icon-theme.json\"。",
 	"reqarray": "扩展点“{0}”必须是一个数组。",
 	"reqpath": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
diff --git a/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..8d5e76dfac0
--- /dev/null
+++ b/i18n/cht/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS 語言伺服器",
+	"folding.start": "摺疊區域開始",
+	"folding.end": "摺疊區域結束"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css-language-features/package.i18n.json b/i18n/cht/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..d40f448f342
--- /dev/null
+++ b/i18n/cht/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS 語言功能",
+	"description": "為 CSS, LESS 和 SCSS 檔案提供豐富的語言支援 ",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"css.lint.emptyRules.desc": "請勿使用空白規則集",
+	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"css.lint.unknownProperties.desc": "未知的屬性。",
+	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"css.lint.zeroUnits.desc": "零不需要任何單位",
+	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
+	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
+	"css.validate.desc": "啟用或停用所有驗證",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"less.lint.emptyRules.desc": "請勿使用空白規則集",
+	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"less.lint.unknownProperties.desc": "未知的屬性。",
+	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"less.lint.zeroUnits.desc": "零不需要任何單位",
+	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
+	"less.validate.desc": "啟用或停用所有驗證",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
+	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
+	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
+	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
+	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
+	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
+	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
+	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
+	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
+	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
+	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
+	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
+	"scss.lint.unknownProperties.desc": "未知的屬性。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
+	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
+	"scss.lint.zeroUnits.desc": "零不需要任何單位",
+	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
+	"scss.validate.desc": "啟用或停用所有驗證",
+	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/css/package.i18n.json b/i18n/cht/extensions/css/package.i18n.json
index d40f448f342..3b83a3b860e 100644
--- a/i18n/cht/extensions/css/package.i18n.json
+++ b/i18n/cht/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 語言功能",
-	"description": "為 CSS, LESS 和 SCSS 檔案提供豐富的語言支援 ",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"css.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"css.lint.emptyRules.desc": "請勿使用空白規則集",
-	"css.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"css.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"css.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"css.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"css.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"css.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"css.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"css.lint.unknownProperties.desc": "未知的屬性。",
-	"css.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"css.lint.zeroUnits.desc": "零不需要任何單位",
-	"css.trace.server.desc": "追蹤 VS Code 與 CSS 語言伺服器之間的通訊。",
-	"css.validate.title": "控制 CSS 驗證與問題嚴重性。",
-	"css.validate.desc": "啟用或停用所有驗證",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"less.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"less.lint.emptyRules.desc": "請勿使用空白規則集",
-	"less.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"less.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"less.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"less.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"less.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"less.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"less.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"less.lint.unknownProperties.desc": "未知的屬性。",
-	"less.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"less.lint.zeroUnits.desc": "零不需要任何單位",
-	"less.validate.title": "控制 LESS 驗證與問題嚴重性。",
-	"less.validate.desc": "啟用或停用所有驗證",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
-	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
-	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
-	"scss.lint.duplicateProperties.desc": "請勿使用重複的樣式定義",
-	"scss.lint.emptyRules.desc": "請勿使用空白規則集",
-	"scss.lint.float.desc": "避免使用 'float'。浮動會使 CSS 脆弱，在版面配置的任一層面改變時容易中斷。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則必須定義 'src' 和 'font-family' 屬性",
-	"scss.lint.hexColorLength.desc": "十六進位色彩必須由三個或六個十六進位數字組成",
-	"scss.lint.idSelector.desc": "選取器不應包含 ID，因為這些規則與 HTML 結合過於緊密。",
-	"scss.lint.ieHack.desc": "只有在支援 IE7 及更舊的版本時才需要 IE Hack",
-	"scss.lint.important.desc": "避免使用 !important。這表示整個 CSS 的明確性皆失控，需要重構。",
-	"scss.lint.importStatement.desc": "匯入陳述式不會平行載入",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "屬性因顯示而忽略。例如，若為 'display: inline'，則 width、height、margin-top、margin-bottom 以及 float 屬性就不會有任何作用。",
-	"scss.lint.universalSelector.desc": "已知通用選取器 (*) 速度緩慢",
-	"scss.lint.unknownProperties.desc": "未知的屬性。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "未知的廠商特定屬性。",
-	"scss.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
-	"scss.lint.zeroUnits.desc": "零不需要任何單位",
-	"scss.validate.title": "控制 SCSS 驗證與問題嚴重性。",
-	"scss.validate.desc": "啟用或停用所有驗證",
-	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` 已淘汰，改為 `editor.colorDecorators`。"
+	"displayName": "CSS 語言基礎知識",
+	"description": "為 CSS、LESS 與 SCSS 檔案提供語法醒目提示與括弧對應功能。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/emmet/package.i18n.json b/i18n/cht/extensions/emmet/package.i18n.json
index 660a269c068..b3dc8be8bb9 100644
--- a/i18n/cht/extensions/emmet/package.i18n.json
+++ b/i18n/cht/extensions/emmet/package.i18n.json
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'webkit' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'webkit' 前綴。",
 	"emmetPreferencesCssMozProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'moz' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'moz' 前綴。",
 	"emmetPreferencesCssOProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'o' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'o' 前綴。",
-	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。"
+	"emmetPreferencesCssMsProperties": "在以 `-` 開頭的 Emmet 縮寫中使用時，會取得 'ms' 廠商前綴的逗點分隔 CSS 屬性。設定為空白字串可避免總是取得 'ms' 前綴。",
+	"emmetPreferencesCssFuzzySearchMinScore": "模糊比對的縮寫應該達到最低分數(從 0 到 1)。較低數值可能產生錯誤的比對，較高的數值可能會降低可能的比對。",
+	"emmetOptimizeStylesheetParsing": "當設定為 false 時，將解析整個檔案以確定目前的位置是否適用於展開 Emmet 縮寫。當設定為 true 時，僅會解析 css/scss/less 檔案中目前位置周圍的內容。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/commands.i18n.json b/i18n/cht/extensions/git/out/commands.i18n.json
index e25ea2cf781..b7d543af3f2 100644
--- a/i18n/cht/extensions/git/out/commands.i18n.json
+++ b/i18n/cht/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "確定",
 	"push with tags success": "已成功使用標籤推送。",
 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
-	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
+	"sync is unpredictable": "此動作會推送認可至`{0}/{1}`並從中提取認可。",
 	"never again": "確定，不要再顯示",
 	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
 	"no changes stash": "沒有變更可供隱藏。",
diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json
index 044a69ec71a..bc042cb15d8 100644
--- a/i18n/cht/extensions/git/package.i18n.json
+++ b/i18n/cht/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "控制是否在Git變更列表中的檔名旁顯示“開啟檔案”的動作按鈕。",
 	"config.inputValidation": "控制何時顯示認可訊息輸入驗證。",
 	"config.detectSubmodules": "控制是否自動偵測 Git 子模組。",
+	"config.detectSubmodulesLimit": "控制 Git 子模組的偵測限制",
 	"colors.modified": "修改資源的顏色。",
 	"colors.deleted": "刪除資源的顏色",
 	"colors.untracked": "未追蹤資源的顏色。",
diff --git a/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..0c001145a7a
--- /dev/null
+++ b/i18n/cht/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML 語言伺服器",
+	"folding.start": "摺疊區域開始",
+	"folding.end": "摺疊區域結束"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html-language-features/package.i18n.json b/i18n/cht/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..d83d91cc72a
--- /dev/null
+++ b/i18n/cht/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML 語言功能",
+	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
+	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
+	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
+	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
+	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
+	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
+	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
+	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
+	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
+	"html.format.endWithNewline.desc": "以新行字元結尾。",
+	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
+	"html.format.wrapAttributes.desc": "將屬性換行。",
+	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
+	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
+	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
+	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
+	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
+	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
+	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
+	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
+	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
+	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
+	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/html/package.i18n.json b/i18n/cht/extensions/html/package.i18n.json
index d120f92d827..eb9141c8094 100644
--- a/i18n/cht/extensions/html/package.i18n.json
+++ b/i18n/cht/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 語言功能",
-	"description": "為 HTML、Razor 及 Handlebars 檔案提供豐富的語言支援。",
-	"html.format.enable.desc": "啟用/停用預設 HTML 格式器",
-	"html.format.wrapLineLength.desc": "每行的字元數上限 (0 = 停用)。",
-	"html.format.unformatted.desc": "不應重新格式化的逗號分隔標記清單。'null' 預設為 https://www.w3.org/TR/html5/dom.html#phrasing-content 中列出的所有標記。",
-	"html.format.contentUnformatted.desc": "逗點分隔的標記清單，其中內容的格式不應重新設定。'null' 預設為 'pre' 標記。",
-	"html.format.indentInnerHtml.desc": "縮排 <head> 及 <body> 區段。",
-	"html.format.preserveNewLines.desc": "是否應保留項目前方現有的分行符號。僅適用於項目前方，而不適用於標記內或文字。",
-	"html.format.maxPreserveNewLines.desc": "一個區塊要保留的最大分行符號數。使用 'null' 表示無限制。",
-	"html.format.indentHandlebars.desc": "格式化並縮排 {{#foo}} 及 {{/foo}}。",
-	"html.format.endWithNewline.desc": "以新行字元結尾。",
-	"html.format.extraLiners.desc": "前方應有額外新行字元的標記清單，須以逗號分隔。'null' 的預設值為 \"head, body, /html\"。",
-	"html.format.wrapAttributes.desc": "將屬性換行。",
-	"html.format.wrapAttributes.auto": "只在超過行的長度時將屬性換行。",
-	"html.format.wrapAttributes.force": "將第一個以外的每個屬性換行。",
-	"html.format.wrapAttributes.forcealign": "將第一個以外的每個屬性換行，並保持對齊。",
-	"html.format.wrapAttributes.forcemultiline": "將每個屬性換行。",
-	"html.suggest.angular1.desc": "設定內建 HTML 語言支援是否建議 Angular V1 標記和屬性。",
-	"html.suggest.ionic.desc": "設定內建 HTML 語言支援是否建議 Ionic 標記、屬性和值。",
-	"html.suggest.html5.desc": "設定內建 HTML 語言支援是否建議 HTML5 標記、屬性和值。",
-	"html.trace.server.desc": "追蹤 VS Code 與 HTML  語言伺服器之間的通訊。",
-	"html.validate.scripts": "設定內建 HTML 語言支援是否會驗證內嵌指定碼。",
-	"html.validate.styles": "設定內建 HTML 語言支援是否會驗證內嵌樣式。",
-	"html.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
-	"html.autoClosingTags": "啟用/停用 HTML 標籤的自動關閉功能。"
+	"displayName": "HTML 語言基礎知識",
+	"description": "為 HTML 檔案提供語法醒目提示、括弧對應與程式碼片段功能。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..275d7ba3cb0
--- /dev/null
+++ b/i18n/cht/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON 語言伺服器"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json-language-features/package.i18n.json b/i18n/cht/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..15eaaf64aef
--- /dev/null
+++ b/i18n/cht/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON 語言功能",
+	"description": "為 JSON 檔案提供豐富的語言支援",
+	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
+	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
+	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
+	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
+	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
+	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
+	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
+	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/json/package.i18n.json b/i18n/cht/extensions/json/package.i18n.json
index b0012a5af6c..909f55cf270 100644
--- a/i18n/cht/extensions/json/package.i18n.json
+++ b/i18n/cht/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 語言功能",
-	"description": "為 JSON 檔案提供豐富的語言支援",
-	"json.schemas.desc": "在結構描述與目前專案的 JSON 檔案之間建立關聯",
-	"json.schemas.url.desc": "目前目錄中的結構描述 URL 或結構描述相對路徑",
-	"json.schemas.fileMatch.desc": "檔案模式陣列，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.fileMatch.item.desc": "可包含 '*' 的檔案模式，在將 JSON 檔案解析成結構描述時的比對對象。",
-	"json.schemas.schema.desc": "指定 URL 的結構描述定義。只須提供結構描述以避免存取結構描述 URL。",
-	"json.format.enable.desc": "啟用/停用預設 JSON 格式器 (需要重新啟動)",
-	"json.tracing.desc": "追蹤 VS Code 與 JSON 語言伺服器之間的通訊。",
-	"json.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` 已淘汰，將改為 `editor.colorDecorators`。",
-	"json.experimental.syntaxFolding": "啟用/停用語法感知折疊標記。"
+	"displayName": "JSON 語言基礎知識",
+	"description": "為 JSON  檔案提供語法醒目提示與括弧對應功能。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..2f489d0fef5
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "無法載入 ‘markdown.style' 樣式:{0}"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..74c6cf18168
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[預覽] {0}",
+	"previewTitle": "預覽 [0]"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..fe1f5c5a4e5
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "此文件中的部分內容已停用",
+	"preview.securityMessage.title": "Markdown 預覽中已停用可能不安全或不安全的內容。請將 Markdown 預覽的安全性設定變更為允許不安全內容，或啟用指令碼",
+	"preview.securityMessage.label": "內容已停用安全性警告"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/out/security.i18n.json b/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..6f41794bacc
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "嚴謹",
+	"strict.description": "僅載入安全內容",
+	"insecureLocalContent.title": "允許不安全的本機內容",
+	"insecureLocalContent.description": "啟用從本機提供 http 載入內容",
+	"insecureContent.title": "允許不安全的內容",
+	"insecureContent.description": "啟用 http 載入內容",
+	"disable.title": "停用",
+	"disable.description": "允許所有內容與指令碼執行。不建議",
+	"moreInfo.title": "詳細資訊",
+	"enableSecurityWarning.title": "允許此工作區預覽安全性警告",
+	"disableSecurityWarning.title": "不允許此工作區預覽安全性警告",
+	"toggleSecurityWarning.description": "不影響內容安全性層級",
+	"preview.showPreviewSecuritySelector.title": "選擇此工作區 Markdown 預覽的安全性設定"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/markdown-language-features/package.i18n.json b/i18n/cht/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..d27fa896c2a
--- /dev/null
+++ b/i18n/cht/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown 語言功能",
+	"description": "為 Markdown 提供豐富的語言支援。",
+	"markdown.preview.breaks.desc": "設定在 Markdown 預覽中如何顯示分行符號。設為 'trure' 為每個新行建立<br>",
+	"markdown.preview.linkify": "啟用或停用在 Markdown 預覽中將類似 URL 的文字轉換為連結。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 預覽中按兩下會切換到編輯器。",
+	"markdown.preview.fontFamily.desc": "控制 Markdown 預覽中使用的字型家族。",
+	"markdown.preview.fontSize.desc": "控制 Markdown 預覽中使用的字型大小 (以像素為單位)。",
+	"markdown.preview.lineHeight.desc": "控制 Markdown 預覽中使用的行高。此數字相對於字型大小。",
+	"markdown.preview.markEditorSelection.desc": "在 Markdown 預覽中標記目前的編輯器選取範圍。",
+	"markdown.preview.scrollEditorWithPreview.desc": "在捲動 Markdown 預覽時更新編輯器的檢視。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "在捲動 Markdown 編輯器時更新預覽的檢視。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[已淘汰] 捲動 Markdown 預覽，以從編輯器顯示目前選取的程式行。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "此設定已由 'markdown.preview.scrollPreviewWithEditor' 取代，不再具有任何效果。",
+	"markdown.preview.title": "開啟預覽",
+	"markdown.previewFrontMatter.dec": "設定 YAML 前端在 Markdown 預覽中呈現的方式。[隱藏] 會移除前端。否則，前端會視為 Markdown 內容。",
+	"markdown.previewSide.title": "在一側開啟預覽",
+	"markdown.showLockedPreviewToSide.title": "在側面開啟鎖定的預覽",
+	"markdown.showSource.title": "顯示來源",
+	"markdown.styles.dec": "可從 Markdown 預覽使用之 CSS 樣式表的 URL 或本機路徑清單。相對路徑是相對於在總管中開啟的資料夾來進行解釋。若沒有開啟資料夾，路徑則是相對於 Markdown 檔案的位置來進行解釋。所有 '\\' 都必須寫成 '\\\\'。",
+	"markdown.showPreviewSecuritySelector.title": "變更預覽的安全性設定",
+	"markdown.trace.desc": "允許 Markdown 延伸模組進行偵錯記錄。",
+	"markdown.preview.refresh.title": "重新整理預覽",
+	"markdown.preview.toggleLock.title": "切換預覽鎖定"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..62153a9c2da
--- /dev/null
+++ b/i18n/cht/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "要允許 {0} (定義為工作區設定) 執行，以使用 lint 標記 PHP 檔案嗎?",
+	"php.yes": "允許",
+	"php.no": "不允許",
+	"wrongExecutable": "因為 {0} 不是有效的 PHP 可執行檔，所以無法驗證。您可以使用設定 'php.validate.executablePath' 設定 PHP 可執行檔。",
+	"noExecutable": "因為未設定任何 PHP 可執行檔，所以無法驗證。您可以使用 'php.validate.executablePath'  設定可執行檔。",
+	"unknownReason": "無法使用路徑 {0} 執行 PHP。原因不明。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php-language-features/package.i18n.json b/i18n/cht/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..abe5dfe9ea4
--- /dev/null
+++ b/i18n/cht/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
+	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
+	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
+	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
+	"displayName": "PHP 語言功能",
+	"description": "為 PHP 檔案提供豐富的語言支援。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/php/package.i18n.json b/i18n/cht/extensions/php/package.i18n.json
index 397c38b737e..d6cdfe9a0f2 100644
--- a/i18n/cht/extensions/php/package.i18n.json
+++ b/i18n/cht/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "設定是否啟用內建 PHP 語言建議。此支援會建議 PHP 全域和變數。",
-	"configuration.validate.enable": "啟用/停用內建 PHP 驗證。",
-	"configuration.validate.executablePath": "指向 PHP 可執行檔。",
-	"configuration.validate.run": "是否在儲存或輸入時執行 linter。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "禁止 PHP 驗證可執行檔 (定義為工作區設定)",
-	"displayName": "PHP 語言功能",
-	"description": "為 PHP 檔案提供 IntelliSense、Lint 支援及語言基礎知識。"
+	"displayName": "PHP 語言基礎知識",
+	"description": "為 PHP 檔案提供語法醒目提示與括弧對應功能。"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json b/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..90f4f953b40
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案",
+	"typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型",
+	"typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案",
+	"typescript.noTypeScriptProjectConfig": "檔案不屬於 TypeScript 專案。若要深入了解，請按一下[這裡]({0})。",
+	"typescript.noJavaScriptProjectConfig": "檔案不屬於 JavaScript 專案。若要深入了解，請按一下[這裡]({0})。",
+	"typescript.configureTsconfigQuickPick": "設定 tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "設定 jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..18117a677b6
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "選擇要套用的程式碼動作",
+	"acquiringTypingsLabel": "正在擷取 typings...",
+	"acquiringTypingsDetail": "正在為 IntelliSense 擷取 typings 定義。",
+	"autoImportLabel": "自動從 {0} 匯入"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..7d901d9ed96
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "啟用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
+	"ts-nocheck": "停用 JavaScript 檔案的語意檢查。必須在檔案的最上面。",
+	"ts-ignore": "隱藏下一行@ts-check 的錯誤警告。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..16a3b7e5e58
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 個實作",
+	"manyImplementationLabel": "{0} 個實作",
+	"implementationsErrorLabel": "無法判斷實作數"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..2851c131eab
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc 註解"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..d3f0fb21867
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "組織匯入"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..85939cee970
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (檔案中修復全部)"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..4ae222d6a1d
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 個參考",
+	"manyReferenceLabel": "{0} 個參考",
+	"referenceErrorLabel": "無法判斷參考"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..61ba5737e64
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "建置 - {0}",
+	"buildAndWatchTscLabel": "監看 - {0}"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..54beeeb5b8d
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "路徑 {0} 未指向有效的 tsserver 安裝。即將回復為配套的 TypeScript 版本。",
+	"serverCouldNotBeStarted": "無法啟動 TypeScript 語言伺服器。錯誤訊息為: {0}",
+	"typescript.openTsServerLog.notSupported": "TS 伺服器的記錄功能需要 TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "TS 伺服器記錄功能已關閉。請設定 `typescript.tsserver.log` 並重新啟動 TS 伺服器，以啟用記錄功能",
+	"typescript.openTsServerLog.enableAndReloadOption": "啟用記錄功能並重新啟動 TS 伺服器",
+	"typescript.openTsServerLog.noLogFile": "TS 伺服器尚未開始記錄。",
+	"openTsServerLog.openFileFailedFailed": "無法開啟 TS 伺服器記錄檔",
+	"serverDiedAfterStart": "TypeScript 語言服務在啟動後立即中止 5 次。服務將不會重新啟動。",
+	"serverDiedReportIssue": "回報問題",
+	"serverDied": "TypeScript 語言服務在過去 5 分鐘內意外中止 5 次。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..bb0bb1a4af9
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "無效的版本"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..5d6e558a988
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
+	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
+	"large.label": "設定排除項目",
+	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..e80262263f7
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "正在擷取資料以改善 TypeScript IntelliSense",
+	"typesInstallerInitializationFailed.title": "無法為 JavaScript 語言功能安裝 typings 檔案。請確認已安裝 NPM，或在使用者設定中設定 'typescript.npm'。若要深入了解，請按一下[這裡]({0})。",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "不要再顯示"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..fdf7133b824
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "使用 VS Code 的版本",
+	"useWorkspaceVersionOption": "使用工作區版本",
+	"learnMore": "深入了解",
+	"selectTsVersion": "選取 JavaScript 與 TypeScript 功能使用的 TypeScript 版本"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..8d374cb1886
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "無法在此路徑載入 TypeScript 版本",
+	"noBundledServerFound": "其他應用程式已刪除了 VS Code 的 tsserver，例如行為不當的病毒偵測工具。請重新安裝 VS Code。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/typescript-language-features/package.i18n.json b/i18n/cht/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..f48586c4f1d
--- /dev/null
+++ b/i18n/cht/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,62 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript 和 JavaScript 語言功能",
+	"description": "為 JavaScript 和 TypeScript 提供豐富的語言支援。",
+	"typescript.reloadProjects.title": "重新載入專案",
+	"javascript.reloadProjects.title": "重新載入專案",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "使用其參數簽章完成函式。",
+	"typescript.tsdk.desc": "指定資料夾路徑，其中包含要使用的 tsserver 和 lib*.d.ts 檔案。",
+	"typescript.disableAutomaticTypeAcquisition": "停用自動類型取得。需要 TypeScript >= 2.0.6。",
+	"typescript.tsserver.log": "允許 TS 伺服器記錄到檔案。此記錄可用來診斷 TS 伺服器問題。記錄可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
+	"typescript.tsserver.pluginPaths": "發現 TypeScript 語言服務外掛的其他路徑。需要 TypeScript >= 2.3.0。",
+	"typescript.tsserver.pluginPaths.item": "無論是絕對路徑或是相對路徑。相對路徑將會根據工作區資料夾進行解析。",
+	"typescript.tsserver.trace": "允許將訊息追蹤傳送到 TS 伺服器。此追蹤可用來診斷 TS 伺服器問題。追蹤可能包含檔案路徑、原始程式碼及您專案中可能具有敏感性的其他資訊。",
+	"typescript.validate.enable": "啟用/停用 TypeScript 驗證。",
+	"typescript.format.enable": "啟用/停用預設 TypeScript 格式器。",
+	"javascript.format.enable": "啟用/停用預設 JavaScript 格式器。",
+	"format.insertSpaceAfterCommaDelimiter": "定義逗號分隔符號後的空格處理。",
+	"format.insertSpaceAfterConstructor": "定義 constructor 關鍵字後空格處理。需要 TypeScript >= 2.3.0。",
+	"format.insertSpaceAfterSemicolonInForStatements": " 定義 for 陳述式內分號後的空格處理。",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "定義二元運算子後的空格處理。",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定義控制流程陳述式內關鍵字後的空格處理方式。",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定義匿名函式之函式關鍵字後的空格處理。",
+	"format.insertSpaceBeforeFunctionParenthesis": "定義如何處理函式引數括號之前的空格。TypeScript 必須 >= 2.1.5。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "定義範本字串左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定義 JSX 運算式左右大括弧間的空格處理。需要 TypeScript >= 2.0.6。",
+	"format.insertSpaceAfterTypeAssertion": "定義在 TypeScript 內類型宣告後空格處理。需要 TypeScript >= 2.4。",
+	"format.placeOpenBraceOnNewLineForFunctions": "定義是否將左大括弧放入函式的新行。",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "定義是否將左大括弧放入控制區塊的新行。",
+	"javascript.validate.enable": "啟用/停用 JavaScript 驗證。",
+	"typescript.goToProjectConfig.title": "移至專案組態",
+	"javascript.goToProjectConfig.title": "移至專案組態",
+	"javascript.referencesCodeLens.enabled": "在JavaScript檔案啟用/停用 參考CodeLens ",
+	"typescript.referencesCodeLens.enabled": "在TypeScript檔案啟用/停用CodeLens參考。需要TypeScript>=2.0.6。",
+	"typescript.implementationsCodeLens.enabled": "啟用/停用實作 CodeLens。需要 TypeScript >= 2.2.0。",
+	"typescript.openTsServerLog.title": "開啟 TS 伺服器記錄",
+	"typescript.restartTsServer": "重新啟動TS伺服器",
+	"typescript.selectTypeScriptVersion.title": "選取 TypeScript 版本",
+	"typescript.reportStyleChecksAsWarnings": "使用警告顯示樣式檢查",
+	"jsDocCompletion.enabled": "啟用/停用自動 JSDoc 註解",
+	"javascript.implicitProjectConfig.checkJs": "啟用/停用 JavaScript 檔案的語意檢查。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >=2.3.1。",
+	"typescript.npm": "指定用於自動類型取得的 NPM 可執行檔路徑。TypeScript 必須 >= 2.3.4.",
+	"typescript.check.npmIsInstalled": "檢查是否已安裝NPM用以取得自動類型擷取.",
+	"javascript.nameSuggestions": "從JavaScript推薦表檔案中啟用/停用包含唯一檔名",
+	"typescript.tsc.autoDetect": "控制自動偵測 tsc 任務。 'off' 停用此功能。 'build' 僅建立單次編譯任務。 'watch'  僅建立編譯並監看任務。 'on' 同時建立編譯及監看任務。預設值為 'on'。",
+	"typescript.problemMatchers.tsc.label": "TypeScript 問題",
+	"typescript.problemMatchers.tscWatch.label": " TypeScript 問題 (監看模式)",
+	"typescript.quickSuggestionsForPaths": "啟用/停用在輸入匯入路徑顯示即時建議。",
+	"typescript.locale": "設定報告 TypeScript 錯誤的語系。需要 TypeScript >= 2.6.0。預設值 'null' 則使用 VS Code 的語系來顯示 TypeScript 錯誤。",
+	"javascript.implicitProjectConfig.experimentalDecorators": "啟用/停用 JavaScript 檔案中非專案部分的 'experimentalDecorators'。現有的 jsconfig.json 或 tsconfig.json 檔案會覆寫此設定。需要 TypeScript >=2.3.1。",
+	"typescript.autoImportSuggestions.enabled": "啟用/停用 自動匯入建議。需要 TypeScript >=2.6.1",
+	"typescript.experimental.syntaxFolding": "啟用/停用語法感知摺疊標記。",
+	"taskDefinition.tsconfig.description": "定義 TS 組建的 tsconfig 檔案。",
+	"javascript.suggestionActions.enabled": "編輯器內啟用/停用 JavaScript 檔案建議診斷。需要 TypeScript >= 2.8",
+	"typescript.suggestionActions.enabled": "編輯器內啟用/停用 TypeScript 檔案建議診斷。需要 TypeScript >= 2.8"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/node/processes.i18n.json b/i18n/cht/src/vs/base/node/processes.i18n.json
index 5989cf78970..35229bd6699 100644
--- a/i18n/cht/src/vs/base/node/processes.i18n.json
+++ b/i18n/cht/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "無法在 UNC 磁碟機上執行殼層命令。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 04261af3234..b51abfd46f9 100644
--- a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,14 @@
 	],
 	"previewOnGitHub": "在 GitHub 預覽",
 	"loadingData": "正在載入資料...",
+	"rateLimited": "超出了 GitHub 查詢限制。請稍候。",
 	"similarIssues": "相似的問題",
 	"open": "開啟",
 	"closed": "已關閉",
-	"noResults": "找不到結果",
 	"settingsSearchIssue": "設定值搜尋問題",
 	"bugReporter": "臭蟲回報",
-	"performanceIssue": "效能問題",
 	"featureRequest": "功能要求",
+	"performanceIssue": "效能問題",
 	"stepsToReproduce": "重現的步驟",
 	"bugDescription": "請共用必要步驟以確實複製問題。請包含實際與預期的結果。我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
 	"performanceIssueDesciption": "效能問題的發生時間點為何? 問題是在啟動或經過一組特定動作後發生的? 我們支援 GitHub 慣用的 Markdown 語言。當我們在 GitHub 上進行預覽時，您仍可編輯問題和新增螢幕擷取畫面。",
diff --git a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 4d744adee44..a03e5ae0f53 100644
--- a/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/cht/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "請用英語填寫這張表格。",
 	"issueTypeLabel": "這是一個",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "停用所有延伸模組並重新載入視窗",
+	"chooseExtension": "擴充功能",
 	"issueTitleLabel": "標題",
 	"issueTitleRequired": "請輸入標題。",
 	"titleLengthValidation": "標題太長。",
@@ -18,13 +21,6 @@
 	"extensions": "我的擴充功能",
 	"searchedExtensions": "搜尋過的擴充功能",
 	"settingsSearchDetails": "設定值搜尋詳細資料",
-	"tryDisablingExtensions": "是否在停用擴充功能後問題仍會發生？",
-	"yes": "是",
-	"no": "否",
-	"disableExtensionsLabelText": "請在 {0} 之後嘗試複製問題。",
-	"disableExtensions": "停用所有延伸模組並重新載入視窗",
-	"showRunningExtensionsLabelText": "如果您認為這是延伸模組問題，請 {0} 以回報延伸模組問題。",
-	"showRunningExtensions": "檢視所有執行中的延伸模組",
 	"details": "請輸入詳細資料。",
 	"loadingData": "正在載入資料..."
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..5ad17302606
--- /dev/null
+++ b/i18n/cht/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "名稱",
+	"killProcess": "關閉處理序",
+	"forceKillProcess": "強制關閉處理序"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/code/electron-main/menus.i18n.json b/i18n/cht/src/vs/code/electron-main/menus.i18n.json
index 70d119fbd0c..a0a1e927719 100644
--- a/i18n/cht/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/cht/src/vs/code/electron-main/menus.i18n.json
@@ -113,7 +113,7 @@
 	"miZoomOut": "縮小(&&U)",
 	"miZoomReset": "重設縮放(&&R)",
 	"miBack": "上一步(&B)",
-	"miForward": "轉寄(&&F)",
+	"miForward": "下一頁(&&F)",
 	"miNextEditor": "下一個編輯器(&&N)",
 	"miPreviousEditor": "上一個編輯器(&&P)",
 	"miNextEditorInGroup": "群組中下一個已使用的編輯器(&&N)",
diff --git a/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json
index 20db8e59ff5..36323e840be 100644
--- a/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/cht/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "關閉",
-	"header": "差異 {0} / {1}: 原始 {2}，{3} 行，修改後 {4}，{5} 行",
 	"blankLine": "空白",
 	"equalLine": "原始 {0},修改後{1}: {2",
 	"insertLine": "+ 修改後 {0}: {1}",
diff --git a/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
index abe0e03af43..1ffb558df45 100644
--- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "對應 Windows 和 Linux 的 `Control` 與對應 macOS 的 `Command`",
 	"multiCursorModifier.alt": "對應 Windows 和 Linux 的 `Alt` 與對應 macOS 的 `Option`",
 	"multiCursorModifier": "用於新增多個滑鼠游標的修改。 `ctrlCmd` 會對應到 Windows 和 Linux 上的 `Control` 以及 macOS 上的 `Command`。 [移至定義] 及 [開啟連結] 滑鼠手勢將會適應以避免和 multicursor 修改衝突。",
+	"multiCursorMergeOverlapping": "在重疊時合併多個游標。",
 	"quickSuggestions.strings": "允許在字串內顯示即時建議。",
 	"quickSuggestions.comments": "允許在註解中顯示即時建議。",
 	"quickSuggestions.other": "允許在字串與註解以外之處顯示即時建議。",
diff --git a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 67c4e506a0f..6690219f7e0 100644
--- a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "編輯器縮排輔助線的色彩。",
 	"editorLineNumbers": "編輯器行號的色彩。",
 	"editorActiveLineNumber": "編輯器使用中行號的色彩 ",
+	"deprecatedEditorActiveLineNumber": "Id 已取代。請改用 'editorLineNumber.activeForeground' 。",
 	"editorRuler": "編輯器尺規的色彩",
 	"editorCodeLensForeground": "編輯器程式碼濾鏡的前景色彩",
 	"editorBracketMatchBackground": "成對括號背景色彩",
@@ -28,7 +29,9 @@
 	"warningBorder": "編輯器內警告提示線的邊框色彩.",
 	"infoForeground": "編輯器內資訊提示線的前景色彩",
 	"infoBorder": "編輯器內資訊提示線的邊框色彩",
-	"overviewRulerRangeHighlight": "範圍醒目提示的概觀尺規標記色彩。",
+	"hintForeground": "編輯器內提示訊息的提示線前景色彩",
+	"hintBorder": "編輯器內提示訊息的提示線邊框色彩",
+	"overviewRulerRangeHighlight": "概述反白範圍的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
 	"overviewRuleError": "錯誤的概觀尺規標記色彩。",
 	"overviewRuleWarning": "警示的概觀尺規標記色彩。",
 	"overviewRuleInfo": "資訊的概觀尺規標記色彩。"
diff --git a/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..7a628e7ee2b
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "顯示修正 ({0})",
+	"quickFix": "顯示修正",
+	"organizeImports.label": "組織匯入"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index ad654fda54a..c7f226e111b 100644
--- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "移至下一個問題 (錯誤, 警告, 資訊)",
-	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)",
-	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
-	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
-	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
-	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
+	"markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..11b5e18ff6c
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。",
+	"editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。",
+	"editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩",
+	"editorMarkerNavigationBackground": "編輯器標記導覽小工具的背景。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/links/links.i18n.json b/i18n/cht/src/vs/editor/contrib/links/links.i18n.json
index 2671372341b..d175645515a 100644
--- a/i18n/cht/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "按住 Ctrl 並按一下滑鼠按鈕可連入連結",
 	"links.command.mac": "按住 Cmd 並按一下滑鼠以執行命令",
 	"links.command": "按住 Ctrl 並按一下滑鼠以執行命令",
+	"links.navigate.al.mac": "按住 Option 並按一下滑鼠按鈕以追蹤連結",
 	"links.navigate.al": "按住Alt並點擊以追蹤連結",
+	"links.command.al.mac": "按住 Option 並按一下滑鼠以執行命令",
 	"links.command.al": "按住 Alt 並按一下滑鼠以執行命令",
 	"invalid.url": "因為此連結的格式不正確，所以無法開啟: {0}",
 	"missing.url": "因為此連結目標遺失，所以無法開啟。",
diff --git a/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..54de5e0d2da
--- /dev/null
+++ b/i18n/cht/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "星期日",
+	"Monday": "星期一",
+	"Tuesday": "星期二",
+	"Wednesday": "星期三",
+	"Thursday": "星期四",
+	"Friday": "星期五",
+	"Saturday": "星期六",
+	"SundayShort": "週日",
+	"MondayShort": "週一",
+	"TuesdayShort": "週二",
+	"WednesdayShort": "週三",
+	"ThursdayShort": "週四",
+	"FridayShort": "週五",
+	"SaturdayShort": "週六",
+	"January": "1月",
+	"February": "2月",
+	"March": "3月",
+	"April": "4月",
+	"May": "5月",
+	"June": "6月",
+	"July": "7月",
+	"August": "8月",
+	"September": "9月",
+	"October": "10月",
+	"November": "11月",
+	"December": "12月",
+	"JanuaryShort": "1月",
+	"FebruaryShort": "2月",
+	"MarchShort": "3月",
+	"AprilShort": "4月",
+	"MayShort": "5月",
+	"JuneShort": "6月",
+	"JulyShort": "7月",
+	"AugustShort": "8月",
+	"SeptemberShort": "9月",
+	"OctoberShort": "10月",
+	"NovemberShort": "11月",
+	"DecemberShort": "12月"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 1cee9b500bb..1018aa75dc7 100644
--- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "寫入存取符號時的背景顏色，如寫入變數。不能使用非透明的顏色來隱藏底層的樣式。",
 	"wordHighlightBorder": "讀取存取期間 (例如讀取變數時) 符號的邊框顏色。",
 	"wordHighlightStrongBorder": "寫入存取期間 (例如寫入變數時) 符號的邊框顏色。 ",
-	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
-	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
+	"overviewRulerWordHighlightForeground": "概述反白符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
+	"overviewRulerWordHighlightStrongForeground": "概述反白寫入權限符號的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
 	"wordHighlight.next.label": "移至下一個反白符號",
 	"wordHighlight.previous.label": "移至上一個反白符號"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..3b2a2f318b6
--- /dev/null
+++ b/i18n/cht/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...另外 1 個檔案未顯示",
+	"moreFiles": "...另外 {0} 個檔案未顯示"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..7667b941599
--- /dev/null
+++ b/i18n/cht/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "取消"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
index 7656568be84..fea1fa5538f 100644
--- a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。",
 	"prof-startup": "啟動時執行 CPU 分析工具",
 	"disableExtensions": "停用所有已安裝的擴充功能。",
-	"inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。",
-	"inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。",
 	"disableGPU": "停用 GPU 硬體加速。",
 	"uploadLogs": "上傳目前的工作階段紀錄至安全的端點。",
 	"maxMemory": "視窗的最大記憶體大小 (以 MB 為單位)。",
diff --git a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 01f556d1f68..066b714df00 100644
--- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
 	"MarketPlaceDisabled": "未啟用市集",
 	"removeError": "移除擴充功能: {0} 時發生錯誤。重新嘗試前請離開並再次啟動 VS Code。",
-	"Not Market place extension": "只有市集擴充功能可以重新安裝",
+	"Not a Marketplace extension": "只有市集擴充功能可以重新安裝",
 	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
 	"malicious extension": "因為有使用者回報該延伸模組有問題，所以無法安裝延伸模組。",
 	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
 	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
 	"exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。",
 	"uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?",
-	"uninstallOnly": "只有",
-	"uninstallAll": "全部",
+	"uninstallOnly": "僅擴充功能",
+	"uninstallAll": "全部解除安裝",
 	"uninstallConfirmation": "確定要將 '{0}' 解除安裝嗎?",
 	"ok": "確定",
 	"singleDependentError": "無法將延伸模組 '{0}' 解除安裝。其為延伸模組 '{1}' 的相依對象。",
diff --git a/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 53fba7137de..3c3d0f5631d 100644
--- a/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/cht/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "無法剖析 'engines.vscode` 值 {0}。例如，請使用：^0.10.0、^1.2.3、^0.11.0、^0.10.x 等。",
+	"versionSyntax": "無法解析 'engines.vscode` 值 {0}。請使用範例：^1.22.0, ^1.22.x, 等。",
 	"versionSpecificity1": "在 `engines.vscode` ({0}) 中指定的版本不夠具體。對於 1.0.0 之前的 vscode 版本，請至少定義所需的主要和次要版本。 例如 ^0.10.0、0.10.x、0.11.0 等。",
 	"versionSpecificity2": "在 `engines.vscode` ({0}) 中指定的版本不夠具體。對於 1.0.0 之後的 vscode 版本，請至少定義所需的主要和次要版本。 例如 ^1.10.0、1.10.x、1.x.x、2.x.x 等。",
 	"versionMismatch": "擴充功能與 Code {0} 不相容。擴充功能需要: {1}。"
diff --git a/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 5102b2af0d7..f4431d41910 100644
--- a/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/cht/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "您的 {0} 安裝似乎已損毀。請重新安裝。",
 	"integrity.moreInformation": "詳細資訊",
-	"integrity.dontShowAgain": "不要再顯示",
-	"integrity.prompt": "您的 {0} 安裝似乎已損毀。請重新安裝。"
+	"integrity.dontShowAgain": "不要再顯示"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
index e9ebd5685ed..16ce88704c4 100644
--- a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "透過滑鼠多選，用於在樹狀目錄與清單中新增項目的輔助按鍵 (例如在總管中開啟 [編輯器] 及 [SCM] 檢視)。在 Windows 及 Linux 上，`ctrlCmd` 對應 `Control`，在 macOS 上則對應 `Command`。[在側邊開啟] 滑鼠手勢 (若支援) 將會適應以避免和多選輔助按鍵衝突。",
 	"openMode.singleClick": "以滑鼠按一下開啟項目。",
 	"openMode.doubleClick": "以滑鼠按兩下開啟項目。",
-	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。"
+	"openModeModifier": "控制如何使用滑鼠在樹狀目錄與清單中開啟項目 (若有支援)。設為 `singleClick` 可以滑鼠按一下開啟物件，設為 `doubleClick` 則只能透過按兩下滑鼠開啟物件。對於樹狀目錄中具子系的父系而言，此設定會控制應以滑鼠按一下或按兩下展開父系。注意，某些樹狀目錄或清單若不適用此設定則會予以忽略。",
+	"horizontalScrolling setting": "控制是否支援工作台中的水平滾動。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/markers/common/markers.i18n.json b/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..cd4eb5c86cf
--- /dev/null
+++ b/i18n/cht/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "錯誤",
+	"sev.warning": "警告",
+	"sev.info": "資訊"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
index ba572d1fad3..1633b008b0b 100644
--- a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
 	"overviewRulerCommonContentForeground": "內嵌合併衝突中的共同上階概觀尺規前景。",
-	"overviewRulerFindMatchForeground": "尋找比對的概觀尺規標記色彩。",
-	"overviewRulerSelectionHighlightForeground": "選取項目醒目提示的概觀尺規標記色彩。"
+	"overviewRulerFindMatchForeground": "概述符合尋找條件的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。",
+	"overviewRulerSelectionHighlightForeground": "概述反白選擇的尺規標記顏色。不能使用非透明的顏色來隱藏底層的樣式。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..efc4571aceb
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型",
+	"showViewlet": "顯示 {0}",
+	"view": "檢視"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 4a5f6d65148..97fd8a138b1 100644
--- a/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/cht/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "提供意見給編輯者",
 	"views.explorer": "檔案總管檢視",
 	"views.debug": "偵錯檢視",
-	"locationId.invalid": "`{0}`不是有效的識別位置",
 	"duplicateView1": "無法在位置 '{1}' 使用相同的識別碼 '{0}' 註冊多個檢視",
 	"duplicateView2": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 4bf77a965be..ca923fa42ab 100644
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "在 {0} 毫秒後儲存時中止格式",
+	"timeout.onWillSave": "在 1750 亳秒後中止 onWillSaveTextDocument 事件",
 	"saveParticipants": "執行儲存參與者..."
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 7aa96ea3f1e..35229bd6699 100644
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "webview 編輯器"
+	]
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..950340ccaf2
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (延伸模組)"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 01f9e8f017f..9af81e350d6 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "聚焦下一個群組",
 	"openToSide": "開至側邊",
 	"closeEditor": "關閉編輯器",
+	"closeOneEditor": "關閉",
 	"revertAndCloseActiveEditor": "還原並關閉編輯器",
 	"closeEditorsToTheLeft": "將編輯器關到左側",
 	"closeAllEditors": "關閉所有編輯器",
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index afae41621bb..7dc8700e978 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "若您不打算使用螢幕助讀程式，請將設定 `editor.accessibilitySupport` 變更為 \"off\"。",
 	"disableTabMode": "停用協助工具模式",
 	"gotoLine": "移至行",
-	"indentation": "縮排",
 	"selectEncoding": "選取編碼",
 	"selectEOL": "選取行尾順序",
 	"selectLanguageMode": "選取語言模式",
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 56500848556..3c1c3df6d55 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0}MB",
 	"sizeGB": "{0}GB",
 	"sizeTB": "{0}TB",
-	"largeImageError": "影像的檔案大小太大 (>1MB)，無法在編輯器中顯示。",
 	"resourceOpenExternalButton": "要使用外部程式打開影像嗎?",
-	"nativeBinaryError": "檔案為二進位檔、非常大或使用不支援的文字編碼，因此將不會顯示於編輯器中。",
 	"zoom.action.fit.label": "整個影像",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index bd46f839ef8..47f703cf2f9 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "關閉",
 	"araLabelEditorActions": "編輯器動作"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 87b4e30eb9d..57cd7f56821 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "尚無新通知",
 	"notifications": "通知",
 	"notificationsToolbar": "通知中心動作",
 	"notificationsList": "通知列表"
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..e7e11a078b1
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "確定"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 7f571b29a98..b8069009fb7 100644
--- a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "視窗",
 	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
 	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
-	"window.openFilesInNewWindow.default": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟 (僅限 macOS)",
-	"openFilesInNewWindow": "控制檔案是否應在新視窗中開啟。\n- default: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟，除非透過擴充座或從尋找工具開啟 (僅限 macOS)\n- on: 檔案會在新視窗開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
+	"window.openFilesInNewWindow.defaultMac": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
+	"window.openFilesInNewWindow.default": "除非已從應用程式內挑選 (例如透過 [檔案] 功能表)，否則檔案會在新視窗中開啟",
+	"openFilesInNewWindowMac": "控制檔案是否應在新視窗中開啟。\n- default: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟，除非透過擴充座或從尋找工具開啟\n- on: 檔案會在新視窗開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
+	"openFilesInNewWindow": "控制是否在新視窗中打開檔案。\n- default: 檔案會在新視窗中開啟，除非從應用程式中選擇 (例如透過 \"檔案\" 功能表)\n- on: 檔案會在新視窗中開啟\n- off: 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟\n請注意，在某些情況下會略過此設定 (例如，使用 the -new-window 或 -reuse-window 命令列選項時)。",
 	"window.openFoldersInNewWindow.on": "資料夾會在新視窗中開啟",
 	"window.openFoldersInNewWindow.off": "資料夾會取代上一個使用中的視窗",
 	"window.openFoldersInNewWindow.default": "除非已從應用程式內挑選了資料夾 (例如透過 [檔案] 功能表)，否則資料夾會在新視窗中開啟",
 	"openFoldersInNewWindow": "控制資料夾應在新視窗中開啟或取代上一個使用中的視窗。\n- default: 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟\n- on: 資料夾會在新視窗開啟\n- off: 資料夾會取代上一個使用中視窗\n請注意，在某些情況下會略過此設定 (例如，使用了 -new-window 或 -reuse-window 命令列選項時)。",
+	"window.openWithoutArgumentsInNewWindow.on": "開啟新空白視窗",
+	"window.openWithoutArgumentsInNewWindow.off": "聚焦在上一個正在運行的執行個體",
+	"openWithoutArgumentsInNewWindow": "控制不以引數啟動第二個執行個體時是否要開啟新的空白視窗，或是應聚焦於上一個執行的執行個體。\n- on: 開啟新的空白視窗\n- off: 上一個使用中的執行中執行個體將會受到聚焦\n請注意：仍可能發生忽略此設定的情形 (例如，在使用 -new-window 或 -reuse-window 命令列選項時)。",
 	"window.reopenFolders.all": "重新開啟所有視窗。",
 	"window.reopenFolders.folders": "重新開啟所有資料夾。空白工作區將不會還原。",
 	"window.reopenFolders.one": "重新開啟上一個使用中的視窗。",
@@ -58,7 +63,7 @@
 	"restoreWindows": "控制重新啟動後視窗重新開啟的方式。選取 [無] 一律以空白工作區開始、選取 [一] 從上一個編輯的視窗重新開啟、選取 [資料夾] 重新開啟所有資料夾曾經開啟的視窗，或選取 [全部] 重新開啟上一個工作階段的所有視窗。",
 	"restoreFullscreen": "控制當視窗在全螢幕模式下結束後，下次是否仍以全螢幕模式開啟。",
 	"zoomLevel": "調整視窗的縮放比例。原始大小為 0，而且每個向上增量 (例如 1) 或向下增量 (例如 -1) 代表放大或縮小 20%。您也可以輸入小數，更細微地調整縮放比例。",
-	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值之變數括住時才顯示的條件式分隔符號 (\" - \")",
+	"title": "依據使用中的編輯器控制視窗標題。變數會依據內容替換:\n${activeEditorShort}: 檔案名稱 (例如 myFile.txt)\n${activeEditorMedium}: 與工作區資料夾相關的檔案路徑 (例如 myFolder/myFile.txt)\n${activeEditorLong}: 完整的檔案路徑 (例如 /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 包含著資料夾之工作區資料夾的名稱 (例如 myFolder)\n${folderPath}: 包含著資料夾之工作區資料夾的檔案路徑 (例如 /Users/Development/myFolder)\n${rootName}: 工作區的名稱 (例如 myFolder 或 myWorkspace)\n${rootPath}: 工作區的檔案路徑 (例如 /Users/Development/myWorkspace)\n${appName}: 例如 VS Code\n${dirty}: 已變更指示 (若使用中編輯器已變更)\n${separator}: 僅在受具有值或靜態文字之變數括住時才顯示的條件式分隔符號 (\" - \")",
 	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
 	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
 	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "若啟用，如果 Windows 使用高對比佈景主題，就會自動變更為高對比佈景主題，切換掉 Windows 高對比佈景主題時則變更為深色佈景主題。",
 	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
 	"window.nativeTabs": "啟用 macOS Sierra 視窗索引標籤。請注意需要完全重新啟動才能套用變更，並且完成設定後原始索引標籤將會停用自訂標題列樣式。",
+	"window.smoothScrollingWorkaround": "在還原最小化的 VS Code 視窗後，若捲動功能不再流暢，請啟用此因應措施。此因應措施適用於 Microsoft Surface 等具備精確軌跡板發生的捲動延遲問題 (https://github.com/Microsoft/vscode/issues/13612)。啟用此因應措施可能會在將視窗從最小化狀態還原後，導致版面稍微閃爍，但並不會造成任何傷害。",
 	"zenModeConfigurationTitle": "Zen Mode",
 	"zenMode.fullScreen": "控制開啟 Zen Mode 是否也會將 Workbench 轉換為全螢幕模式。",
 	"zenMode.centerLayout": "控制開啟 Zen Mode 是否也會置中配置。",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 219551b11e8..cd5762d9e8b 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "編輯中斷點...",
+	"breakpoint": "中斷點",
 	"functionBreakpointsNotSupported": "此偵錯類型不支援函式中斷點",
 	"functionBreakpointPlaceholder": "要中斷的函式",
 	"functionBreakPointInputAriaLabel": "輸入函式中斷點",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "未驗證的中斷點",
 	"functionBreakpointUnsupported": "此偵錯類型不支援函式中斷點",
 	"breakpointDirtydHover": "未驗證的中斷點。檔案已修改，請重新啟動偵錯工作階段。",
+	"logBreakpointUnsupported": "此偵錯類型不支援紀錄點",
 	"conditionalBreakpointUnsupported": "此偵錯類型不支援的條件式中斷點",
 	"hitBreakpointUnsupported": "此偵錯類型不支援點擊條件式中斷點"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index f2e740a82b9..0f2f7956622 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "重新啟動框架",
 	"removeBreakpoint": "移除中斷點",
 	"removeAllBreakpoints": "移除所有中斷點",
-	"enableBreakpoint": "啟用中斷點",
-	"disableBreakpoint": "停用中斷點",
 	"enableAllBreakpoints": "啟用所有中斷點",
 	"disableAllBreakpoints": "停用所有中斷點",
 	"activateBreakpoints": "啟動中斷點",
 	"deactivateBreakpoints": "停用中斷點",
 	"reapplyAllBreakpoints": "重新套用所有中斷點",
 	"addFunctionBreakpoint": "加入函式中斷點",
-	"addConditionalBreakpoint": "新增條件中斷點...",
-	"editConditionalBreakpoint": "編輯中斷點...",
 	"setValue": "設定值",
 	"addWatchExpression": "加入運算式",
 	"editWatchExpression": "編輯運算式",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index c84d5a3227a..2c747d5afe2 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "偵錯: 切換中斷點",
 	"conditionalBreakpointEditorAction": "偵錯: 新增條件中斷點...",
+	"logPointEditorAction": "偵錯: 新增紀錄點...",
 	"runToCursor": "執行至游標處",
 	"debugEvaluate": "偵錯: 評估",
 	"debugAddToWatch": "偵錯: 加入監看",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..357f07f4254
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "符合叫用次數條件時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
+	"breakpointWidgetExpressionPlaceholder": "在運算式評估為 true 時中斷。按 'Enter' 鍵接受，按 'esc' 鍵取消。",
+	"expression": "運算式",
+	"hitCount": "叫用次數",
+	"logMessage": "日誌訊息"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index a3ce7418d3b..94fb09e76eb 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "請使用唯一的組態名稱。",
 	"app.launch.json.compound.folder": "複合所在的資料夾名稱。",
 	"app.launch.json.compounds.configurations": "將會作為此複合一部份而啟動之組態的名稱。",
-	"debugNoType": "偵錯配接器 'type' 不能省略且必須屬於 'string' 類型。",
 	"selectDebug": "選取環境",
 	"DebugConfig.failed": "無法在 '.vscode' 資料夾 ({0}) 中建立 'launch.json' 檔案。",
 	"workspace": "工作區",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 0eb51f5a0eb..e48c78a24f2 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "中斷點",
 	"removeBreakpoints": "移除中斷點",
 	"removeBreakpointOnColumn": "移除資料行 {0} 的中斷點",
 	"removeLineBreakpoint": "移除行中斷點",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "啟用資料行 {0} 的中斷點",
 	"enableBreakpointOnLine": "啟用行中斷點",
 	"addBreakpoint": "加入中斷點",
+	"addConditionalBreakpoint": "新增條件中斷點...",
+	"addLogPoint": "新增紀錄點...",
+	"cancel": "取消",
 	"addConfiguration": "新增組態..."
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index b104866a55b..a922616389e 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "顯示錯誤",
 	"noFolderWorkspaceDebugError": "無法對使用中的檔案偵錯。請確認檔案已儲存在磁碟上，而且您已經為該檔案類型安裝偵錯延伸模組。",
 	"cancel": "取消",
-	"DebugTaskNotFound": "找不到 preLaunchTask '{0}'。",
-	"taskNotTracked": "無法追蹤 preLaunchTask '{0}'。"
+	"DebugTaskNotFound": "找不到工作 \"{0}\"。",
+	"taskNotTracked": "無法追蹤工作 '{0}'。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index a23b2bbf4ba..00af2e04bbf 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "詳細資訊",
-	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
-	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。",
-	"stoppingDebugAdapter": "{0}。正在停止偵錯配接器。",
 	"debugAdapterCrash": "偵錯配接器處理序已意外終止"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index d4a12e733ff..b15f9a6ac6a 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "偵錯配接器可執行檔 '{0}' 不存在。",
 	"debugAdapterCannotDetermineExecutable": "無法判斷偵錯配接器 '{0}' 的可執行檔。",
-	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
-	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
-	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
-	"debugType": "組態的類型。",
-	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
-	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
-	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
-	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
-	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
-	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
-	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
-	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
-	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
+	"unableToLaunchDebugAdapter": "無法從 '{0}' 啟動偵錯配接器。",
+	"unableToLaunchDebugAdapterNoArgs": "無法啟動偵錯配接器。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..49c1a7df761
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "使用 IntelliSense 以得知可用的屬性。",
+	"launch.config.comment2": "暫留以檢視現有屬性的描述。",
+	"launch.config.comment3": "如需詳細資訊，請瀏覽: {0}",
+	"debugType": "組態的類型。",
+	"debugTypeNotRecognised": "無法辨識此偵錯類型.請確認已有安裝並啟用相對應的偵錯擴充功能.",
+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。",
+	"debugName": "組態的名稱; 出現在啟動組態下拉式功能表中。",
+	"debugRequest": "要求組態的類型。可以是 [啟動] 或 [附加]。",
+	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
+	"debugPrelaunchTask": "偵錯工作階段啟動前要執行的工作。",
+	"debugPostDebugTask": "偵錯工作階段結束後要執行的工作。",
+	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
+	"debugOSXConfiguration": "OS X 特定的啟動設定屬性。",
+	"debugLinuxConfiguration": "Linux 特定的啟動設定屬性。",
+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..afdfcfb0e98
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code 主控台",
+	"mac.terminal.script.failed": "指令碼 '{0}' 失敗，結束代碼為 {1}",
+	"mac.terminal.type.not.supported": "不支援 '{0}'",
+	"press.any.key": "請按任意鍵繼續...",
+	"linux.term.failed": "'{0}' 失敗，結束代碼為 {1}"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
index d368fda6a7e..af127333714 100644
--- a/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/emmet/electron-browser/emmet.contribution.i18n.json
@@ -6,9 +6,9 @@
 {
 	"emmetConfigurationTitle": "Emmet",
 	"triggerExpansionOnTab": "啟用時，按下 TAB 即可展開 Emmet 縮寫。當 emmet.useNewemmet 設定為 true 時不適用。",
-	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 ture 時不適用。",
+	"emmetPreferences": "用以修改部分 Emmet 動作及解析程式之行為的喜好設定。emmet.useNewemmet 設定為 true 時不適用。",
 	"emmetSyntaxProfiles": "為指定的語法定義設定檔，或透過特定規則使用自己的設定檔。",
 	"emmetExclude": "不應展開 Emmet 縮寫的語言陣列。",
 	"emmetExtensionsPath": "包含 Emmet 設定檔、片段及喜好設定的資料夾路徑。emmet.useNewEmmet 設定為 true 時僅會從延伸模組路徑接受設定檔。",
 	"useNewEmmet": "試試所有 Emmet 功能的新 Emmet 模組 (最終會取代舊的單一 Emmet 程式庫)。"
-}
\ No newline at end of file
+}
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index f678d3e4041..beddde6d10c 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "設定建議的延伸模組 (工作區資料夾) ",
 	"malicious tooltip": "這個延伸模組曾經被回報是有問題的。",
 	"malicious": "惡意",
+	"disabled": "停用",
+	"disabled globally": "停用",
+	"disabled workspace": "在此工作區停用",
 	"disableAll": "停用所有已安裝的延伸模組",
 	"disableAllWorkspace": "停用此工作區的所有已安裝延伸模組",
 	"enableAll": "啟用所有擴充功能",
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..49e59b56429
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "延伸模組名稱",
+	"extension id": "延伸模組識別碼",
+	"preview": "預覽",
+	"builtin": "內建",
+	"publisher": "發行者名稱",
+	"install count": "安裝計數",
+	"rating": "評等",
+	"repository": "儲存庫",
+	"license": "授權",
+	"details": "詳細資料",
+	"contributions": "貢獻",
+	"changelog": "變更記錄",
+	"dependencies": "相依性",
+	"noReadme": "沒有可用的讀我檔案。",
+	"noChangelog": "沒有可用的 Changelog。",
+	"noContributions": "沒有比重",
+	"noDependencies": "沒有相依性",
+	"settings": "設定 ({0})",
+	"setting name": "名稱",
+	"description": "描述",
+	"default": "預設",
+	"debuggers": "偵錯工具 ({0})",
+	"debugger name": "名稱",
+	"debugger type": "型別",
+	"views": "瀏覽次數 ({0})",
+	"view id": "識別碼",
+	"view name": "名稱",
+	"view location": "位置",
+	"localizations": "當地語系化 ({0})",
+	"localizations language id": "語言識別碼",
+	"colorThemes": "色彩佈景主題 ({0})",
+	"iconThemes": "圖示佈景主題 ({0}) ",
+	"colors": "色彩 ({0})",
+	"colorId": "識別碼",
+	"defaultDark": "預設深色",
+	"defaultLight": "預設淺色",
+	"defaultHC": "預設高對比",
+	"JSON Validation": "JSON 驗證 ({0})",
+	"fileMatch": "檔案相符",
+	"schema": "結構描述",
+	"commands": "命令 ({0})",
+	"command name": "名稱",
+	"keyboard shortcuts": "鍵盤快速鍵(&&K)",
+	"menuContexts": "功能表內容",
+	"languages": "語言 ({0})",
+	"language id": "識別碼",
+	"language name": "名稱",
+	"file extensions": "副檔名",
+	"grammar": "文法",
+	"snippets": "程式碼片段"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index a6842652e2e..4c641b129be 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
 	"reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。",
 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
-	"showRecommendations": "顯示建議",
 	"install": "安裝",
+	"showRecommendations": "顯示建議",
 	"showLanguageExtensions": "市集有 '.{0}' 個文件的擴充功能可以提供協助",
 	"workspaceRecommended": "此工作區具有擴充功能建議。",
 	"installAll": "全部安裝",
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index c1249a2f499..c096eb60a7d 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "要停用其他按鍵對應 ({0})，以避免按鍵繫結關係間的衝突嗎?",
 	"yes": "是",
-	"no": "否",
-	"betterMergeDisabled": "目前已內建 Better Merge 延伸模組，安裝的延伸模組已停用並且可以移除。",
-	"uninstall": "解除安裝"
+	"no": "否"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 0893e280839..14b49f43b71 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": " 推薦項目",
 	"otherRecommendedExtensions": "其他建議",
 	"workspaceRecommendedExtensions": "工作區建議",
-	"builtInExtensions": "內建",
+	"builtInExtensions": "功能",
+	"builtInThemesExtensions": "主題",
 	"searchExtensions": "在 Marketplace 中搜尋擴充功能",
 	"sort by installs": "排序依據: 安裝計數",
 	"sort by rating": "排序依據: 評等",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 8c93678ae26..79ad427acdd 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,10 @@
 	"confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?",
 	"confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?",
 	"irreversible": "此動作無法回復!",
-	"cancel": "取消",
-	"permDelete": "永久刪除",
-	"importFiles": "匯入檔案",
+	"binFailed": "無法使用資源回收筒刪除。您要改為永久刪除嗎？ ",
+	"trashFailed": "無法使用垃圾筒刪除。您要改為永久刪除嗎？",
+	"deletePermanentlyButtonLabel": "永久刪除(&&D)",
+	"retryButtonLabel": "重試(&&R)",
 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
 	"replaceButtonLabel": "取代(&&R)",
 	"fileIsAncestor": "要貼上的檔案是在目地資料夾的上層 ",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index c024cac3cb0..ef1a56ddaa3 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "指派給新檔案的預設語言模式。",
 	"editorConfigurationTitle": "編輯器",
 	"formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。",
+	"formatOnSaveTimeout": "儲存時格式化超時。指定 formatOnSave 命令的時間限制 (以毫秒為單位)。超過指定超時時間的命令將被取消。",
 	"explorerConfigurationTitle": "檔案總管",
 	"openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。",
 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index b86d381ecd0..b183fbaeaf8 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "輸入檔案名稱。請按 Enter 鍵確認或按 Esc 鍵取消。",
-	"constructedPath": "在 **{1}** 建立 {0}",
 	"filesExplorerViewerAriaLabel": "{0}，檔案總管",
 	"dropFolders": "要在工作區新增資料夾嗎?",
 	"dropFolder": "要在工作區新增資料夾嗎?",
 	"addFolders": "新增資料夾(&A)",
 	"addFolder": "新增資料夾(&A)",
+	"confirmRootsMove": "您確定要變更工作區中多個根資料夾的順序嗎？",
 	"confirmMultiMove": "確定要移動以下 {0} 個文件嗎？",
+	"confirmRootMove": "您確定要變更工作區中根資料夾 '{0}' 的順序嗎？ ",
 	"confirmMove": "確定要移動 '{0}' 嗎?",
 	"doNotAskAgain": "不要再詢問我",
 	"moveButtonLabel": "移動(&&M)",
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..b4173cd7e58
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "HTML 預覽"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..99f3827f916
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "編輯器輸入無效。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..8e9c4235dcd
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "開發人員"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..da7857bbdcf
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "開啟 Webview Developer 工具",
+	"refreshWebviewLabel": "重新載入 Webviews"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 3a808520ab4..42320096aec 100644
--- a/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "您想要變更 VS Code 的 UI 語言為 {0} 並重新啟動嗎?",
+	"yes": "是",
+	"no": "否",
+	"neverAgain": "不要再顯示",
 	"JsonSchema.locale": "要使用的 UI 語言。",
 	"vscode.extension.contributes.localizations": "提供在地化服務給編輯者",
 	"vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id",
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..505303ab7e3
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "複製",
+	"copyMessage": "複製訊息"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..9459b771c76
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "共 {0} 項問題"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..6a593deff2f
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "問題",
+	"tooltip.1": "此檔案發生 1 個問題",
+	"tooltip.N": "此檔案發生 {0} 個問題",
+	"markers.showOnFile": "在檔案和資料夾上顯示錯誤和警告。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..cc0be28b025
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "檢視",
+	"problems.view.toggle.label": "切換至問題(錯誤, 警告, 資訊)",
+	"problems.view.focus.label": "聚焦於問題(錯誤, 警告, 資訊)",
+	"problems.panel.configuration.title": "[問題] 檢視",
+	"problems.panel.configuration.autoreveal": "控制 [問題] 檢視是否應自動在開啟檔案時加以顯示",
+	"markers.panel.title.problems": "問題",
+	"markers.panel.aria.label.problems.tree": "依檔案分組的問題",
+	"markers.panel.no.problems.build": "目前在工作區中未偵測到任何問題。",
+	"markers.panel.action.filter": "篩選問題",
+	"markers.panel.filter.ariaLabel": "篩選問題",
+	"markers.panel.filter.errors": "錯誤",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "資訊",
+	"markers.panel.single.error.label": "1 個錯誤",
+	"markers.panel.multiple.errors.label": "{0} 個錯誤",
+	"markers.panel.single.warning.label": "1 個警告",
+	"markers.panel.multiple.warnings.label": "{0} 個警告",
+	"markers.panel.single.info.label": "1 個資訊",
+	"markers.panel.multiple.infos.label": "{0} 個資訊",
+	"markers.panel.single.unknown.label": "1 個未知",
+	"markers.panel.multiple.unknowns.label": "{0} 個未知",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "發生 {1} 個問題的 {0}",
+	"problems.tree.aria.label.marker.relatedInformation": "此問題在 {0} 個位置有參考。",
+	"problems.tree.aria.label.error.marker": "{0} 產生的錯誤: 在行 {2} 與字元 {3} 的 {1}。{4} ",
+	"problems.tree.aria.label.error.marker.nosource": "錯誤: {0} 在行 {1} 和字元 {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "{0} 產生的警告: 在行 {2} 與字元 {3} 的 {1}。{4} ",
+	"problems.tree.aria.label.warning.marker.nosource": "警告: 在行 {1} 與字元 {2} 的 {0}。{3}",
+	"problems.tree.aria.label.info.marker": "{0} 產生的資訊: 在行 {2} 與字元 {3} 的 {1}。{4}",
+	"problems.tree.aria.label.info.marker.nosource": "資訊: 在行 {1} 與字元 {2} 的 {0}。{3} ",
+	"problems.tree.aria.label.marker": "{0} 產生的問題: 在行 {2} 與字元 {3} 的 {1}。{4} ",
+	"problems.tree.aria.label.marker.nosource": "問題: 在行 {1} 與字元 {2} 的 {0}。{3} ",
+	"problems.tree.aria.label.relatedinfo.message": "在第 {1} 行的 {0}，以及在 {3} 的 {2} 字元",
+	"errors.warnings.show.label": "顯示錯誤和警告"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 6f396ee79c2..f5bbc727caf 100644
--- a/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "切換輸出",
 	"clearOutput": "清除輸出",
 	"toggleOutputScrollLock": "切換輸出 SCROLL LOCK",
-	"switchToOutput.label": "切換至輸出"
+	"switchToOutput.label": "切換至輸出",
+	"openInLogViewer": "開啟日誌檔案"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index b1a05feb9e7..d1554edfa0a 100644
--- a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "輸出",
 	"logViewer": "紀錄檢視器",
 	"viewCategory": "檢視",
-	"clearOutput.label": "清除輸出"
+	"clearOutput.label": "清除輸出",
+	"openActiveLogOutputFile": "檢視: 開啟活動日誌輸出檔案"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index fb9f954c81c..fc90fe51e84 100644
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "鍵盤快速鍵(&&K)",
+	"showDefaultKeybindings": "顯示預設按鍵繫結",
+	"showUserKeybindings": "顯示使用者按鍵繫結",
 	"SearchKeybindings.AriaLabel": "搜尋按鍵繫結關係",
 	"SearchKeybindings.Placeholder": "搜尋按鍵繫結關係",
 	"sortByPrecedene": "依優先順序排序",
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index 903d12aaed4..aadc754a854 100644
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "開啟原始預設設置",
+	"openSettings": "開啟設定",
 	"openGlobalSettings": "開啟使用者設定",
 	"openGlobalKeybindings": "開啟鍵盤快速鍵",
 	"openGlobalKeybindingsFile": "開啟鍵盤快速鍵檔案",
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 7f9e4282439..566a9672a3c 100644
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "預設設定",
 	"SearchSettingsWidget.AriaLabel": "搜尋設定",
 	"SearchSettingsWidget.Placeholder": "搜尋設定",
 	"noSettingsFound": "沒有結果",
@@ -16,6 +15,8 @@
 	"nlpResult": "自然語言結果",
 	"filterResult": "篩選結果",
 	"defaultSettings": "預設設定",
+	"defaultUserSettings": "預設使用者設定",
+	"defaultWorkspaceSettings": "預設工作區設定",
 	"defaultFolderSettings": "預設資料夾設定",
 	"defaultEditorReadonly": "在右方編輯器中編輯以覆寫預設。",
 	"preferencesAriaLabel": "預設喜好設定。唯讀文字編輯器。"
diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 1349faf0322..912f924cec9 100644
--- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "顯示擴充功能 \"{0}\"",
 	"editTtile": "編輯",
 	"replaceDefaultValue": "在設定中取代",
-	"copyDefaultValue": "複製到設定",
-	"unsupportedPHPExecutablePathSetting": "這項設定必須是使用者設定。若要設定工作區的 PHP，請開啟 PHP 檔案並按一下狀態列中的 [PHP 路徑]。",
-	"unsupportedWorkspaceSetting": "這項設定必須是使用者設定。",
-	"unsupportedWorkbenchSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。",
-	"unsupportedWorkbenchSettingDevMode": "目前無法套用此設定。若您在註冊時將其範圍定義為「資源」，或您直接開啟此資料夾時，才會套用該設定。 "
+	"copyDefaultValue": "複製到設定"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index d4515832082..4bf0fb57a82 100644
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
 	"no open repo": "沒有使用中的原始檔控制提供者。",
 	"source control": "原始檔控制",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "隱藏"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 5b97663e3cf..1b7c3b9b6fa 100644
--- a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "顯示上一個搜尋排除模式",
 	"nextSearchTerm": "顯示下一個搜尋字詞",
 	"previousSearchTerm": "顯示上一個搜尋字詞",
-	"showSearchViewlet": "顯示搜尋",
 	"findInFiles": "在檔案中尋找",
 	"replaceInFiles": "檔案中取代",
 	"RefreshAction.label": "重新整理",
diff --git a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 39cad4cb3d4..1ab677e6ae2 100644
--- a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "搜尋",
+	"copyMatchLabel": "複製",
+	"copyPathLabel": "複製路徑",
+	"copyAllLabel": "全部複製",
 	"findInFolder": "在資料夾中尋找...",
 	"findInWorkspace": "在工作區中尋找...",
 	"showTriggerActions": "前往工作區中的符號...",
 	"name": "搜尋",
-	"search": "搜尋",
 	"showSearchViewl": "顯示搜尋",
 	"view": "檢視",
 	"findInFiles": "在檔案中尋找",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "設定以將全域符號搜尋的結果納入 Quick Open 的檔案結果中。",
 	"search.followSymlinks": "控制是否要在搜尋時遵循 symlink。",
 	"search.smartCase": "如果搜尋式為全部小寫，則用不分大小寫的搜尋，否則用分大小寫的搜尋",
-	"search.globalFindClipboard": "控制搜尋檢視是否應讀取或修改 macOS 上的共用尋找剪貼簿 (shared find clipboard)",
-	"search.location": "預覽: 控制搜尋會在資訊看板顯示為檢視，或在面板區域顯示為面板以取得更多水平空間。下個版本的面板搜尋將具有改善的水平版面配置，而此項目將不再處於預覽階段。"
+	"search.globalFindClipboard": "控制搜尋檢視是否應讀取或修改 macOS 上的共用尋找剪貼簿 (shared find clipboard)"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index ef6eef03108..0d09e32233d 100644
--- a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "協助我們改善{0}",
 	"takeShortSurvey": "填寫簡短調查問卷",
 	"remindLater": "稍後再提醒我",
-	"neverAgain": "不要再顯示",
-	"helpUs": "協助我們改善{0}"
+	"neverAgain": "不要再顯示"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 9d71ec68080..4b75935cfb3 100644
--- a/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "您願意填寫簡短的意見反應問卷嗎?",
 	"takeSurvey": "填寫問卷",
 	"remindLater": "稍後再提醒我",
-	"neverAgain": "不要再顯示",
-	"surveyQuestion": "您願意填寫簡短的意見反應問卷嗎?"
+	"neverAgain": "不要再顯示"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 229384af3d5..bd7d5bfc2f7 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "問題模式或所提供或預先定義之問題模式的名稱。如有指定基底，即可發出。",
 	"ProblemMatcherSchema.base": "要使用之基底問題比對器的名稱。",
 	"ProblemMatcherSchema.owner": "Code 內的問題擁有者。如果指定基底，則可以省略。如果省略且未指定基底，預設為 [外部]。",
+	"ProblemMatcherSchema.source": "可供人們閱讀的診斷描述來源，例如 'typescript' 或 'super lint'。",
 	"ProblemMatcherSchema.severity": "擷取項目問題的預設嚴重性。如果模式未定義嚴重性的符合群組，就會加以使用。",
 	"ProblemMatcherSchema.applyTo": "控制文字文件上所回報的問題僅會套用至開啟的文件、關閉的文件或所有文件。",
 	"ProblemMatcherSchema.fileLocation": "定義問題模式中所回報檔案名稱的解譯方式。",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 515b745aabc..4c9bd3ae056 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "指派工作到沒有群組",
 	"JsonSchema.tasks.group": "定義工作屬於哪個執行群組。支援將 「組建」新增到組建群組，以及將「測試」新增到測試群組。",
 	"JsonSchema.tasks.type": "定義工作在殼層中會作為處理序或命令來執行。",
+	"JsonSchema.command.quotedString.value": "實際命令值",
+	"JsonSchema.tasks.quoting.escape": "使用殼層逸出字元的逸出字元 (例如  ` under PowerShell 與 \\ under bash)。",
+	"JsonSchema.tasks.quoting.strong": "使用殼層的強式引號字元將引數括住 (例如 PowerShell 及 Bash 下的 \")。",
+	"JsonSchema.tasks.quoting.weak": "使用殼層的弱式引號字元將引數括住 (例如 PowerShell 及 Bash 下的 ')",
+	"JsonSchema.command.quotesString.quote": "如何引用命令值。",
+	"JsonSchema.command": "要執行的命令。可以是外部程式或殼層命令。",
+	"JsonSchema.args.quotedString.value": "實際參數值",
+	"JsonSchema.args.quotesString.quote": "如何引用參數值。",
+	"JsonSchema.tasks.args": "叫用此工作時，傳遞至命令的引數。",
 	"JsonSchema.tasks.label": "工作的使用者介面標籤",
 	"JsonSchema.version": "組態版本號碼",
 	"JsonSchema.tasks.identifier": "用以參考在 launch.json 或 dependsOn 子句中工作的使用者定義識別碼。",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index f498908a44c..06b20143d00 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "工作",
 	"ConfigureTaskRunnerAction.label": "設定工作",
+	"totalErrors": "{0} 個錯誤",
+	"totalWarnings": "{0} 個警告",
+	"totalInfos": "{0} 個資訊",
 	"problems": "問題",
 	"building": "建置中...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "顯示執行中的工作",
 	"tasks": "工作",
 	"TaskSystem.noHotSwap": "必須重新載入視窗才可變更執行使用中工作的工作執行引擎",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "選取錯誤和警告的種類以掃描工作輸出",
 	"customizeParseErrors": "當前的工作組態存在錯誤.請更正錯誤再執行工作.",
 	"moreThanOneBuildTask": "定義了很多建置工作於tasks.json.執行第一個.",
-	"TaskSystem.activeSame.background": "工作 '{0}' 已在使用中並處於背景模式。若要予以終止，請使用 [Tasks] \\(工作\\) 功能表的 [Terminate Task...] \\(終止工作...\\)。",
-	"TaskSystem.activeSame.noBackground": "工作 '{0}' 已在使用中。若要予以終止，請使用 [Tasks] \\(工作\\) 功能表的 [Terminate Task...] \\(終止工作...\\)。",
+	"terminateTask": "終止工作",
+	"restartTask": "重新啟動工作",
 	"TaskSystem.active": "已有工作在執行。請先終止該工作，然後再執行其他工作。",
 	"TaskSystem.restartFailed": "無法終止再重新啟動工作 {0}",
 	"TaskService.noConfiguration": "錯誤: {0} 工作偵測未替下列組態提供工作:\n{1}\n將會忽略該工作。\n",
diff --git a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 1066b0d3be0..b9d0cc54748 100644
--- a/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "警告: options.cwd 必須屬於字串類型。即將忽略值 {0}。",
+	"ConfigurationParser.inValidArg": "錯誤: 命令參數必須是字串或帶引號的字串。提供的值為:\n{0}",
 	"ConfigurationParser.noargs": "錯誤: 命令引數必須是字串陣列。提供的值為:\n{0}",
 	"ConfigurationParser.noShell": "警告: 只有在終端機中執行工作時才支援殼層組態。",
 	"ConfigurationParser.noName": "錯誤: 宣告範圍中的問題比對器必須有名稱:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "錯誤: 工作組態 '{0}' 缺少要求的屬性 '{1}'。會略過工作組態。",
 	"ConfigurationParser.notCustom": "錯誤: 未將工作宣告為自訂工作。將會忽略該組態。\n{0}\n",
 	"ConfigurationParser.noTaskName": "錯誤: 一項工作必須提供標籤屬性。即將忽略此工作。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: 工作 '{0}' 是 shell 命令 ，其中一個引數可能有未逸出的空格。若要確保命令列正確引述，請將引數合併到命令中。",
 	"taskConfiguration.noCommandOrDependsOn": "錯誤: 工作 '{0}' 未指定命令與 dependsOn 屬性。將會略過該工作。其定義為: \n{1}",
 	"taskConfiguration.noCommand": "錯誤: 工作 '{0}' 未定義命令。即將略過該工作。其定義為:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "工作版本 2.0.0 不支援全域 OS 特定工作。請使用 OS 特定命令來轉換這些工作。受影響的工作為:\n{0}"
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..2657899133e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "終端機的背景色彩，允許終端機和面板的色彩不同。",
+	"terminal.foreground": "終端機的前景色彩。",
+	"terminalCursor.foreground": "終端機游標的前景色彩。",
+	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
+	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
+	"terminal.border": "在終端機內將窗格分割之邊界的色彩。預設為 panel.border。",
+	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 08bb4aff71d..5ca89988fe2 100644
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -43,6 +43,7 @@
 	"workbench.action.terminal.scrollUpPage": "向上捲動 (頁)",
 	"workbench.action.terminal.scrollToTop": "捲動至頂端",
 	"workbench.action.terminal.clear": "清除",
+	"workbench.action.terminal.clearSelection": "清除選取項目",
 	"workbench.action.terminal.allowWorkspaceShell": "允許工作區外觀配置",
 	"workbench.action.terminal.disallowWorkspaceShell": "不允許工作區外觀設置",
 	"workbench.action.terminal.rename": "重新命名",
@@ -51,5 +52,9 @@
 	"workbench.action.terminal.hideFindWidget": "隱藏尋找小工具",
 	"nextTerminalFindTerm": "顯示下一個尋找字詞",
 	"previousTerminalFindTerm": "顯示上一個尋找字詞",
-	"quickOpenTerm": "切換使用中的終端機 "
+	"quickOpenTerm": "切換使用中的終端機 ",
+	"workbench.action.terminal.scrollToPreviousCommand": "捲動至上一個命令",
+	"workbench.action.terminal.scrollToNextCommand": "捲動至下一個命令",
+	"workbench.action.terminal.selectToPreviousCommand": "選取上一個命令",
+	"workbench.action.terminal.selectToNextCommand": "選取下一個命令"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 1fc27ddf20a..6e6cd238c56 100644
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "複製",
+	"split": "分割",
 	"paste": "貼上",
 	"selectAll": "全選",
-	"clear": "清除",
-	"split": "分割"
+	"clear": "清除"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index 0b5ee94a971..18f46d9ce41 100644
--- a/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "此工作區包含只能在 [使用者設定] 中進行的設定 ({0})。點擊 [這裡]({1}) 了解更多。",
 	"openWorkspaceSettings": "開啟工作區設定",
-	"dontShowAgain": "不要再顯示",
-	"unsupportedWorkspaceSettings": "此工作區包含只能在 [使用者設定] 中進行的設定 ({0})。點擊 [這裡]({1}) 了解更多。"
+	"dontShowAgain": "不要再顯示"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..bc0754d2c3e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "版本資訊: {0}",
+	"unassigned": "未指派"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index cda5b7948e8..bc2c29afc58 100644
--- a/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "稍後",
-	"unassigned": "未指派",
 	"releaseNotes": "版本資訊",
 	"showReleaseNotes": "顯示版本資訊",
 	"read the release notes": "歡迎使用 {0} v{1}! 您要閱讀版本資訊嗎?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "新的 {0} 更新已可用。",
 	"noUpdatesAvailable": "目前沒有任何可用的更新。",
 	"ok": "確定",
-	"download now": "立即下載",
 	"thereIsUpdateAvailable": "已有更新可用。",
+	"download now": "立即下載",
+	"later": "稍後",
 	"installUpdate": "安裝更新",
-	"updateAvailable": "已有更新可用: {0} {1}",
 	"updateInstalling": "{0} {1} 正在背景執行安裝，完成後我們會通知您。",
 	"updateNow": "立即更新",
-	"updateAvailableAfterRestart": "{0} 重新啟動後將會更新。",
 	"commandPalette": "命令選擇區...",
 	"settings": "設定",
 	"keyboardShortcuts": "鍵盤快速鍵(&&K)",
diff --git a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..b50b4d83e7d
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "webview 編輯器",
+	"developer": "開發人員"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..b418d6bed42
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "開啟 Webview Developer 工具"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..c089b63f259
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "允許 Microsoft 收集使用率資料來協助改進 VS Code。閱讀我們的 [隱私權聲明] ({0}) 以及學習如何 [選擇退出] ({1})。",
+	"telemetryOptOut.optInNotice": "允許 Microsoft 收集使用率資料來協助改進 VS Code。閱讀我們的 [隱私權聲明] ({0}) 以及學習如何 [選擇參加] ({1})。",
+	"telemetryOptOut.readMore": "閱讀其他資訊"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 8104e02472c..c1ac321018a 100644
--- a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "工具與語言",
 	"welcomePage.installExtensionPacksDescription": "安裝{0}與{1}的支援功能。",
 	"welcomePage.moreExtensions": "更多",
-	"welcomePage.installKeymapDescription": "安裝鍵盤快速鍵",
-	"welcomePage.installKeymapExtension": "安裝鍵盤快速鍵{0}與{1}",
 	"welcomePage.others": "其他",
 	"welcomePage.colorTheme": "彩色佈景主題",
 	"welcomePage.colorThemeDescription": "將編輯器及您的程式碼設定成您喜愛的外觀",
diff --git a/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..b292db4923f
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "目前無法套用此設定。要在您直接開啟此資料夾時才會套用。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..e3294fd3329
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "是(&&Y)",
+	"cancelButton": "取消"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index b8196a053ae..4d5641feb37 100644
--- a/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "延伸主機意外終止。",
 	"extensionHostProcess.unresponsiveCrash": "因為延伸主機沒有回應，所以意外終止。",
-	"devTools": "開發人員工具",
 	"restart": "重新啟動延伸主機",
 	"overwritingExtension": "正在以 {1} 覆寫延伸模組 {0}。",
 	"extensionUnderDevelopment": "正在載入位於 {0} 的開發延伸模組",
diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 822c6c89950..5f4414cf665 100644
--- a/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "需要 Microsoft .NET Framework 4.5。請連入此連結進行安裝。",
 	"installNet": "下載 .NET Framework 4.5",
 	"neverShowAgain": "不要再顯示",
-	"netVersionError": "需要 Microsoft .NET Framework 4.5。請連入此連結進行安裝。",
+	"enospcError": "{0} 無法監看此大型工作區中的檔案變更。請按照連結中的說明來解決此問題。",
 	"learnMore": "說明",
-	"enospcError": "{0} 已超出檔案處理。請按照說明連結解決此問題。",
+	"fileInvalidPath": "檔案資源 ({0}) 無效",
+	"fileIsDirectoryError": "檔案是目錄",
+	"fileNotModifiedError": "未修改檔案的時間",
+	"fileTooLargeError": "檔案太大無法開啟",
+	"fileNotFoundError": "找不到檔案 ({0})",
+	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
+	"filePermission": "寫至檔案 ({0}) 的權限遭拒",
+	"fileExists": "要建立的檔案已存在 ({0})",
+	"fileModifiedError": "修改檔案的時間",
+	"fileReadOnlyError": "檔案為唯讀",
+	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
+	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
 	"binFailed": "無法將 '{0}' 移至資源回收筒",
 	"trashFailed": "無法將 '{0}' 移動至垃圾"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 445082ba333..5b44b85bd11 100644
--- a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "找不到檔案 ({0})",
 	"fileIsDirectoryError": "檔案是目錄",
 	"fileNotModifiedError": "未修改檔案的時間",
 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟"
diff --git a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
index 17a563b7b1a..ad99e777e96 100644
--- a/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "檔案資源 ({0}) 無效",
 	"fileIsDirectoryError": "檔案是目錄",
 	"fileNotModifiedError": "未修改檔案的時間",
-	"fileTooLargeForHeapError": "檔案大小超過視窗記憶體限制，請試執行 code --max-memory=NEWSIZE",
 	"fileTooLargeError": "檔案太大無法開啟",
 	"fileNotFoundError": "找不到檔案 ({0})",
 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
diff --git a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..2ac63294841 100644
--- a/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "取消"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 5b30d29c44f..9579a990fa8 100644
--- a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 檔案所使用的 textmate 範圍名稱。",
 	"vscode.extension.contributes.grammars.path": "tmLanguage 檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './syntaxes/' 開頭。",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此文法包含內嵌語言，即為範圍名稱到語言識別碼的對應。",
+	"vscode.extension.contributes.grammars.tokenTypes": "範圍名稱到象徵類型的對應。",
 	"vscode.extension.contributes.grammars.injectTo": "要插入此文法的語言範圍名稱清單。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index a06e75b15d3..2f6acd42b1f 100644
--- a/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}",
 	"invalid.injectTo": "`contributes.{0}.injectTo` 中的值無效。必須是語言範圍名稱的陣列。提供的值: {1}",
 	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 中的值無效。必須是從範圍名稱到語言的物件對應。提供的值: {1}",
+	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` 的值無效。必須是從範圍名稱到象徵類型的物件對應。提供的值: {1} ",
 	"invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。",
 	"no-tm-grammar": "此語言未註冊任何 TM 文法。"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..05ec8e77798
--- /dev/null
+++ b/i18n/deu/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS-Sprachserver",
+	"folding.start": "Regionsanfang wird gefaltet",
+	"folding.end": "Regionsende wird gefaltet"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css-language-features/package.i18n.json b/i18n/deu/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..6c525265ecf
--- /dev/null
+++ b/i18n/deu/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
+	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
+	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
+	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"scss.title": "SCSS (SASS)",
+	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
+	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
+	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
+	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
+	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
+	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
+	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
+	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
+	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
+	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
+	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
+	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
+	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
+	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
+	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
+	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
+	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
+	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
+	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
+	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/css/package.i18n.json b/i18n/deu/extensions/css/package.i18n.json
index 6c525265ecf..aed34432417 100644
--- a/i18n/deu/extensions/css/package.i18n.json
+++ b/i18n/deu/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für CSS-, LESS- und SCSS-Dateien.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"css.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"css.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"css.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"css.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"css.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"css.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"css.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"css.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"css.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"css.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"css.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"css.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"css.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"css.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"css.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"css.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem CSS-Sprachserver.",
-	"css.validate.title": "Steuert die CSS-Validierung und Problemschweregrade.",
-	"css.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"less.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"less.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"less.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"less.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"less.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"less.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"less.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"less.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"less.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"less.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"less.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"less.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"less.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"less.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"less.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"less.validate.title": "Steuert die LESS-Validierung und Problemschweregrade.",
-	"less.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Ungültige Parameteranzahl.",
-	"scss.lint.boxModel.desc": "Verwenden Sie width oder height nicht beim Festlegen von padding oder border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Stellen Sie beim Verwenden vom anbieterspezifischen Präfix sicher, dass alle anderen anbieterspezifischen Eigenschaften miteinbezogen werden",
-	"scss.lint.duplicateProperties.desc": "Keine doppelten Formatvorlagendefinitionen verwenden",
-	"scss.lint.emptyRules.desc": "Keine leeren Regelsätze verwenden",
-	"scss.lint.float.desc": "Die Verwendung von \"float\" vermeiden. float-Eigenschaften führen zu anfälligem CSS, das schnell nicht mehr funktioniert, wenn sich ein Aspekt des Layouts ändert.",
-	"scss.lint.fontFaceProperties.desc": "@font-face-Regel muss die Eigenschaften \"src\" und \"font-family\" definieren.",
-	"scss.lint.hexColorLength.desc": "Hexfarben müssen aus drei oder sechs Hexzahlen bestehen",
-	"scss.lint.idSelector.desc": "Selektoren sollten keine IDs enthalten, da diese Regeln zu eng mit HTML verknüpft sind.",
-	"scss.lint.ieHack.desc": "IE-Hacks sind nur für die Unterstützung von IE7 und älter erforderlich",
-	"scss.lint.important.desc": "Verwendung von „!important“ vermeiden. Damit wird angegeben, dass die Spezifität vom gesamten CSS außer Kontrolle geraten ist und umgestaltet werden muss.",
-	"scss.lint.importStatement.desc": "Importanweisungen können nicht parallel geladen werden.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Die Eigenschaft wird aufgrund der Anzeige ignoriert. Mit \"display: inline\" besitzen die width-, height-, margin-top-, margin-bottom- und float-Eigenschaften z. B. keine Auswirkung.",
-	"scss.lint.universalSelector.desc": "Es ist bekannt, dass der Universalselektor (*) langsam ist.",
-	"scss.lint.unknownProperties.desc": "Unbekannte Eigenschaft.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Unbekannte anbieterspezifische Eigenschaft.",
-	"scss.lint.vendorPrefix.desc": "Beim Verwenden von anbieterspezifischen Präfix auch die Standardeigenschaft miteinbeziehen",
-	"scss.lint.zeroUnits.desc": "Keine Einheit für Null erforderlich",
-	"scss.validate.title": "Steuert die SCSS-Überprüfung und Problemschweregrade.",
-	"scss.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
-	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"css.colorDecorators.enable.deprecationMessage": "Die Einstellung \"css.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Die Einstellung \"scss.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"less.colorDecorators.enable.deprecationMessage": "Die Einstellung \"less.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+	"displayName": "CSS-Sprachgrundlagen",
+	"description": "Bietet Syntax-Highlighting und Bracket-Matching für CSS, LESS und SCSS Dateien."
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/emmet/package.i18n.json b/i18n/deu/extensions/emmet/package.i18n.json
index 0dac2469d98..280cca4ed3d 100644
--- a/i18n/deu/extensions/emmet/package.i18n.json
+++ b/i18n/deu/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Pfad zu einem Ordner mit Emmet-Profilen und Ausschnitten.",
 	"emmetShowExpandedAbbreviation": "Zeigt erweiterte Emmet-Abkürzungen als Vorschläge an.\nDie Option inMarkupAndStylesheetFilesOnly gilt für HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, Sass, Less und Stylus.\nDie Option \"always\" gilt unabhängig vom Markup/CSS für alle Teile der Datei.",
 	"emmetShowAbbreviationSuggestions": "Zeigt mögliche Emmet-Abkürzungen als Vorschläge an. Diese Option gilt nicht in Stylesheets oder wenn emmet.showExpandedAbbreviation auf \"never\" festgelegt ist.",
-	"emmetIncludeLanguages": "Aktivieren Sie Emmet-Abkürzungen in Sprachen, die nicht standardmäßig unterstützt werden. Fügen Sie hier ein Mapping zwischen der Sprache und der von Emmet unterstützten Sprache hinzu.\nBeispiel: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "In Emmet-Ausschnitten zu verwendende Codeausschnitte",
 	"emmetTriggerExpansionOnTab": "Wenn aktiviert, werden Emmet-Abkürzungen beim Drücken der TAB-Taste erweitert.",
 	"emmetPreferences": "Einstellungen, die zum Ändern des Verhaltens einiger Aktionen und Konfliktlöser von Emmet verwendet werden.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"webkit\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"webkit\"-Präfix immer zu vermeiden.",
 	"emmetPreferencesCssMozProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"moz\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"moz\"-Präfix immer zu vermeiden.",
 	"emmetPreferencesCssOProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"o\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"o\"-Präfix immer zu vermeiden.",
-	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden."
+	"emmetPreferencesCssMsProperties": "Durch Trennzeichen getrennte CSS-Eigenschaften, die das \"ms\"-Herstellerpräfix erhalten, wenn sie in einer Emmet-Abkürzung verwendet werden, die mit \"-\" beginnt. Legen Sie eine leere Zeichenfolge fest, um das \"ms\"-Präfix immer zu vermeiden.",
+	"emmetPreferencesCssFuzzySearchMinScore": "Das Mindestergebnis (zwischen 0 und 1), das die Abkürzung mit Fuzzyübereinstimmung erreichen muss. Niedrigere Werte führen zu vielen falsch positiven Übereinstimmungen, höhere Werte verringern unter Umständen die möglichen Übereinstimmungen."
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/commands.i18n.json b/i18n/deu/extensions/git/out/commands.i18n.json
index 390ed62228d..7efb13a1a10 100644
--- a/i18n/deu/extensions/git/out/commands.i18n.json
+++ b/i18n/deu/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "Push mit Tags erfolgreich ausgeführt.",
 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
-	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
+	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}/{1}\" übertragen.",
 	"never again": "OK, nicht mehr anzeigen",
 	"no remotes to publish": "In Ihrem Repository wurden keine Remoteelemente für die Veröffentlichung konfiguriert.",
 	"no changes stash": "Es sind keine Änderungen vorhanden, für die ein Stash ausgeführt werden kann.",
diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json
index 4c745be0f35..70e0819e8ad 100644
--- a/i18n/deu/extensions/git/package.i18n.json
+++ b/i18n/deu/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Steuert, ob eine Inlineaktion zum Öffnen der Datei in der Ansicht \"Git-Änderungen\" angezeigt wird.",
 	"config.inputValidation": "Steuert, wann die Commit-Meldung der Eingabevalidierung angezeigt wird.",
 	"config.detectSubmodules": "Steuert, ob Git-Submodule automatisch erkannt werden.",
+	"config.detectSubmodulesLimit": "Steuert die Begrenzung der Git-Submodule.",
 	"colors.modified": "Farbe für geänderte Ressourcen.",
 	"colors.deleted": "Farbe für gelöschten Ressourcen.",
 	"colors.untracked": "Farbe für nicht verfolgte Ressourcen.",
diff --git a/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..6a6d9025074
--- /dev/null
+++ b/i18n/deu/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML-Sprachserver",
+	"folding.start": "Regionsanfang wird gefaltet",
+	"folding.end": "Regionsende wird gefaltet"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html-language-features/package.i18n.json b/i18n/deu/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..a18d59eb263
--- /dev/null
+++ b/i18n/deu/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
+	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
+	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
+	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
+	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
+	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
+	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
+	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
+	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
+	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
+	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
+	"html.format.wrapAttributes.desc": "Attribute umschließen.",
+	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
+	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
+	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
+	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
+	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
+	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
+	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
+	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
+	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
+	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
+	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/html/package.i18n.json b/i18n/deu/extensions/html/package.i18n.json
index a85a95e5d5d..9ce5789f793 100644
--- a/i18n/deu/extensions/html/package.i18n.json
+++ b/i18n/deu/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für HTML-, Razor- und Handlebar-Dateien.",
-	"html.format.enable.desc": "Standard-HTML-Formatierer aktivieren/deaktivieren",
-	"html.format.wrapLineLength.desc": "Die maximale Anzahl von Zeichen pro Zeile (0 = deaktiviert).",
-	"html.format.unformatted.desc": "Die Liste der Tags (durch Kommas getrennt), die nicht erneut formatiert werden sollen. \"null\" bezieht sich standardmäßig auf alle Tags, die unter https://www.w3.org/TR/html5/dom.html#phrasing-content aufgeführt werden.",
-	"html.format.contentUnformatted.desc": "Liste der Tags (durch Trennzeichen getrennt), in der der Inhalt nicht neu formatiert werden muss. \"null\" entspricht standardmäßig dem Tag \"pre\".",
-	"html.format.indentInnerHtml.desc": "Nimmt einen Einzug für <head>- und <body>-Abschnitte vor.",
-	"html.format.preserveNewLines.desc": "Gibt an, ob vorhandene Zeilenumbrüche vor Elemente beibehalten werden sollen. Funktioniert nur vor Elementen, nicht in Tags oder für Text.",
-	"html.format.maxPreserveNewLines.desc": "Die maximale Anzahl von Zeilenumbrüchen, die in einem Block beibehalten werden soll. Verwenden Sie \"null\" für eine unbegrenzte Anzahl.",
-	"html.format.indentHandlebars.desc": "Formatiert {{#foo}} und {{/foo}} und nimmt einen Einzug vor.",
-	"html.format.endWithNewline.desc": "Endet mit einer neuen Zeile.",
-	"html.format.extraLiners.desc": "Die Liste der Tags (durch Kommas getrennt), vor denen eine zusätzliche neue Zeile eingefügt werden soll. \"null\" verwendet standardmäßig \"head, body, /HTML\".",
-	"html.format.wrapAttributes.desc": "Attribute umschließen.",
-	"html.format.wrapAttributes.auto": "Attribute nur dann umschließen, wenn die Zeilenlänge überschritten wird.",
-	"html.format.wrapAttributes.force": "Jedes Attribut mit Ausnahme des ersten umschließen.",
-	"html.format.wrapAttributes.forcealign": "Jedes Attribut mit Ausnahme des ersten umschließen und Ausrichtung beibehalten.",
-	"html.format.wrapAttributes.forcemultiline": "Jedes Attribut umschließen.",
-	"html.suggest.angular1.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Angular V1-Tags und -Eigenschaften vorschlägt.",
-	"html.suggest.ionic.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung Ionic-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.suggest.html5.desc": "Konfiguriert, ob die integrierte HTML-Sprachuntersützung HTML5-Tags, -Eigenschaften und -Werte vorschlägt.",
-	"html.trace.server.desc": "Verfolgt die Kommunikation zwischen VS Code und dem HTML-Sprachserver.",
-	"html.validate.scripts": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts unterstützt.",
-	"html.validate.styles": "Konfiguriert, ob die integrierte HTML-Sprachunterstützung eingebettete Skripts validiert.",
-	"html.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert syntaxabhängige Faltungsmarkierungen.",
-	"html.autoClosingTags": "Automatisches Schließen von HTML-Tags aktivieren/deaktivieren."
+	"displayName": "HTML-Sprachgrundlagen",
+	"description": "Bietet Syntaxhervorhebung, Klammernpaare und Ausschnitte in HTML-Dateien."
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..fa24cd1104c
--- /dev/null
+++ b/i18n/deu/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON-Sprachserver"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json-language-features/package.i18n.json b/i18n/deu/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..422563eeb75
--- /dev/null
+++ b/i18n/deu/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
+	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
+	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
+	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
+	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
+	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
+	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
+	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
+	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
+	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/json/package.i18n.json b/i18n/deu/extensions/json/package.i18n.json
index 1ee4f4553c8..b9be795e738 100644
--- a/i18n/deu/extensions/json/package.i18n.json
+++ b/i18n/deu/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON-Sprachfeatures",
-	"description": "Bietet umfangreiche Sprachunterstützung für JSON-Dateien.",
-	"json.schemas.desc": "Schemas zu JSON-Dateien im aktuellen Projekt zuordnen",
-	"json.schemas.url.desc": "Eine URL zu einem Schema oder ein relativer Pfad zu einem Schema im aktuellen Verzeichnis",
-	"json.schemas.fileMatch.desc": "Ein Array von Dateimustern, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.fileMatch.item.desc": "Ein Dateimuster, das \"*\" enthalten kann, mit dem beim Auflösen von JSON-Dateien zu Schemas ein Abgleich erfolgt.",
-	"json.schemas.schema.desc": "Die Schemadefinition für die angegebene URL. Das Schema muss nur angegeben werden, um Zugriffe auf die Schema-URL zu vermeiden.",
-	"json.format.enable.desc": "Standard-JSON-Formatierer aktivieren/deaktivieren (Neustart erforderlich)",
-	"json.tracing.desc": "Verfolgt die Kommunikation zwischen VS Code und JSON-Sprachserver nach.",
-	"json.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
-	"json.colorDecorators.enable.deprecationMessage": "Die Einstellung \"json.colorDecorators.enable\" ist veraltet und wurde durch \"editor.colorDecorators\" ersetzt.",
-	"json.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen."
+	"displayName": "JSON-Sprachgrundlagen",
+	"description": "Bietet Syntaxhervorhebung und Klammernpaare in JSON-Dateien."
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..fdc135e8bec
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' konnte nicht geladen werden: {0}"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..145213b7b2e
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Vorschau] {0}",
+	"previewTitle": "Vorschau von {0}"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..1793456fe9d
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "In diesem Dokument wurden einige Inhalte deaktiviert.",
+	"preview.securityMessage.title": "Potenziell unsichere Inhalte wurden in der Markdown-Vorschau deaktiviert. Ändern Sie die Sicherheitseinstellung der Markdown-Vorschau, um unsichere Inhalte zuzulassen oder Skripts zu aktivieren.",
+	"preview.securityMessage.label": "Sicherheitswarnung – Inhalt deaktiviert"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/out/security.i18n.json b/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..828b182b8ed
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Nur sicheren Inhalt laden",
+	"insecureContent.title": "Unsicheren Inhalt zulassen",
+	"insecureContent.description": "Laden von Inhalten über HTTP aktivieren",
+	"disable.title": "Deaktivieren",
+	"disable.description": "Alle Inhalte und Skriptausführung zulassen. Nicht empfohlen.",
+	"moreInfo.title": "Weitere Informationen",
+	"enableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich aktivieren",
+	"disableSecurityWarning.title": "Vorschau von Sicherheitswarnungen in diesem Arbeitsbereich deaktivieren ",
+	"toggleSecurityWarning.description": "Hat keinen Einfluss auf die Inhaltssicherheitsebene",
+	"preview.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für die Markdown-Vorschau in diesem Arbeitsbereich auswählen"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/markdown-language-features/package.i18n.json b/i18n/deu/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..8a886edcb00
--- /dev/null
+++ b/i18n/deu/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für Markdown.",
+	"markdown.preview.breaks.desc": "Legt fest, wie Zeilenumbrüche in der Markdown-Vorschau gerendert werden. Die Einstellung 'true' erzeugt ein <br> für jede neue Zeile.",
+	"markdown.preview.linkify": "Aktiviert oder deaktiviert die Konvertierung von URL-ähnlichem Text in Links in der Markdown-Vorschau.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Doppelklicken Sie in die Markdown-Vorschau, um zum Editor zu wechseln.",
+	"markdown.preview.fontFamily.desc": "Steuert die Schriftfamilie, die in der Markdownvorschau verwendet wird.",
+	"markdown.preview.fontSize.desc": "Steuert den Schriftgrad in Pixeln, der in der Markdownvorschau verwendet wird.",
+	"markdown.preview.lineHeight.desc": "Steuert die Zeilenhöhe, die in der Markdownvorschau verwendet wird. Diese Zahl ist relativ zum Schriftgrad.",
+	"markdown.preview.markEditorSelection.desc": "Markieren Sie die aktuelle Editor-Auswahl in der Markdown-Vorschau.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Wenn für eine Markdown-Vorschau ein Bildlauf durchgeführt wird, die Ansicht des Editors aktualisieren.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Wenn für die Markdown-Vorschau ein Bildlauf durchgeführt wird, aktualisieren Sie die Ansicht der Vorschau.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Veraltet] Führt einen Bildlauf für die Markdown-Vorschau durch, um die aktuell ausgewählte Zeile im Editor anzuzeigen.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Diese Einstellung wurde durch \"markdown.preview.scrollPreviewWithEditor\" ersetzt und ist nicht mehr wirksam.",
+	"markdown.preview.title": "Vorschau öffnen",
+	"markdown.previewFrontMatter.dec": "Legt fest, wie die YAML-Titelei in der Markdownvorschau gerendert werden soll. Durch \"hide\" wird die Titelei entfernt. Andernfalls wird die Titelei wie Markdowninhalt verarbeitet.",
+	"markdown.previewSide.title": "Vorschau an der Seite öffnen",
+	"markdown.showLockedPreviewToSide.title": "Gesperrte Vorschau an der Seite öffnen",
+	"markdown.showSource.title": "Quelle anzeigen",
+	"markdown.styles.dec": "Eine Liste von URLs oder lokalen Pfaden zu CSS-Stylesheets aus der Markdownvorschau, die verwendet werden sollen. Relative Pfade werden relativ zu dem Ordner interpretiert, der im Explorer geöffnet ist. Wenn kein Ordner geöffnet ist, werden sie relativ zum Speicherort der Markdowndatei interpretiert. Alle '\\' müssen als '\\\\' geschrieben werden.",
+	"markdown.showPreviewSecuritySelector.title": "Sicherheitseinstellungen für Vorschau ändern",
+	"markdown.trace.desc": "Aktiviert die Debugprotokollierung für die Markdown-Erweiterung.",
+	"markdown.preview.refresh.title": "Vorschau aktualisieren",
+	"markdown.preview.toggleLock.title": "Vorschausperre umschalten"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..5805f86da6e
--- /dev/null
+++ b/i18n/deu/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Möchten Sie zulassen, dass {0} (als Arbeitsbereichseinstellung definiert) zum Bereinigen von PHP-Dateien ausgeführt wird?",
+	"php.yes": "Zulassen",
+	"php.no": "Nicht zulassen",
+	"wrongExecutable": "Eine Überprüfung ist nicht möglich, da {0} keine gültige ausführbare PHP-Datei ist. Verwenden Sie die Einstellung \"'php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
+	"noExecutable": "Eine Überprüfung ist nicht möglich, da keine ausführbare PHP-Datei festgelegt ist. Verwenden Sie die Einstellung \"php.validate.executablePath\", um die ausführbare PHP-Datei zu konfigurieren.",
+	"unknownReason": "Fehler beim Ausführen von PHP mithilfe des Pfads \"{0}\". Die Ursache ist unbekannt."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php-language-features/package.i18n.json b/i18n/deu/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..7124411caa7
--- /dev/null
+++ b/i18n/deu/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
+	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
+	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
+	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
+	"displayName": "PHP-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für PHP-Dateien."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/php/package.i18n.json b/i18n/deu/extensions/php/package.i18n.json
index b969aa85c93..25f008aacf8 100644
--- a/i18n/deu/extensions/php/package.i18n.json
+++ b/i18n/deu/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Konfiguriert, ob die integrierten PHP-Sprachvorschläge aktiviert sind. Die Unterstützung schlägt globale und variable PHP-Elemente vor.",
-	"configuration.validate.enable": "Integrierte PHP-Überprüfung aktivieren/deaktivieren.",
-	"configuration.validate.executablePath": "Zeigt auf die ausführbare PHP-Datei.",
-	"configuration.validate.run": "Gibt an, ob der Linter beim Speichern oder bei der Eingabe ausgeführt wird.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Ausführbare Datei für PHP-Überprüfung nicht zulassen (als Arbeitsbereicheinstellung definiert)",
-	"displayName": "PHP-Sprachfeatures",
-	"description": "Bietet IntelliSense, Bereinigen und Sprachgrundlagen für PHP-Dateien."
+	"description": "Bietet Syntaxhervorhebung und Klammernpaare für PHP-Dateien."
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json b/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..cdebacc88db
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.",
+	"typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.",
+	"typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.",
+	"typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
+	"typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekt. Klicken Sie [hier]({0}), um mehr zu erfahren.",
+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren",
+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..3d20846a443
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Anzuwendende Codeaktion auswählen",
+	"acquiringTypingsLabel": "Eingaben werden abgerufen...",
+	"acquiringTypingsDetail": "Eingabedefinitionen für IntelliSense werden abgerufen."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..ab837c60f37
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Aktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
+	"ts-nocheck": "Deaktiviert die Semantiküberprüfung in einer JavaScript-Datei. Muss sich oben in einer Datei befinden.",
+	"ts-ignore": "Unterdrückt @ts-check-Fehler in der nächsten Zeile einer Datei."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..2dd478f8590
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 Implementierung",
+	"manyImplementationLabel": "{0}-Implementierungen",
+	"implementationsErrorLabel": "Implementierungen konnten nicht bestimmt werden"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..e5e06fc03c8
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc-Kommentar"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..9df063abf44
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Importe organisieren"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..e0e88f5e50e
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Behebe alle in Datei)"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..73d84e6a380
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 Verweis",
+	"manyReferenceLabel": "{0} Verweise",
+	"referenceErrorLabel": "Verweise konnten nicht bestimmt werden"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..8d79b969dfa
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "Erstellen – {0}",
+	"buildAndWatchTscLabel": "Überwachen – {0}"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..eb955bb9c06
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "Der Pfad \"{0}\" zeigt nicht auf eine gültige tsserver-Installation. Fallback auf gebündelte TypeScript-Version wird durchgeführt.",
+	"serverCouldNotBeStarted": "Der TypeScript-Sprachserver konnte nicht gestartet werden. Fehlermeldung: {0}",
+	"typescript.openTsServerLog.notSupported": "Die TS Server-Protokollierung erfordert TS 2.2.2+.",
+	"typescript.openTsServerLog.loggingNotEnabled": "Die TS Server-Protokollierung ist deaktiviert. Legen Sie \"typescript.tsserver.log\" fest, und laden Sie VS Code erneut, um die Protokollierung zu aktivieren.",
+	"typescript.openTsServerLog.enableAndReloadOption": "Aktiviert die Protokollierung und startet den TS-Server neu.",
+	"typescript.openTsServerLog.noLogFile": "TS Server hat noch nicht mit der Protokollierung begonnen.",
+	"openTsServerLog.openFileFailedFailed": "Die TS-Server-Protokolldatei konnte nicht geöffnet werden.",
+	"serverDiedAfterStart": "Der TypeScript-Sprachdienst wurde direkt nach seinem Start fünfmal beendet. Der Dienst wird nicht neu gestartet.",
+	"serverDiedReportIssue": "Problem melden",
+	"serverDied": "Der TypeScript-Sprachdienst wurde während der letzten fünf Minuten fünfmal unerwartet beendet."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..e381d6d3b73
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "Ungültige Version"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..b36d5e0aec6
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Um die JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
+	"hintExclude.generic": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
+	"large.label": "Auszuschließende Elemente konfigurieren",
+	"hintExclude.tooltip": "Um JavaScript/TypeScript-Sprachfunktionen für das gesamte Projekt zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..797c586cb35
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Daten werden zum Optimieren von TypeScript IntelliSense abgerufen",
+	"typesInstallerInitializationFailed.title": "Typisierungsdateien für JavaScript-Sprachfunktionen konnten nicht installiert werden. Stellen Sie sicher, das NPM installiert ist, oder konfigurieren Sie \"typescript.npm\" in Ihren Benutzereinstellungen. Klicken Sie [hier]({0}), um mehr zu erfahren.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Nicht mehr anzeigen"
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..9414ff7601e
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Version von VS Code verwenden",
+	"useWorkspaceVersionOption": "Arbeitsbereichsversion verwenden",
+	"learnMore": "Weitere Informationen",
+	"selectTsVersion": "Wählen Sie die für die JavaScript- und TypeScript-Sprachfunktionen verwendete TypeScript-Version aus."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..4d94a01dc62
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Die TypeScript-Version konnte unter diesem Pfad nicht geladen werden.",
+	"noBundledServerFound": "Der tsserver von VS Code wurde von einer anderen Anwendung wie etwa einem fehlerhaften Tool zur Viruserkennung gelöscht. Führen Sie eine Neuinstallation von VS Code durch."
+}
\ No newline at end of file
diff --git a/i18n/deu/extensions/typescript-language-features/package.i18n.json b/i18n/deu/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..8aa361d46a1
--- /dev/null
+++ b/i18n/deu/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,58 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript- und JavaScript-Sprachfeatures",
+	"description": "Bietet umfangreiche Sprachunterstützung für JavaScript und TypeScript.",
+	"typescript.reloadProjects.title": "Projekt erneut laden",
+	"javascript.reloadProjects.title": "Projekt erneut laden",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Vervollständigen Sie Funktionen mit deren Parametersignatur.",
+	"typescript.tsdk.desc": "Gibt den Ordnerpfad mit den zu verwendenden tsserver- und lib*.d.ts-Dateien an.",
+	"typescript.disableAutomaticTypeAcquisition": "Deaktiviert die automatische Typerfassung. Erfordert TypeScript >= 2.0.6.",
+	"typescript.tsserver.log": "Aktiviert die Protokollierung des TS-Servers in eine Datei. Mithilfe der Protokolldatei lassen sich Probleme beim TS-Server diagnostizieren. Die Protokolldatei kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
+	"typescript.tsserver.trace": "Aktiviert die Ablaufverfolgung von an den TS-Server gesendeten Nachrichten. Mithilfe der Ablaufverfolgung lassen sich Probleme beim TS-Server diagnostizieren. Die Ablaufverfolgung kann Dateipfade, Quellcode und weitere potenziell sensible Informationen aus Ihrem Projekt enthalten.",
+	"typescript.validate.enable": "TypeScript-Überprüfung aktivieren/deaktivieren.",
+	"typescript.format.enable": "Standardmäßigen TypeScript-Formatierer aktivieren/deaktivieren.",
+	"javascript.format.enable": "Standardmäßigen JavaScript-Formatierer aktivieren/deaktivieren.",
+	"format.insertSpaceAfterCommaDelimiter": "Definiert die Verarbeitung von Leerzeichen nach einem Kommatrennzeichen.",
+	"format.insertSpaceAfterConstructor": "Definiert die Verarbeitung von Leerzeichen nach dem Konstruktor-Schlüsselwort. Erfordert TypeScript 2.3.0 oder höher.",
+	"format.insertSpaceAfterSemicolonInForStatements": " Definiert die Verarbeitung von Leerzeichen nach einem Semikolon in einer for-Anweisung.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Definiert die Verarbeitung von Leerzeichen nach einem binären Operator.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Definiert die Verarbeitung von Leerzeichen nach Schlüsselwörtern in einer Flusssteuerungsanweisung.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Definiert die Verarbeitung von Leerzeichen nach einem Funktionsschlüsselwort für anonyme Funktionen.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Definiert die Verarbeitung von Leerzeichen vor Funktionsargumentklammern. Erfordert TypeScript >= 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für Vorlagenzeichenfolgen. Erfordert TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Definiert die Verarbeitung von Leerzeichen nach öffnenden und vor schließenden geschweiften Klammern für JSX-Ausdrücke. Erfordert TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterTypeAssertion": "Definiert die Verarbeitung von Leerzeichen nach Typassertionen in TypeScript. Erfordert TypeScript >= 2.4.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Definiert, ob eine öffnende geschweifte Klammer für Funktionen in eine neue Zeile eingefügt wird.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Definiert, ob eine öffnende geschweifte Klammer für Kontrollblöcke in eine neue Zeile eingefügt wird.",
+	"javascript.validate.enable": "JavaScript-Überprüfung aktivieren/deaktivieren.",
+	"typescript.goToProjectConfig.title": "Zur Projektkonfiguration wechseln",
+	"javascript.goToProjectConfig.title": "Zur Projektkonfiguration wechseln",
+	"javascript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in JavaScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
+	"typescript.referencesCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Verweise in TypeScript Dateien. Erfordert TypeScript 2.0.6 oder höher.",
+	"typescript.implementationsCodeLens.enabled": "Aktiviert oder deaktiviert CodeLens-Implementierungen. Erfordert TypeScript 2.2.0 oder höher.",
+	"typescript.openTsServerLog.title": "TS Server-Protokolldatei öffnen",
+	"typescript.restartTsServer": "TS Server neu starten",
+	"typescript.selectTypeScriptVersion.title": "TypeScript-Version wählen",
+	"typescript.reportStyleChecksAsWarnings": "Formatvorlagenprüfungen als Warnungen melden",
+	"jsDocCompletion.enabled": "Automatische JSDoc-Kommentare aktivieren/deaktivieren",
+	"javascript.implicitProjectConfig.checkJs": "Aktiviert/deaktiviert die Semantikprüfung bei JavaScript-Dateien. Diese Einstellung wird von vorhandenen \"jsconfig.json\"- oder \"tsconfig.json\"-Dateien außer Kraft gesetzt. Erfordert TypeScript 2.3.1 oder höher.",
+	"typescript.npm": "Gibt den Pfad zur ausführbaren NPM-Datei an, die für die automatische Typerfassung verwendet wird. Hierfür ist TypeScript 2.3.4 oder höher erforderlich.",
+	"typescript.check.npmIsInstalled": "Überprüfen Sie, ob NPM für die automatische Typerfassung installiert ist.",
+	"javascript.nameSuggestions": "Das Einbeziehen eindeutiger Namen von der Datei in der JavaScript-Vorschlagsliste aktivieren/deaktivieren.",
+	"typescript.tsc.autoDetect": "Steuert die automatische Erkennung von TSC-Aufgaben. \"Aus\" deaktiviert diese Funktion. \"Build\" erstellt nur Kompilierungsaufgaben mit einer Ausführung. \"Überwachen\" erstellt nur Kompilierungs- und Überwachungsaufgaben. \"Ein\" erstellt sowohl Build- als auch Überwachungsaufgaben. Der Standardwert ist \"Ein\".",
+	"typescript.problemMatchers.tsc.label": "TypeScript-Probleme",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript-Probleme (Überwachungsmodus)",
+	"typescript.quickSuggestionsForPaths": "Aktiviert oder deaktiviert Schnellvorschläge, wenn Sie einen Importpfad ausschreiben.",
+	"typescript.locale": "Legt das zum Melden von TypeScript-Fehlern verwendete Gebietsschema fest. Erfordert TypeScript 2.6.0 oder höher. Der Standardwert \"null\" verwendet für TypeScript-Fehler das Gebietsschema von VS Code.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Aktiviert oder deaktiviert \"experimentalDecorators\" für JavaScript-Dateien, die nicht Teil eines Projekts sind. Vorhandene jsconfig.json- oder tsconfig.json-Dateien setzen diese Einstellung außer Kraft. Erfordert TypeScript 2.3.1 oder höher.",
+	"typescript.autoImportSuggestions.enabled": "Aktiviert oder deaktiviert Vorschläge für den automatischen Import. Erfordert TypeScript 2.6.1 oder höher.",
+	"typescript.experimental.syntaxFolding": "Aktiviert bzw. deaktiviert die syntaxabhängigen Faltungsmarkierungen.",
+	"taskDefinition.tsconfig.description": "Die \"tsconfig\"-Datei, die den TS-Build definiert."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/base/node/processes.i18n.json b/i18n/deu/src/vs/base/node/processes.i18n.json
index 04fbcbe033d..35229bd6699 100644
--- a/i18n/deu/src/vs/base/node/processes.i18n.json
+++ b/i18n/deu/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Ein Shell-Befehl kann nicht auf einem UNC-Laufwerk ausgeführt werden."
+	]
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 631d23eff3f..3d0b8a3e84d 100644
--- a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -11,11 +11,10 @@
 	"similarIssues": "Ähnliche Probleme",
 	"open": "Öffnen",
 	"closed": "Geschlossen",
-	"noResults": "Es wurden keine Ergebnisse gefunden.",
 	"settingsSearchIssue": "Fehler in Einstellungssuche ",
 	"bugReporter": "Fehlerbericht",
-	"performanceIssue": "Leistungsproblem",
 	"featureRequest": "Featureanforderung",
+	"performanceIssue": "Leistungsproblem",
 	"stepsToReproduce": "Zu reproduzierende Schritte",
 	"bugDescription": "Geben Sie an, welche Schritte ausgeführt werden müssen, um das Problem zuverlässig zu reproduzieren. Was sollte geschehen, und was ist stattdessen geschehen? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
 	"performanceIssueDesciption": "Wann ist dieses Leistungsproblem aufgetreten? Tritt es beispielsweise beim Start oder nach einer bestimmten Reihe von Aktionen auf? Wir unterstützen GitHub Flavored Markdown. Sie können während der Vorschau in GitHub Ihr Problem bearbeiten und Screenshots hinzufügen.",
diff --git a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index f74316af1b5..5318cd985e4 100644
--- a/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/deu/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "Füllen Sie das Formular auf Englisch aus.",
 	"issueTypeLabel": "Dies ist",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "Alle Erweiterungen werden deaktiviert, und das Fenster wird neu geladen",
+	"chooseExtension": "Erweiterung",
 	"issueTitleLabel": "Titel",
 	"issueTitleRequired": "Geben Sie einen Titel ein.",
 	"titleLengthValidation": "Der Titel ist zu lang.",
@@ -18,13 +21,6 @@
 	"extensions": "Eigene Erweiterungen",
 	"searchedExtensions": "Gesuchte Erweiterungen",
 	"settingsSearchDetails": "Details der Einstellungssuche",
-	"tryDisablingExtensions": "Kann das Problem reproduziert werden, wenn Erweiterungen deaktiviert sind?",
-	"yes": "Ja",
-	"no": "Nein",
-	"disableExtensionsLabelText": "Versuchen Sie, das Problem nach {0} zu reproduzieren.",
-	"disableExtensions": "Alle Erweiterungen werden deaktiviert, und das Fenster wird neu geladen",
-	"showRunningExtensionsLabelText": "Wenn Sie ein Erweiterungsproblem vermuten, melden Sie dieses Problem durch {0}.",
-	"showRunningExtensions": "Alle ausgeführten Erweiterungen anzeigen",
 	"details": "Geben Sie Details ein.",
 	"loadingData": "Daten werden geladen …"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..aa725d508b2
--- /dev/null
+++ b/i18n/deu/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Name"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json
index 16555984126..78765c76363 100644
--- a/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/deu/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Schließen",
-	"header": "Unterschied von {0} zu {1}: Original {2}, {3} Zeilen, Geändert {4}, {5} Zeilen",
 	"blankLine": "leer",
 	"equalLine": "Original {0}, geändert {1}: {2}",
 	"insertLine": "+ geändert {0}: {1}",
diff --git a/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
index eee74c27615..fc7ba3f58b4 100644
--- a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "Rahmenfarbe von Warnungsunterstreichungen im Editor.",
 	"infoForeground": "Vordergrundfarbe von Informationsunterstreichungen im Editor.",
 	"infoBorder": "Rahmenfarbe von Informationsunterstreichungen im Editor.",
-	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen.",
+	"hintForeground": "Vordergrundfarbe der Hinweisunterstreichungen im Editor.",
+	"hintBorder": "Rahmenfarbe der Hinweisunterstreichungen im Editor.",
+	"overviewRulerRangeHighlight": "Übersichtslineal-Markierungsfarbe für Bereichshervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
 	"overviewRuleError": "Übersichtslineal-Markierungsfarbe für Fehler.",
 	"overviewRuleWarning": "Übersichtslineal-Markierungsfarbe für Warnungen.",
 	"overviewRuleInfo": "Übersichtslineal-Markierungsfarbe für Informationen."
diff --git a/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..cd90a9fdc29
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Korrekturen anzeigen ({0})",
+	"quickFix": "Korrekturen anzeigen",
+	"organizeImports.label": "Importe organisieren"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index d1e83453813..9822e6e535d 100644
--- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Gehe zu nächstem Problem (Fehler, Warnung, Information)",
-	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)",
-	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
-	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
-	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
+	"markerAction.previous.label": "Gehe zu vorigem Problem (Fehler, Warnung, Information)"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a710ee11dcf
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.",
+	"editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
+	"editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.",
+	"editorMarkerNavigationBackground": "Editormarkierung: Hintergrund des Navigationswidgets."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..bc7ae23d394
--- /dev/null
+++ b/i18n/deu/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Sonntag",
+	"Monday": "Montag",
+	"Tuesday": "Dienstag",
+	"Wednesday": "Mittwoch",
+	"Thursday": "Donnerstag",
+	"Friday": "Freitag",
+	"Saturday": "Samstag",
+	"SundayShort": "So",
+	"MondayShort": "Mo",
+	"TuesdayShort": "Di",
+	"WednesdayShort": "Mi",
+	"ThursdayShort": "Do",
+	"FridayShort": "Fr",
+	"SaturdayShort": "Sa",
+	"January": "Januar",
+	"February": "Februar",
+	"March": "März",
+	"April": "April",
+	"May": "Mai",
+	"June": "Juni",
+	"July": "Juli",
+	"August": "August",
+	"September": "September",
+	"October": "Oktober",
+	"November": "November",
+	"December": "Dezember",
+	"JanuaryShort": "Jan",
+	"FebruaryShort": "Feb",
+	"MarchShort": "Mar",
+	"AprilShort": "Apr",
+	"MayShort": "Mai",
+	"JuneShort": "Jun",
+	"JulyShort": "Jul",
+	"AugustShort": "Aug",
+	"SeptemberShort": "Sep",
+	"OctoberShort": "Okt",
+	"NovemberShort": "Nov",
+	"DecemberShort": "Dez"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 9d57cce8b1d..d79e05a3c24 100644
--- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Hintergrundfarbe eines Symbols bei Schreibzugriff, beispielsweise dem Schreiben einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
 	"wordHighlightBorder": "Randfarbe eines Symbols beim Lesezugriff, wie etwa beim Lesen einer Variablen.",
 	"wordHighlightStrongBorder": "Randfarbe eines Symbols beim Schreibzugriff, wie etwa beim Schreiben einer Variablen.",
-	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
-	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
+	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
+	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
 	"wordHighlight.previous.label": "Gehe zur vorherigen Symbolhervorhebungen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..86e0a5c4225
--- /dev/null
+++ b/i18n/deu/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 weitere Datei wird nicht angezeigt",
+	"moreFiles": "...{0} weitere Dateien werden nicht angezeigt"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..73350e0c953
--- /dev/null
+++ b/i18n/deu/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Abbrechen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
index 8001da9cf01..e0ac23f5587 100644
--- a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".",
 	"prof-startup": "CPU-Profiler beim Start ausführen",
 	"disableExtensions": "Deaktiviert alle installierten Extensions.",
-	"inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
-	"inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
 	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
 	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
 	"maxMemory": "Maximale Speichergröße für ein Fenster (in Mbyte).",
diff --git a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 786adadf99d..fe6e6c0c316 100644
--- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
 	"MarketPlaceDisabled": "Marketplace ist nicht aktiviert.",
 	"removeError": "Fehler beim Entfernen der Erweiterung: {0}. Bitte beenden Sie und starten Sie VS Code neu bevor Sie erneut versuchen die Erweiterung zu installieren.",
-	"Not Market place extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
+	"Not a Marketplace extension": "Nur Marktplatz-Erweiterungen können neu installiert werden",
 	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
 	"malicious extension": "Die Erweiterung kann nicht installiert werden, da sie als problematisch gemeldet wurde.",
 	"notFoundCompatibleDependency": "Kann nicht installiert werden, da die abhängige Erweiterung '{0}', die mit der aktuellen VS Code Version '{1}' kompatibel ist, nicht gefunden werden kann. ",
 	"quitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
 	"exitCode": "Fehler bei der Installation der Erweiterung. Beenden und starten Sie VS Code vor der erneuten Installation neu.",
 	"uninstallDependeciesConfirmation": "Möchten Sie nur \"{0}\" oder auch die zugehörigen Abhängigkeiten deinstallieren?",
-	"uninstallOnly": "Nur",
-	"uninstallAll": "Alle",
+	"uninstallOnly": "Nur Erweiterung",
+	"uninstallAll": "Alle deinstallieren",
 	"uninstallConfirmation": "Möchten Sie \"{0}\" deinstallieren?",
 	"ok": "OK",
 	"singleDependentError": "Die Erweiterung \"{0}\" kann nicht deinstalliert werden. Die Erweiterung \"{1}\" hängt von dieser Erweiterung ab.",
diff --git a/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 04eec7993f4..0ef3a16d232 100644
--- a/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/deu/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Der engines.vscode-Wert {0} konnte nicht analysiert werden. Verwenden Sie z. B. ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x usw.",
 	"versionSpecificity1": "Die in \"engines.vscode\" ({0}) angegebene Version ist nicht spezifisch genug. Definieren Sie für VS Code-Versionen vor Version 1.0.0 bitte mindestens die gewünschte Haupt- und Nebenversion, z. B. ^0.10.0, 0.10.x, 0.11.0 usw.",
 	"versionSpecificity2": "Die in \"engines.vscode\" ({0}) angegebene Version ist nicht spezifisch genug. Definieren Sie für VS Code-Versionen nach Version 1.0.0 bitte mindestens die gewünschte Hauptversion, z. B. ^1.10.0, 1.10.x, 1.x.x, 2.x.x usw.",
 	"versionMismatch": "Die Extension ist nicht mit dem Code {0} kompatibel. Die Extension erfordert {1}."
diff --git a/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 108b0df58d7..2a32b38a4e3 100644
--- a/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/deu/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "Ihre {0}-Installation ist offenbar beschädigt. Führen Sie eine Neuinstallation durch.",
 	"integrity.moreInformation": "Weitere Informationen",
-	"integrity.dontShowAgain": "Nicht mehr anzeigen",
-	"integrity.prompt": "Ihre {0}-Installation ist offenbar beschädigt. Führen Sie eine Neuinstallation durch."
+	"integrity.dontShowAgain": "Nicht mehr anzeigen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
index 204a5c783e7..d3f2996964a 100644
--- a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Der Modifizierer zum Hinzufügen eines Elements in Bäumen und Listen zu einer Mehrfachauswahl mit der Maus (zum Beispiel im Explorer, in geöffneten Editoren und in der SCM-Ansicht). \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter macOSX der Befehlstaste zugeordnet. Die Mausbewegung \"Seitlich öffnen\" wird – sofern unterstützt – so angepasst, dass kein Konflikt mit dem Modifizierer zur Mehrfachauswahl entsteht.",
 	"openMode.singleClick": "Öffnet Elemente mit einem einzelnen Mausklick.",
 	"openMode.doubleClick": "Öffnet Elemente mit einem doppelten Mausklick.",
-	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft."
+	"openModeModifier": "Steuert, wie Elemente in Bäumen und Listen mithilfe der Maus geöffnet werden (sofern unterstützt). Legen Sie \"singleClick\" fest, um Elemente mit einem einzelnen Mausklick zu öffnen, und \"doubleClick\", damit sie nur mit einem doppelten Mausklick geöffnet werden. Bei übergeordneten Elementen, deren untergeordnete Elemente sich in Bäumen befinden, steuert diese Einstellung, ob ein Einfachklick oder ein Doppelklick das übergeordnete Elemente erweitert. Beachten Sie, dass einige Bäume und Listen diese Einstellung ggf. ignorieren, wenn sie nicht zutrifft.",
+	"horizontalScrolling setting": "Steuert, ob Bäume horizontales Scrollen in der Workbench unterstützen."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/markers/common/markers.i18n.json b/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..e5b40fe4a67
--- /dev/null
+++ b/i18n/deu/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Fehler",
+	"sev.warning": "Warnung",
+	"sev.info": "Info"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
index dd41efec383..d703cc6af77 100644
--- a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Aktueller Übersichtslineal-Vordergrund für Inline-Mergingkonflikte.",
 	"overviewRulerIncomingContentForeground": "Eingehender Übersichtslineal-Vordergrund für Inline-Mergingkonflikte. ",
 	"overviewRulerCommonContentForeground": "Hintergrund des Übersichtslineals des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten.",
-	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen.",
-	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen."
+	"overviewRulerFindMatchForeground": "Übersichtslineal-Markierungsfarbe für Suchübereinstimmungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
+	"overviewRulerSelectionHighlightForeground": "Übersichtslineal-Markierungsfarbe für Auswahlhervorhebungen. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..729878b1595
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.",
+	"showViewlet": "{0} anzeigen",
+	"view": "Anzeigen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index c3de36954de..10d819ab539 100644
--- a/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/deu/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Trägt Ansichten zum Editor bei.",
 	"views.explorer": "Explorer-Ansicht",
 	"views.debug": "Debugansicht",
-	"locationId.invalid": "{0}\" ist kein gültiger Ansichtenspeicherort",
 	"duplicateView1": "Mehrere Ansichten können nicht mit derselben ID \"{0}\" am Speicherort \"{1}\" registriert werden.",
 	"duplicateView2": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 4290f5cc693..1f1499c09e6 100644
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Formatieren beim Speichern nach {0} ms abgebrochen",
+	"timeout.onWillSave": "Bei onWillSaveTextDocument-Ereignis nach 1750 ms abgebrochen",
 	"saveParticipants": "Speichern von Teilnehmern wird ausgeführt …"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 0a2dcb8a2c9..35229bd6699 100644
--- a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "Webview-Editor"
+	]
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..a933ea1e428
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (Erweiterung)"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 1fe62d2efcb..bfd72770d07 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Fokus in nächster Gruppe",
 	"openToSide": "Zur Seite öffnen",
 	"closeEditor": "Editor schließen",
+	"closeOneEditor": "Schließen",
 	"revertAndCloseActiveEditor": "Wiederherstellen und Editor schließen",
 	"closeEditorsToTheLeft": "Editoren links schließen",
 	"closeAllEditors": "Alle Editoren schließen",
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 4ee819d71fa..8355c93e305 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "Wenn Sie keine Sprachausgabe verwenden, ändern Sie die Einstellung \"editor.accessibilitySupport\" in \"Aus\".",
 	"disableTabMode": "Barrierefreiheitsmodus deaktivieren",
 	"gotoLine": "Gehe zu Zeile",
-	"indentation": "Einzug",
 	"selectEncoding": "Codierung auswählen",
 	"selectEOL": "Zeilenendesequenz auswählen",
 	"selectLanguageMode": "Sprachmodus auswählen",
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 21a390445da..72f24a7c13e 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0} MB",
 	"sizeGB": "{0} GB",
 	"sizeTB": "{0} TB",
-	"largeImageError": "Die Dateigröße des Bilds ist zu groß (über 1 MB), um im Editor angezeigt zu werden.",
 	"resourceOpenExternalButton": "Bild mit externem Programm öffnen?",
-	"nativeBinaryError": "Die Datei wird nicht im Editor angezeigt, weil sie binär oder sehr groß ist oder eine nicht unterstützte Textcodierung verwendet.",
 	"zoom.action.fit.label": "Ganzes Bild",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index c7fbfd6ffe1..6054596bd29 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Schließen",
 	"araLabelEditorActions": "Editor-Aktionen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index cabab414f2d..25fb0b63c30 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Keine neuen Benachrichtigungen",
 	"notifications": "Benachrichtigungen",
 	"notificationsToolbar": "Aktionen der Benachrichtigungszentrale",
 	"notificationsList": "Benachrichtigungsliste"
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..bcdf56e4849
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
index d7684461feb..52379955308 100644
--- a/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Fenster",
 	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
 	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-	"window.openFilesInNewWindow.default": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden (nur MacOS).",
-	"openFilesInNewWindow": "Steuert, ob Dateien in einem neuen Fenster oder im letzten aktiven Fenster geöffnet werden.\n- default: Die Dateien werden im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden (nur macOS).\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
+	"window.openFilesInNewWindow.defaultMac": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.",
+	"window.openFilesInNewWindow.default": "Dateien werden in einem neuen Fenster geöffnet, sofern sie nicht innerhalb der Anwendung ausgewählt werden (z. B. über das Dateimenü).",
+	"openFilesInNewWindowMac": "Steuert, ob Dateien in einem neuen Fenster geöffnet werden.\n- default: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet, sofern sie nicht über das Dock oder den Finder geöffnet werden.\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
+	"openFilesInNewWindow": "Steuert, ob Dateien in einem neuen Fenster geöffnet werden.\n- default: Die Dateien werden in einem neuen Fenster geöffnet, sofern sie nicht innerhalb der Anwendung ausgewählt werden (z. B. über das Dateimenü).\n- on: Die Dateien werden in einem neuen Fenster geöffnet.\n- off: Die Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
 	"window.openFoldersInNewWindow.on": "Ordner werden in einem neuen Fenster geöffnet.",
 	"window.openFoldersInNewWindow.off": "Ordner ersetzen das letzte aktive Fenster.",
 	"window.openFoldersInNewWindow.default": "Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).",
 	"openFoldersInNewWindow": "Steuert, ob Ordner in einem neuen Fenster geöffnet werden oder das letzte aktive Fenster ersetzen.\n- default: Die Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B. über das Dateimenü).\n- on: Die Ordner werden in einem neuen Fenster geöffnet.\n- off: Die Ordner ersetzen das letzte aktive Fenster.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
+	"window.openWithoutArgumentsInNewWindow.on": "Neues leeres Fenster öffnen",
+	"window.openWithoutArgumentsInNewWindow.off": "Fokus auf die zuletzt aktive ausgeführte Instanz",
+	"openWithoutArgumentsInNewWindow": "Steuert, ob ein neues leeres Fenster geöffnet wird, wenn eine zweite Instanz ohne Argumente gestartet wird oder wenn für die zuletzt ausgeführt Instanz ein Fokus erforderlich ist.\n- on: Öffnet ein neues leeres Fenster.\n- off: Die zuletzt aktive ausgeführte Instanz erhält den Fokus.\nIn einigen Fällen wird diese Einstellung unter Umständen ignoriert (z. B. bei der Befehlszeilenoption \"-new-window\" oder \"-reuse-window\").",
 	"window.reopenFolders.all": "Alle Fenster erneut öffnen.",
 	"window.reopenFolders.folders": "Alle Ordner erneut öffnen. Leere Arbeitsbereiche werden nicht wiederhergestellt.",
 	"window.reopenFolders.one": "Das letzte aktive Fenster erneut öffnen. ",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "Ist diese Option aktiviert, erfolgt automatisch ein Wechsel zu einem Design mit hohem Kontrast, wenn Windows ein Design mit hohem Kontrast verwendet, und zu einem dunklen Design, wenn Sie für Windows kein Design mit hohem Kontrast mehr verwenden.",
 	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
 	"window.nativeTabs": "Aktiviert MacOS Sierra-Fensterregisterkarten. Beachten Sie, dass zum Übernehmen von Änderungen ein vollständiger Neustart erforderlich ist und durch ggf. konfigurierte native Registerkarten ein benutzerdefinierter Titelleistenstil deaktiviert wird.",
+	"window.smoothScrollingWorkaround": "Aktivieren Sie diese Problemumgehung, wenn der Bildlauf nach der Wiederherstellung eines minimierten VS Code-Fensters nicht mehr reibungslos funktioniert. Dies ist eine Problemumgehung für ein Problem (https://github.com/Microsoft/vscode/issues/13612), bei dem der Bildlauf auf Geräten mit präzisen Trackpads wie etwa den Surface-Geräten von Microsoft verzögert ist. Wenn Sie diese Problemumgehung aktivieren, flackert die Anzeige nach dem Wiederherstellen eines Fensters aus dem minimierten Zustand unter Umständen ein wenig, ansonsten treten jedoch keine Probleme auf.",
 	"zenModeConfigurationTitle": "Zen-Modus",
 	"zenMode.fullScreen": "Steuert, ob die Workbench durch das Aktivieren des Zen-Modus in den Vollbildmodus wechselt.",
 	"zenMode.centerLayout": "Steuert, ob das Layout durch Aktivieren des Zen-Modus ebenfalls zentriert wird.",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 6a4e04d332e..ddd2d3abd5a 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Haltepunkt bearbeiten...",
+	"breakpoint": "Haltepunkt",
 	"functionBreakpointsNotSupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
 	"functionBreakpointPlaceholder": "Funktion mit Haltepunkt",
 	"functionBreakPointInputAriaLabel": "Geben Sie den Funktionshaltepunkt ein.",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Nicht überprüfter Haltepunkt",
 	"functionBreakpointUnsupported": "Funktionshaltepunkte werden von diesem Debugtyp nicht unterstützt.",
 	"breakpointDirtydHover": "Nicht überprüfter Haltepunkt. Die Datei wurde geändert. Bitte starten Sie die Debugsitzung neu.",
+	"logBreakpointUnsupported": "Protokollpunkte werden für diesen Debugtyp nicht unterstützt.",
 	"conditionalBreakpointUnsupported": "Bedingte Haltepunkte werden für diesen Debugtyp nicht unterstützt.",
 	"hitBreakpointUnsupported": "Bedingte Trefferhaltepunkte werden für diesen Debugtyp nicht unterstützt."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index e7fc581ef98..659f9528874 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Frame neu starten",
 	"removeBreakpoint": "Haltepunkt entfernen",
 	"removeAllBreakpoints": "Alle Haltepunkte entfernen",
-	"enableBreakpoint": "Haltepunkt aktivieren",
-	"disableBreakpoint": "Haltepunkt deaktivieren",
 	"enableAllBreakpoints": "Alle Haltepunkte aktivieren",
 	"disableAllBreakpoints": "Alle Haltepunkte deaktivieren",
 	"activateBreakpoints": "Haltepunkte aktivieren",
 	"deactivateBreakpoints": "Haltepunkte deaktivieren",
 	"reapplyAllBreakpoints": "Alle Haltepunkte erneut anwenden",
 	"addFunctionBreakpoint": "Funktionshaltepunkt hinzufügen",
-	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
-	"editConditionalBreakpoint": "Haltepunkt bearbeiten...",
 	"setValue": "Wert festlegen",
 	"addWatchExpression": "Ausdruck hinzufügen",
 	"editWatchExpression": "Ausdruck bearbeiten",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index d105d95f39c..7540c5e0ca9 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Debuggen: Haltepunkt umschalten",
 	"conditionalBreakpointEditorAction": "Debuggen: Bedingten Haltepunkt hinzufügen...",
+	"logPointEditorAction": "Debuggen: Protokollpunkt hinzufügen …",
 	"runToCursor": "Ausführen bis Cursor",
 	"debugEvaluate": "Debuggen: Auswerten",
 	"debugAddToWatch": "Debuggen: Zur Überwachung hinzufügen",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..d82e734ead9
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Unterbrechen, wenn die Bedingung für die Trefferanzahl erfüllt ist. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
+	"breakpointWidgetExpressionPlaceholder": "Unterbrechen, wenn der Ausdruck als TRUE ausgewertet wird. EINGABETASTE zum Akzeptieren, ESC-TASTE zum Abbrechen.",
+	"expression": "Ausdruck",
+	"hitCount": "Trefferanzahl",
+	"logMessage": "Protokollmeldung"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index d64bb26e64f..0ab881816f8 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Verwenden Sie eindeutige Konfigurationsnamen.",
 	"app.launch.json.compound.folder": "Name des Ordners, in dem sich der Verbund befindet.",
 	"app.launch.json.compounds.configurations": "Namen von Konfigurationen, die als Bestandteil dieses Verbunds gestartet werden.",
-	"debugNoType": "Der \"type\" des Debugadapters kann nicht ausgelassen werden und muss vom Typ \"string\" sein.",
 	"selectDebug": "Umgebung auswählen",
 	"DebugConfig.failed": "Die Datei \"launch.json\" kann nicht im Ordner \".vscode\" erstellt werden ({0}).",
 	"workspace": "Arbeitsbereich",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 9da3944bf5c..fa33a362fd9 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "Haltepunkt",
 	"removeBreakpoints": "Haltepunkte entfernen",
 	"removeBreakpointOnColumn": "Haltepunkt in Spalte {0} entfernen",
 	"removeLineBreakpoint": "Zeilenhaltepunkt entfernen",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "Haltepunkt in Spalte {0} aktivieren",
 	"enableBreakpointOnLine": "Zeilenhaltepunkt aktivieren",
 	"addBreakpoint": "Haltepunkt hinzufügen",
+	"addConditionalBreakpoint": "Bedingten Haltepunkt hinzufügen...",
+	"addLogPoint": "Protokollpunkt hinzufügen …",
+	"cancel": "Abbrechen",
 	"addConfiguration": "Konfiguration hinzufügen..."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 451f6c89a46..d6cc1170dbf 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Fehler anzeigen",
 	"noFolderWorkspaceDebugError": "Debuggen der aktiven Datei ist nicht möglich. Stellen Sie sicher, dass sie auf einem Datenträger gespeichert ist und dass Sie die Debugerweiterung für diesen Dateityp installiert haben.",
 	"cancel": "Abbrechen",
-	"DebugTaskNotFound": "Der preLaunchTask \"{0}\" wurde nicht gefunden.",
-	"taskNotTracked": "Der preLaunchTask \"{0}\" kann nicht getrackt werden."
+	"DebugTaskNotFound": "Der Task \"{0}\" konnte nicht gefunden werden.",
+	"taskNotTracked": "Der Task \"{0}\" kann nicht nachverfolgt werden."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 7c14cdd4ed3..153ffe94777 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Weitere Informationen",
-	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
-	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden.",
-	"stoppingDebugAdapter": "{0}. Der Debugadapter wird beendet.",
 	"debugAdapterCrash": "Der Debugadapterprozess wurde unerwartet beendet."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index d9c6aec8ad3..9b039afb7e7 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "Die ausführbare Datei \"{0}\" des Debugadapters ist nicht vorhanden.",
 	"debugAdapterCannotDetermineExecutable": "Die ausführbare Datei \"{0}\" des Debugadapters kann nicht bestimmt werden.",
-	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
-	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
-	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
-	"debugType": "Der Typ der Konfiguration.",
-	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
-	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
-	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
-	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
-	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
-	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
-	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
-	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
-	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
+	"unableToLaunchDebugAdapter": "Der Debugadapter kann nicht aus {0} gestartet werden.",
+	"unableToLaunchDebugAdapterNoArgs": "Debugadapter kann nicht gestartet werden."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..1bdbec328ab
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Verwendet IntelliSense zum Ermitteln möglicher Attribute.",
+	"launch.config.comment2": "Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.",
+	"launch.config.comment3": "Weitere Informationen finden Sie unter {0}",
+	"debugType": "Der Typ der Konfiguration.",
+	"debugTypeNotRecognised": "Dieser Debugging-Typ wurde nicht erkannt. Bitte installieren und aktivieren Sie die dazugehörige Debugging-Erweiterung.",
+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest.",
+	"debugName": "Der Name der Konfiguration. Er wird im Dropdownmenü der Startkonfiguration angezeigt.",
+	"debugRequest": "Der Anforderungstyp der Konfiguration. Der Wert kann \"launch\" oder \"attach\" sein.",
+	"debugServer": "Nur für die Entwicklung von Debugerweiterungen: Wenn ein Port angegeben ist, versucht der VS-Code, eine Verbindung mit einem Debugadapter herzustellen, der im Servermodus ausgeführt wird.",
+	"debugPrelaunchTask": "Ein Task, der ausgeführt werden soll, bevor die Debugsitzung beginnt.",
+	"debugPostDebugTask": "Ein Task, der ausgeführt werden soll, nachdem die Debugsitzung endet.",
+	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
+	"debugOSXConfiguration": "OS X-spezifische Startkonfigurationsattribute.",
+	"debugLinuxConfiguration": "Linux-spezifische Startkonfigurationsattribute.",
+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\"."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..eb3d8920646
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code-Konsole",
+	"mac.terminal.script.failed": "Fehler bei Skript \"{0}\" mit Exitcode {1}.",
+	"mac.terminal.type.not.supported": "\"{0}\" wird nicht unterstützt.",
+	"press.any.key": "Drücken Sie eine beliebige Taste, um fortzufahren...",
+	"linux.term.failed": "Fehler bei \"{0}\" mit Exitcode {1}."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 5b2cebadb75..a2f215a756f 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Empfohlene Erweiterungen konfigurieren (Arbeitsbereichsordner)",
 	"malicious tooltip": "Die Erweiterung wurde als problematisch gemeldet.",
 	"malicious": "Böswillig",
+	"disabled": "Deaktiviert",
+	"disabled globally": "Deaktiviert",
+	"disabled workspace": "Für diesen Arbeitsbereich deaktiviert",
 	"disableAll": "Alle installierten Erweiterungen löschen",
 	"disableAllWorkspace": "Alle installierten Erweiterungen für diesen Arbeitsbereich deaktivieren",
 	"enableAll": "Alle Erweiterungen aktivieren",
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..6789227ba76
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Erweiterungsname",
+	"extension id": "Erweiterungsbezeichner",
+	"preview": "Vorschau",
+	"builtin": "Integriert",
+	"publisher": "Name des Herausgebers",
+	"install count": "Installationsanzahl",
+	"rating": "Bewertung",
+	"repository": "Repositorium",
+	"license": "Lizenz",
+	"details": "Details",
+	"contributions": "Beiträge",
+	"changelog": "ChangeLog",
+	"dependencies": "Abhängigkeiten",
+	"noReadme": "Keine INFODATEI verfügbar.",
+	"noChangelog": "Es ist kein ChangeLog verfügbar.",
+	"noContributions": "Keine Beiträge",
+	"noDependencies": "Keine Abhängigkeiten",
+	"settings": "Einstellungen ({0})",
+	"setting name": "Name",
+	"description": "Beschreibung",
+	"default": "Standard",
+	"debuggers": "Debugger ({0})",
+	"debugger name": "Name",
+	"debugger type": "Typ",
+	"views": "Ansichten ({0})",
+	"view id": "ID",
+	"view name": "Name",
+	"view location": "Wo",
+	"localizations": "Lokalisierungen ({0})",
+	"localizations language id": "Sprach-ID",
+	"colorThemes": "Farbdesigns ({0})",
+	"iconThemes": "Symboldesigns ({0})",
+	"colors": "Farben ({0})",
+	"colorId": "ID",
+	"defaultDark": "Standard, dunkel",
+	"defaultLight": "Standard, hell",
+	"defaultHC": "Standard, hoher Kontrast",
+	"JSON Validation": "JSON-Validierung ({0})",
+	"fileMatch": "Dateiübereinstimmung",
+	"schema": "Schema",
+	"commands": "Befehle ({0})",
+	"command name": "Name",
+	"keyboard shortcuts": "Tastenkombinationen",
+	"menuContexts": "Menükontexte",
+	"languages": "Sprachen ({0})",
+	"language id": "ID",
+	"language name": "Name",
+	"file extensions": "Dateierweiterungen",
+	"grammar": "Grammatik",
+	"snippets": "Codeausschnitte"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 161dda932e8..ad43edf49b9 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
 	"reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.",
 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
-	"showRecommendations": "Empfehlungen anzeigen",
 	"install": "Installieren",
+	"showRecommendations": "Empfehlungen anzeigen",
 	"showLanguageExtensions": "Der Marketplace enthält Erweiterungen, die bei \".{0}\"-Dateien behilflich sind.",
 	"workspaceRecommended": "Für diesen Arbeitsbereich sind Erweiterungsempfehlungen verfügbar.",
 	"installAll": "Alle installieren",
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index e3e245a637c..b0cd80e83a4 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Deaktivere Tastenzuordnungen ({0}) um Konfilkte mit anderen zu vermeiden?",
 	"yes": "Ja",
-	"no": "Nein",
-	"betterMergeDisabled": "Die \"Better Merge\" Erweiterung ist jetzt integriert, die alte Erweiterung wurde deaktiviert und kann deinstalliert werden.",
-	"uninstall": "Deinstallieren"
+	"no": "Nein"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 29577e29ba6..7cca8764763 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "Empfohlen",
 	"otherRecommendedExtensions": "Weitere Empfehlungen",
 	"workspaceRecommendedExtensions": "Arbeitsbereich-Empfehlungen",
-	"builtInExtensions": "Integriert",
+	"builtInExtensions": "Features",
+	"builtInThemesExtensions": "Designs",
 	"searchExtensions": "Nach Erweiterungen im Marketplace suchen",
 	"sort by installs": "Sortieren nach: Installationsanzahl",
 	"sort by rating": "Sortieren nach: Bewertung",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 157f84b48e7..2736ae43b6c 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,10 @@
 	"confirmDeleteMessageFolder": "Möchten Sie \"{0}\" samt Inhalt wirklich endgültig löschen?",
 	"confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?",
 	"irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.",
-	"cancel": "Abbrechen",
-	"permDelete": "Endgültig löschen",
-	"importFiles": "Dateien importieren",
+	"binFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
+	"trashFailed": "Fehler beim Löschen über den Papierkorb. Möchten Sie den Löschvorgang stattdessen dauerhaft ausführen?",
+	"deletePermanentlyButtonLabel": "En&&dgültig löschen",
+	"retryButtonLabel": "Wiede&&rholen",
 	"confirmOverwrite": "Im Zielordner ist bereits eine Datei oder ein Ordner mit dem gleichen Namen vorhanden. Möchten Sie sie bzw. ihn ersetzen?",
 	"replaceButtonLabel": "&&Ersetzen",
 	"fileIsAncestor": "Die einzufügende Datei ist ein Vorgänger des Zielordners",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 3a121e07e4e..8a4578792a4 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "Der Standardsprachmodus, der neuen Dateien zugewiesen wird.",
 	"editorConfigurationTitle": "Editor",
 	"formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.",
+	"formatOnSaveTimeout": "Zeitüberschreitung beim Formatieren während des Speicherns. Legt eine Zeitbegrenzung in Millisekunden für formatOnSave-Befehle fest. Befehle, die länger dauern als die festgelegte Zeitüberschreitung, werden abgebrochen. ",
 	"explorerConfigurationTitle": "Datei-Explorer",
 	"openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden.",
 	"autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index 10464e3a656..93c8167356a 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Geben Sie den Dateinamen ein. Drücken Sie zur Bestätigung die EINGABETASTE oder ESC, um den Vorgang abzubrechen.",
-	"constructedPath": "{0} in **{1}** erstellen",
 	"filesExplorerViewerAriaLabel": "{0}, Datei-Explorer",
 	"dropFolders": "Möchten Sie die Ordner zum Arbeitsbereich hinzufügen?",
 	"dropFolder": "Möchten Sie den Ordner zum Arbeitsbereich hinzufügen?",
 	"addFolders": "&&Ordner hinzufügen",
 	"addFolder": "&&Ordner hinzufügen",
+	"confirmRootsMove": "Möchten Sie die Reihenfolge mehrerer Stammordner in Ihrem Arbeitsbereich ändern?",
 	"confirmMultiMove": "Möchten Sie die folgenden {0} Dateien verschieben?",
+	"confirmRootMove": "Möchten Sie die Reihenfolge des Stammordners \"{0}\" in Ihrem Arbeitsbereich ändern?",
 	"confirmMove": "Möchten Sie \"{0}\" wirklich verschieben?",
 	"doNotAskAgain": "Nicht erneut fragen",
 	"moveButtonLabel": "&&Verschieben",
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..755aaf46f80
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "HTML-Vorschau"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..4a857815246
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Ungültige Editor-Eingabe."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..0c1f5497f13
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Entwickler"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..1492a37abd0
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview-Entwicklertools öffnen",
+	"refreshWebviewLabel": "Webviews erneut laden"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 2e89465d3be..6f978d7eda1 100644
--- a/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Möchten Sie die Sprache der Benutzeroberfläche von VS Code in {0} ändern und einen Neustart durchführen?",
+	"yes": "Ja",
+	"no": "Nein",
+	"neverAgain": "Nicht mehr anzeigen",
 	"JsonSchema.locale": "Die zu verwendende Sprache der Benutzeroberfläche.",
 	"vscode.extension.contributes.localizations": "Trägt Lokalisierungen zum Editor bei",
 	"vscode.extension.contributes.localizations.languageId": "ID der Sprache, in die Anzeigezeichenfolgen übersetzt werden.",
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..778741d8c94
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Kopieren"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..68d40f09248
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Insgesamt {0} Probleme"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..8a10d218183
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Probleme",
+	"tooltip.1": "1 Problem in dieser Datei",
+	"tooltip.N": "{0} Probleme in dieser Datei",
+	"markers.showOnFile": "Fehler & Warnungen auf Dateien und Ordnern anzeigen."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..1dd4edae3e5
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Anzeigen",
+	"problems.view.toggle.label": "Probleme umschalten (Fehler, Warnungen, Informationen)",
+	"problems.view.focus.label": "Probleme fokussieren (Fehler, Warnungen, Informationen)",
+	"problems.panel.configuration.title": "Ansicht \"Probleme\"",
+	"problems.panel.configuration.autoreveal": "Steuert, ob die Ansicht \"Probleme\" automatisch Dateien anzeigen sollte, wenn diese geöffnet werden.",
+	"markers.panel.title.problems": "Probleme",
+	"markers.panel.aria.label.problems.tree": "Probleme nach Dateien gruppiert",
+	"markers.panel.no.problems.build": "Es wurden bisher keine Probleme im Arbeitsbereich erkannt.",
+	"markers.panel.action.filter": "Probleme filtern",
+	"markers.panel.filter.ariaLabel": "Probleme filtern",
+	"markers.panel.filter.errors": "Fehler",
+	"markers.panel.filter.warnings": "Warnungen",
+	"markers.panel.filter.infos": "Informationen",
+	"markers.panel.single.error.label": "1 Fehler",
+	"markers.panel.multiple.errors.label": "{0} Fehler",
+	"markers.panel.single.warning.label": "1 Warnung",
+	"markers.panel.multiple.warnings.label": "{0} Warnungen",
+	"markers.panel.single.info.label": "1 Information",
+	"markers.panel.multiple.infos.label": "{0}-Informationen",
+	"markers.panel.single.unknown.label": "1 Unbekannte",
+	"markers.panel.multiple.unknowns.label": "{0} Unbekannte",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} mit {1} Problemen",
+	"problems.tree.aria.label.marker.relatedInformation": "Dieses Problem verweist auf {0} Speicherorte.",
+	"problems.tree.aria.label.error.marker": "Von {0} generierter Fehler: {1} in Zeile {2} bei Zeichen {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Fehler: {0} in Zeile {1} bei Zeichen {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "Von {0} generierte Warnung: {1} in Zeile {2} bei Zeichen {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Warnung: {0} in Zeile {1} bei Zeichen {2}.{3}",
+	"problems.tree.aria.label.info.marker": "Von {0} generierte Informationen: {1} in Zeile {2} bei Zeichen {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Informationen: {0} in Zeile {1} bei Zeichen {2}.{3}",
+	"problems.tree.aria.label.marker": "Von {0} generiertes Problem: {1} in Zeile {2} bei Zeichen {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Problem: {0} in Zeile {1} bei Zeichen {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0} in Zeile {1} bei Zeichen {2} in {3}",
+	"errors.warnings.show.label": "Fehler und Warnungen anzeigen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 8a331f71f6e..d5aa2275e15 100644
--- a/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Ausgabe umschalten",
 	"clearOutput": "Ausgabe löschen",
 	"toggleOutputScrollLock": "Ausgabe-Bildlaufsperre umschalten",
-	"switchToOutput.label": "Zur Ausgabe wechseln"
+	"switchToOutput.label": "Zur Ausgabe wechseln",
+	"openInLogViewer": "Protokolldatei öffnen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 88ed08aa1d5..900a7f7ac3b 100644
--- a/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Ausgabe",
 	"logViewer": "Protokollanzeige",
 	"viewCategory": "Anzeigen",
-	"clearOutput.label": "Ausgabe löschen"
+	"clearOutput.label": "Ausgabe löschen",
+	"openActiveLogOutputFile": "Ansicht: Aktive Protokollausgabedatei öffnen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index d9089d4fc04..737a3d57cf8 100644
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Tastenkombinationen",
+	"showDefaultKeybindings": "Standard-Tastaturbelegungen anzeigen",
+	"showUserKeybindings": "Benutzer-Tastaturbelegungen anzeigen",
 	"SearchKeybindings.AriaLabel": "Tastenzuordnungen suchen",
 	"SearchKeybindings.Placeholder": "Tastenzuordnungen suchen",
 	"sortByPrecedene": "Nach Priorität sortieren",
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index c30d63e57e9..43033cd08a7 100644
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Raw-Standardeinstellungen öffnen",
+	"openSettings": "Einstellungen öffnen",
 	"openGlobalSettings": "Benutzereinstellungen öffnen",
 	"openGlobalKeybindings": "Tastaturkurzbefehle öffnen",
 	"openGlobalKeybindingsFile": "Datei mit Tastaturkurzbefehlen öffnen",
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 6baba95d0bf..1fe4a79f5f0 100644
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Standardeinstellungen",
 	"SearchSettingsWidget.AriaLabel": "Einstellungen suchen",
 	"SearchSettingsWidget.Placeholder": "Einstellungen suchen",
 	"noSettingsFound": "Keine Ergebnisse",
diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 2940088146f..93e401bd692 100644
--- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Erweiterung \"{0}\" anzeigen",
 	"editTtile": "Bearbeiten",
 	"replaceDefaultValue": "In Einstellungen ersetzen",
-	"copyDefaultValue": "In Einstellungen kopieren",
-	"unsupportedPHPExecutablePathSetting": "Diese Einstellung muss eine Benutzereinstellung sein. Öffnen Sie zum Konfigurieren von PHP für den Arbeitsbereich eine PHP-Datei, und klicken Sie in der Statusleiste auf \"PHP-Pfad\".",
-	"unsupportedWorkspaceSetting": "Diese Einstellung muss eine Benutzereinstellung sein.",
-	"unsupportedWorkbenchSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen.",
-	"unsupportedWorkbenchSettingDevMode": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie ihren Bereich beim Registrieren als \"Ressource\" definieren oder den Ordner direkt öffnen."
+	"copyDefaultValue": "In Einstellungen kopieren"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index f953fa7ad28..ac92df5f79c 100644
--- a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Vorheriges Suchausschlussmuster anzeigen",
 	"nextSearchTerm": "Nächsten Suchbegriff anzeigen",
 	"previousSearchTerm": "Vorherigen Suchbegriff anzeigen",
-	"showSearchViewlet": "Suche anzeigen",
 	"findInFiles": "In Dateien suchen",
 	"replaceInFiles": "In Dateien ersetzen",
 	"RefreshAction.label": "Aktualisieren",
diff --git a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 1dbbf27f3f1..23fd972a5ff 100644
--- a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Suchen",
+	"copyMatchLabel": "Kopieren",
+	"copyPathLabel": "Pfad kopieren",
+	"copyAllLabel": "Alles kopieren",
 	"findInFolder": "In Ordner suchen...",
 	"findInWorkspace": "In Arbeitsbereich suchen...",
 	"showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...",
 	"name": "Suchen",
-	"search": "Suchen",
 	"showSearchViewl": "Suche anzeigen",
 	"view": "Anzeigen",
 	"findInFiles": "In Dateien suchen",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Konfigurieren Sie diese Option, um Ergebnisse aus einer globalen Symbolsuche in die Dateiergebnisse für Quick Open einzuschließen.",
 	"search.followSymlinks": "Steuert, ob Symlinks während der Suche gefolgt werden.",
 	"search.smartCase": "Sucht ohne Berücksichtigung von Groß-/Kleinschreibung, wenn das Muster kleingeschrieben ist, andernfalls wird mit Berücksichtigung von Groß-/Kleinschreibung gesucht.",
-	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll",
-	"search.location": "Vorschau: Steuert, ob die Suche als Ansicht in der Seitenleiste oder als Bedienfeld im Bereich des Bedienfelds für horizontales Layout angezeigt wird. In der nächsten Version wird das horizontale Layout im Bedienfeld verbessert und dies keine Vorschau mehr sein."
+	"search.globalFindClipboard": "Steuert, ob die Suchansicht die freigegebene Suchzwischenablage auf macOS lesen oder verändern soll"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 3c93dff57c4..4f5c93b0864 100644
--- a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Helfen Sie uns die Unterstützung für {0} zu verbessern",
 	"takeShortSurvey": "An kurzer Umfrage teilnehmen",
 	"remindLater": "Später erinnern",
-	"neverAgain": "Nicht mehr anzeigen",
-	"helpUs": "Helfen Sie uns die Unterstützung für {0} zu verbessern"
+	"neverAgain": "Nicht mehr anzeigen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 8a2cf7269c2..3acd207c608 100644
--- a/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Wir würden uns freuen, wenn Sie an einer schnellen Umfrage teilnehmen.",
 	"takeSurvey": "An Umfrage teilnehmen",
 	"remindLater": "Später erinnern",
-	"neverAgain": "Nicht mehr anzeigen",
-	"surveyQuestion": "Wir würden uns freuen, wenn Sie an einer schnellen Umfrage teilnehmen."
+	"neverAgain": "Nicht mehr anzeigen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index cf9da95afab..4bee31d66e2 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Ein Problemmuster oder der Name eines beigetragenen oder vordefinierten Problemmusters. Kann ausgelassen werden, wenn die Basis angegeben ist.",
 	"ProblemMatcherSchema.base": "Der Name eines zu verwendenden Basisproblemabgleichers.",
 	"ProblemMatcherSchema.owner": "Der Besitzer des Problems im Code. Kann ausgelassen werden, wenn \"base\" angegeben wird. Der Standardwert ist \"external\", wenn keine Angabe erfolgt und \"base\" nicht angegeben wird.",
+	"ProblemMatcherSchema.source": "Eine visuell lesbare Zeichenfolge, die die Quelle dieser Diagnose beschreibt, z. B. \"typescript\" oder \"super lint\".",
 	"ProblemMatcherSchema.severity": "Der Standardschweregrad für Erfassungsprobleme. Dieser wird verwendet, wenn das Muster keine Übereinstimmungsgruppe für den Schweregrad definiert.",
 	"ProblemMatcherSchema.applyTo": "Steuert, ob ein für ein Textdokument gemeldetes Problem nur auf geöffnete, geschlossene oder alle Dokumente angewendet wird.",
 	"ProblemMatcherSchema.fileLocation": "Definiert, wie Dateinamen interpretiert werden sollen, die in einem Problemmuster gemeldet werden.",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 31dfb0b2d5e..fcf1a9b5913 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "Weist die Aufgabe keiner Gruppe zu.",
 	"JsonSchema.tasks.group": "Definiert die Ausführungsgruppe, zu der diese Aufgabe gehört. Zum Hinzufügen der Aufgabe zur Buildgruppe wird \"build\" unterstützt und zum Hinzufügen zur Testgruppe \"test\".",
 	"JsonSchema.tasks.type": "Definiert, ob die Aufgabe als Prozess oder als Befehl innerhalb einer Shell ausgeführt wird.",
+	"JsonSchema.command.quotedString.value": "Der tatsächliche Sollwert",
+	"JsonSchema.tasks.quoting.escape": "Fügt mithilfe des Escapezeichens der Shell vor Zeichen Escapezeichen ein (z. B. `  bei PowerShell und \\ bei Bash).",
+	"JsonSchema.tasks.quoting.strong": "Setzt das Argument mithilfe des starken Anführungszeichens der Shell in Anführungszeichen (z. B. \" bei PowerShell und Bash).",
+	"JsonSchema.tasks.quoting.weak": "Setzt das Argument mithilfe des schwachen Anführungszeichens der Shell in Anführungszeichen (z. B. ' bei PowerShell und Bash).",
+	"JsonSchema.command.quotesString.quote": "In welche Anführungszeichen der Befehlswert gesetzt wird.",
+	"JsonSchema.command": "Der auszuführende Befehl. Es kann sich um ein externes Programm oder einen Shellbefehl handeln.",
+	"JsonSchema.args.quotedString.value": "Der tatsächliche Argumentwert",
+	"JsonSchema.args.quotesString.quote": "In welche Anführungszeichen der Argumentwert gesetzt wird.",
+	"JsonSchema.tasks.args": "Argumente, die an den Befehl übergeben werden, wenn diese Aufgabe aufgerufen wird.",
 	"JsonSchema.tasks.label": "Die Bezeichnung der Aufgabe der Benutzerschnittstelle",
 	"JsonSchema.version": "Die Versionsnummer der Konfiguration.",
 	"JsonSchema.tasks.identifier": "Ein vom Benutzer definierter Bezeichner, mit dem in \"launch.json\" oder in einer dependsOn-Klausel auf die Aufgabe verwiesen wird.",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index f3b5da63084..a7490d669b4 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Aufgaben",
 	"ConfigureTaskRunnerAction.label": "Aufgabe konfigurieren",
+	"totalErrors": "{0} Fehler",
+	"totalWarnings": "{0} Warnungen",
+	"totalInfos": "{0}-Informationen",
 	"problems": "Probleme",
 	"building": "Wird gebaut...",
-	"manyMarkers": "mehr als 99",
+	"manyProblems": "Über 10.000",
 	"runningTasks": "Aktive Aufgaben anzeigen",
 	"tasks": "Aufgaben",
 	"TaskSystem.noHotSwap": "Zum Ändern des Aufgabenausführungsmoduls mit einem aktiven Task muss das Fenster erneut geladen werden.",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Fehler- und Warnungsarten auswählen, auf die die Aufgabenausgabe überprüft werden soll",
 	"customizeParseErrors": "Die aktuelle Aufgabenkonfiguration weist Fehler auf. Beheben Sie die Fehler, bevor Sie eine Aufgabe anpassen.",
 	"moreThanOneBuildTask": "In \"tasks.json\" sind mehrere Buildaufgaben definiert. Die erste wird ausgeführt.\n",
-	"TaskSystem.activeSame.background": "Die Aufgabe \"{0}\" ist bereits im Hintergrundmodus aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden…\".",
-	"TaskSystem.activeSame.noBackground": "Die Aufgabe \"{0}\" ist bereits aktiv. Klicken Sie zum Beenden der Aufgabe im Menü \"Aufgaben\" auf \"Aufgabe beenden\".",
+	"terminateTask": "Aufgabe beenden",
+	"restartTask": "Aufgabe neu starten",
 	"TaskSystem.active": "Eine aktive Aufgabe wird bereits ausgeführt. Beenden Sie diese, bevor Sie eine andere Aufgabe ausführen.",
 	"TaskSystem.restartFailed": "Fehler beim Beenden und Neustarten der Aufgabe \"{0}\".",
 	"TaskService.noConfiguration": "Fehler: Die Aufgabenerkennung {0} hat für die folgende Konfiguration keine Aufgabe beigetragen:\n {1}\nDie Aufgabe wird ignoriert.\n",
diff --git a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 5f774b9427a..4f46618a812 100644
--- a/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Warnung: \"options.cwd\" muss vom Typ \"string\" sein. Der Wert {0} wird ignoriert.\n",
+	"ConfigurationParser.inValidArg": "Fehler: Befehlsargumente müssen Zeichenfolgen oder Zeichenfolgen in Anführungszeichen sein. Der angegebene Wert ist:\n{0}",
 	"ConfigurationParser.noargs": "Fehler: Befehlsargumente müssen ein Array aus Zeichenfolgen sein. Angegebener Wert:\n{0}",
 	"ConfigurationParser.noShell": "Warnung: Die Shell-Konfiguration wird nur beim Ausführen von Tasks im Terminal unterstützt.",
 	"ConfigurationParser.noName": "Fehler: Der Problemabgleich im Deklarationsbereich muss einen Namen besitzen:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Fehler: Die Aufgabenkonfiguration \"{0}\" enthält die erforderlich Eigenschaft \"{1}\" nicht. Die Aufgabenkonfiguration wird ignoriert.",
 	"ConfigurationParser.notCustom": "Fehler: Die Aufgabe ist nicht als benutzerdefinierte Aufgabe deklariert. Die Konfiguration wird ignoriert.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Fehler: Eine Aufgabe muss eine label-Eigenschaft angeben. Die Aufgabe wird ignoriert.\n{0}\n",
-	"taskConfiguration.shellArgs": "Warnung: Die Aufgabe \"{0}\" ist ein Shellbefehl, und eines seiner Argumente enthält Leerzeichen ohne Escapezeichen. Führen Sie Argumente im Befehl zusammen, um eine korrekte Angabe der Befehlszeile sicherzustellen.",
 	"taskConfiguration.noCommandOrDependsOn": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl bzw. keine depondsOn-Eigenschaft. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
 	"taskConfiguration.noCommand": "Fehler: Aufgabe \"{0}\" definiert keinen Befehl. Die Aufgabe wird ignoriert. Die Definition lautet:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Die Aufgabenversion 2.0.0 unterstützt globale betriebssystemspezifische Aufgaben nicht. Konvertieren Sie sie in eine Aufgabe mit einem betriebssystemspezifischen Befehl. Folgende Aufgaben sind hiervon betroffen:\n{0}"
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..84fc7fe0d67
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "Die Hintergrundfarbe des Terminals, dies ermöglicht eine unterschiedliche Färbung des Terminals im Panel.",
+	"terminal.foreground": "Die Vordergrundfarbe des Terminal.",
+	"terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.",
+	"terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.",
+	"terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.",
+	"terminal.border": "Die Farbe des Rahmens, der Bereiche innerhalb des Terminals teilt. Der Standardwert ist panel.border.",
+	"terminal.ansiColor": "\"{0}\" ANSI-Farbe im Terminal"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index b47e2f347c0..c66ad2bebf8 100644
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,7 @@
 	"workbench.action.terminal.hideFindWidget": "Widget zum Ausblenden der Suche",
 	"nextTerminalFindTerm": "Nächsten Suchbegriff anzeigen",
 	"previousTerminalFindTerm": "Vorherigen Suchbegriff anzeigen",
-	"quickOpenTerm": "Aktives Terminal wechseln"
+	"quickOpenTerm": "Aktives Terminal wechseln",
+	"workbench.action.terminal.selectToPreviousCommand": "Auswählen bis zu vorherigem Befehl",
+	"workbench.action.terminal.selectToNextCommand": "Auswählen bis zu nächstem Befehl"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 10ca73d9616..6fee7de3b43 100644
--- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Kopieren",
+	"split": "Teilen",
 	"paste": "Einfügen",
 	"selectAll": "Alles auswählen",
-	"clear": "Löschen",
-	"split": "Teilen"
+	"clear": "Löschen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index fd696a9b61a..531c9fb5189 100644
--- a/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Dieser Arbeitsbereich enthält Einstellungen, die nur in den Benutzereinstellungen festgelegt werden können ({0}). Klicken Sie [hier]({1}), um mehr zu erfahren.",
 	"openWorkspaceSettings": "Arbeitsbereichseinstellungen öffnen",
-	"dontShowAgain": "Nicht mehr anzeigen",
-	"unsupportedWorkspaceSettings": "Dieser Arbeitsbereich enthält Einstellungen, die nur in den Benutzereinstellungen festgelegt werden können ({0}). Klicken Sie [hier]({1}), um mehr zu erfahren."
+	"dontShowAgain": "Nicht mehr anzeigen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..e9c3a683375
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Anmerkungen zu dieser Version: {0}",
+	"unassigned": "Nicht zugewiesen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index f2d901b3bb9..dbd9faf3c7e 100644
--- a/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Später",
-	"unassigned": "Nicht zugewiesen",
 	"releaseNotes": "Anmerkungen zu dieser Version",
 	"showReleaseNotes": "Anmerkungen zu dieser Version anzeigen",
 	"read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "Neues {0}-Update verfügbar.",
 	"noUpdatesAvailable": "Zurzeit sind keine Updates verfügbar.",
 	"ok": "OK",
-	"download now": "Jetzt herunterladen",
 	"thereIsUpdateAvailable": "Ein Update ist verfügbar.",
+	"download now": "Jetzt herunterladen",
+	"later": "Später",
 	"installUpdate": "Update installieren",
-	"updateAvailable": "Ein Update ist verfügbar: {0} {1}",
 	"updateInstalling": "{0} {1} wird im Hintergrund installiert. Wir informieren Sie, wenn dies abgeschlossen ist.",
 	"updateNow": "Jetzt aktualisieren",
-	"updateAvailableAfterRestart": "{0} wird nach dem Neustart aktualisiert.",
 	"commandPalette": "Befehlspalette...",
 	"settings": "Einstellungen",
 	"keyboardShortcuts": "Tastenkombinationen",
diff --git a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..129a60d789e
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "Webview-Editor",
+	"developer": "Entwickler"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..1492a37abd0
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview-Entwicklertools öffnen",
+	"refreshWebviewLabel": "Webviews erneut laden"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..343d4b1d7ec
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Tragen Sie zur Verbesserung von VS Code bei, und lassen Sie zu, dass Microsoft Nutzungsdaten erfasst. Lesen Sie unsere  [Datenschutzvereinbarung]({0}), und erfahren Sie, wie Sie dies [deaktivieren]({1}).",
+	"telemetryOptOut.optInNotice": "Tragen Sie zur Verbesserung von VS Code bei, und lassen Sie zu, dass Microsoft Nutzungsdaten erfasst. Lesen Sie unsere [Datenschutzvereinbarung]({0}), und erfahren Sie, wie Sie dies [aktivieren]({1}).",
+	"telemetryOptOut.readMore": "Weitere Informationen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 406000b5b3e..de0f13bcb07 100644
--- a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Tools und Sprachen",
 	"welcomePage.installExtensionPacksDescription": "Unterstützung für {0} und {1} installieren",
 	"welcomePage.moreExtensions": "mehr",
-	"welcomePage.installKeymapDescription": "Tastenkombinationen installieren",
-	"welcomePage.installKeymapExtension": "Installieren Sie die Tastenkombinationen von {0} und {1}.",
 	"welcomePage.others": "Andere",
 	"welcomePage.colorTheme": "Farbdesign",
 	"welcomePage.colorThemeDescription": "Passen Sie das Aussehen des Editors und Ihres Codes an Ihre Wünsche an.",
diff --git a/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..0905d3e2f24
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "Diese Einstellung kann jetzt nicht angewendet werden. Sie wird angewendet, wenn Sie den Ordner direkt öffnen."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..4a29a1c902d
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Ja",
+	"cancelButton": "Abbrechen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 88c843bf458..5887d7611b4 100644
--- a/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "Der Erweiterungshost wurde unerwartet beendet.",
 	"extensionHostProcess.unresponsiveCrash": "Der Erweiterungshost wurde beendet, weil er nicht reagiert hat.",
-	"devTools": "Entwicklertools",
 	"restart": "Erweiterungshost neu starten",
 	"overwritingExtension": "Die Erweiterung \"{0}\" wird mit \"{1}\" überschrieben.",
 	"extensionUnderDevelopment": "Die Entwicklungserweiterung unter \"{0}\" wird geladen.",
diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 37247fac832..25ed118e0c1 100644
--- a/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
 	"installNet": ".NET Framework 4.5 herunterladen",
 	"neverShowAgain": "Nicht mehr anzeigen",
-	"netVersionError": "Microsoft .NET Framework 4.5 ist erforderlich. Klicken Sie auf den Link, um die Anwendung zu installieren.",
+	"enospcError": "{0} kann keine Dateiänderungen in diesem großen Workspace überwachen. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
 	"learnMore": "Anweisungen",
-	"enospcError": "Keine Dateihandles mehr in {0} vorhanden. Folgen Sie dem Anwendungslink, um das Problem zu beheben.",
+	"fileInvalidPath": "Ungültige Dateiressource ({0})",
+	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
+	"fileNotModifiedError": "Datei nicht geändert seit",
+	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
+	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
+	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
+	"filePermission": "Schreibzugriff auf Datei ({0}) verweigert",
+	"fileExists": "Die zu erstellende Datei ist bereits vorhanden ({0}). ",
+	"fileModifiedError": "Datei geändert seit",
+	"fileReadOnlyError": "Die Datei ist schreibgeschützt.",
+	"fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.",
+	"unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.",
 	"binFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb.",
 	"trashFailed": "Fehler beim Verschieben von \"{0}\" in den Papierkorb."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index ae94f99053a..c75ef9a2b35 100644
--- a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
 	"fileNotModifiedError": "Datei nicht geändert seit",
 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden."
diff --git a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
index 548b1344de6..a2229be0cee 100644
--- a/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Ungültige Dateiressource ({0})",
 	"fileIsDirectoryError": "Die Datei ist ein Verzeichnis",
 	"fileNotModifiedError": "Datei nicht geändert seit",
-	"fileTooLargeForHeapError": "Die Dateigröße überschreitet die maximale Speichergröße für Fenster. Führen Sie folgenden Code aus: --max-memory=NEWSIZE",
 	"fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.",
 	"fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).",
 	"fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.",
diff --git a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..56b19fa3a5a 100644
--- a/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Abbrechen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index f8184dd0601..c9b03adcbae 100644
--- a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "Der TextMate-Bereichsname, der von der tmLanguage-Datei verwendet wird.",
 	"vscode.extension.contributes.grammars.path": "Der Pfad der tmLanguage-Datei. Der Pfad ist relativ zum Extensionordner und beginnt normalerweise mit \". /syntaxes/\".",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "Eine Zuordnung zwischen Bereichsname und Sprach-ID, wenn diese Grammatik eingebettete Sprachen enthält.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Eine Zuordnung von Bereichsnamen zu Tokentypen.",
 	"vscode.extension.contributes.grammars.injectTo": "Die Liste der Sprachbereichsnamen, in die diese Grammatik injiziert wird."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 64b51d1c603..033bdbfd918 100644
--- a/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/deu/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}",
 	"invalid.injectTo": "Ungültiger Wert in \"contributes.{0}.injectTo\". Es muss sich um ein Array von Sprachbereichsnamen handeln. Bereitgestellter Wert: {1}",
 	"invalid.embeddedLanguages": "Ungültiger Wert in \"contributes.{0}.embeddedLanguages\". Muss eine Objektzuordnung von Bereichsname zu Sprache sein. Angegebener Wert: {1}",
+	"invalid.tokenTypes": "Ungültiger Wert in \"contributes.{0}.tokenTypes\". Muss eine Objektzuordnung von Bereichsname zu Tokentyp sein. Angegebener Wert: {1}",
 	"invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.",
 	"no-tm-grammar": "Keine TM-Grammatik für diese Sprache registriert."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..0100d5fd5a7
--- /dev/null
+++ b/i18n/esn/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "Servidor de lenguaje CSS",
+	"folding.start": "Inicio de la región plegable",
+	"folding.end": "Fin de la región plegable"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css-language-features/package.i18n.json b/i18n/esn/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..91d31339c05
--- /dev/null
+++ b/i18n/esn/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Características del lenguaje CSS",
+	"description": "Proporciona un potente soporte de lenguaje para archivos CSS, LESS y SCSS.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
+	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
+	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
+	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
+	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
+	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
+	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
+	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
+	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
+	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
+	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
+	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
+	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
+	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
+	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
+	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
+	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
+	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
+	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
+	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
+	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
+	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
+	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/css/package.i18n.json b/i18n/esn/extensions/css/package.i18n.json
index 91d31339c05..8b817c2ddd4 100644
--- a/i18n/esn/extensions/css/package.i18n.json
+++ b/i18n/esn/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje CSS",
-	"description": "Proporciona un potente soporte de lenguaje para archivos CSS, LESS y SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"css.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"css.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"css.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"css.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"css.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"css.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"css.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"css.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"css.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"css.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"css.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"css.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"css.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"css.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"css.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"css.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje CSS.",
-	"css.validate.title": "Controla la validación de CSS y la gravedad de los problemas.",
-	"css.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"less.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"less.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"less.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"less.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"less.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"less.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"less.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"less.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"less.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"less.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"less.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"less.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"less.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"less.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"less.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"less.validate.title": "Controla la validación de LESS y la gravedad de los problemas.",
-	"less.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número de parámetros no válido",
-	"scss.lint.boxModel.desc": "No use ancho o alto con el relleno o los bordes.",
-	"scss.lint.compatibleVendorPrefixes.desc": "Cuando use un prefijo específico del proveedor, compruebe que también haya incluido el resto de propiedades específicas del proveedor.",
-	"scss.lint.duplicateProperties.desc": "No use definiciones de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "No use conjuntos de reglas vacíos",
-	"scss.lint.float.desc": "Le recomendamos no usar 'float'. Los floats producen CSS frágiles, fáciles de corromper si cambia cualquier aspecto del diseño.",
-	"scss.lint.fontFaceProperties.desc": "La regla @font-face debe definir las propiedades \"src\" y \"font-family\"",
-	"scss.lint.hexColorLength.desc": "Los colores hexadecimales deben estar formados por tres o seis números hexadecimales.",
-	"scss.lint.idSelector.desc": "Los selectores no deben contener identificadores porque estas reglas están estrechamente ligadas a HTML.",
-	"scss.lint.ieHack.desc": "Las modificaciones de IE solo son necesarias cuando admiten IE7 y anteriores",
-	"scss.lint.important.desc": "Le recomendamos no usar !important. Esto indica que la especificidad de todo el CSS está fuera de control y que debe refactorizarse.",
-	"scss.lint.importStatement.desc": "Las instrucciones Import no se cargan en paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La propiedad se ignora a causa de la pantalla. Por ejemplo, con 'display: inline', el ancho, el alto, el margen superior e inferior y las propiedades de float no tienen efecto.",
-	"scss.lint.universalSelector.desc": "Se sabe que el selector universal (*) es lento",
-	"scss.lint.unknownProperties.desc": "Propiedad desconocida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propiedad específica del proveedor desconocida.",
-	"scss.lint.vendorPrefix.desc": "Cuando use un prefijo específico del proveedor, incluya también la propiedad estándar.",
-	"scss.lint.zeroUnits.desc": "No se necesita una unidad para cero",
-	"scss.validate.title": "Controla la validación de SCSS y la gravedad de los problemas.",
-	"scss.validate.desc": "Habilita o deshabilita todas las validaciones",
-	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"css.colorDecorators.enable.deprecationMessage": "El valor \"css.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"scss.colorDecorators.enable.deprecationMessage": "El valor \"scss.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"less.colorDecorators.enable.deprecationMessage": "El valor \"less.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+	"displayName": "Básicos de CSS",
+	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos CSS, LESS y SCSS."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/emmet/package.i18n.json b/i18n/esn/extensions/emmet/package.i18n.json
index 852d92d405c..d6c05800c1e 100644
--- a/i18n/esn/extensions/emmet/package.i18n.json
+++ b/i18n/esn/extensions/emmet/package.i18n.json
@@ -35,7 +35,7 @@
 	"emmetExtensionsPath": "Ruta de acceso a una carpeta que contiene los perfiles y fragmentos de Emmet.",
 	"emmetShowExpandedAbbreviation": "Muestra abreviaciones Emmet expandidas como sugerencias. La opción \"inMarkupAndStylesheetFilesOnly\" se aplica a HTML, HAML, Jade, Slim, XML, XSL, CSS, SCSS, SASS, LESS y Stylus. La opción \"always\" se aplica a todas las partes del archivo, independientemente de que sea de marcado o CSS. ",
 	"emmetShowAbbreviationSuggestions": "Muestra posibles abreviaciones Emmet como sugerencias. No se aplica a hojas de estilos ni cuando emmet.showExpandedAbbreviation está establecido en \"never\". ",
-	"emmetIncludeLanguages": "Habilita abreviaciones Emmet en lenguajes que no se admiten de forma predeterminada. Agregue una asignación aquí entre el lenguaje y el lenguaje que admite Emmet. Ejemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"} ",
+	"emmetIncludeLanguages": "Habilite las abreviaturas de Emmet en idiomas que no sean compatibles de forma predeterminada. Añada una asignación aquí entre el idioma y el idioma admitido por Emmet.\n Ej.: { \"Vue-HTML \": \"HTML \", \"JavaScript \": \"javascriptreact \"}",
 	"emmetVariables": "Variables para ser utilizadas en fragmentos de código de Emmet",
 	"emmetTriggerExpansionOnTab": "Cuando se habilita, se expande la abreviación Emmet al presionar la tecla TAB. ",
 	"emmetPreferences": "Preferencias usadas para modificar el comportamiento de algunas acciones y resoluciones de Emmet.",
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'webkit' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'webkit'.",
 	"emmetPreferencesCssMozProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'moz' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'moz'.",
 	"emmetPreferencesCssOProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'o' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'o'.",
-	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'."
+	"emmetPreferencesCssMsProperties": "Propiedades CSS separadas por comas que obtienen el prefijo de proveedor 'ms' cuando se utilizan en la abreviatura Emmet que comienza con '-'. Establecer en la cadena vacía para evitar siempre el prefijo 'ms'.",
+	"emmetPreferencesCssFuzzySearchMinScore": "La mínima puntuación (de 0 a 1) que se debe alcanzar en la comparación difusa de abreviación. Los valores más bajos pueden producir muchos resultados falsos positivos, los valores más altos pueden reducir posibles coincidencias.",
+	"emmetOptimizeStylesheetParsing": "Cuando se establece en falso, se analiza el archivo entero para determinar si la posición actual es válida para la expansión de abreviaturas de Emmet. Cuando se establece en verdadero, sólo el contenido alrededor de la posición actual en archivos css, scss/less es analizado."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/commands.i18n.json b/i18n/esn/extensions/git/out/commands.i18n.json
index dad69ea9b3f..6f668444142 100644
--- a/i18n/esn/extensions/git/out/commands.i18n.json
+++ b/i18n/esn/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "Aceptar",
 	"push with tags success": "Insertado con etiquetas correctamente.",
 	"pick remote": "Seleccionar un elemento remoto para publicar la rama '{0}':",
-	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
+	"sync is unpredictable": "Esta acción insertará e incorporará cambios en y desde '{0}/{1}'.",
 	"never again": "No volver a mostrar ",
 	"no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.",
 	"no changes stash": "No existen cambios para el guardado provisional.",
diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json
index 0fdd9b9bbbf..87a73cba8a7 100644
--- a/i18n/esn/extensions/git/package.i18n.json
+++ b/i18n/esn/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Controla si se debe mostrar una acción de archivo abierto en la vista de cambios en Git",
 	"config.inputValidation": "Controla cuándo mostrar el mensaje de validación de entrada en el contador de entrada.",
 	"config.detectSubmodules": "Controla si se detectan automáticamente los submódulos Git. ",
+	"config.detectSubmodulesLimit": "Controla el límite de submódulos de git detectados.",
 	"colors.modified": "Color para recursos modificados.",
 	"colors.deleted": "Color para los recursos eliminados.",
 	"colors.untracked": "Color para los recursos a los que no se les hace seguimiento.",
diff --git a/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9900526f77a
--- /dev/null
+++ b/i18n/esn/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "Servidor de lenguaje HTML",
+	"folding.start": "Inicio de la región plegable",
+	"folding.end": "Fin de la región plegable"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html-language-features/package.i18n.json b/i18n/esn/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..44cb8a85815
--- /dev/null
+++ b/i18n/esn/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Características del lenguaje HTML",
+	"description": "Proporciona un potente soporte del lenguaje para archivos HTML, Razor y Handlebar.",
+	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
+	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
+	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
+	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
+	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
+	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
+	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
+	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
+	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Ajustar atributos.",
+	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
+	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
+	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
+	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
+	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
+	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
+	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
+	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
+	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
+	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
+	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/html/package.i18n.json b/i18n/esn/extensions/html/package.i18n.json
index fbe039bb6bf..3a6ffcc4e4e 100644
--- a/i18n/esn/extensions/html/package.i18n.json
+++ b/i18n/esn/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje HTML",
-	"description": "Proporciona un potente soporte del lenguaje para archivos HTML, Razor y Handlebar.",
-	"html.format.enable.desc": "Habilitar o deshabilitar el formateador HTML predeterminado",
-	"html.format.wrapLineLength.desc": "Cantidad máxima de caracteres por línea (0 = deshabilitar).",
-	"html.format.unformatted.desc": "Lista de etiquetas, separadas por comas, a las que no se debe volver a aplicar formato. El valor predeterminado de \"null\" son todas las etiquetas mostradas en https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de etiquetas, separadas por comas, en las que el contenido no debe volver a formatearse. \"null\" se establece de manera predeterminada en la etiqueta \"pre\".",
-	"html.format.indentInnerHtml.desc": "Aplicar sangría a las secciones <head> y <body>.",
-	"html.format.preserveNewLines.desc": "Indica si los saltos de línea existentes delante de los elementos deben conservarse. Solo funciona delante de los elementos, no dentro de las etiquetas o con texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de saltos de línea que deben conservarse en un fragmento. Use \"null\" para que el número sea ilimitado.",
-	"html.format.indentHandlebars.desc": "Formato y sangría {{#foo}} y {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar con una nueva línea.",
-	"html.format.extraLiners.desc": "Lista de etiquetas, separadas por comas, que deben tener una nueva línea adicional delante. \"null\" tiene como valores predeterminados \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Ajustar atributos.",
-	"html.format.wrapAttributes.auto": "Ajustar atributos solo cuando se supera la longitud de la línea.",
-	"html.format.wrapAttributes.force": "Ajustar todos los atributos excepto el primero.",
-	"html.format.wrapAttributes.forcealign": "Ajustar todos los atributos excepto el primero y mantener la alineación.",
-	"html.format.wrapAttributes.forcemultiline": "Ajustar todos los atributos.",
-	"html.suggest.angular1.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas y propiedades de Angular V1.",
-	"html.suggest.ionic.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de Ionic.",
-	"html.suggest.html5.desc": "Configura si la compatibilidad con el lenguaje HTML integrada sugiere etiquetas, propiedades y valores de HTML5.",
-	"html.trace.server.desc": "Hace un seguimiento de la comunicación entre VSCode y el servidor de lenguaje HTML.",
-	"html.validate.scripts": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los scripts insertados.",
-	"html.validate.styles": "Configura si la compatibilidad con el lenguaje HTML incorporado valida los estilos insertados.",
-	"html.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
-	"html.autoClosingTags": "Habilita o deshabilita el cierre automático de las etiquetas HTML."
+	"displayName": "Conceptos básicos de lenguaje HTML",
+	"description": "Proporciona resaltado de sintaxis, correspondencia de corchetes y fragmentos de código en archivos HTML."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..253bfb394d3
--- /dev/null
+++ b/i18n/esn/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "Servidor de lenguaje JSON"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json-language-features/package.i18n.json b/i18n/esn/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..d18d8b81bc3
--- /dev/null
+++ b/i18n/esn/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Características del lenguaje JSON",
+	"description": "Proporciona un potente soporte de lenguaje para archivos JSON.",
+	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
+	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
+	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
+	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
+	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
+	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
+	"json.tracing.desc": "Realiza el seguimiento de la comunicación entre VS Code y el servidor de lenguaje JSON.",
+	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
+	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/json/package.i18n.json b/i18n/esn/extensions/json/package.i18n.json
index a3e0c5de0ee..4586ba0848a 100644
--- a/i18n/esn/extensions/json/package.i18n.json
+++ b/i18n/esn/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Características del lenguaje JSON",
-	"description": "Proporciona un potente soporte de lenguaje para archivos JSON.",
-	"json.schemas.desc": "Asociar esquemas a archivos JSON en el proyecto actual",
-	"json.schemas.url.desc": "Una dirección URL a un esquema o una ruta de acceso relativa a un esquema en el directorio actual",
-	"json.schemas.fileMatch.desc": "Una matriz de patrones de archivo con los cuales coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.fileMatch.item.desc": "Un patrón de archivo que puede contener \"*\" con el cual coincidir cuando los archivos JSON se resuelvan en esquemas.",
-	"json.schemas.schema.desc": "La definición de esquema de la dirección URL determinada. Solo se necesita proporcionar el esquema para evitar los accesos a la dirección URL del esquema.",
-	"json.format.enable.desc": "Habilitar/deshabilitar formateador JSON predeterminado (requiere reiniciar)",
-	"json.tracing.desc": "Seguimiento de comunicación entre VS Code y el servidor de lenguaje JSON",
-	"json.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
-	"json.colorDecorators.enable.deprecationMessage": "El valor \"json.colorDecorators.enable\" está en desuso en favor de \"editor.colorDecorators\".",
-	"json.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis."
+	"displayName": "Conceptos básicos de lenguaje JSON",
+	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos JSON."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..a97aa29723b
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "No se pudo cargar 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..0743f600836
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Vista previa] {0}",
+	"previewTitle": "Vista Previa {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..ef0bed92441
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Se ha deshabilitado parte del contenido de este documento",
+	"preview.securityMessage.title": "Se ha deshabilitado el contenido potencialmente inseguro en la previsualización de Markdown. Para permitir el contenido inseguro o habilitar scripts cambie la configuración de la previsualización de Markdown",
+	"preview.securityMessage.label": "Alerta de seguridad de contenido deshabilitado"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/out/security.i18n.json b/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..6d04884c962
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Cargar solo el contenido seguro",
+	"insecureLocalContent.title": "Permitir contenido local inseguro ",
+	"insecureLocalContent.description": "Habilitar la carga del contenido sobre http desde localhost",
+	"insecureContent.title": "Permitir contenido no seguro",
+	"insecureContent.description": "Habilitar el contenido de carga sobre http",
+	"disable.title": "Deshabilitar",
+	"disable.description": "Permitir todo el contenido y la ejecución de scripts. No se recomienda.",
+	"moreInfo.title": "Más información",
+	"enableSecurityWarning.title": "Habilitar advertencias de seguridad de vista previa en este espacio de trabajo",
+	"disableSecurityWarning.title": "Deshabilitar advertencias de seguridad de vista previa en este espacio de trabajo",
+	"toggleSecurityWarning.description": "No afecta al nivel de seguridad de contenido",
+	"preview.showPreviewSecuritySelector.title": "Seleccione configuración de seguridad para las previsualizaciones de Markdown en esta área de trabajo"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/markdown-language-features/package.i18n.json b/i18n/esn/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..0e6d8a1f74f
--- /dev/null
+++ b/i18n/esn/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Características del lenguaje Markdown",
+	"description": "Proporciona un potente soporte de lenguaje para archivos Markdown.",
+	"markdown.preview.breaks.desc": "Establece cómo los saltos de línea son representados en la vista previa de markdown. Estableciendolo en 'true' crea un <br> para cada nueva línea.",
+	"markdown.preview.linkify": "Habilitar o deshabilitar la conversión de texto de tipo URL a enlaces en la vista previa de markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Haga doble clic en la vista previa de Markdown para cambiar al editor.",
+	"markdown.preview.fontFamily.desc": "Controla la familia de la fuente utilizada en la previsualización del descuento.",
+	"markdown.preview.fontSize.desc": "Controla el tamaño de la fuente en píxeles utilizado en la previsualización del descuento.",
+	"markdown.preview.lineHeight.desc": "Controla la altura de línea utilizada en la previsualización del descuento. Este número es relativo al tamaño de la fuente.",
+	"markdown.preview.markEditorSelection.desc": "Marca la selección del editor actual en la vista previa de Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Al desplazarse en la vista previa de Markdown, se actualiza la vista del editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Al desplazarse en el editor de Markdown, se actualiza la vista de la previsualización .",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Desestimado] Desplaza la vista previa de Markdown para revelar la línea del editor seleccionada actualmente.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Este valor se ha reemplazado por \"markdown.preview.scrollPreviewWithEditor\" y ya no tiene ningún efecto.",
+	"markdown.preview.title": "Abrir vista previa",
+	"markdown.previewFrontMatter.dec": "Establece cómo se debe representar el asunto de la parte delantera de YAML en la vista previa del descuento. 'hide' quita el asunto de la parte delantera. De lo contrario, el asunto de la parte delantera se trata como contenido del descuento.",
+	"markdown.previewSide.title": "Abrir vista previa en el lateral",
+	"markdown.showLockedPreviewToSide.title": "Abrir vista previa fija en el lateral",
+	"markdown.showSource.title": "Mostrar origen",
+	"markdown.styles.dec": "Una lista de direcciones URL o rutas de acceso locales a hojas de estilo CSS que utilizar desde la vista previa del descuento. Las tutas de acceso relativas se interpretan en relación con la carpeta abierta en el explorador. Si no hay ninguna carpeta abierta, se interpretan en relación con la ubicación del archivo del descuento. Todos los '\\' deben escribirse como '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Cambiar configuración de seguridad de vista previa",
+	"markdown.trace.desc": "Habilitar registro de depuración para las extensiones de Markdown. ",
+	"markdown.preview.refresh.title": "Actualizar vista previa",
+	"markdown.preview.toggleLock.title": "Cambiar fijación de la vista previa "
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..a2041159412
--- /dev/null
+++ b/i18n/esn/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "¿Permite la ejecución de {0} (definido como valor del área de trabajo) para detectar errores en archivos PHP?",
+	"php.yes": "Permitir",
+	"php.no": "No permitir",
+	"wrongExecutable": "No se puede validar porque {0} no es un ejecutable PHP válido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable PHP.",
+	"noExecutable": "No se puede validar porque no hay ningún ejecutable PHP establecido. Use el ajuste \"php.validate.executablePath\" para configurar el ejecutable de PHP.",
+	"unknownReason": "No se pudo ejecutar el archivo PHP con la ruta de acceso: {0}. Se desconoce el motivo."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php-language-features/package.i18n.json b/i18n/esn/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..0b5e90ed32d
--- /dev/null
+++ b/i18n/esn/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
+	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
+	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
+	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)",
+	"displayName": "Características del lenguaje PHP",
+	"description": "Proporciona un potente soporte de lenguaje para archivos PHP."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/php/package.i18n.json b/i18n/esn/extensions/php/package.i18n.json
index 1e2e57cee70..edf1d540da8 100644
--- a/i18n/esn/extensions/php/package.i18n.json
+++ b/i18n/esn/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configura si se habilitan las sugerencias del lenguaje PHP integradas. La asistencia sugiere variables y opciones globales de PHP.",
-	"configuration.validate.enable": "Habilita o deshabilita la validación integrada de PHP.",
-	"configuration.validate.executablePath": "Señala al ejecutable PHP.",
-	"configuration.validate.run": "Indica si linter se ejecuta al guardar o al escribir.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "No permitir el ejecutable de validación de PHP (como configuración de área de trabajo)",
-	"displayName": "Características del lenguaje PHP",
-	"description": "Proporciona IntelliSense, linting y conceptos básicos del lenguaje para archivos de PHP."
+	"displayName": "Conceptos básicos del lenguaje PHP",
+	"description": "Proporciona resaltado de sintaxis y correspondencia de corchetes en archivos PHP."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json b/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..0406f029ae5
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript",
+	"typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible",
+	"typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript",
+	"typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript. Haga clic [aquí]({0}) para obtener más información.",
+	"typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript. Haga clic [aquí]({0}) para obtener más información.",
+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..20f05236719
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Seleccione acción de código para aplicar",
+	"acquiringTypingsLabel": "Adquiriendo typings...",
+	"acquiringTypingsDetail": "Adquiriendo definiciones de typings para IntelliSense.",
+	"autoImportLabel": "Importar automáticamente desde {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..c51828607c1
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Habilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
+	"ts-nocheck": "Deshabilita la verificación semántica en un archivo de JavaScript. Debe estar al principio del archivo.",
+	"ts-ignore": "Suprime los errores @ts-check en la siguiente línea de un archivo. "
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..5cab0f0f878
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 implementación",
+	"manyImplementationLabel": "{0} implementaciones",
+	"implementationsErrorLabel": "No se pueden determinar las implementaciones"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..7579ba46bb3
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "Comentario de JSDoc"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..226cfad1182
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Organizar las importaciones"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..a3699d251e4
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Corregir todo en el archivo)"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..028c2af8de2
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 referencia",
+	"manyReferenceLabel": "{0} referencias",
+	"referenceErrorLabel": "No se pudieron determinar las referencias"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..2737725617d
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "construir - {0}",
+	"buildAndWatchTscLabel": "seguir - {0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..12d95cb7073
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "La ruta de acceso {0} no apunta a una instalación válida de tsserver. Se usará la versión de TypeScript del paquete.",
+	"serverCouldNotBeStarted": "El servidor de lenguaje TypeScript no se pudo iniciar. El mensaje de error es: {0}",
+	"typescript.openTsServerLog.notSupported": "El registro del servidor de TS requiere TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "Los registros del servidor TS están desconectados. Establezca \"typescript.tsserver.log\" y reinicie el servidor TS para activar los registros.",
+	"typescript.openTsServerLog.enableAndReloadOption": "Habilite el registro y reinicie el servidor TS",
+	"typescript.openTsServerLog.noLogFile": "El servidor de TS no ha iniciado el registro.",
+	"openTsServerLog.openFileFailedFailed": "No se puede abrir el archivo de registro del servidor de TS",
+	"serverDiedAfterStart": "El servicio de lenguaje TypeScript finalizó de forma inesperada cinco veces después de haberse iniciado y no se reiniciará.",
+	"serverDiedReportIssue": "Notificar problema",
+	"serverDied": "El servicio de lenguaje Typescript finalizó de forma inesperada cinco veces en los últimos cinco minutos."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..ea0f0a445e5
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "versión inválida"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..6b1caf7be01
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Para habilitar las características de lenguaje de JavaScript/TypeScript en todo el proyecto, excluya las carpetas con muchos archivos, como: {0}",
+	"hintExclude.generic": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje.",
+	"large.label": "Configurar exclusiones",
+	"hintExclude.tooltip": "Para habilitar las características de idioma de JavaScript/TypeScript IntelliSense en todo el proyecto, excluya las carpetas de tamaño grande con archivos de origen en los que no trabaje."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..290207978aa
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Recuperando cambios en los datos para un mejor rendimiento de TypeScript IntelliSense",
+	"typesInstallerInitializationFailed.title": "No se pudieron instalar archivos de términos para las características de lenguaje de JavaScript. Asegúrese de que NPM está instalado o configure \"typescript.npm\" en la configuración de usuario. Haga clic [aquí]({0}) para obtener más información.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "No volver a mostrar"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..2cac579a218
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Utilizar la versión de VS Code",
+	"useWorkspaceVersionOption": "Usar versión del área de trabajo",
+	"learnMore": "Más información",
+	"selectTsVersion": "Seleccionar la versión de TypeScript usada para las características del lenguaje de JavaScript y TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..2fa648a3e7e
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "No se pudo cargar la versión de TypeScript en esta ruta",
+	"noBundledServerFound": "Otra aplicación (por ejemplo, una herramienta de detección de virus con un comportamiento erróneo) eliminó el tsserver de VSCode. Debe reinstalar el VS Code."
+}
\ No newline at end of file
diff --git a/i18n/esn/extensions/typescript-language-features/package.i18n.json b/i18n/esn/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..60682458562
--- /dev/null
+++ b/i18n/esn/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,64 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Características del lenguaje JavaScript y TypeScript",
+	"description": "Proporciona soporte de lenguaje enriquecido para JavaScript y TypeScript.",
+	"typescript.reloadProjects.title": "Volver a cargar el proyecto",
+	"javascript.reloadProjects.title": "Volver a cargar el proyecto",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete las funciones con la signatura de parámetro.",
+	"typescript.tsdk.desc": "Especifica la ruta de acceso de carpeta que contiene los archivos lib*.d.ts y tsserver que se van a usar.",
+	"typescript.disableAutomaticTypeAcquisition": "Desactiva la adquisición automática de tipos. Requiere TypeScript >= 2.0.6.",
+	"typescript.tsserver.log": "votes Habilita los registros del servidor TS a un archivo. Este registro se puede utilizar para diagnosticar problemas en el servidor TS. Este registro puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
+	"typescript.tsserver.pluginPaths": "Rutas adicionales para descubrir plugins de servicio del lenguaje Typescript. Requiere TypeScript >= 2.3.0.",
+	"typescript.tsserver.pluginPaths.item": "Ruta relativa o absoluta. La ruta de acceso relativa se resolverá contra las carpetas del espacio de trabajo.",
+	"typescript.tsserver.trace": "Habilita el seguimiento de mensajes al servidor TS. Este seguimiento se puede utilizar para diagnosticar problemas en el servidor TS. Este seguimiento puede contener rutas de acceso, código fuente y posiblemente otra información sensitiva acerca del proyecto.",
+	"typescript.validate.enable": "Habilita o deshabilita la validación de TypeScript.",
+	"typescript.format.enable": "Habilita o deshabilita el formateador predeterminado de TypeScript.",
+	"javascript.format.enable": "Habilita o deshabilita el formateador predeterminado de JavaScript.",
+	"format.insertSpaceAfterCommaDelimiter": "Define el tratamiento del espacio después de un delimitador de coma.",
+	"format.insertSpaceAfterConstructor": "Define el manejo del espacio después de la palabra clave constructor. Requiere TypeScript >= 2.3.0",
+	"format.insertSpaceAfterSemicolonInForStatements": " Define el tratamiento del espacio después de punto y coma en una instrucción for.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define el tratamiento del espacio después de un operador binario.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define el tratamiento del espacio después de las palabras clave en una instrucción de flujo de control.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define el tratamiento del espacio después de la palabra clave function para las funciones anónimas.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Define el tratamiento del espacio delante de los paréntesis de los argumentos de las funciones. Requiere TypeScript >= 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define el manejo del espacio después de abrir y antes de cerrar paréntesis no vacíos.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define el manejo del espacio después de abrir y antes de cerrar los soportes no vacíos.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Define el manejo del espacio después de abrir y antes de cerrar llaves no vacías. Requiere TypeScript > = 2.3.0.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de cadenas de plantilla. Requiere TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define el tratamiento del espacio después de la llave de apertura y antes de la llave de cierre de las expresiones JSX. Requiere TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterTypeAssertion": "Define el control del espacio después de las aserciones de tipos en TypeScript. Requiere TypeScript >= 2.4",
+	"format.placeOpenBraceOnNewLineForFunctions": "Define si una llave de apertura se incluye en una nueva línea para las funciones o no.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Define si una llave de apertura se incluye en una nueva línea para los bloques de control o no.",
+	"javascript.validate.enable": "Habilita o deshabilita la validación de JavaScript.",
+	"typescript.goToProjectConfig.title": "Ir a configuración del proyecto",
+	"javascript.goToProjectConfig.title": "Ir a configuración del proyecto",
+	"javascript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de JavaScript.",
+	"typescript.referencesCodeLens.enabled": "Habilitar/deshabilitar las referencias de CodeLens en los archivos de TypeScript. Requiere TypeScript  >= 2.0.6.",
+	"typescript.implementationsCodeLens.enabled": "Habilita o deshabilita implementaciones de CodeLens. Requiere TypeScript >= 2.2.0.",
+	"typescript.openTsServerLog.title": "Abrir registro del servidor de TS",
+	"typescript.restartTsServer": "Reiniciar servidor TS",
+	"typescript.selectTypeScriptVersion.title": "Seleccionar versión de TypeScript",
+	"typescript.reportStyleChecksAsWarnings": "Notificar comprobaciones de estilo como advertencias",
+	"jsDocCompletion.enabled": "Habilita o deshabilita comentarios automaticos de JSDoc",
+	"javascript.implicitProjectConfig.checkJs": "Habilita/deshabilita la comprobación semántica de los archivos JavaScript. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Se requiere TypeScript >=2.3.1.",
+	"typescript.npm": "Especifica la ruta de acceso al archivo ejecutable de NPM usada para la adquisición automática de tipos. Requiere TypeScript >= 2.3.4.",
+	"typescript.check.npmIsInstalled": "Compruebe si NPM está instalado para la adquisición automática de tipos.",
+	"javascript.nameSuggestions": "Habilitar/deshabilitar nombres únicos de la lista de sugerencias en los archivos de JavaScript. ",
+	"typescript.tsc.autoDetect": "Controla la auto detección de tareas del CAC. 'off' inhabilita esta función. 'build' crea una ejecución de compilación de tareas. 'watch' sólo crea compilación y 'watch tasks' 'on' crea tanto construir y ver tareas. Por defecto = 'on'. ",
+	"typescript.problemMatchers.tsc.label": "Problemas de TypeScript",
+	"typescript.problemMatchers.tscWatch.label": "Problemas de TypeScript (modo de inspección)",
+	"typescript.quickSuggestionsForPaths": "Activar o desactiva las sugerencias rápidas al escribir una ruta de importación.",
+	"typescript.locale": "Establece la configuración regional para reportar errores de TypeScript. Requiere TypeScript > = 2.6.0. Por defecto, utiliza el valor 'null'  de VS Code para errores de TypeScript.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Activar/desactivar 'experimentalDecorators' para los archivos JavaScript que no son parte de un proyecto. Los archivos jsconfig.json o tsconfig.json reemplazan esta configuración. Requiere inicio > = 2.3.1. ",
+	"typescript.autoImportSuggestions.enabled": "Habilita o deshabilita sugerencias de importación automática.  Requiere TypeScript >= 2.6.1.",
+	"typescript.experimental.syntaxFolding": "Habilita/deshabilita los marcadores de plegado sensibles a la sintaxis.",
+	"taskDefinition.tsconfig.description": "Archivo tsconfig que define la compilación de TS.",
+	"javascript.suggestionActions.enabled": "Habilitar/deshabilitar sugerencias de diagnóstico para los archivos JavaScript en el editor. Requiere TypeScript > = 2.8 "
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/processes.i18n.json b/i18n/esn/src/vs/base/node/processes.i18n.json
index ca0c97371a5..35229bd6699 100644
--- a/i18n/esn/src/vs/base/node/processes.i18n.json
+++ b/i18n/esn/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "No se puede ejecutar un comando shell en una unidad UNC."
+	]
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/zip.i18n.json b/i18n/esn/src/vs/base/node/zip.i18n.json
index 545249f03c4..fff6f71f4a8 100644
--- a/i18n/esn/src/vs/base/node/zip.i18n.json
+++ b/i18n/esn/src/vs/base/node/zip.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"incompleteExtract": "Incompleta. Extraído {0} de {1} entradas",
 	"notFound": "{0} no se encontró dentro del archivo zip."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 9719ad40a2d..efeedf70590 100644
--- a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "Visualizar en GitHub",
 	"loadingData": "Cargando datos...",
+	"rateLimited": "Límite de consulta de GitHub excedido. Espera.",
 	"similarIssues": "Problemas similares",
 	"open": "Abrir",
 	"closed": "Cerrado",
-	"noResults": "No se encontraron resultados",
+	"noSimilarIssues": "No hay problemas similares encontrados",
 	"settingsSearchIssue": "Problema de búsqueda de configuración",
 	"bugReporter": "Informe de errores",
-	"performanceIssue": "Problema de rendimiento",
 	"featureRequest": "Solicitud de característica",
+	"performanceIssue": "Problema de rendimiento",
 	"stepsToReproduce": "Pasos para reproducir",
 	"bugDescription": "Indique los pasos necesarios para reproducir el problema. Debe incluir el resultado real y el resultado esperado. Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
 	"performanceIssueDesciption": "¿Cuándo ocurrió este problema de rendimiento? ¿Se produce al inicio o después de realizar una serie específica de acciones? Admitimos Markdown al estilo de GitHub. Podrá editar el problema y agregar capturas de pantalla cuando veamos una vista previa en GitHub.",
diff --git a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 5e6ecd766bd..ad772087dc1 100644
--- a/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/esn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,12 @@
 	],
 	"completeInEnglish": "Por favor complete el formulario en inglés.",
 	"issueTypeLabel": "Esto es un",
+	"issueSourceLabel": "Archivo en",
+	"vscode": "Visual Studio Code",
+	"extension": "Una extensión",
+	"disableExtensionsLabelText": "Intente reproducir el problema después de {0}. Si el problema sólo se reproduce cuando las extensiones están activas, puede que haya un problema con una extensión.",
+	"disableExtensions": "Deshabilitar todas las extensiones y volver a cargar la ventana",
+	"chooseExtension": "Extensión",
 	"issueTitleLabel": "Título",
 	"issueTitleRequired": "Por favor, introduzca un título.",
 	"titleLengthValidation": "El título es demasiado largo.",
@@ -18,13 +24,6 @@
 	"extensions": "Mis extensiones",
 	"searchedExtensions": "Extensiones que se han buscado",
 	"settingsSearchDetails": "Detalles de la búsqueda de configuración",
-	"tryDisablingExtensions": "¿Se reproduce el problema cuando están deshabilitadas las extensiones?",
-	"yes": "Sí",
-	"no": "No",
-	"disableExtensionsLabelText": "Intente reproducir el problema después de {0}.",
-	"disableExtensions": "Deshabilitar todas las extensiones y volver a cargar la ventana",
-	"showRunningExtensionsLabelText": "Si sospecha que se trata de un problema con una extensión, {0} para notificarlo.",
-	"showRunningExtensions": "Ver todas las extensiones que están en ejecución",
 	"details": "Especifique los detalles.",
 	"loadingData": "Cargando datos..."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..c10a769e352
--- /dev/null
+++ b/i18n/esn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "CPU %",
+	"memory": "Memoria (MB)",
+	"pid": "pid",
+	"name": "Nombre",
+	"killProcess": "Matar proceso",
+	"forceKillProcess": "Forzar matar proceso"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/code/electron-main/menus.i18n.json b/i18n/esn/src/vs/code/electron-main/menus.i18n.json
index 5286de3ed56..4fa8264443e 100644
--- a/i18n/esn/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/esn/src/vs/code/electron-main/menus.i18n.json
@@ -146,6 +146,7 @@
 	"miConditionalBreakpoint": "Punto de interrupción &&condicional...",
 	"miColumnBreakpoint": "Punto de interrupción de c&&olumna",
 	"miFunctionBreakpoint": "Punto de interrupción de &&función...",
+	"miLogPoint": "&& Punto de registro de...",
 	"miNewBreakpoint": "&&Nuevo punto de interrupción",
 	"miEnableAllBreakpoints": "Habilitar todos los puntos de interrupción",
 	"miDisableAllBreakpoints": "&&Deshabilitar todos los puntos de interrupción",
@@ -161,6 +162,7 @@
 	"mMergeAllWindows": "Fusionar todas las ventanas",
 	"miToggleDevTools": "&&Alternar herramientas de desarrollo",
 	"miAccessibilityOptions": "&&Opciones de accesibilidad",
+	"miOpenProcessExplorerer": "Abrir Explorador de &&Procesos",
 	"miReportIssue": "&&Notificar problema",
 	"miWelcome": "&&Bienvenido",
 	"miInteractivePlayground": "Área de juegos &&interactiva",
diff --git a/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json
index 6fac622936b..44586570582 100644
--- a/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/esn/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Cerrar",
-	"header": "Diferencia {0} de {1}: original {2}, {3} líneas, modificado {4}, {5} líneas",
 	"blankLine": "vacío",
 	"equalLine": "original {0}, modificado {1}: {2}",
 	"insertLine": "+ modificado {0}: {1}",
diff --git a/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..d60d995d489
--- /dev/null
+++ b/i18n/esn/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cursors.maximum": "El número de cursores se ha limitado a {0}."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 966708573a3..385993cc48e 100644
--- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.",
 	"multiCursorModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS.",
 	"multiCursorModifier": "El modificador que se usará para agregar varios cursores con el mouse. \"ctrlCmd\" se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS. Los gestos del mouse \"Ir a la definición\" y \"Abrir vínculo\" se adaptarán de modo que no entren en conflicto con el modificador multicurso",
+	"multiCursorMergeOverlapping": "Combinar varios cursores cuando se solapan.",
 	"quickSuggestions.strings": "Habilita sugerencias rápidas en las cadenas.",
 	"quickSuggestions.comments": "Habilita sugerencias rápidas en los comentarios.",
 	"quickSuggestions.other": "Habilita sugerencias rápidas fuera de las cadenas y los comentarios.",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "Controla cómo el editor debe presentar el resaltado de línea. Las posibilidades son \"ninguno\", \"margen\", \"línea\" y \"todo\".",
 	"codeLens": "Controla si el editor muestra lentes de código",
 	"folding": "Controla si el editor tiene habilitado el plegado de código.",
+	"foldingStrategyAuto": "Si está disponible, utilice una estrategia de plegado específica del idioma, de lo contrario volverá a la estrategia basada en sangría.",
+	"foldingStrategyIndentation": "Utilice siempre la estrategia de plegado basado en sangría.",
+	"foldingStrategy": "Controla la forma en que se calculan las gamas plegables. Las selecciones ' auto' utilizan una estrategia de plegado específica del idioma, si está disponible. 'Sangría' obliga a utilizar la estrategia de plegado con sangría.",
 	"showFoldingControls": "Controla cuándo los controles de plegado del margen son ocultados automáticamente.",
 	"matchBrackets": "Resaltar corchetes coincidentes cuando se seleccione uno de ellos.",
 	"glyphMargin": "Controla si el editor debe representar el margen de glifo vertical. El margen de glifo se usa, principalmente, para depuración.",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "Controla si el portapapeles principal de Linux debe admitirse.",
 	"sideBySide": "Controla si el editor de diferencias muestra las diferencias en paralelo o alineadas.",
 	"ignoreTrimWhitespace": "Controla si el editor de diferencias muestra los cambios de espacio inicial o espacio final como diferencias.",
+	"largeFileSize": "Controla el umbral de tamaño de archivo en bytes más allá de los cuales se aplican reglas de optimización especiales",
+	"largeFileLineCount": "Controla el umbral de tamaño de archivo en términos de cuenta de línea más allá de las cuales se aplican reglas de optimización especiales",
 	"renderIndicators": "Controla si el editor de diff muestra indicadores +/- para cambios agregados/quitados"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 9b8e29dd1a9..1da3081cf27 100644
--- a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,16 +6,17 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"lineHighlight": "Color de fondo del resaltado de línea en la posición del cursor.",
+	"lineHighlight": "Color de fondo para la línea resaltada en la posición del cursor.",
 	"lineHighlightBorderBox": "Color de fondo del borde alrededor de la línea en la posición del cursor.",
 	"rangeHighlight": "Color de fondo de los rangos resaltados, como por ejemplo las características de abrir rápidamente y encontrar. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"rangeHighlightBorder": "Color de fondo del borde alrededor de los intervalos resaltados.",
 	"caret": "Color del cursor del editor.",
-	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del carácter solapado por el bloque del cursor.",
+	"editorCursorBackground": "Color de fondo del cursor de edición. Permite personalizar el color del caracter solapado por el bloque del cursor.",
 	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
 	"editorIndentGuides": "Color de las guías de sangría del editor.",
 	"editorLineNumbers": "Color de números de línea del editor.",
 	"editorActiveLineNumber": "Color del número de línea activa en el editor",
+	"deprecatedEditorActiveLineNumber": "ID es obsoleto. Usar en lugar 'editorLineNumber.activeForeground'. ",
 	"editorRuler": "Color de las reglas del editor",
 	"editorCodeLensForeground": "Color principal de lentes de código en el editor",
 	"editorBracketMatchBackground": "Color de fondo tras corchetes coincidentes",
@@ -28,7 +29,9 @@
 	"warningBorder": "Color de borde de squigglies de advertencia en el editor.",
 	"infoForeground": "Color de primer plano de los subrayados ondulados informativos en el editor.",
 	"infoBorder": "Color del borde de los subrayados ondulados informativos en el editor.",
-	"overviewRulerRangeHighlight": "Color de marcador de regla de información general para intervalos resaltados.",
+	"hintForeground": "Color de primer plano de pista squigglies en el editor.",
+	"hintBorder": "Color de borde de pista squigglies en el editor.",
+	"overviewRulerRangeHighlight": "Resumen de color de marcador para destacar rangos. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"overviewRuleError": "Color de marcador de regla de información general para errores. ",
 	"overviewRuleWarning": "Color de marcador de regla de información general para advertencias.",
 	"overviewRuleInfo": "Color de marcador de regla de información general para mensajes informativos. "
diff --git a/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..8a8848e3498
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,17 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Mostrar correcciones ({0})",
+	"quickFix": "Mostrar correcciones",
+	"quickfix.trigger.label": "Solución rápida...",
+	"editor.action.quickFix.noneMessage": "No hay acciones de código disponibles",
+	"refactor.label": "Refactorizar...",
+	"editor.action.refactor.noneMessage": "No hay refactorizaciones disponibles",
+	"source.label": "Acción de la fuente...",
+	"editor.action.source.noneMessage": "No hay acciones de fuente disponibles"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json b/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json
index 98e450e770f..0a2f41c1bae 100644
--- a/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/find/findController.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"startFindAction": "Buscar",
+	"startFindWithSelectionAction": "Buscar con selección",
 	"findNextMatchAction": "Buscar siguiente",
 	"findPreviousMatchAction": "Buscar anterior",
 	"nextSelectionMatchFindAction": "Buscar selección siguiente",
diff --git a/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json
index f54e722387a..d811487bd46 100644
--- a/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/format/formatActions.i18n.json
@@ -12,5 +12,7 @@
 	"hintnn": "{0} ediciones de formato entre las líneas {1} y {2}",
 	"no.provider": "No hay formateador para los archivos ' {0} ' instalados.",
 	"formatDocument.label": "Dar formato al documento",
-	"formatSelection.label": "Dar formato a la selección"
+	"no.documentprovider": "No hay formateador de documentos para los archivos ' {0} ' instalados.",
+	"formatSelection.label": "Dar formato a la selección",
+	"no.selectionprovider": "No hay formateador de selección para los archivos ' {0} ' instalados."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 5682e32cf74..ce6be2a8dc0 100644
--- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Ir al siguiente problema (Error, Advertencia, Información)",
-	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)",
-	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
-	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
-	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
+	"markerAction.previous.label": "Ir al problema anterior (Error, Advertencia, Información)"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..862620a88d9
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Color de los errores del widget de navegación de marcadores del editor.",
+	"editorMarkerNavigationWarning": "Color de las advertencias del widget de navegación de marcadores del editor.",
+	"editorMarkerNavigationInfo": "Color del widget informativo marcador de navegación en el editor.",
+	"editorMarkerNavigationBackground": "Fondo del widget de navegación de marcadores del editor."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/links/links.i18n.json b/i18n/esn/src/vs/editor/contrib/links/links.i18n.json
index cd880de830b..a7200dfc8a2 100644
--- a/i18n/esn/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "Ctrl + clic para abrir el vínculo",
 	"links.command.mac": "Cmd + click para ejecutar el comando",
 	"links.command": "Ctrl + click para ejecutar el comando",
+	"links.navigate.al.mac": "Opción + clic para seguir el enlace",
 	"links.navigate.al": "Alt + clic para seguir el vínculo",
+	"links.command.al.mac": "Opción + click para ejecutar el comando",
 	"links.command.al": "Alt + clic para ejecutar el comando",
 	"invalid.url": "No se pudo abrir este vínculo porque no tiene un formato correcto: {0}",
 	"missing.url": "No se pudo abrir este vínculo porque falta el destino.",
diff --git a/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..bc97e24608a
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"editor.readonly": "No se puede editar en editor de sólo lectura"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..22631072b43
--- /dev/null
+++ b/i18n/esn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Domingo",
+	"Monday": "Lunes",
+	"Tuesday": "Martes",
+	"Wednesday": "Miércoles",
+	"Thursday": "Jueves",
+	"Friday": "Viernes",
+	"Saturday": "Sábado",
+	"SundayShort": "Dom",
+	"MondayShort": "Lun",
+	"TuesdayShort": "Mar",
+	"WednesdayShort": "Mié",
+	"ThursdayShort": "Jue",
+	"FridayShort": "Vie",
+	"SaturdayShort": "Sáb",
+	"January": "Enero",
+	"February": "Febrero",
+	"March": "Marzo",
+	"April": "Abril",
+	"May": "Mayo",
+	"June": "Junio",
+	"July": "Julio",
+	"August": "Agosto",
+	"September": "Septiembre",
+	"October": "Octubre",
+	"November": "Noviembre",
+	"December": "Diciembre",
+	"JanuaryShort": "Ene",
+	"FebruaryShort": "Feb",
+	"MarchShort": "Mar",
+	"AprilShort": "Abr",
+	"MayShort": "May",
+	"JuneShort": "Jun",
+	"JulyShort": "Jul",
+	"AugustShort": "Ago",
+	"SeptemberShort": "Sep",
+	"OctoberShort": "Oct",
+	"NovemberShort": "Noviembre",
+	"DecemberShort": "Dic"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 430b8e97079..502886a6ec8 100644
--- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Color de fondo de un símbolo durante el acceso de escritura, como escribir en una variable. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"wordHighlightBorder": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.",
 	"wordHighlightStrongBorder": "Color de fondo de un símbolo durante el acceso de escritura; por ejemplo, cuando se escribe una variable.",
-	"overviewRulerWordHighlightForeground": "Color de marcador de regla de información general para símbolos resaltados.",
-	"overviewRulerWordHighlightStrongForeground": "Color de marcador de regla de información general para símbolos de acceso de escritura resaltados. ",
+	"overviewRulerWordHighlightForeground": "Destaca el color del marcador para los puntos del símbolo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
+	"overviewRulerWordHighlightStrongForeground": "Destaca el color del marcador de acceso de escritura. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"wordHighlight.next.label": "Ir al siguiente símbolo destacado",
 	"wordHighlight.previous.label": "Ir al símbolo destacado anterior"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..cf1d1d7ad84
--- /dev/null
+++ b/i18n/esn/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 archivo más que no se muestra",
+	"moreFiles": "...{0} archivos más que no se muestran"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..4a277edc564
--- /dev/null
+++ b/i18n/esn/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
index 6011d3c42ac..386d85b039d 100644
--- a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Comience con el comando 'Developer: Startup Performance' habilitado.",
 	"prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio",
 	"disableExtensions": "Deshabilite todas las extensiones instaladas.",
-	"inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.",
-	"inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.",
 	"disableGPU": "Deshabilita la aceleración de hardware de GPU.",
 	"uploadLogs": "Carga los registros de la sesión actual a un extremo.",
 	"maxMemory": "Tamaño máximo de memoria para una ventana (en Mbytes).",
diff --git a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 0206bd0f46c..5e55b7d238c 100644
--- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"invalidManifest": "Extensión no válida: package.json no es un archivo JSON.",
+	"incompatible": "No se puede instalar la extensión ' {0} ', ya que no es compatible con el código ' {1} '.",
 	"restartCode": "Reinicie Code antes de volver a instalar {0}.",
 	"installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?",
 	"override": "Anular",
@@ -14,15 +15,16 @@
 	"errorInstallingDependencies": "Error instalando dependencias. {0}",
 	"MarketPlaceDisabled": "Marketplace no está habilitado",
 	"removeError": "Error al quitar la extensión: {0}. Salga e inicie VS Code antes de intentarlo de nuevo.",
-	"Not Market place extension": "Solo se pueden reinstalar las extensiones de Marketplace",
+	"Not a Marketplace extension": "Sólo se pueden reinstalar Extensiones del Marketplace",
 	"notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ",
 	"malicious extension": "No se puede instalar la extensión ya que se informó que era problemático.",
 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
 	"quitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
 	"exitCode": "No se puede instalar la extensión. Por favor, salga e inicie VS Code antes de reinstalarlo. ",
+	"renameError": "Error desconocido al cambiar el nombre de {0} a {1}",
 	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
-	"uninstallOnly": "Solo",
-	"uninstallAll": "Todo",
+	"uninstallOnly": "Sólo extensión",
+	"uninstallAll": "Desinstalar todo",
 	"uninstallConfirmation": "¿Seguro que quiere desinstalar '{0}'?",
 	"ok": "Aceptar",
 	"singleDependentError": "No se puede desinstalar la extensión '{0}'. La extensión '{1}' depende de esta.",
diff --git a/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 049daba800c..c38e957e55c 100644
--- a/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/esn/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "No se pudo analizar el valor {0} de \"engines.vscode\". Por ejemplo, use: ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x, etc.",
+	"versionSyntax": "No se pudo analizar el valor de ' engines.vscode ' {0}. Utilice, por ejemplo: ^ 1.22.0, ^ 1.22. x, etc.",
 	"versionSpecificity1": "La versión indicada en \"engines.vscode\" ({0}) no es suficientemente específica. Para las versiones de vscode anteriores a la 1.0.0, defina como mínimo la versión principal y secundaria deseadas. Por ejemplo: ^0.10.0, 0.10.x, 0.11.0, etc.",
 	"versionSpecificity2": "La versión indicada en \"engines.vscode\" ({0}) no es suficientemente específica. Para las versiones de vscode posteriores a la 1.0.0, defina como mínimo la versión principal deseada. Por ejemplo: ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
 	"versionMismatch": "La extensión no es compatible con {0} de Code y requiere: {1}."
diff --git a/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index e067f1c4e31..97c37f2a269 100644
--- a/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/esn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "La instalación de {0} parece estar dañada. Vuelva a instalar.",
 	"integrity.moreInformation": "Más información",
-	"integrity.dontShowAgain": "No volver a mostrar",
-	"integrity.prompt": "La instalación de {0} parece estar dañada. Vuelva a instalar."
+	"integrity.dontShowAgain": "No volver a mostrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json
index 7ed60aab299..2386e8f046d 100644
--- a/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ b/i18n/esn/src/vs/platform/issue/electron-main/issueService.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"issueReporter": "Reportero de tema"
+	"issueReporter": "Reportero de tema",
+	"processExplorer": "Process Explorer"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/list/browser/listService.i18n.json b/i18n/esn/src/vs/platform/list/browser/listService.i18n.json
index 3c5d4431859..fd8a2daed6a 100644
--- a/i18n/esn/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/esn/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "El modificador que se usará para agregar un elemento en árboles y listas a una selección múltiple con el mouse (por ejemplo en el explorador, los editores abiertos y la vista SCM). ' ctrlCmd ' se asigna a ' control ' en Windows y Linux y a ' Command ' en macOS. Los gestos de ratón \"abrir a lado\", si se admiten, se adaptarán de tal manera que no estén en conflicto con el modificador multiselección.",
 	"openMode.singleClick": "Abre elementos en solo clic de ratón.",
 	"openMode.doubleClick": "Abre elementos en doble clic del ratón. ",
-	"openModeModifier": "Controla cómo abrir elementos en árboles y listas con el ratón (si está soportado). Establecer en ' singleClick ' para abrir elementos con un solo clic del ratón y ' DoubleClick ' para abrir sólo a través del doble clic del ratón. Para los elementos padres con hijos en los árboles, este ajuste controlará si un solo clic expande el padre o un doble clic. Tenga en cuenta que algunos árboles y listas pueden optar por ignorar esta configuración si no es aplicable"
+	"openModeModifier": "Controla cómo abrir elementos en árboles y listas con el ratón (si está soportado). Establecer en ' singleClick ' para abrir elementos con un solo clic del ratón y ' DoubleClick ' para abrir sólo a través del doble clic del ratón. Para los elementos padres con hijos en los árboles, este ajuste controlará si un solo clic expande el padre o un doble clic. Tenga en cuenta que algunos árboles y listas pueden optar por ignorar esta configuración si no es aplicable",
+	"horizontalScrolling setting": "Controla el esplazamiento horizontal de los árboles en la mesa de trabajo."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/markers/common/markers.i18n.json b/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..2229fecdaf4
--- /dev/null
+++ b/i18n/esn/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Error",
+	"sev.warning": "Advertencia",
+	"sev.info": "Información"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
index 2ff0a4aa513..39139e04743 100644
--- a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Primer plano de la regla de visión general actual para conflictos de combinación alineados.",
 	"overviewRulerIncomingContentForeground": "Primer plano de regla de visión general de entrada para conflictos de combinación alineados.",
 	"overviewRulerCommonContentForeground": "Primer plano de la regla de visión general de ancestros comunes para conflictos de combinación alineados.",
-	"overviewRulerFindMatchForeground": "Color de marcador de regla de información general para coincidencias encontradas.",
-	"overviewRulerSelectionHighlightForeground": "Color de marcador de regla de información general para elementos seleccionados resaltados."
+	"overviewRulerFindMatchForeground": "Destaca el color del marcador de regla para las coincidencias de búsqueda. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
+	"overviewRulerSelectionHighlightForeground": "Destaca el color del marcador de regla para los puntos de selección . El color no debe ser opaco para no ocultar las decoraciones subyacentes."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..1dcbde980fd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
+	"showViewlet": "Mostrar {0}",
+	"view": "Ver"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index c174fe9d262..fed60fe1bf0 100644
--- a/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/esn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"requirearray": "views debe ser una mariz",
+	"requirearray": "Las vistas deben ser una matriz",
 	"requirestring": "la propiedad `{0}` es obligatoria y debe ser de tipo \"string\"",
 	"optstring": "la propiedad `{0}` se puede omitir o debe ser de tipo \"string\"",
 	"vscode.extension.contributes.view.id": "Identificador de la vista. Úselo para registrar un proveedor de datos mediante la API \"vscode.window.registerTreeDataProviderForView\". También para desencadenar la activación de su extensión al registrar el evento \"onView:${id}\" en \"activationEvents\".",
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Aporta vistas al editor",
 	"views.explorer": "Vista del explorador",
 	"views.debug": "Vista de depuración",
-	"locationId.invalid": "`{0}` no es una ubicación de vista válida",
 	"duplicateView1": "No se pueden registrar múltiples vistas con el mismo identificador '{0}' en la ubicación '{1}'",
 	"duplicateView2": "Una vista con el identificador '{0}' ya está registrada en la ubicación '{1}'"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 34f590266a9..754cfd39b02 100644
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Anular la aplicación de formato al guardar después de {0} ms",
+	"timeout.onWillSave": "Se anuló onWillSaveTextDocument-event después de 1750 ms",
 	"saveParticipants": "Ejecutando Guardar Participantes..."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 7957a5748f1..c6974979361 100644
--- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"webview.editor.label": "Editor de vistas web"
+	"errorMessage": "Ha ocurrido un error mientras se restauraba la vista: {0}"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..651918c67b7
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (extensión)"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 2597aecdf39..e35e95658e0 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Enfocar el grupo siguiente",
 	"openToSide": "Abrir en el lateral",
 	"closeEditor": "Cerrar editor",
+	"closeOneEditor": "Cerrar",
 	"revertAndCloseActiveEditor": "Revertir y cerrar el editor",
 	"closeEditorsToTheLeft": "Cerrar los editores a la izquierda",
 	"closeAllEditors": "Cerrar todos los editores",
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 1295b45f8c6..29cf10b5371 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,7 @@
 	"screenReaderDetectedExtra": "Si no va a usar un lector de pantalla, cambie el valor de configuración \"editor.accessibilitySupport\" a \"desactivado\".",
 	"disableTabMode": "Deshabilitar modo de accesibilidad",
 	"gotoLine": "Ir a la línea",
-	"indentation": "Sangría",
+	"selectIndentation": "Seleccione la sangría",
 	"selectEncoding": "Seleccionar Encoding",
 	"selectEOL": "Seleccionar secuencia de fin de línea",
 	"selectLanguageMode": "Seleccionar modo de lenguaje",
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 400b2707b25..0ca704a5b8d 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,11 @@
 	"sizeMB": "{0} MB",
 	"sizeGB": "{0} GB",
 	"sizeTB": "{0} TB",
-	"largeImageError": "El tamaño del archivo de la imagen es demasiado grande (> 1MB) para mostrarlo en el editor.",
+	"largeImageError": "La imagen no se muestra en el editor porque es demasiado grande ({0}). ",
 	"resourceOpenExternalButton": "¿Abrir la imagen mediante un programa externo?",
-	"nativeBinaryError": "El archivo no se mostrará en el editor porque es binario, muy grande o usa una codificación de texto no compatible.",
+	"nativeFileTooLargeError": "El archivo no se muestra en el editor porque es demasiado grande ({0}). ",
+	"nativeBinaryError": "El archivo no se muestra en el editor porque es binario o utiliza una codificación de texto no soportada. ",
+	"openAsText": "¿Desea abrirlo de todas formas?",
 	"zoom.action.fit.label": "Imagen completa",
 	"imgMeta": "{0} x {1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 9367c8315b0..9310ecec997 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Cerrar",
 	"araLabelEditorActions": "Acciones del editor"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 369309aa7cb..94aeba068ee 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "No hay notificaciones nuevas",
 	"notifications": "Notificaciones",
 	"notificationsToolbar": "Acciones del centro de notificaciones",
 	"notificationsList": "Lista de notificaciones"
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..232be4ece69
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInput.countSelected": "{0} seleccionadas",
+	"ok": "Aceptar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..c9120e6b4eb
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInputBox.ariaLabel": "Escriba para restringir los resultados."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
index 8c8e17dfa93..89fe344b57b 100644
--- a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json
@@ -32,6 +32,7 @@
 	"openRecent": "Abrir Reciente...",
 	"quickOpenRecent": "Abrir Reciente Rapidamente...",
 	"reportIssueInEnglish": "Notificar problema",
+	"openProcessExplorer": "Abrir Explorador de Procesos",
 	"reportPerformanceIssue": "Notificar problema de rendimiento",
 	"keybindingsReference": "Referencia de métodos abreviados de teclado",
 	"openDocumentationUrl": "Documentación",
diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 4147b8a00c3..57d447a0a0b 100644
--- a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Ventana",
 	"window.openFilesInNewWindow.on": "Los archivos se abrirán en una nueva ventana",
 	"window.openFilesInNewWindow.off": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-	"window.openFilesInNewWindow.default": "Los archivos se abrirán en la ventana con la carpeta de los archivos abierta o en la última ventana activa a menos que se abran mediante el Dock o el Finder (solo macOS)",
-	"openFilesInNewWindow": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran mediante el Dock o desde el Finder (solo macOS)\n- on: los archivos se abrirán en una ventana nueva\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa\nTenga en cuenta que aún puede haber casos en los que este parámetro se ignore (por ejemplo, al usar la opción de la línea de comandos -new-window o -reuse-window).",
+	"window.openFilesInNewWindow.defaultMac": "Los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.",
+	"window.openFilesInNewWindow.default": "Los archivos se abrirán en una nueva ventana hasta que sean llamados dentro de la aplicación (ej.: via menú Archivo)",
+	"openFilesInNewWindowMac": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa, a menos que se abran con Dock o desde Finder.\n- on: los archivos se abrirán en una ventana nueva.\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window). ",
+	"openFilesInNewWindow": "Controla si los archivos deben abrirse en una ventana nueva.\n- default: los archivos se abrirán en una ventana nueva a menos que se seleccionen desde la aplicación (por ejemplo, desde el menú Archivo).\n- on: los archivos se abrirán en una ventana nueva.\n- off: los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window).",
 	"window.openFoldersInNewWindow.on": "Las carpetas se abrirán en una nueva ventana",
 	"window.openFoldersInNewWindow.off": "Las carpetas reemplazarán la ventana activa más reciente",
 	"window.openFoldersInNewWindow.default": "Las carpetas se abrirán en una nueva ventana a menos que se seleccione una carpeta desde la aplicación (p. ej. mediante el menú Archivo)",
 	"openFoldersInNewWindow": "Controla si las carpetas deben abrirse en una ventana nueva o reemplazar la última ventana activa.\n- default: las carpetas se abrirán en una ventana nueva, a menos que se seleccione una carpeta desde la aplicación (por ejemplo, desde el menú Archivo)\n- on: las carpetas se abrirán en una ventana nueva\n- off: las carpetas reemplazarán la última ventana activa\nTenga en cuenta que aún puede haber casos en los que este parámetro se ignore (por ejemplo, al usar la opción de la línea de comandos -new-window o -reuse-window).",
+	"window.openWithoutArgumentsInNewWindow.on": "Abrir una nueva ventana vacía",
+	"window.openWithoutArgumentsInNewWindow.off": "Aplicar el foco a la última instancia en ejecución activa",
+	"openWithoutArgumentsInNewWindow": "Controla si debe abrirse una ventana nueva vacía cuando se inicia una segunda instancia sin argumentos o si la última instancia en ejecución debe obtener el foco.\n- on: se abre una ventana nueva vacía.\n- off: la última instancia en ejecución activa obtiene el foco.\nTenga en cuenta que puede haber casos en los que se omita esta configuración (por ejemplo, cuando se utilizan las opciones de la línea de comandos -new-window o -reuse-window).",
 	"window.reopenFolders.all": "Reabrir todas las ventanas.",
 	"window.reopenFolders.folders": "Reabrir todas las carpetas. Las áreas de trabajo vacías no se restaurarán.",
 	"window.reopenFolders.one": "Reabrir la última ventana activa.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Controla cómo se vuelven a abrir las ventanas tras un reinicio. Seleccione \"none\" para comenzar siempre con un área de trabajo vacía, \"one\" para volver a abrir la última ventana en la que trabajó, \"folders\" para volver a abrir todas las ventanas que tenían carpetas abiertas o \"all\" para volver a abrir todas las ventanas de la última sesión.",
 	"restoreFullscreen": "Controla si una ventana se debe restaurar al modo de pantalla completa si se salió de ella en dicho modo.",
 	"zoomLevel": "Ajuste el nivel de zoom de la ventana. El tamaño original es 0 y cada incremento (por ejemplo, 1) o disminución (por ejemplo, -1) representa una aplicación de zoom un 20 % más grande o más pequeño. También puede especificar decimales para ajustar el nivel de zoom con una granularidad más precisa.",
-	"title": "Controla el título de ventana basado en el editor activo. Las variables se sustituyen según el contexto: ${activeEditorShort}: el archivo nombre (e.g. miarchivo.txt) ${activeEditorMedium}: la ruta del archivo en relación con el área de trabajo carpeta (por ejemplo, myFolder/myFile.txt) ${activeEditorLong}: la ruta de acceso completa del archivo (p. ej. / Users/Development/myProject/myFolder/myFile.txt) ${nombre de carpeta}: nombre de la carpeta el archivo del espacio de trabajo está contenida en (e.g. myFolder) ${folderPath}: ruta del archivo de la carpeta el archivo del espacio de trabajo está contenida en (por ejemplo, /Users/Development/myFolder) {} $ rootName}: nombre de la área de trabajo (por ejemplo myFolder o myWorkspace) ${Ruta_raíz}: ruta del archivo del espacio de trabajo (por ejemplo, /Users/Development/myWorkspace) ${appName}: por ejemplo VS código ${sucio}: un indicador sucio si el editor activo es sucio ${separador}: condicional separador (\"-\") que sólo muestra cuando rodeada de variables con valores",
+	"title": "Controla el título de la ventana en función del editor activo. Las variables se reemplazan según el contexto:\n${activeEditorShort}: nombre del archivo (por ejemplo, miArchivo.txt).\n${activeEditorMedium}: ruta de acceso del archivo relativa a la carpeta del área de trabajo (por ejemplo, miCarpeta/miArchivo.txt).\n${activeEditorLong}: ruta de acceso completa del archivo (por ejemplo, /Usuarios/Desarrollo/miProyecto/miCarpeta/miArchivo.txt).\n${folderName}: nombre de la carpeta del área de trabajo que contiene el archivo (por ejemplo, miCarpeta).\n${folderPath}: ruta de acceso de la carpeta del área de trabajo que contiene el archivo (por ejemplo, /Usuarios/Desarrollo/miCarpeta).\n${rootName}: nombre del área de trabajo (por ejemplo, miCarpeta o miÁreaDeTrabajo).\n${rootPath}: ruta de acceso del área de trabajo (por ejemplo, /Usuarios/Desarrollo/miÁreaDeTrabajo).\n${appName}: nombre de la aplicación (por ejemplo, VS Code).\n${dirty}: indicador de modificaciones si se han realizado cambios en el editor activo.\n${separator}: separador condicional (\" - \") que solo se muestra cuando está rodeado de variables con valores o texto estático.",
 	"window.newWindowDimensions.default": "Abrir las nuevas ventanas en el centro de la pantalla.",
 	"window.newWindowDimensions.inherit": "Abrir las nuevas ventanas con la misma dimensión que la última activa.",
 	"window.newWindowDimensions.maximized": "Abrir las nuevas ventanas maximizadas.",
@@ -74,6 +79,8 @@
 	"autoDetectHighContrast": "Si está habilitado, se cambiará automáticamente al tema de contraste alto si Windows utiliza un tema de contraste alto, y al tema oscuro si cambia desde un tema de contraste alto de Windows.",
 	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
 	"window.nativeTabs": "Habilita las fichas de ventana en macOS Sierra. Note que los cambios requieren que reinicie el equipo y las fichas nativas deshabilitan cualquier estilo personalizado que haya configurado.",
+	"window.smoothScrollingWorkaround": "Habilite esta solución alternativa si el desplazamiento deja de ser homogéneo después de restaurar una ventana de VS Code minimizada. Esta es una solución para un problema (https://github.com/Microsoft/vscode/issues/13612) en el que el desplazamiento comienza a sufrir interrupciones en dispositivos con panel táctil de precisión, como los dispositivos Surface de Microsoft. Al habilitar esta solución alternativa, puede parpadear ligeramente la distribución después de restaurar la ventana minimizada, pero no afecta a nada más.",
+	"window.clickThroughInactive": "Si está habilitado, haciendo clic en una ventana inactiva, activará dicha ventana y disparará el elemento bajo el cursor del ratón si éste es clicable. Si está deshabilitado, haciendo clic en cualquier lugar en una ventana inactiva, solo activará la misma y será necesario un segundo clic en el elemento. ",
 	"zenModeConfigurationTitle": "Modo zen",
 	"zenMode.fullScreen": "Controla si activar el modo Zen pone también el trabajo en modo de pantalla completa.",
 	"zenMode.centerLayout": "Controla si al encender el Modo Zen también se centra el diseño.",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 19e1e0cc44d..bde7768bba1 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Editar punto de interrupción...",
+	"breakpoint": "Punto de interrupción",
 	"functionBreakpointsNotSupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
 	"functionBreakpointPlaceholder": "Función donde interrumpir",
 	"functionBreakPointInputAriaLabel": "Escribir punto de interrupción de función",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Punto de interrupción no comprobado",
 	"functionBreakpointUnsupported": "Este tipo de depuración no admite puntos de interrupción en funciones",
 	"breakpointDirtydHover": "Punto de interrupción no comprobado. El archivo se ha modificado, reinicie la sesión de depuración.",
+	"logBreakpointUnsupported": "Este tipo de depuración no admite puntos de registro",
 	"conditionalBreakpointUnsupported": "Este tipo de depuración no es compatible con los puntos de interrupción condicionales.",
 	"hitBreakpointUnsupported": "Este tipo de depuración no admite el uso de puntos de interrupción condicionales"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index dd1b28c53bf..eee54fa1f1c 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Reiniciar marco",
 	"removeBreakpoint": "Quitar punto de interrupción",
 	"removeAllBreakpoints": "Quitar todos los puntos de interrupción",
-	"enableBreakpoint": "Habilitar punto de interrupción",
-	"disableBreakpoint": "Deshabilitar punto de interrupción",
 	"enableAllBreakpoints": "Habilitar todos los puntos de interrupción",
 	"disableAllBreakpoints": "Deshabilitar todos los puntos de interrupción",
 	"activateBreakpoints": "Activar puntos de interrupción",
 	"deactivateBreakpoints": "Desactivar puntos de interrupción",
 	"reapplyAllBreakpoints": "Volver a aplicar todos los puntos de interrupción",
 	"addFunctionBreakpoint": "Agregar punto de interrupción de función",
-	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
-	"editConditionalBreakpoint": "Editar punto de interrupción...",
 	"setValue": "Establecer valor",
 	"addWatchExpression": "Agregar expresión",
 	"editWatchExpression": "Editar expresión",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 77f54a5e29f..83395706f58 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Depuración: Alternar punto de interrupción",
 	"conditionalBreakpointEditorAction": "Depuración: agregar punto de interrupción condicional...",
+	"logPointEditorAction": "Depurar: agregar punto de registro...",
 	"runToCursor": "Ejecutar hasta el cursor",
 	"debugEvaluate": "Depuración: Evaluar",
 	"debugAddToWatch": "Depuración: Agregar a inspección",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..3da9af08237
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Interrumpir cuando se alcance el número de llamadas. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
+	"breakpointWidgetExpressionPlaceholder": "Interrumpir cuando la expresión se evalúa como true. Presione \"ENTRAR\" para aceptar o \"Esc\" para cancelar.",
+	"expression": "Expresión",
+	"hitCount": "Número de llamadas",
+	"logMessage": "Mensaje de registro"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 64d4f38579f..779210b4ba7 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Por favor utilice nombres de configuración exclusivos.",
 	"app.launch.json.compound.folder": "Nombre de la carpeta en la que se encuentra el compuesto.",
 	"app.launch.json.compounds.configurations": "Nombres de las configuraciones que se iniciarán como parte de este elemento compuesto.",
-	"debugNoType": "El valor \"type\" del adaptador de depuración no se puede omitir y debe ser de tipo \"string\".",
 	"selectDebug": "Seleccionar entorno",
 	"DebugConfig.failed": "No se puede crear el archivo \"launch.json\" dentro de la carpeta \".vscode\" ({0}).",
 	"workspace": "espacio de trabajo",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b33d36b0b85..3ff917571be 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "Punto de interrupción",
 	"removeBreakpoints": "Quitar puntos de interrupción",
 	"removeBreakpointOnColumn": "Quitar punto de interrupción en la columna {0}",
 	"removeLineBreakpoint": "Quitar punto de interrupción de línea",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "Habilitar punto de interrupción en la columna {0}",
 	"enableBreakpointOnLine": "Habilitar punto de interrupción de línea",
 	"addBreakpoint": "Agregar punto de interrupción",
+	"addConditionalBreakpoint": "Agregar punto de interrupción condicional...",
+	"addLogPoint": "Agregar punto de registro...",
+	"cancel": "Cancelar",
 	"addConfiguration": "Agregar configuración..."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 818cc21eb9a..d28e2c7b8c0 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Mostrar errores",
 	"noFolderWorkspaceDebugError": "El archivo activo no se puede depurar. Compruebe que se ha guardado en el disco y que tiene una extensión de depuración instalada para ese tipo de archivo.",
 	"cancel": "Cancelar",
-	"DebugTaskNotFound": "No se encontró el elemento preLaunchTask '{0}'.",
-	"taskNotTracked": "No se puede realizar un seguimiento de la tarea preLaunchTask '{0}'."
+	"DebugTaskNotFound": "No se pudo encontrar la tarea '{0}'.",
+	"taskNotTracked": "La tarea '{0}' no puede rastrearse."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 48c3d79a0dd..f5edde234b9 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Más información",
-	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración.",
-	"stoppingDebugAdapter": "{0}. Deteniendo el adaptador de depuración.",
 	"debugAdapterCrash": "El proceso de adaptación del depurador finalizó inesperadamente"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 2bceb504035..3055932755f 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "El ejecutable del adaptador de depuración \"{0}\" no existe.",
 	"debugAdapterCannotDetermineExecutable": "No se puede determinar el ejecutable para el adaptador de depuración \"{0}\".",
-	"launch.config.comment1": "Utilizar IntelliSense para aprender acerca de los posibles atributos.",
-	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
-	"launch.config.comment3": "Para más información, visite: {0}",
-	"debugType": "Tipo de configuración.",
-	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
-	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
-	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
-	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
-	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
-	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
-	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
-	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
-	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
+	"unableToLaunchDebugAdapter": "No se puede iniciar el adaptador de depuración desde '{0}'.",
+	"unableToLaunchDebugAdapterNoArgs": "No se puede iniciar el adaptador de depuración."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..b916d2192fa
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Utilizar IntelliSense para aprender acerca de los posibles atributos.",
+	"launch.config.comment2": "Mantenga el puntero para ver las descripciones de los existentes atributos ",
+	"launch.config.comment3": "Para más información, visite: {0}",
+	"debugType": "Tipo de configuración.",
+	"debugTypeNotRecognised": "Este tipo de depuración no se reconoce. Compruebe que tiene instalada la correspondiente extensión de depuración y que está habilitada.",
+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\".",
+	"debugName": "Nombre de la configuración. Aparece en el menú desplegable de la configuración de inicio.",
+	"debugRequest": "Tipo de solicitud de la configuración. Puede ser \"launch\" o \"attach\".",
+	"debugServer": "Solo para el desarrollo de extensiones de depuración: si se especifica un puerto, VS Code intenta conectarse a un adaptador de depuración que se ejecuta en modo servidor",
+	"debugPrelaunchTask": "Tarea que se va a ejecutar antes de iniciarse la sesión de depuración.",
+	"debugPostDebugTask": "Tarea que se ejecutará después de terminar la sesión de depuración.",
+	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
+	"debugOSXConfiguration": "Atributos de configuración de inicio específicos de OS X.",
+	"debugLinuxConfiguration": "Atributos de configuración de inicio específicos de Linux.",
+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\"."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..ec6803b438e
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "Consola de VS Code",
+	"mac.terminal.script.failed": "No se pudo ejecutar el script '{0}'. Código de salida: {1}.",
+	"mac.terminal.type.not.supported": "No se admite '{0}'",
+	"press.any.key": "Presione cualquier tecla para continuar...",
+	"linux.term.failed": "Error de '{0}' con el código de salida {1}"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index d1cf9483c41..695af76fade 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Configurar extensiones recomendadas (Carpeta del área de trabajo)",
 	"malicious tooltip": "Se informó de que esta extensión era problemática.",
 	"malicious": "Malintencionado",
+	"disabled": "Deshabilitado",
+	"disabled globally": "Deshabilitado",
+	"disabled workspace": "Deshabilitado para esta área de trabajo",
 	"disableAll": "Deshabilitar todas las extensiones instaladas",
 	"disableAllWorkspace": "Deshabilitar todas las extensiones instaladas para esta área de trabajo",
 	"enableAll": "Habilitar todas las extensiones",
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..9945b32ea23
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Nombre de la extensión",
+	"extension id": "Identificador de la extensión",
+	"preview": "Vista Previa",
+	"builtin": "Integrada",
+	"publisher": "Nombre del editor",
+	"install count": "Número de instalaciones",
+	"rating": "Clasificación",
+	"repository": "Repositorio",
+	"license": "Licencia",
+	"details": "Detalles",
+	"contributions": "Contribuciones",
+	"changelog": "Registro de cambios",
+	"dependencies": "Dependencias",
+	"noReadme": "No hay ningún archivo LÉAME disponible.",
+	"noChangelog": "No hay ningún objeto CHANGELOG disponible.",
+	"noContributions": "No hay contribuciones.",
+	"noDependencies": "No hay dependencias.",
+	"settings": "Configuración ({0})",
+	"setting name": "Nombre",
+	"description": "Descripción",
+	"default": "Predeterminado",
+	"debuggers": "Depuradores ({0})",
+	"debugger name": "Nombre",
+	"debugger type": "Tipo",
+	"views": "Vistas ({0})",
+	"view id": "Id.",
+	"view name": "Nombre",
+	"view location": "Donde",
+	"localizations": "Localizaciones ({0}) ",
+	"localizations language id": "ID. de idioma",
+	"colorThemes": "Temas de color ({0})",
+	"iconThemes": "Temas de icono ({0})",
+	"colors": "Colores ({0})",
+	"colorId": "Id",
+	"defaultDark": "Oscuro por defecto",
+	"defaultLight": "Claro por defecto",
+	"defaultHC": "Contraste alto por defecto",
+	"JSON Validation": "Validación JSON ({0})",
+	"fileMatch": "Coincidencia de archivo",
+	"schema": "Esquema",
+	"commands": "Comandos ({0})",
+	"command name": "Nombre",
+	"keyboard shortcuts": "Métodos abreviados de teclado",
+	"menuContexts": "Contextos de menú",
+	"languages": "Lenguajes ({0})",
+	"language id": "Id.",
+	"language name": "Nombre",
+	"file extensions": "Extensiones de archivo",
+	"grammar": "Gramática",
+	"snippets": "Fragmentos"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 7a8e29d1760..1bc6e380146 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
 	"reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}",
 	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
-	"showRecommendations": "Mostrar recomendaciones",
 	"install": "Instalar",
+	"showRecommendations": "Mostrar recomendaciones",
 	"showLanguageExtensions": "El Marketplace tiene extensiones que pueden ayudar con '. {0} ' archivos ",
 	"workspaceRecommended": "Esta área de trabajo tiene recomendaciones de extensión.",
 	"installAll": "Instalar todo",
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 598580cdc04..a14a5510a07 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "¿Quiere deshabilitar otras asignaciones de teclas ({0}) para evitar conflictos entre enlaces de teclado?",
 	"yes": "Sí",
-	"no": "No",
-	"betterMergeDisabled": "La extensión Mejor combinación está ahora integrada, la extensión instalada se deshabilitó y no se puede desinstalar.",
-	"uninstall": "Desinstalación"
+	"no": "No"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 7e5657b2ee0..a44cd55d9ca 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "Recomendado",
 	"otherRecommendedExtensions": "Otras recomendaciones",
 	"workspaceRecommendedExtensions": "Recomendaciones de espacio de trabajo",
-	"builtInExtensions": "Integrado",
+	"builtInExtensions": "Características",
+	"builtInThemesExtensions": "Temas",
+	"builtInBasicsExtensions": "Lenguajes de programación",
 	"searchExtensions": "Buscar extensiones en Marketplace",
 	"sort by installs": "Criterio de ordenación: Número de instalaciones",
 	"sort by rating": "Criterio de ordenación: Clasificación",
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index e7856c7726a..1a94d955a1e 100644
--- a/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "Editor de archivos de texto",
 	"createFile": "Crear archivo",
+	"relaunchWithIncreasedMemoryLimit": "Reiniciar con {0} MB",
+	"configureMemoryLimit": "Configurar el límite de memoria",
 	"fileEditorWithInputAriaLabel": "{0}. Editor de archivos de texto.",
 	"fileEditorAriaLabel": "Editor de archivos de texto."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 88a1e52e347..9cb57c08e43 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,16 +27,17 @@
 	"confirmMoveTrashMessageMultiple": "¿Está seguro de que desea eliminar los siguientes archivos {0}?",
 	"confirmMoveTrashMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido?",
 	"confirmMoveTrashMessageFile": "¿Está seguro de que desea eliminar '{0}'?",
-	"undoBin": "Puede restaurar desde la papelera de reciclaje.",
-	"undoTrash": "Puede restaurar desde la papelera.",
+	"undoBin": "Se puede restaurar de la papelera de reciclaje.",
+	"undoTrash": "Se puede restaurar de la papelera.",
 	"doNotAskAgain": "No volver a preguntarme",
 	"confirmDeleteMessageMultiple": "¿Está seguro de que desea eliminar de forma permanente los siguientes archivos {0}?",
 	"confirmDeleteMessageFolder": "¿Está seguro de que desea eliminar '{0}' y su contenido de forma permanente?",
 	"confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?",
 	"irreversible": "Esta acción es irreversible.",
-	"cancel": "Cancelar",
-	"permDelete": "Eliminar permanentemente",
-	"importFiles": "Importar archivos",
+	"binFailed": "Error al eliminar usando la papelera de reciclaje. ¿Desea eliminar de forma permanente en su lugar?",
+	"trashFailed": "No se pudo eliminar usando la papelera. ¿Desea eliminar de forma permanente?",
+	"deletePermanentlyButtonLabel": "&&Eliminar de forma permanente",
+	"retryButtonLabel": "&&Reintentar",
 	"confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?",
 	"replaceButtonLabel": "&&Reemplazar",
 	"fileIsAncestor": "El archivo que se va a pegar es un antecesor de la carpeta de destino",
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 93ee0518a0b..6a280847cb6 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "El modo de lenguaje predeterminado que se asigna a nuevos archivos.",
 	"editorConfigurationTitle": "Editor",
 	"formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.",
+	"formatOnSaveTimeout": "Tiempo de espera de aplicación de formato al guardar. Especifica un límite de tiempo en milisegundos para los comandos formatOnSave. Los comandos que tarden más del tiempo de espera especificado se cancelarán.",
 	"explorerConfigurationTitle": "Explorador de archivos",
 	"openEditorsVisible": "Número de editores mostrados en el panel de editores abiertos.",
 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index 1bcad541fa7..2a357906cfb 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Escriba el nombre de archivo. Presione ENTRAR para confirmar o Esc para cancelar",
-	"constructedPath": "Crear {0} en **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Explorador de archivos",
 	"dropFolders": "¿Quiere agregar las carpetas al área de trabajo?",
 	"dropFolder": "¿Quiere agregar la carpeta al área de trabajo?",
 	"addFolders": "&&Agregar carpetas",
 	"addFolder": "&&Agregar carpeta",
+	"confirmRootsMove": "¿Está seguro de que quiere cambiar el orden de varias carpetas raíz en el área de trabajo?",
 	"confirmMultiMove": "¿Está seguro de que desea mover los siguientes archivos {0}?",
+	"confirmRootMove": "¿Está seguro de que quiere cambiar el orden de la carpeta raíz \"{0}\" en el área de trabajo?",
 	"confirmMove": "¿Está seguro de que desea mover '{0}'?",
 	"doNotAskAgain": "No volver a preguntarme",
 	"moveButtonLabel": "&&Mover",
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..d73134b9c52
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Vista previa de HTML"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..1709fee8d03
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Entrada del editor no válida."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..70152293951
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Desarrollador"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..760d6b600cd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
+	"refreshWebviewLabel": "Recargar vistas web"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 27bdc18017a..6fd49793b66 100644
--- a/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "¿Desea cambiar el idioma de la interfaz de usuario de VS Code a {0} y reiniciar la aplicación?",
+	"yes": "Sí",
+	"no": "No",
+	"neverAgain": "No volver a mostrar",
 	"JsonSchema.locale": "Idioma de la interfaz de usuario que debe usarse.",
 	"vscode.extension.contributes.localizations": "Contribuye a la localización del editor",
 	"vscode.extension.contributes.localizations.languageId": "Identificador del idioma en el que se traducen las cadenas de visualización.",
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..57024a086ac
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Copiar",
+	"copyMessage": "Copiar mensaje"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..8323facb36a
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Total {0} Problemas"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..5f229151f6c
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Problemas",
+	"tooltip.1": "1 problema en este fichero",
+	"tooltip.N": "{0} problemas en este fichero",
+	"markers.showOnFile": "Mostrar Errores y Advertencias en la carpeta y ficheros."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..e7f7ed6b7d1
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Ver",
+	"problems.view.toggle.label": "Alternar problemas (errores, advertencias, información)",
+	"problems.view.focus.label": "Problemas de enfoque (errores, advertencias, información)",
+	"problems.panel.configuration.title": "Vista Problemas",
+	"problems.panel.configuration.autoreveal": "Controla si la vista Problemas debe revelar automáticamente los archivos cuando los abre",
+	"markers.panel.title.problems": "Problemas",
+	"markers.panel.aria.label.problems.tree": "Problemas agrupados por archivos",
+	"markers.panel.no.problems.build": "Hasta el momento, no se encontraron problemas en el área de trabajo.",
+	"markers.panel.action.filter": "Filtrar problemas",
+	"markers.panel.filter.ariaLabel": "Filtrar problemas",
+	"markers.panel.filter.errors": "errores",
+	"markers.panel.filter.warnings": "advertencias",
+	"markers.panel.filter.infos": "informaciones",
+	"markers.panel.single.error.label": "1 error",
+	"markers.panel.multiple.errors.label": "{0} errores",
+	"markers.panel.single.warning.label": "1 advertencia",
+	"markers.panel.multiple.warnings.label": "{0} advertencias",
+	"markers.panel.single.info.label": "1 información",
+	"markers.panel.multiple.infos.label": "{0} informaciones",
+	"markers.panel.single.unknown.label": "1 desconocido",
+	"markers.panel.multiple.unknowns.label": "{0} desconocidos",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} con {1} problemas",
+	"problems.tree.aria.label.marker.relatedInformation": " Este problema tiene referencias a ubicaciones de {0}.",
+	"problems.tree.aria.label.error.marker": "Error generado por {0}: {1} en la línea {2} y el carácter {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Error: {0} en la línea {1} y el carácter {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "Advertencia generada por {0}: {1} en la línea {2} y el carácter {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Advertencia: {0} en la línea {1} y el carácter {2}.{3}",
+	"problems.tree.aria.label.info.marker": "Información generada por {0}: {1} en la línea {2} y el carácter {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Información: {0} en la línea {1} y el carácter {2}.{3}",
+	"problems.tree.aria.label.marker": "Problema generado por {0}: {1} en la línea {2} y el carácter {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Problema: {0} en la línea {1} y el carácter {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0} en la línea {1} y el carácter {2} en {3}",
+	"errors.warnings.show.label": "Mostrar errores y advertencias"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index d799d3d1934..0c741775e1f 100644
--- a/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Alternar salida",
 	"clearOutput": "Borrar salida",
 	"toggleOutputScrollLock": "Alternar Bloq Despl salida",
-	"switchToOutput.label": "Cambiar a salida"
+	"switchToOutput.label": "Cambiar a salida",
+	"openInLogViewer": "Abrir archivo de registro"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index d0ee7119bb7..1ce77e76c3f 100644
--- a/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Salida",
 	"logViewer": "Visor de registros",
 	"viewCategory": "Ver",
-	"clearOutput.label": "Borrar salida"
+	"clearOutput.label": "Borrar salida",
+	"openActiveLogOutputFile": "Ver: abrir el archivo de salida del registro activo"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index b0f61204eeb..634545e1c6f 100644
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Métodos abreviados de teclado",
+	"showDefaultKeybindings": "Mostrar enlaces de teclado predeterminados",
+	"showUserKeybindings": "Mostrar enlaces de teclado del usuario",
 	"SearchKeybindings.AriaLabel": "Buscar enlaces de teclado",
 	"SearchKeybindings.Placeholder": "Buscar enlaces de teclado",
 	"sortByPrecedene": "Ordenar por procedimiento",
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index 61b308ae32d..33e1d8a94d2 100644
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Abrir Configuración Predeterminada Raw",
+	"openSettings": "Abrir configuración",
 	"openGlobalSettings": "Abrir configuración de usuario",
 	"openGlobalKeybindings": "Abrir métodos abreviados de teclado",
 	"openGlobalKeybindingsFile": "Abrir el archivo de métodos abreviados de teclado",
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index af8a30c82d9..2c40cb00195 100644
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Configuración predeterminada",
 	"SearchSettingsWidget.AriaLabel": "Buscar configuración",
 	"SearchSettingsWidget.Placeholder": "Buscar configuración",
 	"noSettingsFound": "Sin resultados",
@@ -16,6 +15,8 @@
 	"nlpResult": "Resultados en lenguaje natural",
 	"filterResult": "Resultados filtrados",
 	"defaultSettings": "Configuración predeterminada",
+	"defaultUserSettings": "Configuración predeterminada de usuario",
+	"defaultWorkspaceSettings": "Configuración de espacio de trabajo predeterminado",
 	"defaultFolderSettings": "Configuración de carpeta predeterminada",
 	"defaultEditorReadonly": "Editar en el editor de lado de mano derecha para reemplazar valores predeterminados.",
 	"preferencesAriaLabel": "Preferencias predeterminadas. Editor de texto de solo lectura."
diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index e70951fbef4..98610852f74 100644
--- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Mostrar extensión \"{0}\"",
 	"editTtile": "Editar",
 	"replaceDefaultValue": "Reemplazar en Configuración",
-	"copyDefaultValue": "Copiar en Configuración",
-	"unsupportedPHPExecutablePathSetting": "Este valor debe estar en la configuración de usuario. Si quiere configurar PHP para el área de trabajo, abra un archivo PHP y haga clic en \"Ruta de acceso PHP\" en la barra de estado.",
-	"unsupportedWorkspaceSetting": "Este valor debe estar en Configuración de usuario.",
-	"unsupportedWorkbenchSetting": "Esta configuración no se puede aplicar ahora. Se aplicará al abrir esta carpeta directamente.",
-	"unsupportedWorkbenchSettingDevMode": "Esta configuración no se puede aplicar ahora. Se aplicará si se define su alcance como 'recurso' o al abrir esta carpeta directamente. "
+	"copyDefaultValue": "Copiar en Configuración"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 4f4ee6b527a..67ddbe8f8cd 100644
--- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "Instalar proveedores  adicionales de SCM...",
 	"no open repo": "No hay proveedores de control de código fuente activos.",
 	"source control": "Control de código fuente",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Ocultar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 7c31eb187d7..c7dc8145a23 100644
--- a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Mostrar búsqueda anterior de patrón exclude ",
 	"nextSearchTerm": "Mostrar siguiente término de búsqueda",
 	"previousSearchTerm": "Mostrar anterior término de búsqueda",
-	"showSearchViewlet": "Mostrar búsqueda",
 	"findInFiles": "Buscar en archivos",
 	"replaceInFiles": "Reemplazar en archivos",
 	"RefreshAction.label": "Actualizar",
diff --git a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 1cb9f6c349e..fc682127315 100644
--- a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Buscar",
+	"copyMatchLabel": "Copiar",
+	"copyPathLabel": "Copiar ruta de acceso",
+	"copyAllLabel": "Copiar todo",
 	"findInFolder": "Buscar en carpeta...",
 	"findInWorkspace": "Buscar en área de trabajo...",
 	"showTriggerActions": "Ir al símbolo en el área de trabajo...",
 	"name": "Buscar",
-	"search": "Buscar",
 	"showSearchViewl": "Mostrar búsqueda",
 	"view": "Ver",
 	"findInFiles": "Buscar en archivos",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Configurar para incluir los resultados de una búsqueda global de símbolos en los resultados de archivos de Quick Open.",
 	"search.followSymlinks": "Controla si debe seguir enlaces simbólicos durante la búsqueda.",
 	"search.smartCase": "Proporciona busquedas de mayúsculas y minúsculas si el patrón es todo en minúsculas, de lo contrario, busca en mayúsculas y minúsculas",
-	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS",
-	"search.location": "Vista previa: controla si se muestra la búsqueda como una vista en la barra lateral o como un panel en el área de paneles para tener más espacio horizontal. En la próxima versión, la búsqueda en panel tendrá una distribución horizontal mejorada y dejará de ser una vista previa."
+	"search.globalFindClipboard": "Controla si la vista de búsqueda debe leer o modificar el portapapeles de búsqueda compartido en macOS"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 4022b41aaf8..e9c92ac0b0e 100644
--- a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Ayúdenos a mejorar nuestro soporte para {0}",
 	"takeShortSurvey": "Realizar una breve encuesta",
 	"remindLater": "Recordármelo más tarde",
-	"neverAgain": "No volver a mostrar",
-	"helpUs": "Ayúdenos a mejorar nuestro soporte para {0}"
+	"neverAgain": "No volver a mostrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 91318e8e66f..33ec507b93f 100644
--- a/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "¿Le importaría realizar una breve encuesta de opinión?",
 	"takeSurvey": "Realizar encuesta",
 	"remindLater": "Recordármelo más tarde",
-	"neverAgain": "No volver a mostrar",
-	"surveyQuestion": "¿Le importaría realizar una breve encuesta de opinión?"
+	"neverAgain": "No volver a mostrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 485b6c325bf..c4a0654df75 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Patrón de problema o nombre de un patrón de problema que se ha aportado o predefinido. Se puede omitir si se especifica la base.",
 	"ProblemMatcherSchema.base": "Nombre de un buscador de coincidencias de problemas base que se va a usar.",
 	"ProblemMatcherSchema.owner": "Propietario del problema dentro de Code. Se puede omitir si se especifica \"base\". Si se omite y no se especifica \"base\", el valor predeterminado es \"external\".",
+	"ProblemMatcherSchema.source": "Una cadena legible que describe la fuente de este diagnóstico, por ejemplo 'Inicio' o 'super pelusa'.",
 	"ProblemMatcherSchema.severity": "Gravedad predeterminada para los problemas de capturas. Se usa si el patrón no define un grupo de coincidencias para \"severity\".",
 	"ProblemMatcherSchema.applyTo": "Controla si un problema notificado en un documento de texto se aplica solamente a los documentos abiertos, cerrados o a todos los documentos.",
 	"ProblemMatcherSchema.fileLocation": "Define cómo deben interpretarse los nombres de archivo notificados en un patrón de problema.",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 01aace24713..4f1f33161a7 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "No asigna la tarea a ningún grupo",
 	"JsonSchema.tasks.group": "Define a qué grupo de ejecución pertenece esta tarea. Admite \"compilación\" para agregarla al grupo de compilación y \"prueba\" para agregarla al grupo de prueba.",
 	"JsonSchema.tasks.type": "Define si la tarea se ejecuta como un proceso o como un comando dentro de in shell. ",
+	"JsonSchema.command.quotedString.value": "El valor actual del comando",
+	"JsonSchema.tasks.quoting.escape": "Carácteres de escape usan el carácter de escape de la linea de comandos (ej.: ' en PowerShell y \\ en Bash)",
+	"JsonSchema.tasks.quoting.strong": "Cita el argumento usando el carácter de citación doble de la linea de comandos (ej.: \" en PowerShell y Bash) ",
+	"JsonSchema.tasks.quoting.weak": "Cita el argumento usando el carácter de citación simple de la linea de comandos (ej.: ' en PowerShell y Bash) ",
+	"JsonSchema.command.quotesString.quote": "Cómo el valor del comando debería ser citado",
+	"JsonSchema.command": "El comando que se va a ejecutar. Puede ser un programa externo o un comando shell.",
+	"JsonSchema.args.quotedString.value": "El valor actual del argumento",
+	"JsonSchema.args.quotesString.quote": "Cómo el valor del argumento debería ser citado ",
+	"JsonSchema.tasks.args": "Argumentos que se pasan al comando cuando se invoca esta tarea.",
 	"JsonSchema.tasks.label": "Etiqueta de interfaz de usuario de la tarea",
 	"JsonSchema.version": "El número de versión de la configuración.",
 	"JsonSchema.tasks.identifier": "Un identificador definido por el usuario para hacer referencia a la tarea en launch.json o una cláusula dependsOn.",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 6613231543f..870798c942c 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Tareas",
 	"ConfigureTaskRunnerAction.label": "Configurar tarea",
+	"totalErrors": "{0} errores",
+	"totalWarnings": "{0} advertencias",
+	"totalInfos": "{0} informaciones",
 	"problems": "Problemas",
 	"building": "Compilando...",
-	"manyMarkers": "Más de 99",
+	"manyProblems": "+10Mil",
 	"runningTasks": "Mostrar tareas en ejecución",
 	"tasks": "Tareas",
 	"TaskSystem.noHotSwap": "Cambiar el motor de ejecución de tareas con una tarea activa ejecutandose, requiere recargar la ventana",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Seleccione qué tipo de errores y advertencias deben buscarse durante el examen de la salida de la tarea",
 	"customizeParseErrors": "La configuración actual de tareas contiene errores. Antes de personalizar una tarea, corrija los errores.",
 	"moreThanOneBuildTask": "Hay muchas tareas de compilación definidas en el archivo tasks.json. Se ejecutará la primera.\n",
-	"TaskSystem.activeSame.background": "La tarea \"{0}\" ya está activa en segundo plano. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
-	"TaskSystem.activeSame.noBackground": "La tarea \"{0}\" ya está activa. Para terminarla, use la opción \"Terminar tarea\" del menú Tareas.",
+	"terminateTask": "Finalizar tarea",
+	"restartTask": "Reiniciar tarea",
 	"TaskSystem.active": "Ya hay una tarea en ejecución. Finalícela antes de ejecutar otra tarea.",
 	"TaskSystem.restartFailed": "No se pudo terminar y reiniciar la tarea {0}",
 	"TaskService.noConfiguration": "Error: La detección de tarea {0} no encontró una tarea para la siguiente configuración:\n{1}\nLa tarea será omitida.\n",
diff --git a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 2b056d507ea..c53edb70544 100644
--- a/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Advertencia: options.cwd debe ser de tipo cadena. Se ignora el valor {0}.",
+	"ConfigurationParser.inValidArg": "Error: el argumento del comando debe ser una cadena de texto o una cadena de texto citada. El valor provisto es: [0]",
 	"ConfigurationParser.noargs": "Error: Los argumentos de comando deben ser una matriz de cadenas. El valor proporcionado es: {0}",
 	"ConfigurationParser.noShell": "Advertencia: La configuración del shell solo se admite al ejecutar tareas en el terminal.",
 	"ConfigurationParser.noName": "Error: El buscador de coincidencias de problemas del ámbito de declaración debe tener un nombre: {0}",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Error: la configuración de la tarea '{0}' no contiene la propiedad requerida '{1}'. Se omitirá la configuración de la tarea.",
 	"ConfigurationParser.notCustom": "Error: Las tareas no se declaran como una tarea personalizada. La configuración se omitirá.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Error: Las tareas deben proporcionar una propiedad label. La tarea se ignorará.\n{0}\n",
-	"taskConfiguration.shellArgs": "Advertencia: La tarea '{0}' es un comando de shell y uno de sus argumentos podría tener espacios sin escape. Para asegurarse de que la línea de comandos se cite correctamente, fusione mediante combinación los argumentos en el comando.",
 	"taskConfiguration.noCommandOrDependsOn": "Error: La tarea \"{0}\" no especifica un comando ni una propiedad dependsOn. La tarea se ignorará. Su definición es: \n{1}",
 	"taskConfiguration.noCommand": "Error: La tarea \"{0}\" no define un comando. La tarea se ignorará. Su definición es: {1}",
 	"TaskParse.noOsSpecificGlobalTasks": "La versión de tarea 2.0.0 no admite tareas específicas de SO globales. Conviértalas en una tarea con un comando específico de SO. Estas son las tareas afectadas:\n{0}"
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..452c57e6943
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "El color de fondo del terminal, esto permite colorear el terminal de forma diferente al panel.",
+	"terminal.foreground": "El color de primer plano del terminal.",
+	"terminalCursor.foreground": "Color de primer plano del cursor del terminal.",
+	"terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.",
+	"terminal.selectionBackground": "Color de fondo de selección del terminal.",
+	"terminal.border": "Color del borde que separa paneles divididos en el terminal. El valor predeterminado es panel.border.",
+	"terminal.ansiColor": "color ANSI ' {0} ' en el terminal."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 1c13a74b033..9861595bf78 100644
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -21,6 +21,7 @@
 	"workbench.action.terminal.newWorkspacePlaceholder": "Seleccione el directorio de trabajo actual para el nuevo terminal",
 	"workbench.action.terminal.newInActiveWorkspace": "Crear nuevo terminal integrado (en el espacio de trabajo activo)",
 	"workbench.action.terminal.split": "Dividir terminal",
+	"workbench.action.terminal.splitInActiveWorkspace": "Dividir Terminal (En el espacio de trabajo activo)",
 	"workbench.action.terminal.focusPreviousPane": "Aplicar el foco al panel anterior",
 	"workbench.action.terminal.focusNextPane": "Aplicar el foco al panel siguiente",
 	"workbench.action.terminal.resizePaneLeft": "Cambiar el tamaño del panel por la izquierda",
@@ -43,6 +44,7 @@
 	"workbench.action.terminal.scrollUpPage": "Desplazar hacia arriba (página)",
 	"workbench.action.terminal.scrollToTop": "Desplazar al principio",
 	"workbench.action.terminal.clear": "Borrar",
+	"workbench.action.terminal.clearSelection": "Borrar selección",
 	"workbench.action.terminal.allowWorkspaceShell": "Permitir la configuración del área de trabajo Shell",
 	"workbench.action.terminal.disallowWorkspaceShell": "No permitir la configuración del área de trabajo Shell",
 	"workbench.action.terminal.rename": "Cambiar nombre",
@@ -51,5 +53,9 @@
 	"workbench.action.terminal.hideFindWidget": "Ocultar Encontrar Widget",
 	"nextTerminalFindTerm": "Mostrar siguiente término de búsqueda",
 	"previousTerminalFindTerm": "Mostrar término de búsqueda anterior",
-	"quickOpenTerm": "Cambiar terminal activo"
+	"quickOpenTerm": "Cambiar terminal activo",
+	"workbench.action.terminal.scrollToPreviousCommand": "Desplácese al comando anterior",
+	"workbench.action.terminal.scrollToNextCommand": "Desplácese al siguiente comando",
+	"workbench.action.terminal.selectToPreviousCommand": "Seleccionar hasta el comando anterior",
+	"workbench.action.terminal.selectToNextCommand": "Seleccionar hasta el comando siguiente"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 900915d6696..f6620b8d489 100644
--- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copiar",
+	"split": "Dividir",
 	"paste": "Pegar",
 	"selectAll": "Seleccionar todo",
-	"clear": "Borrar",
-	"split": "Dividir"
+	"clear": "Borrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index 330fde9328b..0b35aeabe88 100644
--- a/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Esta área de trabajo contiene valores de configuración que solo se pueden establecer en Configuración de usuario ({0}). Haga clic [aquí]({1}) para obtener más información.",
 	"openWorkspaceSettings": "Abrir configuración del área de trabajo",
-	"dontShowAgain": "No volver a mostrar",
-	"unsupportedWorkspaceSettings": "Esta área de trabajo contiene valores de configuración que solo se pueden establecer en Configuración de usuario ({0}). Haga clic [aquí]({1}) para obtener más información."
+	"dontShowAgain": "No volver a mostrar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..0378f2fc8d2
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Notas de la versión: {0}",
+	"unassigned": "sin asignar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 0c545a6b005..2c980e5c8fe 100644
--- a/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Más tarde",
-	"unassigned": "sin asignar",
 	"releaseNotes": "Notas de la versión",
 	"showReleaseNotes": "Mostrar las notas de la versión",
 	"read the release notes": "{0} v{1}. ¿Quiere leer las notas de la versión?",
@@ -17,13 +15,14 @@
 	"updateIsReady": "Nueva actualización de {0} disponible.",
 	"noUpdatesAvailable": "Actualmente, no hay actualizaciones disponibles.",
 	"ok": "Aceptar",
-	"download now": "Descargar ahora",
 	"thereIsUpdateAvailable": "Hay una actualización disponible.",
-	"installUpdate": "Instalar la actualización ",
+	"download now": "Descargar ahora",
+	"later": "Más tarde",
 	"updateAvailable": "Hay una actualización disponible: {0} {1}",
+	"installUpdate": "Instalar la actualización ",
 	"updateInstalling": "{0} {1} se está instalando en segundo plano, le avisaremos cuando sea completada",
+	"updateAvailableAfterRestart": "Reiniciar {0} para aplicar la última actualización.",
 	"updateNow": "Actualizar ahora",
-	"updateAvailableAfterRestart": "{0} se actualizará después de reiniciarse.",
 	"commandPalette": "Paleta de comandos...",
 	"settings": "Configuración",
 	"keyboardShortcuts": "Métodos abreviados de teclado",
diff --git a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..cfb3d21c72a
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "Editor de vistas web",
+	"developer": "Desarrollador"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..760d6b600cd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Abrir herramientas de desarrollo de vistas web",
+	"refreshWebviewLabel": "Recargar vistas web"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..41dc2fce9fc
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Ayúdenos a mejorar VS Code permitiendo a Microsoft recopilar datos de uso. Lea nuestra [declaración de privacidad]({0}) y vea qué debe hacer para [no participar]({1}).",
+	"telemetryOptOut.optInNotice": "Ayúdenos a mejorar VS Code permitiendo a Microsoft recopilar datos de uso. Lea nuestra [declaración de privacidad]({0}) y vea qué debe hacer para [no participar]({1}).",
+	"telemetryOptOut.readMore": "Leer más"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
index 4cca5673d67..9df96460d57 100644
--- a/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
@@ -13,6 +13,7 @@
 	"welcomeOverlay.extensions": "Administrar extensiones",
 	"welcomeOverlay.problems": "Ver errores y advertencias",
 	"welcomeOverlay.commandPalette": "Buscar y ejecutar todos los comandos",
+	"welcomeOverlay.notifications": "Mostrar notificaciones",
 	"welcomeOverlay": "Información general de la interfaz de usuario",
 	"hideWelcomeOverlay": "Ocultar información general de la interfaz",
 	"help": "Ayuda"
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index eec6537884d..dfe6cefe425 100644
--- a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Herramientas y lenguajes",
 	"welcomePage.installExtensionPacksDescription": "Instalar soporte para {0} y {1}",
 	"welcomePage.moreExtensions": "más",
-	"welcomePage.installKeymapDescription": "Instalar los métodos abreviados de teclado",
-	"welcomePage.installKeymapExtension": "Instalar los métodos abreviados de teclado de {0} y {1}",
 	"welcomePage.others": "otros",
 	"welcomePage.colorTheme": "Tema de color",
 	"welcomePage.colorThemeDescription": "Modifique a su gusto la apariencia del editor y el código",
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
index 890db5376d9..41c9ed2d77b 100644
--- a/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
@@ -11,6 +11,7 @@
 	"open": "Abrir configuración",
 	"saveAndRetry": "Guardar y reintentar",
 	"errorUnknownKey": "No se puede escribir en {0} porque {1} no es una configuración registrada.",
+	"errorInvalidWorkspaceConfigurationApplication": "No se puede escribir {0} en configuración de área de trabajo. Esta opción puede escribirse solamente en configuración de usuario.",
 	"errorInvalidFolderConfiguration": "No se puede escribir en Configuración de carpeta porque {0} no admite el ámbito del recurso de carpeta.",
 	"errorInvalidUserTarget": "No se puede escribir en Configuración de usuario porque {0} no admite el ámbito global.",
 	"errorInvalidWorkspaceTarget": "No se puede escribir a la configuración del espacio de trabajo porque {0} no soporta a un espacio de trabajo con multi carpetas.",
diff --git a/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..53a465b71f5
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedApplicationSetting": "Esta configuración puede aplicarse sólo en configuración de usuario",
+	"unsupportedWindowSetting": "Esta configuración no se puede aplicar ahora. Se aplicará al abrir esta carpeta directamente."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..0a5131780c1
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"canNotResolveWorkspaceFolder": "'${workspaceFolder}' no puede ser resuelto. Por favor, abra una carpeta.",
+	"canNotResolveFolderBasename": "'${workspaceFolderBasename}' no puede ser resuelto. Por favor, abra una carpeta."
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..f78002ce65e
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Sí",
+	"cancelButton": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
index 29f353047f0..dd5c8e077c6 100644
--- a/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
@@ -6,10 +6,12 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"vscode.extension.engines": "Compatibilidad del motor.",
 	"vscode.extension.engines.vscode": "Para las extensiones de VS Code, especifica la versión de VS Code con la que la extensión es compatible. No puede ser *. Por ejemplo: ^0.10.5 indica compatibilidad con una versión de VS Code mínima de 0.10.5.",
 	"vscode.extension.publisher": "El publicador de la extensión VS Code.",
 	"vscode.extension.displayName": "Nombre para mostrar de la extensión que se usa en la galería de VS Code.",
 	"vscode.extension.categories": "Categorías que usa la galería de VS Code para clasificar la extensión.",
+	"vscode.extension.category.languages.deprecated": "Utilice 'Lenguajes de programación' en su lugar ",
 	"vscode.extension.galleryBanner": "Banner usado en VS Code Marketplace.",
 	"vscode.extension.galleryBanner.color": "Color del banner en el encabezado de página de VS Code Marketplace.",
 	"vscode.extension.galleryBanner.theme": "Tema de color de la fuente que se usa en el banner.",
@@ -28,6 +30,8 @@
 	"vscode.extension.badges.url": "URL de la imagen del distintivo.",
 	"vscode.extension.badges.href": "Vínculo del distintivo.",
 	"vscode.extension.badges.description": "Descripción del distintivo.",
+	"vscode.extension.markdown": "Controla el motor de renderizado de Markdown utilizado en el Marketplace. Github (por defecto) o estándar.",
+	"vscode.extension.qna": "Controla el enlace Q&A en el Marketplace. Establézcalo a marketplace para habilitar el sitio web Q&A de Marketplace. Establézcalo a una cadena para proporcionar la dirección URL de un sitio web Q&A personalizado. Establézcalo en falso para deshabilitar el Q&A totalmente. ",
 	"vscode.extension.extensionDependencies": "Dependencias a otras extensiones. El identificador de una extensión siempre es ${publisher}.${name}. Por ejemplo: vscode.csharp.",
 	"vscode.extension.scripts.prepublish": "Script que se ejecuta antes de publicar el paquete como extensión VS Code.",
 	"vscode.extension.scripts.uninstall": "Enlace de desinstalación para la extensión de VS Code. Script que se ejecuta cuando la extensión se ha desinstalado por completo de VS Code, que es cuando VS Code se reinicia (se cierra y se inicia) después de haberse desinstalado la extensión. Solo se admiten scripts de Node.",
diff --git a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 9012f97a2f8..fc53e989dd6 100644
--- a/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -6,9 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionsDisabled": "Todas las extensiones están deshabilitadas.",
 	"extensionHostProcess.crash": "El host de extensiones finalizó inesperadamente.",
 	"extensionHostProcess.unresponsiveCrash": "Se terminó el host de extensiones porque no respondía.",
-	"devTools": "Herramientas de desarrollo",
+	"devTools": "Herramientas de desarrollo abiertas",
 	"restart": "Reiniciar el host de extensiones",
 	"overwritingExtension": "Sobrescribiendo la extensión {0} con {1}.",
 	"extensionUnderDevelopment": "Cargando la extensión de desarrollo en {0}",
diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 3170eed61fb..ecc3269c8a1 100644
--- a/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Requiere Microsoft .NET Framework 4.5. Siga el vínculo para instalarlo.",
 	"installNet": "Descargar .NET Framework 4.5",
 	"neverShowAgain": "No volver a mostrar",
-	"netVersionError": "Requiere Microsoft .NET Framework 4.5. Siga el vínculo para instalarlo.",
+	"enospcError": "{0} es incapaz de observar los cambios de los archivos en este espacio de trabajo tan grande. Por favor siga las instrucciones en el link para resolver este problema.",
 	"learnMore": "Instrucciones",
-	"enospcError": "{0} está a punto de agotar los identificadores de archivo. Por favor siga el enlace de instrucciones para resolver este problema.",
+	"fileInvalidPath": "Recurso de archivo no válido ({0})",
+	"fileIsDirectoryError": "El archivo es un directorio",
+	"fileNotModifiedError": "Archivo no modificado desde",
+	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
+	"fileNotFoundError": "Archivo no encontrado ({0})",
+	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
+	"filePermission": "Permiso denegado al escribir en el archivo ({0})",
+	"fileExists": "El archivo a crear ya existe ({0})",
+	"fileModifiedError": "Archivo Modificado Desde",
+	"fileReadOnlyError": "El archivo es de solo lectura",
+	"fileMoveConflict": "No se puede mover o copiar. El archivo ya existe en la ubicación de destino. ",
+	"unableToMoveCopyError": "No se puede mover o copiar. El archivo reemplazaría a la carpeta que lo contiene.",
 	"binFailed": "No se pudo mover \"{0}\" a la papelera de reciclaje",
 	"trashFailed": "No se pudo mover '{0}' a la papelera"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 577ce27c3b8..33d664310eb 100644
--- a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Archivo no encontrado ({0})",
 	"fileIsDirectoryError": "El archivo es un directorio",
 	"fileNotModifiedError": "Archivo no modificado desde",
 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto"
diff --git a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
index 7f057c36490..69847e82751 100644
--- a/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Recurso de archivo no válido ({0})",
 	"fileIsDirectoryError": "Archivo es el directorio",
 	"fileNotModifiedError": "Archivo no modificado desde",
-	"fileTooLargeForHeapError": "El tamaño del archivo excede el límite de memoria de la ventana, intente ejecutarlo con --max-memory=NUEVOTAMAÑO",
 	"fileTooLargeError": "Archivo demasiado grande para abrirlo",
 	"fileNotFoundError": "Archivo no encontrado ({0})",
 	"fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto",
diff --git a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index d599700ac22..07bc99d803d 100644
--- a/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1} ",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Cancelar"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 54bbf3f0874..bc5ecccc178 100644
--- a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "Nombre del ámbito de TextMate que usa el archivo tmLanguage.",
 	"vscode.extension.contributes.grammars.path": "Ruta de acceso del archivo tmLanguage. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./syntaxes/\".",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "Asignación de un nombre de ámbito al identificador de lenguaje si esta gramática contiene lenguajes incrustados.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Asignación de nombre de ámbito a tipos de token.",
 	"vscode.extension.contributes.grammars.injectTo": "Lista de nombres de ámbito de lenguaje al que se inyecta esta gramática."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index c947b1e5b52..52477cab338 100644
--- a/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/esn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}",
 	"invalid.injectTo": "Valor no válido en `contributes.{0}.injectTo`. Debe ser una matriz de nombres de ámbito de lenguaje. Valor proporcionado: {1}",
 	"invalid.embeddedLanguages": "Valor no válido en \"contributes.{0}.embeddedLanguages\". Debe ser una asignación de objeto del nombre del ámbito al lenguaje. Valor proporcionado: {1}",
+	"invalid.tokenTypes": "Valor no válido en \"contributes.{0}.tokenTypes\". Debe ser una asignación de objeto del nombre del ámbito al tipo de token. Valor proporcionado: {1}",
 	"invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.",
 	"no-tm-grammar": "No hay ninguna gramática de TM registrada para este lenguaje."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..56a7e4e867e
--- /dev/null
+++ b/i18n/fra/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "Serveur de langage CSS",
+	"folding.start": "Début de la région repliable",
+	"folding.end": "Fin de la région repliable"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css-language-features/package.i18n.json b/i18n/fra/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..8ce650a48c0
--- /dev/null
+++ b/i18n/fra/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Fonctionnalités de langage CSS",
+	"description": "Fournit une prise en charge riche de langage pour les fichiers CSS, LESS et SCSS",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"css.lint.unknownProperties.desc": "Propriété inconnue.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
+	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
+	"css.validate.desc": "Active ou désactive toutes les validations",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"less.lint.unknownProperties.desc": "Propriété inconnue.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
+	"less.validate.desc": "Active ou désactive toutes les validations",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
+	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
+	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
+	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
+	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
+	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
+	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
+	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
+	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
+	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
+	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
+	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
+	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
+	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
+	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
+	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
+	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
+	"scss.validate.desc": "Active ou désactive toutes les validations",
+	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
+	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
+	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/css/package.i18n.json b/i18n/fra/extensions/css/package.i18n.json
index 8ce650a48c0..f80d3cb8bfc 100644
--- a/i18n/fra/extensions/css/package.i18n.json
+++ b/i18n/fra/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Fonctionnalités de langage CSS",
-	"description": "Fournit une prise en charge riche de langage pour les fichiers CSS, LESS et SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"css.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"css.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"css.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"css.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"css.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"css.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"css.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"css.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"css.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"css.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"css.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"css.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"css.lint.unknownProperties.desc": "Propriété inconnue.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"css.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"css.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"css.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage CSS.",
-	"css.validate.title": "Contrôle la validation CSS et la gravité des problèmes.",
-	"css.validate.desc": "Active ou désactive toutes les validations",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"less.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"less.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"less.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"less.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"less.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"less.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"less.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"less.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"less.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"less.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"less.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"less.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"less.lint.unknownProperties.desc": "Propriété inconnue.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"less.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"less.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"less.validate.title": "Contrôle la validation LESS et la gravité des problèmes.",
-	"less.validate.desc": "Active ou désactive toutes les validations",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nombre de paramètres non valide",
-	"scss.lint.boxModel.desc": "Ne pas utiliser la largeur ou la hauteur avec une marge intérieure ou une bordure",
-	"scss.lint.compatibleVendorPrefixes.desc": "Lors de l'utilisation d'un préfixe spécifique à un fabricant, toujours inclure également toutes les propriétés spécifiques au fabricant",
-	"scss.lint.duplicateProperties.desc": "Ne pas utiliser de définitions de style en double",
-	"scss.lint.emptyRules.desc": "Ne pas utiliser d'ensembles de règles vides",
-	"scss.lint.float.desc": "N'utilisez pas 'float'. Les éléments Float peuvent fragiliser le code CSS qui est ainsi plus vulnérable si un aspect de la disposition change.",
-	"scss.lint.fontFaceProperties.desc": "la règle @font-face doit définir les propriétés 'src' et 'font-family'",
-	"scss.lint.hexColorLength.desc": "Les couleurs Hex doivent contenir trois ou six chiffres hex",
-	"scss.lint.idSelector.desc": "Les sélecteurs ne doivent pas contenir d'ID, car ces règles sont trop fortement couplées au code HTML.",
-	"scss.lint.ieHack.desc": "Les hacks IE ne sont nécessaires que si IE7 et versions antérieures sont pris en charge",
-	"scss.lint.important.desc": "N'utilisez pas !important. Cela indique que la spécificité de l'intégralité du code CSS est incorrecte et qu'il doit être refactorisé.",
-	"scss.lint.importStatement.desc": "Les instructions d'importation ne sont pas chargées en parallèle",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriété ignorée en raison de l'affichage. Par exemple, avec 'display: inline', les propriétés width, height, margin-top, margin-bottom et float sont sans effet",
-	"scss.lint.universalSelector.desc": "Le sélecteur universel (*) est connu pour sa lenteur",
-	"scss.lint.unknownProperties.desc": "Propriété inconnue.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriété spécifique à un fournisseur inconnue.",
-	"scss.lint.vendorPrefix.desc": "Lors de l'utilisation d'un préfixe spécifique à un fournisseur, ajouter également la propriété standard",
-	"scss.lint.zeroUnits.desc": "Aucune unité nécessaire pour zéro",
-	"scss.validate.title": "Contrôle la validation SCSS et la gravité des problèmes.",
-	"scss.validate.desc": "Active ou désactive toutes les validations",
-	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"css.colorDecorators.enable.deprecationMessage": "Le paramètre 'css.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "Le paramètre 'scss.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "Le paramètre 'less.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+	"displayName": "Bases du langage CSS",
+	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers CSS, LESS et SCSS."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/emmet/package.i18n.json b/i18n/fra/extensions/emmet/package.i18n.json
index 498ecb9bffd..2b38d968d64 100644
--- a/i18n/fra/extensions/emmet/package.i18n.json
+++ b/i18n/fra/extensions/emmet/package.i18n.json
@@ -35,7 +35,7 @@
 	"emmetExtensionsPath": "Chemin d’accès au dossier contenant les profils Emmet et les extraits.",
 	"emmetShowExpandedAbbreviation": "Affiche les abréviations Emmet développées sous forme de suggestions.\nL’option \"inMarkupAndStylesheetFilesOnly\" s’applique à haml, jade, slim, xml, xsl, css, html, scss, sass, less et stylus.\nL’option\"always\" s’applique à toutes les parties du fichier indépendamment du balisage/css.",
 	"emmetShowAbbreviationSuggestions": "Affiche les abréviations Emmet possibles sous forme de suggestions. Non applicable dans les feuilles de style ou lorsque emmet.showExpandedAbbreviation est défini à \"never\".",
-	"emmetIncludeLanguages": "Activer les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajouter ici un mappage entre le langage et le langage Emmet pris en charge.\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetIncludeLanguages": "Activer les abréviations Emmet dans les langages qui ne sont pas pris en charge par défaut. Ajoutez un mappage ici entre la langue et le langage supporté par emmet.\n Par exemple : {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Variables à utiliser dans les extraits de Emmet",
 	"emmetTriggerExpansionOnTab": "Lorsqu’activé, les abréviations Emmet sont développées lorsque vous appuyez sur TAB.",
 	"emmetPreferences": "Préférences utilisées pour modifier le comportement de certaines actions et résolveurs d'Emmet.",
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'webkit' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'webkit'.",
 	"emmetPreferencesCssMozProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'moz' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'moz'.",
 	"emmetPreferencesCssOProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'o' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'o'.",
-	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'."
+	"emmetPreferencesCssMsProperties": "Les propriétés css séparées par des virgules qui ont un préfixe 'ms' vendor lorsqu’elles sont utilisées dans une abréviation emmet qui commence par '-'. Mettre une chaîne vide pour éviter le préfixe 'ms'.",
+	"emmetPreferencesCssFuzzySearchMinScore": "La note minimale (de 0 à 1) que la correspondance de l'abréviation (fuzzy-matched) devrait atteindre. Des valeurs plus faibles peuvent produire de nombreuses correspondances de faux-positifs, des valeurs plus élevées peuvent réduire les correspondances possibles.",
+	"emmetOptimizeStylesheetParsing": "Si défini à false, la fichier entier est analysé pour déterminer si la position courante est valide pour l’expansion des abréviations Emmet. Si défini à true, seul le contenu autour de la position actuelle dans les fichiers css/scss/less est analysé."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/commands.i18n.json b/i18n/fra/extensions/git/out/commands.i18n.json
index d64a35734d2..1fe6735dc5d 100644
--- a/i18n/fra/extensions/git/out/commands.i18n.json
+++ b/i18n/fra/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "Envoyé (push) avec des balises.",
 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
-	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
+	"sync is unpredictable": "Cette action va effectuer un transfert (Push) et une récupération (Pull) des commits à destination et en provenance de '{0}/{1}'.",
 	"never again": "OK, Ne plus afficher",
 	"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
 	"no changes stash": "Aucune modification à remiser (stash).",
diff --git a/i18n/fra/extensions/git/package.i18n.json b/i18n/fra/extensions/git/package.i18n.json
index 560d4f6bf6e..6b9b77f8287 100644
--- a/i18n/fra/extensions/git/package.i18n.json
+++ b/i18n/fra/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Contrôle s’il faut afficher une action Ouvrir le fichier dans l’affichage des modifications de Git.",
 	"config.inputValidation": "Contrôle quand afficher la validation de la saisie du message de commit.",
 	"config.detectSubmodules": "Contrôle s’il faut détecter automatiquement les sous-modules git.",
+	"config.detectSubmodulesLimit": "Contrôle la limite de sous-modules git détectés.",
 	"colors.modified": "Couleur pour les ressources modifiées.",
 	"colors.deleted": "Couleur pour les ressources supprimées.",
 	"colors.untracked": "Couleur pour les ressources non tracées.",
diff --git a/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..9d334931d10
--- /dev/null
+++ b/i18n/fra/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "Serveur de langage HTML",
+	"folding.start": "Début de la région repliable",
+	"folding.end": "Fin de la région repliable"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html-language-features/package.i18n.json b/i18n/fra/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..d94c280aaad
--- /dev/null
+++ b/i18n/fra/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Fonctionnalités de langage HTML",
+	"description": "Fournit une prise en charge riche de langage pour HTML, Razor et les fichiers Handlebar.",
+	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
+	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
+	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
+	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
+	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
+	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
+	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
+	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
+	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
+	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
+	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
+	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
+	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
+	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
+	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
+	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
+	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
+	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
+	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
+	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/html/package.i18n.json b/i18n/fra/extensions/html/package.i18n.json
index d206c104a1a..23dcd2b8cfb 100644
--- a/i18n/fra/extensions/html/package.i18n.json
+++ b/i18n/fra/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Fonctionnalités de langage HTML",
-	"description": "Fournit une prise en charge riche de langage pour HTML, Razor et les fichiers Handlebar.",
-	"html.format.enable.desc": "Activer/désactiver le formateur HTML par défaut.",
-	"html.format.wrapLineLength.desc": "Nombre maximal de caractères par ligne (0 = désactiver).",
-	"html.format.unformatted.desc": "Liste des balises, séparées par des virgules, qui ne doivent pas être remises en forme. 'null' correspond par défaut à toutes les balises répertoriées à l'adresse https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Liste des balises, séparées par des virgules, dont le contenu ne doit pas être remis en forme. 'null' correspond par défaut à toutes les balises 'pre'.",
-	"html.format.indentInnerHtml.desc": "Mettez en retrait les sections <head> et <body>.",
-	"html.format.preserveNewLines.desc": "Spécifie si les sauts de ligne existants qui précèdent les éléments doivent être conservés. Fonctionne uniquement devant les éléments, pas dans les balises, ni pour du texte.",
-	"html.format.maxPreserveNewLines.desc": "Nombre maximal de sauts de ligne à conserver dans un bloc. Utilisez 'null' pour indiquer une valeur illimitée.",
-	"html.format.indentHandlebars.desc": "Mettez en forme et en retrait {{#foo}}, ainsi que {{/foo}}.",
-	"html.format.endWithNewline.desc": "Finissez par un caractère de nouvelle ligne.",
-	"html.format.extraLiners.desc": "Liste de balises, séparées par une virgule, qui doivent être précédées d'une nouvelle ligne. 'null' prend par défaut la valeur \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Retour à la ligne des attributs.",
-	"html.format.wrapAttributes.auto": "Retour automatique à la ligne des attributs uniquement en cas de dépassement de la longueur de la ligne.",
-	"html.format.wrapAttributes.force": "Retour automatique à la ligne de chaque attribut, sauf le premier.",
-	"html.format.wrapAttributes.forcealign": "Retour automatique à la ligne de chaque attribut, sauf le premier, avec maintien de l'alignement.",
-	"html.format.wrapAttributes.forcemultiline": "Retour automatique à la ligne de chaque attribut.",
-	"html.suggest.angular1.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises et propriétés Angular V1.",
-	"html.suggest.ionic.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs Ionic.",
-	"html.suggest.html5.desc": "Permet de configurer la prise en charge intégrée du langage HTML pour suggérer des balises, des propriétés et des valeurs HTML5.",
-	"html.trace.server.desc": "Trace la communication entre VS Code et le serveur de langage HTML.",
-	"html.validate.scripts": "Configure la validation des scripts incorporés par la prise en charge du langage HTML intégré.",
-	"html.validate.styles": "Configure la validation des styles incorporés par la prise en charge du langage HTML intégré.",
-	"html.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe.",
-	"html.autoClosingTags": "Activez/désactivez la fermeture automatique des balises HTML."
+	"displayName": "Notions de base du langage HTML",
+	"description": "Fournit la coloration syntaxique, la correspondance des balises d'ouverture et de fermeture et des extraits de code dans les fichiers HTML."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..bd80392eb07
--- /dev/null
+++ b/i18n/fra/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "Serveur de langage JSON"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json-language-features/package.i18n.json b/i18n/fra/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..9b182858ced
--- /dev/null
+++ b/i18n/fra/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Fonctionnalités de langage JSON",
+	"description": "Fournit une prise en charge de langage pour les fichiers JSON",
+	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
+	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
+	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
+	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
+	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
+	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
+	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
+	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
+	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/json/package.i18n.json b/i18n/fra/extensions/json/package.i18n.json
index 9eda719884e..91f8d80320a 100644
--- a/i18n/fra/extensions/json/package.i18n.json
+++ b/i18n/fra/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Fonctionnalités de langage JSON",
-	"description": "Fournit une prise en charge de langage pour les fichiers JSON",
-	"json.schemas.desc": "Associer les schémas aux fichiers JSON dans le projet actif",
-	"json.schemas.url.desc": "URL de schéma ou chemin relatif d'un schéma dans le répertoire actif",
-	"json.schemas.fileMatch.desc": "Tableau de modèles de fichiers pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.fileMatch.item.desc": "Modèle de fichier pouvant contenir '*' pour la recherche de correspondances durant la résolution de fichiers JSON en schémas.",
-	"json.schemas.schema.desc": "Définition de schéma pour l'URL indiquée. Le schéma doit être fourni uniquement pour éviter les accès à l'URL du schéma.",
-	"json.format.enable.desc": "Activer/désactiver le formateur JSON par défaut (nécessite un redémarrage)",
-	"json.tracing.desc": "Trace la communication entre VS Code et le serveur de langage JSON.",
-	"json.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
-	"json.colorDecorators.enable.deprecationMessage": "Le paramètre 'json.colorDecorators.enable' a été déprécié en faveur de 'editor.colorDecorators'.",
-	"json.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe."
+	"displayName": "Bases du langage JSON",
+	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers JSON."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..69d5cb1c1f2
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "Impossible de charger 'markdown.styles' : {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..9e9f654e2f9
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Aperçu] {0}",
+	"previewTitle": "Prévisualiser {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..38a6bf3c24e
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Du contenu a été désactivé dans ce document",
+	"preview.securityMessage.title": "Le contenu potentiellement dangereux ou précaire a été désactivé dans l’aperçu du format markdown. Modifier le paramètre de sécurité Aperçu Markdown afin d’autoriser les contenus non sécurisés ou activer les scripts",
+	"preview.securityMessage.label": "Avertissement de sécurité de contenu désactivé"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/out/security.i18n.json b/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..a6eb76789ac
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Charger uniquement le contenu sécurisé.",
+	"insecureLocalContent.title": "Autoriser le contenu local non sécurisé",
+	"insecureLocalContent.description": "Activer le chargement de contenu http servi par localhost",
+	"insecureContent.title": "Autoriser le contenu non sécurisé",
+	"insecureContent.description": "Activer le chargement de contenu sur http",
+	"disable.title": "Désactiver",
+	"disable.description": "Autorisez tout le contenu et l’exécution des scripts. Non recommandé",
+	"moreInfo.title": "Informations",
+	"enableSecurityWarning.title": "Activer l'aperçu d'avertissements de sécurité pour cet espace de travail",
+	"disableSecurityWarning.title": "Désactiver l'aperçu d'avertissements de sécurité pour cet espace de travail",
+	"toggleSecurityWarning.description": "N'affecte pas le niveau de sécurité de contenu",
+	"preview.showPreviewSecuritySelector.title": "Sélectionner les paramètres de sécurité pour les aperçus Markdown dans cet espace de travail"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/markdown-language-features/package.i18n.json b/i18n/fra/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..f5aede8507b
--- /dev/null
+++ b/i18n/fra/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Fonctionnalités de langage Markdown",
+	"description": "Fournit une prise en charge riche de langage pour Markdown",
+	"markdown.preview.breaks.desc": "Définit l'affichage des sauts de ligne dans l'aperçu Markdown. Si la valeur est 'true', crée un <br> pour chaque nouvelle ligne.",
+	"markdown.preview.linkify": "Activez ou désactivez la conversion de texte de type URL en liens dans l’aperçu Markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Double-cliquez dans l'aperçu Markdown pour passer à l'éditeur.",
+	"markdown.preview.fontFamily.desc": "Contrôle la famille de polices utilisée dans l'aperçu Markdown.",
+	"markdown.preview.fontSize.desc": "Contrôle la taille de police en pixels utilisée dans l'aperçu Markdown.",
+	"markdown.preview.lineHeight.desc": "Contrôle la hauteur de ligne utilisée dans l'aperçu Markdown. Ce nombre est relatif à la taille de police.",
+	"markdown.preview.markEditorSelection.desc": "Permet de marquer la sélection actuelle de l'éditeur dans l'aperçu Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Lors du défilement de l'aperçu markdown, actualiser l’affichage de l’éditeur.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Lors du défilement d’un éditeur markdow, actualiser l’affichage de l’aperçu.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Déprécié] Fait défiler l'aperçu Markdown pour révéler la ligne actuellement sélectionnée dans l'éditeur.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ce paramètre a été remplacé par 'markdown.preview.scrollPreviewWithEditor' et n'a plus aucun effet.",
+	"markdown.preview.title": "Ouvrir l'aperçu",
+	"markdown.previewFrontMatter.dec": "Définit comment les pages liminaires YAML doivent être affichées dans l'aperçu Markdown. L'option 'hide' supprime les pages liminaires. Sinon, elles sont traitées comme du contenu Markdown.",
+	"markdown.previewSide.title": "Ouvrir l'aperçu sur le côté",
+	"markdown.showLockedPreviewToSide.title": "Ouvrir l'aperçu verrrouillé sur le côté",
+	"markdown.showSource.title": "Afficher la source",
+	"markdown.styles.dec": "Liste d'URL ou de chemins locaux de feuilles de style CSS à utiliser dans l'aperçu Markdown. Les chemins relatifs sont interprétés par rapport au dossier ouvert dans l'explorateur. S'il n'y a aucun dossier ouvert, ils sont interprétés par rapport à l'emplacement du fichier Markdown. Tous les signes '\\' doivent être écrits sous la forme '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Changer les paramètres de sécurité de l'aperçu",
+	"markdown.trace.desc": "Active la journalisation du débogage pour l'extension Markdown.",
+	"markdown.preview.refresh.title": "Actualiser l'aperçu",
+	"markdown.preview.toggleLock.title": "Activer/désactiver le verrouillage de l'aperçu"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..b20a0679e61
--- /dev/null
+++ b/i18n/fra/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Autorisez-vous l'exécution de {0} (défini en tant que paramètre d'espace de travail) pour effectuer une validation lint sur les fichiers PHP ?",
+	"php.yes": "Autoriser",
+	"php.no": "Interdire",
+	"wrongExecutable": "Impossible d'effectuer la validation, car {0} n'est pas un exécutable PHP valide. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
+	"noExecutable": "Impossible d'effectuer la validation, car aucun exécutable PHP n'est défini. Utilisez le paramètre 'php.validate.executablePath' pour configurer l'exécutable PHP.",
+	"unknownReason": "Échec de l'exécution de php avec le chemin : {0}. Raison inconnue."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php-language-features/package.i18n.json b/i18n/fra/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..60709998959
--- /dev/null
+++ b/i18n/fra/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
+	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
+	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
+	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
+	"displayName": "Fonctionnalités de langage PHP",
+	"description": "Fournit une prise en charge de langage riche pour les fichiers PHP."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/php/package.i18n.json b/i18n/fra/extensions/php/package.i18n.json
index 38ff61530b7..2b1f86c1232 100644
--- a/i18n/fra/extensions/php/package.i18n.json
+++ b/i18n/fra/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configure l'activation ou la désactivation des suggestions de langage PHP intégrées. La fonctionnalité de prise en charge suggère les variables globales et les variables de session PHP.",
-	"configuration.validate.enable": "Activez/désactivez la validation PHP intégrée.",
-	"configuration.validate.executablePath": "Pointe vers l'exécutable PHP.",
-	"configuration.validate.run": "Spécifie si linter est exécuté au moment de l'enregistrement ou de la saisie.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Interdire l'exécutable de validation PHP (défini comme paramètre d'espace de travail)",
-	"displayName": "Fonctionnalités du langage PHP",
-	"description": "Fournit IntelliSense, le linting et les concepts de base de langage pour les fichiers PHP."
+	"displayName": "Bases du langage PHP",
+	"description": "Fournit la coloration syntaxique et la correspondance des parenthèses dans les fichiers PHP."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json b/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..1738a01dc86
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript",
+	"typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge",
+	"typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript",
+	"typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript. Cliquer [ici]({0}) pour en savoir plus.",
+	"typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript. Cliquer [ici]({0}) pour en savoir plus.",
+	"typescript.configureTsconfigQuickPick": "Configurer tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "Configurer jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..a9b06927dc3
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Sélectionner l'action de code à appliquer",
+	"acquiringTypingsLabel": "Acquisition des typings...",
+	"acquiringTypingsDetail": "Acquisition des définitions typings pour IntelliSense.",
+	"autoImportLabel": "Importation automatique depuis {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..8096453313a
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Active la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
+	"ts-nocheck": "Désactive la vérification sémantique dans un fichier JavaScript. Doit se trouver au début d'un fichier.",
+	"ts-ignore": "Supprime les erreurs @ts-check sur la ligne suivante d'un fichier."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..2e7856eb1be
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 implémentation",
+	"manyImplementationLabel": "{0} implémentations",
+	"implementationsErrorLabel": "Impossible de déterminer les implémentations"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..7915d99dbd8
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "Commentaire JSDoc"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..064e933aa67
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Organiser les Imports"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..f10b35e9e5b
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Corriger tout dans le fichier)"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..927ba6cdb77
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 référence",
+	"manyReferenceLabel": "{0} références",
+	"referenceErrorLabel": "Impossible de déterminer les références"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..451f7029bac
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "build - {0}",
+	"buildAndWatchTscLabel": "watch - {0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..f31ff437ec4
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "Le chemin {0} ne pointe pas vers une installation tsserver valide. Utilisation par défaut de la version TypeScript groupée.",
+	"serverCouldNotBeStarted": "Impossible de démarrer le serveur de langage TypeScript. Message d'erreur : {0}",
+	"typescript.openTsServerLog.notSupported": "La journalisation du serveur TS nécessite TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "La journalisation du serveur TS est désactivée. Définissez 'typescript.tsserver.log' et redémarrez le serveur TS pour activer la journalisation",
+	"typescript.openTsServerLog.enableAndReloadOption": "Activer la journalisation et redémarrer le serveur TS",
+	"typescript.openTsServerLog.noLogFile": "Le serveur TS n'a pas démarré la journalisation.",
+	"openTsServerLog.openFileFailedFailed": "Impossible d'ouvrir le fichier journal du serveur TS",
+	"serverDiedAfterStart": "Le service de langage TypeScript s'est subitement arrêté 5 fois juste après avoir démarré. Il n'y aura pas d'autres redémarrages.",
+	"serverDiedReportIssue": "Signaler un problème",
+	"serverDied": "Le service de langage TypeScript s'est subitement arrêté 5 fois au cours des 5 dernières minutes."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..61ed0b60124
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "version non valide"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..b39c51e947e
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers contenant de nombreux fichiers, par exemple : {0}",
+	"hintExclude.generic": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés.",
+	"large.label": "Configurer les exclusions",
+	"hintExclude.tooltip": "Pour activer les fonctionnalités de langage JavaScript/TypeScript à l'échelle du projet, excluez les dossiers volumineux contenant des fichiers sources inutilisés."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..108ea8e9d3c
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Récupération (fetch) des données pour l'amélioration de TypeScript IntelliSense",
+	"typesInstallerInitializationFailed.title": "Impossible d'installer des fichiers de typages pour les fonctionnalités de langage JavaScript. Vérifiez que NPM est installé ou configurez 'typescript.npm' dans vos paramètres utilisateur. Cliquer [ici]({0}) pour en savoir plus.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne plus afficher"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..c6da9b3843f
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Utiliser la version de VS Code",
+	"useWorkspaceVersionOption": "Utiliser la version de l'espace de travail",
+	"learnMore": "En savoir plus",
+	"selectTsVersion": "Sélectionner la version TypeScript utilisée pour les fonctionnalités de langage JavaScript et TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..5c32ecfe106
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Impossible de charger la version TypeScript dans ce chemin",
+	"noBundledServerFound": "Le tsserver de VSCode a été supprimé par une autre application, par exemple, un outil de détection de virus mal configuré. Réinstallez VS Code."
+}
\ No newline at end of file
diff --git a/i18n/fra/extensions/typescript-language-features/package.i18n.json b/i18n/fra/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..a84454b66c5
--- /dev/null
+++ b/i18n/fra/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,65 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Fonctionnalités de langage TypeScript et JavaScript",
+	"description": "Fournit une prise en charge riche de langage pour JavaScript et TypeScript.",
+	"typescript.reloadProjects.title": "Recharger le projet",
+	"javascript.reloadProjects.title": "Recharger le projet",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Fonctions complètes avec leur signature de paramètre.",
+	"typescript.tsdk.desc": "Spécifie le chemin de dossier contenant les fichiers tsserver et lib*.d.ts à utiliser.",
+	"typescript.disableAutomaticTypeAcquisition": "Désactive l'acquisition de type automatique. Nécessite TypeScript >= 2.0.6.",
+	"typescript.tsserver.log": "Active la journalisation du serveur TS dans un fichier. Ce journal peut être utilisé pour diagnostiquer les problèmes du serveur TS. Il peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
+	"typescript.tsserver.pluginPaths": "Chemins d’accès supplémentaires pour découvrir les plugins de Service de langage Typescript. Nécessite TypeScript > = 2.3.0.",
+	"typescript.tsserver.pluginPaths.item": "Un chemin absolu ou un chemin relatif. Le chemin d’accès relatif sera résolu en fonction des dossiers de l’espace de travail.",
+	"typescript.tsserver.trace": "Active le traçage des messages envoyés au serveur TS. Cette trace peut être utilisée pour diagnostiquer les problèmes du serveur TS. Elle peut contenir des chemins de fichier, du code source et d'autres informations potentiellement sensibles de votre projet.",
+	"typescript.validate.enable": "Activez/désactivez la validation TypeScript.",
+	"typescript.format.enable": "Activez/désactivez le formateur TypeScript par défaut.",
+	"javascript.format.enable": "Activez/désactivez le formateur JavaScript par défaut.",
+	"format.insertSpaceAfterCommaDelimiter": "Définit le traitement des espaces après une virgule de délimitation.",
+	"format.insertSpaceAfterConstructor": "Définit le traitement des espaces après le mot clé constructor. Nécessite TypeScript >= 2.3.0.",
+	"format.insertSpaceAfterSemicolonInForStatements": " Définit le traitement des espaces après un point-virgule dans une instruction for.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Définit le traitement des espaces après un opérateur binaire.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Définit la gestion des espaces après les mots clés dans une instruction de flux de contrôle.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Définit le traitement des espaces après le mot clé function pour les fonctions anonymes.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Définit la gestion des espaces avant les parenthèses des arguments d'une fonction. Nécessite TypeScript >= 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Définit l’espace après ouverture et avant la fermeture de parenthèses non vides.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Définit l’espace après ouverture et avant la fermeture de crochets non vides.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "Définit l’espace après ouverture et avant la fermeture d'accolades non vides. Nécessite le TypeScript >= 2.3.0.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de la chaîne de modèle. Nécessite TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Définit la gestion de l'espace après l'ouverture et avant la fermeture des accolades de l'expression JSX. Nécessite TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterTypeAssertion": "Définit le traitement des espaces après les assertions de type dans TypeScript. Nécessite TypeScript >= 2.4.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Définit si une accolade ouvrante dans une fonction est placée ou non sur une nouvelle ligne.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Définit si une accolade ouvrante dans un bloc de contrôle est placée ou non sur une nouvelle ligne.",
+	"javascript.validate.enable": "Activez/désactivez la validation JavaScript.",
+	"typescript.goToProjectConfig.title": "Accéder à la configuration du projet",
+	"javascript.goToProjectConfig.title": "Accéder à la configuration du projet",
+	"javascript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers JavaScript.",
+	"typescript.referencesCodeLens.enabled": "Activez/désactivez les références CodeLens dans les fichiers TypeScript. Nécessite TypeScript >= 2.0.6.",
+	"typescript.implementationsCodeLens.enabled": "Activer/désactiver CodeLens dans les implémentations. Nécessite TypeScript >= 2.2.0.",
+	"typescript.openTsServerLog.title": "Ouvrir le journal du serveur TS",
+	"typescript.restartTsServer": "Redémarrer le serveur TS",
+	"typescript.selectTypeScriptVersion.title": "Sélectionner la version de TypeScript",
+	"typescript.reportStyleChecksAsWarnings": "Rapporter les vérifications de style comme des avertissements",
+	"jsDocCompletion.enabled": "Activer/désactiver les commentaires JSDoc automatiques",
+	"javascript.implicitProjectConfig.checkJs": "Activer/désactiver la vérification sémantique des fichiers JavaScript. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >=2.3.1.",
+	"typescript.npm": "Spécifie le chemin de l'exécutable NPM utilisé pour l'acquisition de type automatique. Nécessite TypeScript >= 2.3.4.",
+	"typescript.check.npmIsInstalled": "Vérifie si NPM est installé pour l'acquisition de type automatique.",
+	"javascript.nameSuggestions": "Activez/désactivez l'inclusion de noms uniques à partir du fichier dans les listes de suggestions JavaScript.",
+	"typescript.tsc.autoDetect": "Contrôle la détection automatique des tâches tsc. 'off' désactive cette fonctionnalité. 'build' crée uniquement des tâches de compilation à exécution unique. 'watch' crée uniquement des tâches de compilation et de watch. 'on' crée les deux les tâches build et watch. La valeur par défaut est 'on'.",
+	"typescript.problemMatchers.tsc.label": "Problèmes liés à TypeScript",
+	"typescript.problemMatchers.tscWatch.label": "Problèmes liés à TypeScript (mode espion)",
+	"typescript.quickSuggestionsForPaths": "Activer/désactiver les suggestions rapides lorsque vous saisissez un chemin d’import.",
+	"typescript.locale": "Définit les paramètres locaux utilisés pour signaler les erreurs TypeScript . Nécessite TypeScript >= 2.6.0. Par défaut 'null' utilise les paramètres locaux de VS Code pour les erreurs TypeScript.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Activer/désactiver 'experimentalDecorators' pour les fichiers JavaScript qui ne font pas partie d'un projet. Les fichiers jsconfig.json ou tsconfig.json existants remplacent ce paramètre. Nécessite TypeScript >=2.3.1.",
+	"typescript.autoImportSuggestions.enabled": "Activer/désactiver les suggestions d'import automatiques. Nécessite TypeScript >= 2.6.1.",
+	"typescript.experimental.syntaxFolding": "Active/désactive les marqueurs de réduction en fonction de la syntaxe.",
+	"taskDefinition.tsconfig.description": "Fichier tsconfig qui définit la build TS.",
+	"javascript.suggestionActions.enabled": "Activer/désactiver le diagnostic de suggestion des fichiers JavaScript dans l’éditeur. Nécessite TypeScript > = 2.8",
+	"typescript.suggestionActions.enabled": "Activer/désactiver les diagnostics de suggestion pour les fichiers TypeScript dans l’éditeur de texte. Nécessite TypeScript > = 2.8."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/node/processes.i18n.json b/i18n/fra/src/vs/base/node/processes.i18n.json
index ffb5b40ba74..35229bd6699 100644
--- a/i18n/fra/src/vs/base/node/processes.i18n.json
+++ b/i18n/fra/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Impossible d'exécuter une commande d'interpréteur de commandes sur un lecteur UNC."
+	]
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 4372aeafc54..010c8f12ac4 100644
--- a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "Prévisualiser sur GitHub",
 	"loadingData": "Chargement des données en cours...",
+	"rateLimited": "Limite de requête GitHub dépassée. Veuillez patienter.",
 	"similarIssues": "Problèmes similaires",
 	"open": "Ouvrir",
 	"closed": "Fermé",
-	"noResults": "Résultats introuvables",
+	"noSimilarIssues": "Aucun problème similaire trouvé",
 	"settingsSearchIssue": "Problème de paramètres de recherche",
 	"bugReporter": "Rapporteur de bogue",
-	"performanceIssue": "Problème de performance",
 	"featureRequest": "Demande de fonctionnalité",
+	"performanceIssue": "Problème de performance",
 	"stepsToReproduce": "Étapes à reproduire",
 	"bugDescription": "Partagez les étapes nécessaires pour reproduire fidèlement le problème. Veuillez inclure les résultats réels et prévus. Nous prenons en charge la syntaxe GitHub Markdown. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
 	"performanceIssueDesciption": "Quand ce problème de performance s'est-il produit ? Se produit-il au démarrage ou après une série d'actions spécifiques ? Nous prenons en charge la syntaxe Markdown de GitHub. Vous pourrez éditer votre problème et ajouter des captures d'écran lorsque nous le prévisualiserons sur GitHub.",
diff --git a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index b903d97313a..f18659a614b 100644
--- a/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/fra/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,12 @@
 	],
 	"completeInEnglish": "Veuillez remplir le formulaire en anglais.",
 	"issueTypeLabel": "Ceci est un ",
+	"issueSourceLabel": "Fichier sur",
+	"vscode": "Visual Studio Code",
+	"extension": "Une Extension",
+	"disableExtensionsLabelText": "Essayez de reproduire le problème après {0}. Si le problème se reproduit uniquement lorsque les extensions sont actives, c’est probablement un problème avec une extension.",
+	"disableExtensions": "en désactivant toutes les extensions et en rechargeant la fenêtre",
+	"chooseExtension": "Extension",
 	"issueTitleLabel": "Titre",
 	"issueTitleRequired": "Veuillez s’il vous plaît entrer un titre.",
 	"titleLengthValidation": "Le titre est trop long.",
@@ -18,13 +24,6 @@
 	"extensions": "Mes Extensions",
 	"searchedExtensions": "Extensions recherchées",
 	"settingsSearchDetails": "Détails de paramètres de recherche",
-	"tryDisablingExtensions": "Le problème est-il reproductible lorsque les extensions sont désactivées?",
-	"yes": "Oui",
-	"no": "Non",
-	"disableExtensionsLabelText": "Essayez de reproduire le problème après {0}.",
-	"disableExtensions": "en désactivant toutes les extensions et en rechargeant la fenêtre",
-	"showRunningExtensionsLabelText": "Si vous pensez que c'est un problème d'extension, {0} pour reporter le problème de l'extension.",
-	"showRunningExtensions": "Afficher toutes les extensions en cours d'exécution",
 	"details": "Veuillez saisir les détails ",
 	"loadingData": "Chargement des données..."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..9eedc8116f8
--- /dev/null
+++ b/i18n/fra/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "% PROCESSEUR",
+	"memory": "Mémoire (Mo)",
+	"pid": "pid",
+	"name": "Nom",
+	"killProcess": "Tuer le processus",
+	"forceKillProcess": "Forcer la suppression du processus"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/code/electron-main/menus.i18n.json b/i18n/fra/src/vs/code/electron-main/menus.i18n.json
index 8285cde130f..021a8b5c68b 100644
--- a/i18n/fra/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/fra/src/vs/code/electron-main/menus.i18n.json
@@ -161,6 +161,7 @@
 	"mMergeAllWindows": "Fusionner toutes les fenêtres",
 	"miToggleDevTools": "Activer/désactiver les ou&&tils de développement",
 	"miAccessibilityOptions": "&&Options d'accessibilité",
+	"miOpenProcessExplorerer": "Ouvrir l'Explorateur de &&Processus",
 	"miReportIssue": "Signaler un problème",
 	"miWelcome": "&&Bienvenue",
 	"miInteractivePlayground": "Terrain de jeu &&interactif",
diff --git a/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json
index 5bf8a5a69db..cb044b0dca6 100644
--- a/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/fra/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Fermer",
-	"header": "Différence {0} sur {1} : {2} d'origine, {3} lignes, {4} modifiées, {5} lignes",
 	"blankLine": "vide",
 	"equalLine": "{0} d'origine, {1} modifiées : {2}",
 	"insertLine": "+ {0} modifiées : {1}",
diff --git a/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/fra/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
index c59fa7756c3..ef46fe72220 100644
--- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS.",
 	"multiCursorModifier.alt": "Mappe vers 'Alt' dans Windows et Linux, et vers 'Option' dans macOS.",
 	"multiCursorModifier": "Le modificateur à utiliser pour ajouter plusieurs curseurs avec la souris. 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris Accéder à la définition et Ouvrir le lien s'adaptent pour ne pas entrer en conflit avec le modificateur multicurseur.",
+	"multiCursorMergeOverlapping": "Fusionnez plusieurs curseurs quand ils se chevauchent.",
 	"quickSuggestions.strings": "Activez les suggestions rapides dans les chaînes.",
 	"quickSuggestions.comments": "Activez les suggestions rapides dans les commentaires.",
 	"quickSuggestions.other": "Activez les suggestions rapides en dehors des chaînes et des commentaires.",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "Contrôle la façon dont l'éditeur doit afficher la surbrillance de la ligne active. Les différentes possibilités sont 'none', 'gutter', 'line' et 'all'.",
 	"codeLens": "Contrôle si l'éditeur affiche les indicateurs CodeLens",
 	"folding": "Contrôle si le pliage de code est activé dans l'éditeur",
+	"foldingStrategyAuto": "Si disponible, utilisez une stratégie de présentation langage-spécifique, sinon la stratégie d'indentation s'applique.",
+	"foldingStrategyIndentation": "Utilisez toujours l'indentation basée sur la stratégie de présentation",
+	"foldingStrategy": "Contrôle la façon dont les repliages sont calculées. 'auto' utilise une stratégie repliage spécifique au langage, si disponible. 'indentation' force à ce que la stratégie de repliage basée sur l'indentation soit utilisée.",
 	"showFoldingControls": "Définit si les contrôles de réduction sur la bordure sont cachés automatiquement",
 	"matchBrackets": "Met en surbrillance les crochets correspondants quand l'un d'eux est sélectionné.",
 	"glyphMargin": "Contrôle si l'éditeur doit afficher la marge de glyphes verticale. La marge de glyphes sert principalement au débogage.",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "Contrôle si le presse-papiers primaire Linux doit être pris en charge.",
 	"sideBySide": "Contrôle si l'éditeur de différences affiche les différences en mode côte à côte ou inline",
 	"ignoreTrimWhitespace": "Contrôle si l'éditeur de différences affiche les changements liés aux espaces blancs de début ou de fin comme des différences",
+	"largeFileSize": "Contrôles le seuil de la taille de fichier en octets au-delà de laquelle les règles d’optimisation spéciale sont appliquées",
+	"largeFileLineCount": "Contrôle le seuil de taille de fichier en terme de nombre de lignes au-delà de laquelle les règles d’optimisation spéciale sont appliquées",
 	"renderIndicators": "Contrôle si l'éditeur de différences affiche les indicateurs +/- pour les modifications ajoutées/supprimées"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
index f429643db53..d368519c5fb 100644
--- a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "Couleur des repères de retrait de l'éditeur.",
 	"editorLineNumbers": "Couleur des numéros de ligne de l'éditeur.",
 	"editorActiveLineNumber": "Couleur des numéros de lignes actives de l'éditeur",
+	"deprecatedEditorActiveLineNumber": "Id est obsolète. Utilisez à la place 'editorLineNumber.activeForeground'. ",
 	"editorRuler": "Couleur des règles de l'éditeur",
 	"editorCodeLensForeground": "Couleur pour les indicateurs CodeLens",
 	"editorBracketMatchBackground": "Couleur d'arrière-plan pour les accolades associées",
@@ -28,7 +29,9 @@
 	"warningBorder": "Couleur de bordure de la ligne ondulée marquant les avertissements dans l'éditeur.",
 	"infoForeground": "Couleur de premier plan de la ligne ondulée marquant les informations dans l'éditeur.",
 	"infoBorder": "Couleur de bordure de la ligne ondulée marquant les informations dans l'éditeur.",
-	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de plage.",
+	"hintForeground": "Couleur de premier plan de la ligne ondulée d'indication dans l'éditeur.",
+	"hintBorder": "Couleur de bordure de la ligne ondulée d'indication dans l'éditeur.",
+	"overviewRulerRangeHighlight": "Couleur du marqueur de la règle d'aperçu pour des plages mises en surbrillance. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
 	"overviewRuleError": "Couleur du marqueur de la règle d'aperçu pour les erreurs.",
 	"overviewRuleWarning": "Couleur du marqueur de la règle d'aperçu pour les avertissements.",
 	"overviewRuleInfo": "Couleur du marqueur de la règle d'aperçu pour les informations."
diff --git a/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..9e350d183dc
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Afficher les correctifs ({0})",
+	"quickFix": "Afficher les correctifs",
+	"quickfix.trigger.label": "Correction rapide...",
+	"editor.action.quickFix.noneMessage": "Aucune action de code disponible",
+	"refactor.label": "Remanier...",
+	"editor.action.refactor.noneMessage": "Aucune refactorisation disponible",
+	"source.label": "Action de la source",
+	"editor.action.source.noneMessage": "Aucune action n'est disponible",
+	"organizeImports.label": "Organiser les Imports"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index d76f9865b2b..f73761c7817 100644
--- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Aller au problème suivant (Erreur, Avertissement, Info)",
-	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)",
-	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
-	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
-	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
+	"markerAction.previous.label": "Aller au problème précédent (Erreur, Avertissement, Info)"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..9d9cfafff38
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Couleur d'erreur du widget de navigation dans les marqueurs de l'éditeur.",
+	"editorMarkerNavigationWarning": "Couleur d'avertissement du widget de navigation dans les marqueurs de l'éditeur.",
+	"editorMarkerNavigationInfo": "Couleur d’information du widget de navigation du marqueur de l'éditeur.",
+	"editorMarkerNavigationBackground": "Arrière-plan du widget de navigation dans les marqueurs de l'éditeur."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/links/links.i18n.json b/i18n/fra/src/vs/editor/contrib/links/links.i18n.json
index 765ec6309f7..2837414f765 100644
--- a/i18n/fra/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "Ctrl + clic pour suivre le lien",
 	"links.command.mac": "Cmd + clic pour exécuter la commande",
 	"links.command": "Ctrl + clic pour exécuter la commande",
+	"links.navigate.al.mac": "Option + clic pour suivre le lien",
 	"links.navigate.al": "Alt + clic pour suivre le lien",
+	"links.command.al.mac": "Option + clic pour exécuter la commande",
 	"links.command.al": "Alt + clic pour exécuter la commande",
 	"invalid.url": "Échec de l'ouverture de ce lien, car il n'est pas bien formé : {0}",
 	"missing.url": "Échec de l'ouverture de ce lien, car sa cible est manquante.",
diff --git a/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..5b27a515c99
--- /dev/null
+++ b/i18n/fra/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Dimanche",
+	"Monday": "Lundi",
+	"Tuesday": "Mardi",
+	"Wednesday": "Mercredi",
+	"Thursday": "Jeudi",
+	"Friday": "Vendredi",
+	"Saturday": "Samedi",
+	"SundayShort": "Dim",
+	"MondayShort": "Lun",
+	"TuesdayShort": "Mar",
+	"WednesdayShort": "Mer",
+	"ThursdayShort": "Jeu",
+	"FridayShort": "Ven",
+	"SaturdayShort": "Sam",
+	"January": "Janvier",
+	"February": "Février",
+	"March": "Mars",
+	"April": "Avril",
+	"May": "Mai",
+	"June": "Juin",
+	"July": "Juillet",
+	"August": "Août",
+	"September": "Septembre",
+	"October": "Octobre",
+	"November": "Novembre",
+	"December": "Décembre",
+	"JanuaryShort": "Jan",
+	"FebruaryShort": "Fév",
+	"MarchShort": "Mar",
+	"AprilShort": "Avr",
+	"MayShort": "Mai",
+	"JuneShort": "Jun",
+	"JulyShort": "Jul",
+	"AugustShort": "Aoû",
+	"SeptemberShort": "Sep",
+	"OctoberShort": "Oct",
+	"NovemberShort": "Nov",
+	"DecemberShort": "Déc"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 01d606a017d..0eab06eb685 100644
--- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Couleur d'arrière-plan d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
 	"wordHighlightBorder": "Couleur de bordure d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.",
 	"wordHighlightStrongBorder": "Couleur de bordure d'un symbole durant l'accès en écriture, par exemple l'écriture dans une variable.",
-	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de symbole.",
-	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu la mise en évidence de symbole d’accès en écriture.",
+	"overviewRulerWordHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
+	"overviewRulerWordHighlightStrongForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de symbole d'accès en écriture. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
 	"wordHighlight.previous.label": "Aller à la mise en évidence de symbole précédente"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..40bf02755c5
--- /dev/null
+++ b/i18n/fra/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 fichier supplémentaire non affiché",
+	"moreFiles": "...{0} fichiers supplémentaires non affichés"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..2f086ccc7a3
--- /dev/null
+++ b/i18n/fra/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Annuler"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
index b078a360d5c..a68fecd7d97 100644
--- a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.",
 	"prof-startup": "Exécuter le profileur d'UC au démarrage",
 	"disableExtensions": "Désactivez toutes les extensions installées.",
-	"inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.",
-	"inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.",
 	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
 	"uploadLogs": "Upload les logs depuis la session actuelle vers le endpoint sécurisé.",
 	"maxMemory": "Taille mémoire maximale pour une fenêtre (En Megaoctêts)",
diff --git a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 705af653f74..65d0af43d0c 100644
--- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
 	"MarketPlaceDisabled": "Le marketplace n’est pas activé",
 	"removeError": "Erreur lors de la suppression de l’extension : {0}. Veuillez quitter et relancer VS Code avant de réessayer.",
-	"Not Market place extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
+	"Not a Marketplace extension": "Seules les Extensions de Marketplace peuvent être réinstallées",
 	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
 	"malicious extension": "Impossible d’installer l'extension car elle a été signalée comme problématique.",
 	"notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.",
 	"quitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît quitter et redémarrer VS Code avant de le réinstaller.",
 	"exitCode": "Impossible d’installer l’extension. Veuillez s’il vous plaît sortir et redémarrer VS Code avant de le réinstaller.",
 	"uninstallDependeciesConfirmation": "Voulez-vous désinstaller uniquement '{0}' ou également ses dépendances ?",
-	"uninstallOnly": "Uniquement",
-	"uninstallAll": "Tout",
+	"uninstallOnly": "Extension uniquement",
+	"uninstallAll": "Tout désinstaller",
 	"uninstallConfirmation": "Voulez-vous vraiment désinstaller '{0}' ?",
 	"ok": "OK",
 	"singleDependentError": "Impossible de désinstaller l'extension '{0}'. L'extension '{1}' en dépend.",
diff --git a/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 14df62a8555..164aece343f 100644
--- a/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/fra/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Impossible d'analyser la valeur {0} de 'engines.vscode'. Utilisez, par exemple, ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x, etc.",
+	"versionSyntax": "Impossible d'analyser la valeur {0} de `engines.vscode`. Veuillez utiliser, par exemple : ^1.22.0, ^1.22.x, ...",
 	"versionSpecificity1": "La version spécifiée dans 'engines.vscode' ({0}) n'est pas assez précise. Pour les versions de vscode antérieures à 1.0.0, définissez au minimum les versions majeure et mineure souhaitées. Par exemple : ^0.10.0, 0.10.x, 0.11.0, etc.",
 	"versionSpecificity2": "La version spécifiée dans 'engines.vscode' ({0}) n'est pas assez précise. Pour les versions de vscode ultérieures à 1.0.0, définissez au minimum la version majeure souhaitée. Par exemple : ^1.10.0, 1.10.x, 1.x.x, 2.x.x, etc.",
 	"versionMismatch": "L'extension n'est pas compatible avec le code {0}. L'extension nécessite {1}."
diff --git a/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 8ea54148dad..63284727ee8 100644
--- a/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/fra/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "Votre installation de {0} semble être endommagée. Effectuez une réinstallation.",
 	"integrity.moreInformation": "Informations",
-	"integrity.dontShowAgain": "Ne plus afficher",
-	"integrity.prompt": "Votre installation de {0} semble être endommagée. Effectuez une réinstallation."
+	"integrity.dontShowAgain": "Ne plus afficher"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
index cfbd6f443b7..615db052738 100644
--- a/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ b/i18n/fra/src/vs/platform/issue/electron-main/issueService.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"issueReporter": "Rapporteur du problème"
+	"issueReporter": "Rapporteur du problème",
+	"processExplorer": "Explorateur de processus"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
index e512ed15ca9..79767f92ca9 100644
--- a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Le modificateur à utiliser pour ajouter un élément à une multi-sélection avec la souris (par exemple dans l’Explorateur, des éditeurs ouverts et scm view). 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans macOS. Les mouvements de souris 'Ouvrir sur le côté', si supportés, s'adaptent pour ne pas entrer en conflit avec le modificateur multiselect.",
 	"openMode.singleClick": "Ouvre les éléments sur un simple clic de souris.",
 	"openMode.doubleClick": "Ouvre les éléments sur un double clic de souris.",
-	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. "
+	"openModeModifier": "Contrôle l’ouverture des éléments dans les arbres et listes à l’aide de la souris (si pris en charge). Mettre la valeur `singleClick` pour ouvrir des éléments avec un simple clic de souris et `doubleClick` pour ouvrir uniquement via un double-clic de souris. Pour les parents ayant des enfants dans les arbres, ce paramètre contrôle si un simple clic développe le parent ou un double-clic. Notez que certains arbres et listes peuvent choisir d’ignorer ce paramètre, si ce n’est pas applicable. ",
+	"horizontalScrolling setting": "Contrôle si les arborescences prennent en charge le défilement horizontal dans le plan de travail."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/markers/common/markers.i18n.json b/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..634b6c772a7
--- /dev/null
+++ b/i18n/fra/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Erreur",
+	"sev.warning": "Avertissement",
+	"sev.info": "Informations"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
index a31359353cc..23d1737cd7a 100644
--- a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Premier plan de la règle d'aperçu actuelle pour les conflits de fusion inline.",
 	"overviewRulerIncomingContentForeground": "Premier plan de la règle d'aperçu entrante pour les conflits de fusion inline.",
 	"overviewRulerCommonContentForeground": "Arrière-plan de la règle d'aperçu de l'ancêtre commun dans les conflits de fusion inline.",
-	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour rechercher des correspondances.",
-	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour la mise en évidence de la sélection."
+	"overviewRulerFindMatchForeground": "Couleur du marqueur de la règle d'aperçu pour les correspondances trouvées. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous.",
+	"overviewRulerSelectionHighlightForeground": "Couleur du marqueur de la règle d'aperçu pour les mises en surbrillance de sélection. La couleur doit ne pas être opaque pour ne pas masquer les décorations du dessous."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..7dd67c3300c
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'",
+	"showViewlet": "Afficher {0}",
+	"view": "Affichage"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index ff1868fc667..ed3d04c14e5 100644
--- a/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/fra/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Ajoute des vues à l'éditeur",
 	"views.explorer": "Mode Explorateur",
 	"views.debug": "Debug View",
-	"locationId.invalid": "'{0}' n'est pas un emplacement de vue valide",
 	"duplicateView1": "Impossible d’enregistrer des vues multiples avec le même id '{0}'» dans l’emplacement '{1}'",
 	"duplicateView2": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 6b8c2481d1f..6ad0b22d7ed 100644
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Format avorté lors de l'enregistrement après {0} ms",
+	"timeout.onWillSave": "OnWillSaveTextDocument-event avorté après 1750 ms",
 	"saveParticipants": "Exécution de la sauvegarde des participants..."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..5f508cf00b5
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0} : {1}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index de7accdb519..38f0760c227 100644
--- a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"webview.editor.label": "éditeur webview"
+	"errorMessage": "Une erreur s’est produite lors de restauration de a vue : {0}"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..ba3f3014580
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (Extension)"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 2bc5f99bcfc..1cdd98b12a7 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Focus sur le groupe suivant",
 	"openToSide": "Ouvrir sur le côté",
 	"closeEditor": "Fermer l'éditeur",
+	"closeOneEditor": "Fermer",
 	"revertAndCloseActiveEditor": "Restaurer et fermer l'éditeur",
 	"closeEditorsToTheLeft": "Fermer les éditeurs situés à gauche",
 	"closeAllEditors": "Fermer tous les éditeurs",
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 7f3b1e3e8f9..d86bbe531c6 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,7 @@
 	"screenReaderDetectedExtra": "Si vous n'utilisez pas de lecteur d'écran, définissez le paramètre 'editor.accessibilitySupport' sur \"désactivé\".",
 	"disableTabMode": "Désactiver le mode d'accessibilité",
 	"gotoLine": "Atteindre la ligne",
-	"indentation": "Retrait",
+	"selectIndentation": "Sélectionner le retrait",
 	"selectEncoding": "Sélectionner l'encodage",
 	"selectEOL": "Sélectionner la séquence de fin de ligne",
 	"selectLanguageMode": "Sélectionner le mode de langage",
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index e91a76e9b43..a9163f8c71e 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,11 @@
 	"sizeMB": "{0} Mo",
 	"sizeGB": "{0} Go",
 	"sizeTB": "{0} To",
-	"largeImageError": "La taille du fichier de l’image est trop grande (> à 1Mo) pour afficher dans l’éditeur.",
+	"largeImageError": "L’image n’est pas affichée dans l’éditeur parce qu’elle est trop grande ({0}).",
 	"resourceOpenExternalButton": " Ouvrir l'image en utilisant un programme externe ?",
-	"nativeBinaryError": "Impossible d'afficher le fichier dans l'éditeur : soit il est binaire, soit il est très volumineux, soit il utilise un encodage de texte non pris en charge.",
+	"nativeFileTooLargeError": "Le fichier n’est pas affiché dans l’éditeur, parce qu’il est trop volumineux ({0}).",
+	"nativeBinaryError": "Le fichier n’est pas affiché dans l’éditeur parce que c’est un fichier binaire ou qu'il utilise un encodage de texte non pris en charge.",
+	"openAsText": "Vous voulez l'ouvrir quand même ?",
 	"zoom.action.fit.label": "Toute l’Image",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 5844230292f..628561d4d2c 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Fermer",
 	"araLabelEditorActions": "Actions de l'éditeur"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 2a55390fff5..491f3b3f2fc 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Aucune nouvelle notification",
 	"notifications": "Notifications",
 	"notificationsToolbar": "Actions du centre de notifications",
 	"notificationsList": "Liste des notifications"
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..3eb1fd9f03c
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInput.countSelected": "{0} Sélectionnés",
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..e961aa1b883
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInputBox.ariaLabel": "Taper pour affiner les résultats."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
index 96d9fe6601d..8f9f7eb339d 100644
--- a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json
@@ -32,6 +32,7 @@
 	"openRecent": "Ouvrir les éléments récents...",
 	"quickOpenRecent": "Ouverture rapide des éléments récents...",
 	"reportIssueInEnglish": "Signaler un problème",
+	"openProcessExplorer": "Ouvrir l'explorateur de processus",
 	"reportPerformanceIssue": "Signaler un problème de performance",
 	"keybindingsReference": "Référence des raccourcis clavier",
 	"openDocumentationUrl": "Documentation",
diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
index b87604490e8..1a663cb4405 100644
--- a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Fenêtre",
 	"window.openFilesInNewWindow.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
 	"window.openFilesInNewWindow.off": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-	"window.openFilesInNewWindow.default": "Les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active, sauf s'ils sont ouverts via le Dock ou depuis le Finder (macOS uniquement)",
-	"openFilesInNewWindow": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active, sauf s'ils sont ouverts via le Dock ou depuis le Finder (macOS uniquement)\n- on : les fichiers s'ouvrent dans une nouvelle fenêtre\n- off : les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active\nNotez que dans certains cas, ce paramètre est ignoré (par exemple, quand vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
+	"window.openFilesInNewWindow.defaultMac": "Les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active, à moins qu'ils ne soient ouverts via le Dock ou depuis Finder.",
+	"window.openFilesInNewWindow.default": "Les fichiers s'ouvriront dans une nouvelle fenêtre, à moins qu'ils ne soient sélectionnés dans l'application (par ex. via le menu Fichier)",
+	"openFilesInNewWindowMac": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active à moins qu'ils ne soient ouverts via le Dock ou depuis le Finder\n- on : les fichiers s'ouvriront dans une nouvelle fenêtre\n- off : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active\nNotez qu'il peut encore y avoir des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
+	"openFilesInNewWindow": "Contrôle si les fichiers doivent s'ouvrir dans une nouvelle fenêtre.\n- default : les fichiers s'ouvriront dans une nouvelle fenêtre à moins qu'ils ne soient sélectionnés dans l'application (par ex. via le menu Fichier)\n- on : les fichiers s'ouvriront dans une nouvelle fenêtre\n- off : les fichiers s'ouvriront dans la fenêtre avec le dossier des fichiers ouvert ou la dernière fenêtre active\nNotez qu'il peut encore y avoir des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
 	"window.openFoldersInNewWindow.on": "Les dossiers s'ouvrent dans une nouvelle fenêtre",
 	"window.openFoldersInNewWindow.off": "Les dossiers remplacent la dernière fenêtre active",
 	"window.openFoldersInNewWindow.default": "Les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)",
 	"openFoldersInNewWindow": "Contrôle si les dossiers doivent s'ouvrir dans une nouvelle fenêtre ou remplacer la dernière fenêtre active.\n- default : les dossiers s'ouvrent dans une nouvelle fenêtre, sauf si un dossier est sélectionné depuis l'application (par exemple, via le menu Fichier)\n- on : les dossiers s'ouvrent dans une nouvelle fenêtre\n- off : les dossiers remplacent la dernière fenêtre active\nNotez que dans certains cas, ce paramètre est ignoré (par exemple, quand vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
+	"window.openWithoutArgumentsInNewWindow.on": "Ouvrir une nouvelle fenêtre vide",
+	"window.openWithoutArgumentsInNewWindow.off": "Mettre le focus sur la dernière instance active du terminal",
+	"openWithoutArgumentsInNewWindow": "Contrôle si une nouvelle fenêtre vide doit s’ouvrir lors du démarrage d’une seconde instance sans argument, ou si la dernière instance en cours d’exécution doit obtenir le focus.\n- on : ouvrir une nouvelle fenêtre vide\n- off : la dernière instance en cours d’exécution active obtiendra le focus\nNote qu’il peut encore exister des cas où ce paramètre est ignoré (par exemple lorsque vous utilisez l'option de ligne de commande -new-window ou -reuse-window).",
 	"window.reopenFolders.all": "Rouvre toutes les fenêtres.",
 	"window.reopenFolders.folders": "Rouvrir tous les dossiers. Les espaces de travail vides ne seront pas restaurées.",
 	"window.reopenFolders.one": "Rouvre la dernière fenêtre active.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Contrôle comment les fenêtres seront rouvertes après un redémarrage. Sélectionner 'none' pour toujours démarrer avec un espace de travail vide, 'one' pour rouvrir la dernière fenêtre avec laquelle vous avez travaillé, 'folders' pour rouvrir toutes les fenêtres qui avaient des dossiers ouverts  ou 'all' pour rouvrir toutes les fenêtres de votre dernière session.",
 	"restoreFullscreen": "Contrôle si une fenêtre doit être restaurée en mode plein écran si elle a été fermée dans ce mode.",
 	"zoomLevel": "Modifiez le niveau de zoom de la fenêtre. La taille d'origine est 0. Chaque incrément supérieur (exemple : 1) ou inférieur (exemple : -1) représente un zoom 20 % plus gros ou plus petit. Vous pouvez également entrer des décimales pour changer le niveau de zoom avec une granularité plus fine.",
-	"title": "Contrôle le titre de la fenêtre en fonction sur l’éditeur actif. Les variables sont remplacés selon le contexte : ${activeEditorShort} : le nom du fichier (ex: monFichier.txt) ${activeEditorMedium} : le chemin d’accès au fichier par rapport au dossier de l’espace de travail (ex: monDossier/monFichier.txt) ${activeEditorLong} : le chemin d’accès complet du fichier (par exemple / Users/Developpement/monDossier/monFichier.txt) ${folderName} : nom du dossier de l’espace de travail auquel le fichier appartient (ex: mondossier) ${folderPath} : chemin d’accès du dossier de l'espace de travail auquel le fichier appartient (ex: /Users/Developpement/monDossier) {$ rootName} : nom de l’espace de travail (:. monDossier ou monEspaceDeTravail) ${rootPath} : chemin d’accès de l’espace de travail (ex: /Users/Developpement/monEspaceDeTravail) ${appName} : ex. VS Code  ${dirty} : un indicateur si l’éditeur actif est modifié ${separator} : un séparateur conditionnel (\" - \") qui ne s'affiche que quand ils sont entourés par des variables avec des valeurs",
+	"title": "Contrôle le titre de la fenêtre basé sur l’éditeur actif. Les variables sont remplacées selon le contexte : \n${activeEditorShort} : le nom de fichier (p. ex. monfichier.txt)\n${activeEditorMedium} : le chemin d’accès du fichier par rapport au dossier  de l’espace de travail (par exemple, myFolder/myFile.txt) \n${activeEditorLong} : le chemin d’accès complet du fichier (par exemple / Users/Development/myProject/myFolder/myFile.txt) \n${folderName} : le nom du dossier de l'espace de travail dans lequel le fichier est contenu (p. ex. mondossier) \n${folderPath} : le chemin d’accès au dossier de l'espace de travail dans lequel le fichier est contenu (par exemple /Users/Development/myFolder) \n{$ rootName} : le nom de l’espace de travail (p. ex. myFolder ou myWorkspace) \n${rootPath} : le chemin d’accès de l’espace de travail (par exemple, /Users/Development/myWorkspace) \n${appName} : p. ex. VS Code\n${dirty} : un indicateur si l’éditeur actif est modifié\n${separator} : un séparateur conditionnel  (\" - \") qui ne s'affiche que quand ils sont entourés par des variables avec des valeurs ou du texte statique",
 	"window.newWindowDimensions.default": "Permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
 	"window.newWindowDimensions.inherit": "Permet d'ouvrir les nouvelles fenêtres avec la même dimension que la dernière fenêtre active.",
 	"window.newWindowDimensions.maximized": "Permet d'ouvrir les nouvelles fenêtres de manière agrandie.",
@@ -74,6 +79,8 @@
 	"autoDetectHighContrast": "Si cette option est activée, le thème à contraste élevé est automatiquement choisi quand Windows utilise un thème à contraste élevé. À l'inverse, le thème sombre est automatiquement choisi quand Windows n'utilise plus le thème à contraste élevé.",
 	"titleBarStyle": "Ajustez l'apparence de la barre de titre de la fenêtre. Vous devez effectuer un redémarrage complet pour que les changements soient appliqués.",
 	"window.nativeTabs": "Active les onglets macOS Sierra. Notez que vous devez redémarrer l'ordinateur pour appliquer les modifications et que les onglets natifs désactivent tout style de barre de titre personnalisé configuré, le cas échéant.",
+	"window.smoothScrollingWorkaround": "Activez cette solution de contournement si le défilement n’est plus lissé après la restauration d’une fenêtre de VS Code réduite. Il s’agit d’une solution de contournement pour un problème (https://github.com/Microsoft/vscode/issues/13612) où le défilement commence à laguer sur les périphériques dotés de pavés de précision comme les appareils Surface de Microsoft. Activer cette solution de contournement peut provoquer un peu de scintillement de mise en page après la restauration de la fenêtre depuis l’état minimisé mais est sans danger.",
+	"window.clickThroughInactive": "Si activée, cliquer sur une fenêtre inactive activera la fenêtre et déclenchera l’élément sous la souris, si elle est cliquable. Si désactivé, cliquer n’importe où sur une fenêtre inactive va seulement l'activer et un second clic sur l’élément sera nécessaire.",
 	"zenModeConfigurationTitle": "Mode Zen",
 	"zenMode.fullScreen": "Contrôle si l'activation de Zen Mode met également le banc d'essai en mode plein écran.",
 	"zenMode.centerLayout": "Contrôle si l'activation du mode Zen centre également la disposition.",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index f3007ffa419..41453556314 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Modifier un point d'arrêt...",
+	"breakpoint": "Point d'arrêt",
 	"functionBreakpointsNotSupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
 	"functionBreakpointPlaceholder": "Fonction où effectuer un point d'arrêt",
 	"functionBreakPointInputAriaLabel": "Point d'arrêt sur fonction de type",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Point d'arrêt non vérifié",
 	"functionBreakpointUnsupported": "Les points d'arrêt de fonction ne sont pas pris en charge par ce type de débogage",
 	"breakpointDirtydHover": "Point d'arrêt non vérifié. Fichier modifié. Redémarrez la session de débogage.",
+	"logBreakpointUnsupported": "Log points non pris en charge par ce type de débogage",
 	"conditionalBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage",
 	"hitBreakpointUnsupported": "Les points d'arrêt conditionnels ne sont pas pris en charge par ce type de débogage"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index a1ba3461445..c216d242008 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Redémarrer le frame",
 	"removeBreakpoint": "Supprimer un point d'arrêt",
 	"removeAllBreakpoints": "Supprimer tous les points d'arrêt",
-	"enableBreakpoint": "Activer le point d'arrêt",
-	"disableBreakpoint": "Désactiver le point d'arrêt",
 	"enableAllBreakpoints": "Activer tous les points d'arrêt",
 	"disableAllBreakpoints": "Désactiver tous les points d'arrêt",
 	"activateBreakpoints": "Activer les points d'arrêt",
 	"deactivateBreakpoints": "Désactiver les points d'arrêt",
 	"reapplyAllBreakpoints": "Réappliquer tous les points d'arrêt",
 	"addFunctionBreakpoint": "Ajouter un point d'arrêt sur fonction",
-	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
-	"editConditionalBreakpoint": "Modifier un point d'arrêt...",
 	"setValue": "Définir la valeur",
 	"addWatchExpression": "Ajouter une expression",
 	"editWatchExpression": "Modifier l'expression",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 518d71cfb8f..b9f58b85393 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Déboguer : activer/désactiver un point d'arrêt",
 	"conditionalBreakpointEditorAction": "Déboguer : ajouter un point d'arrêt conditionnel...",
+	"logPointEditorAction": "Déboguer : ajouter un Log point...",
 	"runToCursor": "Exécuter jusqu'au curseur",
 	"debugEvaluate": "Déboguer : évaluer",
 	"debugAddToWatch": "Déboguer : ajouter à la fenêtre Espion",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..44f7ce035b6
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "Message à loguer lorsque le point d’arrêt est atteint. Les expressions entre {} sont interpolées. 'Entrée' pour accepter,'Echap' pour annuler.",
+	"breakpointWidgetHitCountPlaceholder": "Arrêt quand le nombre d'accès est atteint. 'Entrée' pour accepter ou 'Échap' pour annuler.",
+	"breakpointWidgetExpressionPlaceholder": "Arrêt quand l'expression prend la valeur true. 'Entrée' pour accepter ou 'Échap' pour annuler.",
+	"expression": "Expression",
+	"hitCount": "Nombre d'accès",
+	"logMessage": "Message de log"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 899866a157c..f960d2726e7 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -27,5 +27,6 @@
 	"onFirstSessionStart": "Afficher debug dans seule la barre d’état après que le débogage a été lancé pour la première fois",
 	"showInStatusBar": "Contrôle quand la barre d’état de débogage doit être visible",
 	"openDebug": "Contrôle si la vue de débogage doit être ouverte au démarrage de la session de débogage.",
-	"launch": "Configuration du lancement du débogage global. Doit être utilisée comme alternative à 'launch.json' qui est partagé entre les espaces de travail"
+	"launch": "Configuration du lancement du débogage global. Doit être utilisée comme alternative à 'launch.json' qui est partagé entre les espaces de travail",
+	"extensionHostDebugAdapter": "Exécuter l'adaptateur de débogage dans l'hôte d'extension"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 4839400b9f6..8f1025680dd 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,7 @@
 	"useUniqueNames": "Veuillez utiliser des noms de configuration uniques.",
 	"app.launch.json.compound.folder": "Nom du dossier dans lequel le composé se trouve.",
 	"app.launch.json.compounds.configurations": "Noms des configurations qui sont lancées dans le cadre de ce composé.",
-	"debugNoType": "Le 'type' de l'adaptateur de débogage ne peut pas être omis. Il doit s'agir du type 'string'.",
+	"debugNoType": "Le 'type' de débogueur ne peut pas être omis et doit être de type 'string'.",
 	"selectDebug": "Sélectionner l'environnement",
 	"DebugConfig.failed": "Impossible de créer le fichier 'launch.json' dans le dossier '.vscode' ({0}).",
 	"workspace": "espace de travail",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 7e373cfa04c..7ba8fc67a9e 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "Point d'arrêt",
 	"removeBreakpoints": "Supprimer les points d'arrêt",
 	"removeBreakpointOnColumn": "Supprimer le point d'arrêt de la colonne {0}",
 	"removeLineBreakpoint": "Supprimer le point d'arrêt de la ligne",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "Activer le point d'arrêt de la colonne {0}",
 	"enableBreakpointOnLine": "Activer le point d'arrêt de la ligne",
 	"addBreakpoint": "Ajouter un point d'arrêt",
+	"addConditionalBreakpoint": "Ajouter un point d'arrêt conditionnel...",
+	"addLogPoint": "Ajouter un Log Point",
+	"cancel": "Annuler",
 	"addConfiguration": "Ajouter une configuration..."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 3e89fe28373..dc9d0f20d0f 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Afficher les erreurs",
 	"noFolderWorkspaceDebugError": "Impossible de déboguer le fichier actif. Vérifiez qu'il est enregistré sur le disque et qu'une extension de débogage est installée pour ce type de fichier.",
 	"cancel": "Annuler",
-	"DebugTaskNotFound": "preLaunchTask '{0}' introuvable.",
-	"taskNotTracked": "La tâche de prélancement '{0}' n'a pas pu être tracée."
+	"DebugTaskNotFound": "Tâche '{0}' introuvable.",
+	"taskNotTracked": "La tâche '{0}' ne peut pas être tracée."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 8689f3cf375..c3efb42b047 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Informations",
-	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage.",
-	"stoppingDebugAdapter": "{0}. Arrêt de l'adaptateur de débogage.",
 	"debugAdapterCrash": "Le processus de l'adaptateur de débogage s'est terminé de manière inattendue"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 9a38baf2456..11c71d149dc 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "L'exécutable d'adaptateur de débogage '{0}' n'existe pas.",
 	"debugAdapterCannotDetermineExecutable": "Impossible de déterminer l'exécutable pour l'adaptateur de débogage '{0}'.",
-	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
-	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
-	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
-	"debugType": "Type de configuration.",
-	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
-	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
-	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
-	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
-	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
-	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
-	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
-	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
-	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
+	"unableToLaunchDebugAdapter": "Impossible de lancer l'adaptateur de débogage à partir de '{0}'.",
+	"unableToLaunchDebugAdapterNoArgs": "Impossible de lancer l'adaptateur de débogage."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..6d5a247318d
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Utilisez IntelliSense pour en savoir plus sur les attributs possibles.",
+	"launch.config.comment2": "Pointez pour afficher la description des attributs existants.",
+	"launch.config.comment3": "Pour plus d'informations, visitez : {0}",
+	"debugType": "Type de configuration.",
+	"debugTypeNotRecognised": "Le type de débogage n'est pas reconnu. Vérifiez que vous avez installé l'extension de débogage correspondante et qu'elle est activée.",
+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\".",
+	"debugName": "Le nom de la configuration s'affiche dans le menu déroulant de la configuration de lancement.",
+	"debugRequest": "Type de requête de configuration. Il peut s'agir de \"launch\" ou \"attach\".",
+	"debugServer": "Pour le développement d'une extension de débogage uniquement : si un port est spécifié, VS Code tente de se connecter à un adaptateur de débogage s'exécutant en mode serveur",
+	"debugPrelaunchTask": "Tâche à exécuter avant le démarrage de la session de débogage.",
+	"debugPostDebugTask": "Tâche à exécuter après que le débogage se termine.",
+	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
+	"debugOSXConfiguration": "Attributs de configuration de lancement spécifiques à OS X.",
+	"debugLinuxConfiguration": "Attributs de configuration de lancement spécifiques à Linux.",
+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..d7245a4f2e5
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "Console VS Code",
+	"mac.terminal.script.failed": "Échec du script '{0}'. Code de sortie : {1}",
+	"mac.terminal.type.not.supported": "'{0}' non pris en charge",
+	"press.any.key": "Appuyez sur une touche pour continuer...",
+	"linux.term.failed": "Échec de '{0}'. Code de sortie : {1}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 8414cc420ad..0057e22b4a8 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Configurer les extensions recommandées (Dossier d'espace de travail)",
 	"malicious tooltip": "Cette extension a été signalée comme problématique.",
 	"malicious": "Malveillant",
+	"disabled": "Désactivé",
+	"disabled globally": "Désactivé",
+	"disabled workspace": "Désactivé pour cet espace de travail",
 	"disableAll": "Désactiver toutes les extensions installées",
 	"disableAllWorkspace": "Désactiver toutes les extensions installées pour cet espace de travail",
 	"enableAll": "Activer toutes les extension",
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..ecc9b7ee903
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Nom de l'extension",
+	"extension id": "Identificateur d'extension",
+	"preview": "Aperçu",
+	"builtin": "Intégrée",
+	"publisher": "Nom de l'éditeur",
+	"install count": "Nombre d'installations",
+	"rating": "Évaluation",
+	"repository": "Dépôt",
+	"license": "Licence",
+	"details": "Détails",
+	"contributions": "Contributions",
+	"changelog": "Journal des modifications",
+	"dependencies": "Dépendances",
+	"noReadme": "Aucun fichier README disponible.",
+	"noChangelog": "Aucun Changelog disponible.",
+	"noContributions": "Aucune contribution",
+	"noDependencies": "Aucune dépendance",
+	"settings": "Paramètres ({0})",
+	"setting name": "Nom",
+	"description": "Description",
+	"default": "Par défaut",
+	"debuggers": "Débogueurs ({0})",
+	"debugger name": "Nom",
+	"debugger type": "Type",
+	"views": "Vues ({0})",
+	"view id": "ID",
+	"view name": "Nom",
+	"view location": "Emplacement",
+	"localizations": "Localisations ({0})",
+	"localizations language id": "Id de langue",
+	"localizations language name": "Nom de la langue",
+	"localizations localized language name": "Nom de la langue (localisé)",
+	"colorThemes": "Thèmes de couleurs ({0})",
+	"iconThemes": "Thèmes d’icônes ({0})",
+	"colors": "Couleurs ({0})",
+	"colorId": "Id",
+	"defaultDark": "Défaut pour le thème sombre",
+	"defaultLight": "Défaut pour le thème clair",
+	"defaultHC": "Défaut pour le thème de contraste élevé",
+	"JSON Validation": "Validation JSON ({0})",
+	"fileMatch": "Correspondance de fichier",
+	"schema": "Schéma",
+	"commands": "Commandes ({0})",
+	"command name": "Nom",
+	"keyboard shortcuts": "Raccourcis clavier",
+	"menuContexts": "Contextes de menu",
+	"languages": "Langages ({0})",
+	"language id": "ID",
+	"language name": "Nom",
+	"file extensions": "Extensions de fichier",
+	"grammar": "Grammaire",
+	"snippets": "Extraits"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 143075b6592..103a8cee967 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
 	"reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.",
 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
-	"showRecommendations": "Afficher les recommandations",
 	"install": "Installer",
+	"showRecommendations": "Afficher les recommandations",
 	"showLanguageExtensions": "Le Marketplace a des extensions qui peuvent aider avec les fichiers '.{0}'",
 	"workspaceRecommended": "Cet espace de travail a des recommandations d'extension.",
 	"installAll": "Tout installer",
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 60a8451e008..f36787aa87c 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Désactiver les autres mappages de touches ({0}) pour éviter les conflits de combinaisons de touches ?",
 	"yes": "Oui",
-	"no": "Non",
-	"betterMergeDisabled": "L'extension Better Merge est désormais intégrée, l'extension installée est désactivée et peut être désinstallée.",
-	"uninstall": "Désinstaller"
+	"no": "Non"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 518cd664a2e..f395ede0a04 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "Recommandées",
 	"otherRecommendedExtensions": "Autres recommandations",
 	"workspaceRecommendedExtensions": "Recommandations de l’espace de travail",
-	"builtInExtensions": "Intégrée",
+	"builtInExtensions": "Fonctionnalités",
+	"builtInThemesExtensions": "Thèmes",
+	"builtInBasicsExtensions": "Langages de programmation",
 	"searchExtensions": "Rechercher des extensions dans Marketplace",
 	"sort by installs": "Trier par : nombre d'installations",
 	"sort by rating": "Trier par : évaluation",
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index 412d69fb5bf..3d2c988d730 100644
--- a/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "Éditeur de fichier texte",
 	"createFile": "Créer un fichier",
+	"relaunchWithIncreasedMemoryLimit": "Redémarrer avec {0} Mo",
+	"configureMemoryLimit": "Configurer la limite de mémoire",
 	"fileEditorWithInputAriaLabel": "{0}. Éditeur de fichier texte.",
 	"fileEditorAriaLabel": "Éditeur de fichier texte."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 744c7215953..0e64e0d6d54 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,16 +27,18 @@
 	"confirmMoveTrashMessageMultiple": "Êtes-vous sûr de vouloir supprimer les fichiers {0} suivants ?",
 	"confirmMoveTrashMessageFolder": "Voulez-vous vraiment supprimer '{0}' et son contenu ?",
 	"confirmMoveTrashMessageFile": "Voulez-vous vraiment supprimer '{0}' ?",
-	"undoBin": "Vous pouvez effectuer une restauration à partir de la Corbeille.",
-	"undoTrash": "Vous pouvez effectuer une restauration à partir de la Poubelle.",
+	"undoBin": "Vous pouvez restaurer à partir de la Corbeille.",
+	"undoTrash": "Vous pouvez restaurer à partir de la Poubelle.",
 	"doNotAskAgain": "Ne plus me demander",
 	"confirmDeleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer définitivement les fichiers {0} suivants ?",
 	"confirmDeleteMessageFolder": "Voulez-vous vraiment supprimer définitivement '{0}' et son contenu ?",
 	"confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?",
 	"irreversible": "Cette action est irréversible !",
-	"cancel": "Annuler",
-	"permDelete": "Supprimer définitivement",
-	"importFiles": "Importer des fichiers",
+	"binFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place ?",
+	"trashFailed": "Impossible de supprimer en utilisant la corbeille. Voulez-vous supprimer définitivement à la place?",
+	"deletePermanentlyButtonLabel": "Supprimer &&définitivement",
+	"retryButtonLabel": "&&Réessayer",
+	"addFiles": "Ajouter des fichiers",
 	"confirmOverwrite": "Un fichier ou dossier portant le même nom existe déjà dans le dossier de destination. Voulez-vous le remplacer ?",
 	"replaceButtonLabel": "&&Remplacer",
 	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier de destination",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index e5b80a13c44..a75d38efac1 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "Contrôle si les fichiers non enregistrés sont mémorisés entre les sessions, ce qui permet d'ignorer la demande d'enregistrement à la sortie de l'éditeur.",
 	"useExperimentalFileWatcher": "Utilisez le nouvel observateur de fichiers expérimental.",
 	"defaultLanguage": "Mode de langage par défaut affecté aux nouveaux fichiers.",
+	"maxMemoryForLargeFilesMB": "Contrôle la mémoire disponible pour VS Code après redémarrage en essayant d’ouvrir les fichiers volumineux. Cela a le même effet que de spécifier --max-memory=NEWSIZE sur la ligne de commande.",
 	"editorConfigurationTitle": "Éditeur",
 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
+	"formatOnSaveTimeout": "Délai d’attente pour formater lors de l'enregistrement. Spécifie le délai en millisecondes pour les commandes formatOnSave. Les commandes prenant plus de temps que le délai d’attente spécifié seront annulées.",
 	"explorerConfigurationTitle": "Explorateur de fichiers",
 	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts.",
 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index a5adcd52e79..c86f735842b 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Tapez le nom du fichier. Appuyez sur Entrée pour confirmer ou sur Échap pour annuler.",
-	"constructedPath": "Créer {0} dans **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Explorateur de fichiers",
 	"dropFolders": "Voulez-vous ajouter les dossiers à l’espace de travail ?",
 	"dropFolder": "Voulez-vous ajouter le dossier à l’espace de travail ?",
 	"addFolders": "&&Ajouter les dossiers",
 	"addFolder": "&&Ajouter le dossier",
+	"confirmRootsMove": "Êtes-vous sûr de vouloir modifier l’ordre de plusieurs dossiers de la racine dans votre espace de travail ?",
 	"confirmMultiMove": "Êtes-vous sûr de vouloir déplacer les fichiers '{0}' suivants ?",
+	"confirmRootMove": "Êtes-vous sûr de vouloir modifier l’ordre de dossier racine '{0}' dans votre espace de travail ?",
 	"confirmMove": "Êtes-vous certain de vouloir déplacer '{0}' ?",
 	"doNotAskAgain": "Ne plus me demander",
 	"moveButtonLabel": "&&Déplacer",
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..2af49cbd741
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Aperçu HTML"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..eaf9eb82e46
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Entrée d'éditeur non valide."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..dfefdfa0bf8
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Développeur"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..09dc4357050
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Ouvrir les outils de développement Webview",
+	"refreshWebviewLabel": "Recharger les Webviews"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 99d56e82804..9139ee20000 100644
--- a/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Souhaitez-vous changer la langue de l’interface de VS Code en {0} et redémarrer ?",
+	"yes": "Oui",
+	"no": "Non",
+	"neverAgain": "Ne plus afficher",
 	"JsonSchema.locale": "Langue d'interface utilisateur (IU) à utiliser.",
 	"vscode.extension.contributes.localizations": "Contribuer aux localisations de l’éditeur",
 	"vscode.extension.contributes.localizations.languageId": "Id de la langue dans laquelle les chaînes d’affichage sont traduites.",
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..a615adefb9e
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Copier",
+	"copyMessage": "Copier le Message"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..6540dc70d56
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Total de {0} problèmes"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..37f685827c2
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Problèmes",
+	"tooltip.1": "1 problème dans ce fichier",
+	"tooltip.N": "{0} problèmes dans ce fichier",
+	"markers.showOnFile": "Afficher les erreurs & les avertissements sur les fichiers et dossiers."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..ab82f7468d7
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"disableFilesExclude": "Désactiver l'exclusion de fichiers.",
+	"clearFilter": "Effacer le filtre."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..60ed6998077
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"showing filtered problems": "Affichage de {0} de {1}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..9b347a7669b
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,48 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Affichage",
+	"problems.view.toggle.label": "Activer/désactiver les problèmes (Erreurs, Avertissements, Infos)",
+	"problems.view.focus.label": " Focus sur les problèmes (Erreurs, Avertissements, Infos)",
+	"problems.panel.configuration.title": "Affichage des problèmes",
+	"problems.panel.configuration.autoreveal": "Contrôle si l'affichage des problèmes doit automatiquement montrer les fichiers quand il les ouvre",
+	"markers.panel.title.problems": "Problèmes",
+	"markers.panel.aria.label.problems.tree": "Problèmes regroupés par fichiers",
+	"markers.panel.no.problems.build": "Aucun problème n'a été détecté dans l'espace de travail jusqu'à présent.",
+	"markers.panel.no.problems.filters": "Aucun résultat trouvé avec les critères de filtre fourni.",
+	"markers.panel.no.problems.file.exclusions": "Tous les problèmes sont masqués car le filtre d'exclusion de fichiers est activé.",
+	"markers.panel.action.useFilesExclude": "Filtrer en utilisant le paramètre d’exclusion de fichiers",
+	"markers.panel.action.donotUseFilesExclude": "Ne pas utiliser le paramètre d’exclusion de fichiers",
+	"markers.panel.action.filter": "Filtrer les problèmes",
+	"markers.panel.filter.ariaLabel": "Filtrer les problèmes",
+	"markers.panel.filter.placeholder": "Filtre. Par exemple : texte, **/*.ts, !**/node_modules/**",
+	"markers.panel.filter.errors": "erreurs",
+	"markers.panel.filter.warnings": "avertissements",
+	"markers.panel.filter.infos": "infos",
+	"markers.panel.single.error.label": "1 erreur",
+	"markers.panel.multiple.errors.label": "{0} erreurs",
+	"markers.panel.single.warning.label": "1 avertissement",
+	"markers.panel.multiple.warnings.label": "{0} avertissements",
+	"markers.panel.single.info.label": "1 info",
+	"markers.panel.multiple.infos.label": "{0} infos",
+	"markers.panel.single.unknown.label": "1 inconnu",
+	"markers.panel.multiple.unknowns.label": "{0} inconnus",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} avec {1} problèmes",
+	"problems.tree.aria.label.marker.relatedInformation": " Ce problème a des références à {0} emplacements.",
+	"problems.tree.aria.label.error.marker": "Erreur générée par {0} : {1} à la ligne {2} et au caractère {3}. {4}",
+	"problems.tree.aria.label.error.marker.nosource": "Erreur : {0} à la ligne {1} et au caractère {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "Avertissement généré par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Avertissement : {0} à la ligne {1} et au caractère {2}.{3}",
+	"problems.tree.aria.label.info.marker": "Information générée par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Information : {0} à la ligne {1} et au caractère {2}.{3}",
+	"problems.tree.aria.label.marker": "Problème généré par {0} : {1} à la ligne {2} et au caractère {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Problème : {0} à la ligne {1} et au caractère {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0} à la ligne {1} et caractère {2} dans {3}",
+	"errors.warnings.show.label": "Afficher les erreurs et les avertissements"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index d3e62ab1acb..e15ca824e07 100644
--- a/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Activer/désactiver la sortie",
 	"clearOutput": "Effacer la sortie",
 	"toggleOutputScrollLock": "Activer/désactiver l'arrêt du défilement de la sortie",
-	"switchToOutput.label": "Passer à la sortie"
+	"switchToOutput.label": "Passer à la sortie",
+	"openInLogViewer": "Ouvrir le fichier de log"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 1453eaa812b..25674d1f305 100644
--- a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Sortie",
 	"logViewer": "Visualiseur de journal",
 	"viewCategory": "Affichage",
-	"clearOutput.label": "Effacer la sortie"
+	"clearOutput.label": "Effacer la sortie",
+	"openActiveLogOutputFile": "Affichage: Ouvrir le fichier de log de sortie actif"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 10b4d1f5b73..675ad6e2d50 100644
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Raccourcis clavier",
+	"showDefaultKeybindings": "Afficher les raccourcis clavier par défaut",
+	"showUserKeybindings": "Afficher les raccourcis clavier utilisateur",
 	"SearchKeybindings.AriaLabel": "Rechercher dans les combinaisons de touches",
 	"SearchKeybindings.Placeholder": "Rechercher dans les combinaisons de touches",
 	"sortByPrecedene": "Trier par priorité",
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index c0015434d3f..a5e37bb7365 100644
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Ouvrir les paramètres bruts par défaut",
+	"openSettings": "Ouvrir les paramètres",
 	"openGlobalSettings": "Ouvrir les paramètres utilisateur",
 	"openGlobalKeybindings": "Ouvrir les raccourcis clavier",
 	"openGlobalKeybindingsFile": "Ouvrir le fichier des raccourcis clavier",
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 9576e2a4552..6dca29c55a8 100644
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Paramètres par défaut",
 	"SearchSettingsWidget.AriaLabel": "Paramètres de recherche",
 	"SearchSettingsWidget.Placeholder": "Paramètres de recherche",
 	"noSettingsFound": "Aucun résultat",
@@ -16,6 +15,8 @@
 	"nlpResult": "Résultats en langage naturel",
 	"filterResult": "Résultats filtrés",
 	"defaultSettings": "Paramètres par défaut",
+	"defaultUserSettings": "Paramètres utilisateur par défaut",
+	"defaultWorkspaceSettings": "Paramètres de l'espace de travail par défaut",
 	"defaultFolderSettings": "Paramètres de dossier par défaut",
 	"defaultEditorReadonly": "Modifier dans l’éditeur du côté droit pour substituer les valeurs par défaut.",
 	"preferencesAriaLabel": "Préférences par défaut. Éditeur de texte en lecture seule."
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 657d3d560d4..def18c92de6 100644
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Afficher l’Extension \"{0}\"",
 	"editTtile": "Modifier",
 	"replaceDefaultValue": "Remplacer dans les paramètres",
-	"copyDefaultValue": "Copier dans Paramètres",
-	"unsupportedPHPExecutablePathSetting": "Ce paramètre doit être un paramètre utilisateur. Pour configurer PHP pour l'espace de travail, ouvrez un fichier PHP, puis cliquez sur 'Chemin PHP' dans la barre d'état.",
-	"unsupportedWorkspaceSetting": "Ce paramètre doit être un paramètre utilisateur.",
-	"unsupportedWorkbenchSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement.",
-	"unsupportedWorkbenchSettingDevMode": "Ce paramètre ne peut pas s’appliquer maintenant. Il s’appliquera si vous définissez la portée à 'ressource' lors de son inscription, ou lorsque vous ouvrez ce dossier directement."
+	"copyDefaultValue": "Copier dans Paramètres"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 47465e0f5cf..4bae27c08c3 100644
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
 	"no open repo": "Il n’y a aucun fournisseur de contrôle de code source actif.",
 	"source control": "Contrôle de code source",
-	"viewletTitle": "{0} : {1}"
+	"viewletTitle": "{0} : {1}",
+	"hideView": "Masquer"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 675880ca4b7..2598b4942bd 100644
--- a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Afficher le précédent Exclude Pattern de recherche",
 	"nextSearchTerm": "Afficher le terme de recherche suivant",
 	"previousSearchTerm": "Afficher le terme de recherche précédent",
-	"showSearchViewlet": "Afficher la zone de recherche",
 	"findInFiles": "Chercher dans les fichiers",
 	"replaceInFiles": "Remplacer dans les fichiers",
 	"RefreshAction.label": "Actualiser",
diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index dbb8b385ac4..d563780176c 100644
--- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,15 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Rechercher",
+	"copyMatchLabel": "Copier",
+	"copyPathLabel": "Copier le chemin",
+	"copyAllLabel": "Copier tout",
+	"toggleSearchViewPositionLabel": "Basculer la position de la vue de Recherche",
 	"findInFolder": "Rechercher dans le dossier...",
 	"findInWorkspace": "Trouver dans l’espace de travail...",
 	"showTriggerActions": "Atteindre le symbole dans l'espace de travail...",
 	"name": "Rechercher",
-	"search": "Rechercher",
 	"showSearchViewl": "Afficher la zone de recherche",
 	"view": "Affichage",
 	"findInFiles": "Chercher dans les fichiers",
@@ -26,5 +30,5 @@
 	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche.",
 	"search.smartCase": "Recherches de manière non case-sensitive si le modèle est entièrement en minuscules, dans le cas contraire, recherche de manière case-sensitive",
 	"search.globalFindClipboard": "Contrôle si la vue de recherche doit lire ou modifier le presse-papiers partagé sur macOS",
-	"search.location": "Aperçu : contrôle si la recherche est affichée comme une vue dans la barre latérale ou comme un panneau dans la zone correspondante pour libérer de l'espace horizontal. La prochaine version de la recherche dans le panneau prévoit une amélioration de la disposition horizontale qui ne sera plus un aperçu."
+	"search.location": "Contrôle si la recherche s’affichera comme une vue dans la barre latérale ou comme un panneau dans la zone de panneau pour plus d'espace horizontal. La prochaine version de la Recherche dans le panneau aura une meilleure présentation horizontale et cela ne sera plus une preview."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 89d6a7d5a6e..19e27f8073a 100644
--- a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Aidez-nous à améliorer le support de {0}",
 	"takeShortSurvey": "Répondre à une enquête rapide",
 	"remindLater": "Me le rappeler plus tard",
-	"neverAgain": "Ne plus afficher",
-	"helpUs": "Aidez-nous à améliorer le support de {0}"
+	"neverAgain": "Ne plus afficher"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 41963e2a8e9..6f71b2a1bba 100644
--- a/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Acceptez-vous de répondre à une enquête rapide ?",
 	"takeSurvey": "Répondre à l'enquête",
 	"remindLater": "Me le rappeler plus tard",
-	"neverAgain": "Ne plus afficher",
-	"surveyQuestion": "Acceptez-vous de répondre à une enquête rapide ?"
+	"neverAgain": "Ne plus afficher"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index c58795e9606..cb12fed4c55 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Modèle de problème ou bien nom d'un modèle de problème faisant l'objet d'une contribution ou prédéfini. Peut être omis si base est spécifié.",
 	"ProblemMatcherSchema.base": "Nom d'un détecteur de problèmes de correspondance de base à utiliser.",
 	"ProblemMatcherSchema.owner": "Propriétaire du problème dans Code. Peut être omis si base est spécifié. Prend la valeur 'external' par défaut en cas d'omission et si base n'est pas spécifié.",
+	"ProblemMatcherSchema.source": "Une chaîne lisible par humain qui décrit la source de ce diagnostic, par exemple 'typescript' ou 'super lint'.",
 	"ProblemMatcherSchema.severity": "Gravité par défaut des problèmes de capture. Est utilisé si le modèle ne définit aucun groupe de correspondance pour la gravité.",
 	"ProblemMatcherSchema.applyTo": "Contrôle si un problème signalé pour un document texte s'applique uniquement aux documents ouverts ou fermés, ou bien à l'ensemble des documents.",
 	"ProblemMatcherSchema.fileLocation": "Définit la façon dont les noms de fichiers signalés dans un modèle de problème doivent être interprétés.",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 25af594698d..9e767348573 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "N'assigne la tâche à aucun groupe",
 	"JsonSchema.tasks.group": "Définit le groupe d'exécution auquel la tâche appartient. Prend en charge \"build\" pour l'ajouter au groupe de génération et \"test\" pour l'ajouter au groupe de test.",
 	"JsonSchema.tasks.type": "Définit si la tâche est exécutée comme un processus ou comme une commande à l’intérieur d’un shell.",
+	"JsonSchema.command.quotedString.value": "La valeur réelle de la commande",
+	"JsonSchema.tasks.quoting.escape": "Echappe les caractères à l’aide du caractère d’échappement du shell (par exemple: ` sous PowerShell et \\ sous bash).",
+	"JsonSchema.tasks.quoting.strong": "Entoure l’argument en utilisant le caractère guillemet du shell (par exemple: \" sous PowerShell et bash).",
+	"JsonSchema.tasks.quoting.weak": "Entoure l’argument en utilisant le caractère apostrophe du shell (par exemple: ' sous PowerShell et bash).",
+	"JsonSchema.command.quotesString.quote": "Comment la valeur de la commande devrait être donnée.",
+	"JsonSchema.command": "Commande à exécuter. Il peut s'agir d'un programme externe ou d'une commande d'interpréteur de commandes.",
+	"JsonSchema.args.quotedString.value": "La valeur réelle de l’argument",
+	"JsonSchema.args.quotesString.quote": "Comment la valeur de l’argument devrait être donnée.",
+	"JsonSchema.tasks.args": "Arguments passés à la commande quand cette tâche est appelée.",
 	"JsonSchema.tasks.label": "L'étiquette de l’interface utilisateur de la tâche",
 	"JsonSchema.version": "Numéro de version de la configuration.",
 	"JsonSchema.tasks.identifier": "Identificateur défini par l'utilisateur pour référencer la tâche dans launch.json ou une clause dependsOn.",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index b418f7d92e5..87d639c304b 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Tâches",
 	"ConfigureTaskRunnerAction.label": "Configurer une tâche",
+	"totalErrors": "{0} erreurs",
+	"totalWarnings": "{0} avertissements",
+	"totalInfos": "{0} infos",
 	"problems": "Problèmes",
 	"building": "Génération...",
-	"manyMarkers": "99",
+	"manyProblems": "10K+",
 	"runningTasks": "Afficher les tâches en cours d'exécution",
 	"tasks": "Tâches",
 	"TaskSystem.noHotSwap": "Changer le moteur d’exécution de tâches avec une tâche active en cours d’exécution nécessite de recharger la fenêtre",
@@ -28,8 +31,10 @@
 	"selectProblemMatcher": "Sélectionner pour quel type d’erreurs et d’avertissements analyser la sortie de la tâche",
 	"customizeParseErrors": "La configuration de tâche actuelle contient des erreurs. Corrigez-les avant de personnaliser une tâche. ",
 	"moreThanOneBuildTask": "De nombreuses tâches de génération sont définies dans le fichier tasks.json. Exécution de la première.\n",
-	"TaskSystem.activeSame.background": "La tâche '{0}' est déjà active et en mode arrière-plan. Pour la terminer, utiliser `Terminer la Tâche...` dans le menu Tâches.",
-	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active. Pour la terminer, utiliser `Terminer la Tâche...` dans le menu Tâches.",
+	"TaskSystem.activeSame.background": "La tâche '{0}\" est déjà active et en mode arrière-plan.",
+	"TaskSystem.activeSame.noBackground": "La tâche '{0}' est déjà active.",
+	"terminateTask": "Terminer la tâche",
+	"restartTask": "Redémarrer la tâche",
 	"TaskSystem.active": "Une tâche est déjà en cours d'exécution. Terminez-la avant d'exécuter une autre tâche.",
 	"TaskSystem.restartFailed": "Échec de la fin de l'exécution de la tâche {0}",
 	"TaskService.noConfiguration": "Erreur : La détection de la tâche {0} n’a pas contribué à une tâche pour la configuration suivante : {1}, la tâche sera ignorée.\n",
diff --git a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index cc01c3fa1b2..6d14510f43b 100644
--- a/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Warning: options.cwd must be of type string. Ignoring value {0}\n",
+	"ConfigurationParser.inValidArg": "Erreur : l'argument de commande doit être une chaîne ou une chaîne entre apostrophes. La valeur fournie est : \n{0}",
 	"ConfigurationParser.noargs": "Erreur : les arguments de commande doivent correspondre à un tableau de chaînes. La valeur fournie est :\n{0}",
 	"ConfigurationParser.noShell": "Avertissement : La configuration de l'interpréteur de commandes n'est prise en charge que durant l'exécution des tâches dans le terminal.",
 	"ConfigurationParser.noName": "Erreur : le détecteur de problèmes de correspondance dans la portée de déclaration doit avoir un nom :\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Erreur : la configuration de la tâche '{0}' a besoin de la propriété '{1}'. La configuration de la tâche sera ignorée.",
 	"ConfigurationParser.notCustom": "Erreur : la tâche n'est pas déclarée comme une tâche personnalisée. La configuration est ignorée.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Erreur : un tâche doit fournir une propriété label. La tâche va être ignorée.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avertissement : la tâche '{0}' est une commande shell et un de ses arguments peut avoir des espaces non échappés. Afin d’assurer un échappement correct des guillemets dans la ligne de commande, veuillez fusionner les arguments dans la commande.",
 	"taskConfiguration.noCommandOrDependsOn": "Erreur : La tâche '{0}' ne spécifie ni une commande, ni une propriété dependsOn. La tâche est ignorée. Sa définition est :\n{1}",
 	"taskConfiguration.noCommand": "Erreur : La tâche '{0}' ne définit aucune commande. La tâche va être ignorée. Sa définition est :\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Task Version 2.0.0 ne supporte pas les tâches spécifiques globales du système d'exploitation. Convertissez-les en une tâche en une commande spécifique du système d'exploitation. Les tâches concernées sont : {0}"
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..e89604d8194
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "Couleur d'arrière-plan du terminal, permet d'appliquer au terminal une couleur différente de celle du panneau.",
+	"terminal.foreground": "Couleur de premier plan du terminal.",
+	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
+	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
+	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
+	"terminal.border": "Couleur de bordure qui sépare les volets de fractionnement dans le terminal. La valeur par défaut est panel.border.",
+	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 6b1951d0758..827b3155e46 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -21,6 +21,7 @@
 	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
 	"workbench.action.terminal.newInActiveWorkspace": "Créer un nouveau Terminal intégré (dans l'espace de travail actif)",
 	"workbench.action.terminal.split": "Diviser le terminal",
+	"workbench.action.terminal.splitInActiveWorkspace": "Diviser le Terminal (dans l'espace de travail actif)",
 	"workbench.action.terminal.focusPreviousPane": "Focus sur le panneau précédent",
 	"workbench.action.terminal.focusNextPane": "Focus sur le panneau suivant",
 	"workbench.action.terminal.resizePaneLeft": "Redimensionner le panneau vers la gauche",
@@ -43,6 +44,7 @@
 	"workbench.action.terminal.scrollUpPage": "Faire défiler vers le haut (page)",
 	"workbench.action.terminal.scrollToTop": "Faire défiler jusqu'en haut",
 	"workbench.action.terminal.clear": "Effacer",
+	"workbench.action.terminal.clearSelection": "Effacer la sélection",
 	"workbench.action.terminal.allowWorkspaceShell": "Autoriser la configuration de l'interpréteur de commandes de l'espace de travail",
 	"workbench.action.terminal.disallowWorkspaceShell": "Interdire la configuration de l'interpréteur de commandes de l'espace de travail",
 	"workbench.action.terminal.rename": "Renommer",
@@ -51,5 +53,9 @@
 	"workbench.action.terminal.hideFindWidget": "Masquer le widget de recherche",
 	"nextTerminalFindTerm": "Afficher le terme de recherche suivant",
 	"previousTerminalFindTerm": "Afficher le terme de recherche précédent",
-	"quickOpenTerm": "Changer de terminal actif"
+	"quickOpenTerm": "Changer de terminal actif",
+	"workbench.action.terminal.scrollToPreviousCommand": "Faire défiler jusqu'à la commande précédente",
+	"workbench.action.terminal.scrollToNextCommand": "Faire défiler jusqu'à la prochaine commande",
+	"workbench.action.terminal.selectToPreviousCommand": "Sélectionnez pour la commande précédente",
+	"workbench.action.terminal.selectToNextCommand": "Sélectionnez pour la commande suivante"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 023dce563db..8ba26f8e07a 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copier",
+	"split": "Diviser",
 	"paste": "Coller",
 	"selectAll": "Tout Sélectionner",
-	"clear": "Effacer",
-	"split": "Diviser"
+	"clear": "Effacer"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index a4dbf23f4f2..ebee0e36848 100644
--- a/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Cet espace de travail contient des paramètres qui ne peuvent être définis que dans les paramètres utilisateur ({0}). Cliquez [ici]({1}) pour en savoir plus.",
 	"openWorkspaceSettings": "Ouvrir les paramètres d'espace de travail",
-	"dontShowAgain": "Ne plus afficher",
-	"unsupportedWorkspaceSettings": "Cet espace de travail contient des paramètres qui ne peuvent être définis que dans les paramètres utilisateur ({0}). Cliquez [ici]({1}) pour en savoir plus."
+	"dontShowAgain": "Ne plus afficher"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..68cda1a5f01
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Notes de publication : {0}",
+	"unassigned": "non assigné"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 0a4355e2acf..1c0f5e94e48 100644
--- a/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Plus tard",
-	"unassigned": "non assigné",
 	"releaseNotes": "Notes de publication",
 	"showReleaseNotes": "Afficher les notes de publication",
 	"read the release notes": "Bienvenue dans {0} v{1} ! Voulez-vous lire les notes de publication ?",
@@ -17,13 +15,14 @@
 	"updateIsReady": "Nouvelle mise à jour de {0} disponible.",
 	"noUpdatesAvailable": "Aucune mise à jour n'est disponible actuellement.",
 	"ok": "OK",
-	"download now": "Télécharger maintenant",
 	"thereIsUpdateAvailable": "Une mise à jour est disponible.",
-	"installUpdate": "Installer la mise à jour",
+	"download now": "Télécharger maintenant",
+	"later": "Plus tard",
 	"updateAvailable": "Il y a une mise à jour disponible : {0} {1}",
+	"installUpdate": "Installer la mise à jour",
 	"updateInstalling": "{0} {1} est en train d'être installé en arrière-plan, nous vous ferons savoir quand c’est fini.",
+	"updateAvailableAfterRestart": "Redémarrer {0} pour appliquer la dernière mise à jour.",
 	"updateNow": "Mettre à jour maintenant",
-	"updateAvailableAfterRestart": "{0} sera mis à jour après avoir redémarré.",
 	"commandPalette": "Palette de commandes...",
 	"settings": "Paramètres",
 	"keyboardShortcuts": "Raccourcis clavier",
diff --git a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..da5ba7cccbd
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "éditeur webview",
+	"developer": "Développeur"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..09dc4357050
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Ouvrir les outils de développement Webview",
+	"refreshWebviewLabel": "Recharger les Webviews"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..f34ed7abe61
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Aidez-nous à améliorer VS Code en permettant à Microsoft de recueillir des données d’utilisation. Lisez notre [déclaration sur la vie privée]({0}) et apprenez comment [se désengager]({1}).",
+	"telemetryOptOut.optInNotice": "Aidez-nous à améliorer VS Code en permettant à Microsoft de recueillir des données d’utilisation. Lisez notre [déclaration sur la vie privée]({0})  et apprenez comment [se désengager]({1}).",
+	"telemetryOptOut.readMore": "Lire la suite"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
index a6000329037..6a31ba50230 100644
--- a/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
@@ -13,6 +13,7 @@
 	"welcomeOverlay.extensions": "Gérer les extensions",
 	"welcomeOverlay.problems": "Afficher les erreurs et avertissements",
 	"welcomeOverlay.commandPalette": "Rechercher et exécuter toutes les commandes",
+	"welcomeOverlay.notifications": "Afficher les notifications",
 	"welcomeOverlay": "Vue d'ensemble de l'interface utilisateur",
 	"hideWelcomeOverlay": "Masquer la vue d'ensemble de l'interface",
 	"help": "Aide"
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 2e114c616c5..25e95767831 100644
--- a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,8 @@
 	"welcomePage.installExtensionPacks": "Outils et langages",
 	"welcomePage.installExtensionPacksDescription": "Installer un support pour {0} et {1}",
 	"welcomePage.moreExtensions": "plus",
-	"welcomePage.installKeymapDescription": "Installer les raccourcis clavier",
-	"welcomePage.installKeymapExtension": "Installer les raccourcis clavier de {0} et {1}",
+	"welcomePage.installKeymapDescription": "Paramètres et combinaisons de touches",
+	"welcomePage.installKeymapExtension": "Installer les paramètres et les raccourcis clavier de {0} et {1}",
 	"welcomePage.others": "autres",
 	"welcomePage.colorTheme": "Thème de couleur",
 	"welcomePage.colorThemeDescription": "Personnalisez l'apparence de l'éditeur et de votre code",
diff --git a/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
index bce1f4235aa..dc4ae0dbd9a 100644
--- a/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"vscode.extension.contributes.configuration.title": "Résumé des paramètres. Cette étiquette va être utilisée dans le fichier de paramètres en tant que commentaire de séparation.",
 	"vscode.extension.contributes.configuration.properties": "Description des propriétés de configuration.",
+	"scope.application.description": "Configuration spécifique de l'application, qui peut être configurée uniquement dans les paramètres utilisateur.",
 	"scope.window.description": "Configuration spécifique de la fenêtre, qui peut être configurée dans les paramètres utilisateur ou de l'espace de travail.",
 	"scope.resource.description": "Configuration spécifique de la ressource, qui peut être configurée dans les paramètres utilisateur, de l'espace de travail ou du dossier.",
 	"scope.description": "Portée dans laquelle la configuration s’applique. Les portées disponibles sont `window` et `resource`.",
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
index 0c4ab4d6564..9b731129c27 100644
--- a/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
@@ -11,6 +11,7 @@
 	"open": "Ouvrir les paramètres",
 	"saveAndRetry": "Enregistrer et Réessayer",
 	"errorUnknownKey": "Impossible d’écrire dans {0} car {1} n’est pas une configuration recommandée.",
+	"errorInvalidWorkspaceConfigurationApplication": "Impossible d’écrire {0} dans paramètres de l’espace de travail. Ce paramètre peut être écrit uniquement dans les paramètres de l’utilisateur.",
 	"errorInvalidFolderConfiguration": "Impossible d’écrire dans les paramètres de dossier parce que {0} ne supporte pas la portée de ressource de dossier.",
 	"errorInvalidUserTarget": "Impossible d’écrire dans les paramètres utilisateur parce que {0} ne supporte pas de portée globale.",
 	"errorInvalidWorkspaceTarget": "Impossible d’écrire dans les paramètres de l’espace de travail car {0} ne supporte pas de portée d’espace de travail dans un espace de travail multi dossiers.",
diff --git a/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..c28d44842af
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedApplicationSetting": "Ce paramètre ne peut être appliqué que dans les paramètres utilisateur",
+	"unsupportedWindowSetting": "Ce paramètre ne peut pas être appliqué maintenant. Il est appliqué quand vous ouvrez ce dossier directement."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..e5809c2c66f
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "'${workspaceFolder}' ne peut pas être résolu dans un espace de travail de dossiers multiples. Gérer la portée de cette variable en utilisant ':' et un nom de dossier d’espace de travail.",
+	"canNotResolveWorkspaceFolder": "'${workspaceFolder}' ne peut pas être résolu. Veuillez ouvrir un dossier.",
+	"canNotResolveFolderBasenameMultiRoot": "'${workspaceFolderBasename}' ne peut pas être résolu dans un espace de travail de dossiers multiples. Gérer la portée de cette variable en utilisant ':' et un nom de dossier d’espace de travail.",
+	"canNotResolveFolderBasename": "'${workspaceFolderBasename}' ne peut pas être résolu. Veuillez ouvrir un dossier.",
+	"canNotResolveLineNumber": "'${lineNumber}' ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveSelectedText": "'${selectedText}' ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveFile": "${file} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveRelativeFile": "${relativeFile} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveFileDirname": "${fileDirname} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveFileExtname": "${fileExtname} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveFileBasename": "${fileBasename} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur.",
+	"canNotResolveFileBasenameNoExtension": "${fileBasenameNoExtension} ne peut pas être résolu. Veuillez s’il vous plaît ouvrir un éditeur."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..ad189dada97
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Oui",
+	"cancelButton": "Annuler"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
index 0e26b3fa0ff..f79185e93b2 100644
--- a/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
@@ -6,10 +6,12 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"vscode.extension.engines": "Compatibilité de moteur.",
 	"vscode.extension.engines.vscode": "Pour les extensions VS Code, spécifie la version de VS Code avec laquelle l'extension est compatible. Ne peut pas être *. Exemple : ^0.10.5 indique une compatibilité avec la version minimale 0.10.5 de VS Code.",
 	"vscode.extension.publisher": "Éditeur de l'extension VS Code.",
 	"vscode.extension.displayName": "Nom d'affichage de l'extension utilisée dans la galerie VS Code.",
 	"vscode.extension.categories": "Catégories utilisées par la galerie VS Code pour catégoriser l'extension.",
+	"vscode.extension.category.languages.deprecated": "Utiliser 'Langages de programmation' à la place",
 	"vscode.extension.galleryBanner": "Bannière utilisée dans le marketplace VS Code.",
 	"vscode.extension.galleryBanner.color": "Couleur de la bannière de l'en-tête de page du marketplace VS Code.",
 	"vscode.extension.galleryBanner.theme": "Thème de couleur de la police utilisée dans la bannière.",
@@ -28,6 +30,8 @@
 	"vscode.extension.badges.url": "URL de l'image du badge.",
 	"vscode.extension.badges.href": "Lien du badge.",
 	"vscode.extension.badges.description": "Description du badge.",
+	"vscode.extension.markdown": "Contrôle le moteur de rendu de Markdown utilisé sur le marché. Github (par défaut) ou standard.",
+	"vscode.extension.qna": "Contrôle le lien Q&A sur le marché. Mettre à marketplace pour activer le site  de Q&A du Marketplace par défaut. Mettre une chaîne pour fournir l’URL d’un site personnalisé de Q&A. Mettre à false pour désactiver complètement les Q&A.",
 	"vscode.extension.extensionDependencies": "Dépendances envers d'autres extensions. L'identificateur d'une extension est toujours ${publisher}.${name}. Exemple : vscode.csharp.",
 	"vscode.extension.scripts.prepublish": "Le script exécuté avant le package est publié en tant qu'extension VS Code.",
 	"vscode.extension.scripts.uninstall": "Désinstallez le crochet pour l'extension VS Code. Script exécuté quand l'extension est complètement désinstallée dans VS Code et au redémarrage de VS Code (arrêt, puis démarrage). Seuls les scripts Node sont pris en charge.",
diff --git a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 2a4ba8f78bb..7604f9ffac7 100644
--- a/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -6,9 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionsDisabled": "Toutes les extensions sont désactivées.",
 	"extensionHostProcess.crash": "L'hôte d’extension s'est arrêté de manière inattendue.",
 	"extensionHostProcess.unresponsiveCrash": "L'hôte d'extension s'est arrêté, car il ne répondait pas.",
-	"devTools": "Outils de développement",
+	"devTools": "Ouvrir les outils de développement",
 	"restart": "Redémarrer l’hôte d'extension",
 	"overwritingExtension": "Remplacement de l'extension {0} par {1}.",
 	"extensionUnderDevelopment": "Chargement de l'extension de développement sur {0}",
diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index d1cd27ab59c..bd1e8163634 100644
--- a/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,24 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5 est obligatoire. Suivez le lien pour l'installer.",
 	"installNet": "Télécharger .NET Framework 4.5",
 	"neverShowAgain": "Ne plus afficher",
-	"netVersionError": "Microsoft .NET Framework 4.5 est obligatoire. Suivez le lien pour l'installer.",
+	"enospcError": "{0} n’est pas en mesure de surveiller les modifications de fichiers dans ce grand espace de travail. Veuillez suivre le lien d'instructions pour résoudre ce problème.",
 	"learnMore": "Instructions",
-	"enospcError": "{0} est à court de mémoire pour les fichiers. Veuillez suivre le lien avec les instructions pour résoudre ce problème.",
+	"fileInvalidPath": "Ressource de fichier non valide ({0})",
+	"fileIsDirectoryError": "Le fichier est un répertoire",
+	"fileNotModifiedError": "Fichier non modifié depuis",
+	"fileTooLargeForHeapError": "Pour ouvrir un fichier de cette taille, vous devez redémarrer VS Code et lui permettre d’utiliser plus de mémoire",
+	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
+	"fileNotFoundError": "Fichier introuvable ({0})",
+	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
+	"filePermission": "Autorisation refusée en écrivant dans le fichier ({0})",
+	"fileExists": "Le fichier à créer existe déjà ({0})",
+	"fileModifiedError": "Fichier modifié depuis",
+	"fileReadOnlyError": "Fichier en lecture seule",
+	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
+	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
 	"binFailed": "Échec du déplacement de '{0}' vers la corbeille",
 	"trashFailed": "Échec du déplacement de '{0}' vers la corbeille"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 2908555a1fa..d783ab341de 100644
--- a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Fichier introuvable ({0})",
 	"fileIsDirectoryError": "Le fichier est un répertoire",
 	"fileNotModifiedError": "Fichier non modifié depuis",
 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte"
diff --git a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
index 50072355f39..c9a4fd144cd 100644
--- a/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Ressource de fichier non valide ({0})",
 	"fileIsDirectoryError": "Le fichier est un répertoire",
 	"fileNotModifiedError": "Fichier non modifié depuis",
-	"fileTooLargeForHeapError": "La taille du ficher dépasse la limite de mémoire, veuillez essayer d'exécuter  code --max-memory=NEWSIZE",
 	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
 	"fileNotFoundError": "Fichier introuvable ({0})",
 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
diff --git a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index 5ee1cc9aa2b..85206812111 100644
--- a/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0} : {1}"
+	"progress.title": "{0} : {1}",
+	"cancel": "Annuler"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index abfb642e45b..e3c83da3c2d 100644
--- a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "Nom de portée TextMate utilisé par le fichier tmLanguage.",
 	"vscode.extension.contributes.grammars.path": "Chemin du fichier tmLanguage. Le chemin est relatif au dossier d'extensions et commence généralement par './syntaxes/'.",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "Mappage du nom de portée à l'ID de langage si cette grammaire contient des langages incorporés.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Un mappage entre un nom d'étendue et des types de token.",
 	"vscode.extension.contributes.grammars.injectTo": "Liste de noms des portées de langage auxquelles cette grammaire est injectée."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 9cabecf7e05..006e800804b 100644
--- a/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
 	"invalid.injectTo": "Valeur non valide dans 'contributes.{0}.injectTo'. Il doit s'agir d'un tableau de noms de portées de langage. Valeur fournie : {1}",
 	"invalid.embeddedLanguages": "Valeur non valide dans 'contributes.{0}.embeddedLanguages'. Il doit s'agir d'un mappage d'objets entre le nom de portée et le langage. Valeur fournie : {1}",
+	"invalid.tokenTypes": "Valeur non valide dans 'contribue.{0}.tokenTypes'. Il doit s'agir d'un mappage d’objets entre un nom d’étendue et un type de jeton. Valeur fournie : {1}",
 	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
 	"no-tm-grammar": "Aucune grammaire TM n'est inscrite pour ce langage."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..762d665d83d
--- /dev/null
+++ b/i18n/hun/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS nyelvi szerver",
+	"folding.start": "Összecsukható tartomány kezdete",
+	"folding.end": "Összecsukható tartomány vége"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css-language-features/package.i18n.json b/i18n/hun/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..aadc8f5c6ff
--- /dev/null
+++ b/i18n/hun/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás CSS-, LESS- és SCSS-fájlokhoz.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
+	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
+	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
+	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
+	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
+	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
+	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
+	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
+	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
+	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
+	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
+	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
+	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
+	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
+	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
+	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
+	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
+	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
+	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
+	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
+	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
+	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
+	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
+	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/css/package.i18n.json b/i18n/hun/extensions/css/package.i18n.json
index aadc8f5c6ff..804a00791e0 100644
--- a/i18n/hun/extensions/css/package.i18n.json
+++ b/i18n/hun/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás CSS-, LESS- és SCSS-fájlokhoz.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"css.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"css.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"css.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"css.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"css.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"css.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"css.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"css.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"css.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"css.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"css.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"css.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"css.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"css.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"css.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"css.trace.server.desc": "A VS Code és a CSS nyelvi szerver közötti kommunikáció naplózása.",
-	"css.validate.title": "Meghatározza a CSS-validáció működését és a problémák súlyosságát.",
-	"css.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"less.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"less.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"less.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"less.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"less.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"less.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"less.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"less.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"less.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"less.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"less.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"less.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"less.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"less.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"less.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"less.validate.title": "Meghatározza a LESS-validáció működését és a problémák súlyosságát.",
-	"less.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Nem megfelelő számú paraméter",
-	"scss.lint.boxModel.desc": "A width és a height tulajdonság kerülése a padding és a border tulajdonság használata esetén",
-	"scss.lint.compatibleVendorPrefixes.desc": "Gyártóspecifikus előtag használata esetén minden más gyártóspecifikus tulajdonságot is meg kell adni",
-	"scss.lint.duplicateProperties.desc": "Duplikált stílusdefiníciók kerülése",
-	"scss.lint.emptyRules.desc": "Üres szabályhalmazok kerülése",
-	"scss.lint.float.desc": "A float tulajdonságérték kerülése, mivel könnyen váratlan eredményt idézhet elő az elrendezés változásakor.",
-	"scss.lint.fontFaceProperties.desc": "A @font-face szabályokban az src és a font-family tulajdonságot is definiálni kell",
-	"scss.lint.hexColorLength.desc": "A hexadecimális formában megadott színeknek három vagy hat hexadecimális számjegyből kell állniuk",
-	"scss.lint.idSelector.desc": "A szelektorok nem tartalmazhatnak azonosítókat, mivel az ilyen szabályok túl szorosan kötődnek a HTML-hez.",
-	"scss.lint.ieHack.desc": "Az IE hangolása csak az IE7 vagy régebbi verziók támogatása esetén szükséges",
-	"scss.lint.important.desc": "Az !important attribútum mellőzése. Az attribútum jelenléte arra utal, hogy a CSS-struktúra átláthatatlanná vált, és refaktorálásra szorul.",
-	"scss.lint.importStatement.desc": "Ne töltődjenek párhuzamosan az importálási utasítások",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "A megjelenítési mód miatt a megjelenítőkomponensek nem fogják figyelembe venni a tulajdonságot. Ha például a display tulajdonság értéke inline, akkor a megjelenítők figyelmen kívül hagyják a width, a height, a margin-top, a margin-bottom és a float tulajdonságot.",
-	"scss.lint.universalSelector.desc": "Az univerzális szelektor (*) lassú működést eredményez",
-	"scss.lint.unknownProperties.desc": "Ismeretlen tulajdonság.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Ismeretlen gyártóspecifikus tulajdonság.",
-	"scss.lint.vendorPrefix.desc": "Gyártóspecifikus előtagok használata esetén az adott tulajdonság szabványos változatát is meg kell adni",
-	"scss.lint.zeroUnits.desc": "A 0 értékhez nem szükséges mértékegység",
-	"scss.validate.title": "Meghatározza az SCSS-validáció működését és a problémák súlyosságát.",
-	"scss.validate.desc": "Összes validálás engedélyezése vagy letiltása",
-	"less.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"scss.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"css.colorDecorators.enable.deprecationMessage": "Az `css.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"scss.colorDecorators.enable.deprecationMessage": "Az `scss.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"less.colorDecorators.enable.deprecationMessage": "A `less.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+	"displayName": "CSS nyelvi alapok",
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a CSS-, LESS- és SCSS-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/emmet/package.i18n.json b/i18n/hun/extensions/emmet/package.i18n.json
index 8809e7dca73..0445f7ccce3 100644
--- a/i18n/hun/extensions/emmet/package.i18n.json
+++ b/i18n/hun/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Emmet-profilokat és -kódtöredékeket tartalmazó mappa elérési útja.",
 	"emmetShowExpandedAbbreviation": "Kibontott Emmet-rövidítések megjelenítése javaslatként. Az \"inMarkupAndStylesheetFilesOnly\" beállítás csak a html, haml, jade, slim, xml, xsl, css, scss, sass, less és stylus típusú tartalmat jelenti. Az \"always\" beállítás a fájl összes részére vonatkozik a jelölőnyelvtől/css-től függetlenül.",
 	"emmetShowAbbreviationSuggestions": "Lehetséges Emmet-rövidítések megjelenítése javaslatként. Nem használható a stíluslapokon vagy ha az emmet.showExpandedAbbreviation értéke \"never\".",
-	"emmetIncludeLanguages": "Emmet-rövidítések engedélyezése olyan nyelvek esetében, amelyek alapértelmezés szerint nem támogatottak. Egy megfeleltetést kell felvenni a nyelv és egy emmet által támogatott nyelv között.\nPl.: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Az Emmet-kódrészletekben használt változók",
 	"emmetTriggerExpansionOnTab": "Ha engedélyezve van, akkor az Emmet-rövidítések a Tab billentyű lenyomásával bonthatók ki.",
 	"emmetPreferences": "Beállítások, melyek módosítják az Emmet műveleteinek és feloldó algoritmusainak viselkedését.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'webkit' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'webkit' előtagot használni.",
 	"emmetPreferencesCssMozProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'moz' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'moz' előtagot használni.",
 	"emmetPreferencesCssOProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'o' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'o' előtagot használni.",
-	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni."
+	"emmetPreferencesCssMsProperties": "CSS-tulajdonságok vesszővel ellátott listája, melyek 'ms' gyártói előtagot kapnak azoknál az Emmet-rövidtéseknél, melyek `-` karakterrel kezdődnek. Állítsa üres szövegre, ha soha nem szeretne 'ms' előtagot használni.",
+	"emmetPreferencesCssFuzzySearchMinScore": "A minimális pontszám (0-tól 1-ig), amit egy fuzzy keresési találatnak el kell érnie. Az alacsonyabb értékek álpozitív találatokat eredményezhetnek, míg a magasabb értékek szűkítik a lehetséges találatok számát."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/git/out/commands.i18n.json b/i18n/hun/extensions/git/out/commands.i18n.json
index b06c2c09402..9c1a3de3b6c 100644
--- a/i18n/hun/extensions/git/out/commands.i18n.json
+++ b/i18n/hun/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.",
 	"pick remote": "Válassza ki a távoli szervert, ahová publikálni szeretné a(z) '{0}' ágat:",
-	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}'.",
+	"sync is unpredictable": "Ez a művelet pusholja és pullozza a commitokat a következő helyről: '{0}/{1}'.",
 	"never again": "Rendben, ne jelenjen meg újra",
 	"no remotes to publish": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová publikálni lehetne.",
 	"no changes stash": "Nincs elrakandó módosítás.",
diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json
index 71a958c4b2c..d2831b61da5 100644
--- a/i18n/hun/extensions/git/package.i18n.json
+++ b/i18n/hun/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Meghatározza, hogy megjelenjen-e a sorok között egy 'Fájl megnyitása' művelet a git változások nézetén.",
 	"config.inputValidation": "Meghatározza, hogy mikor jelenjen meg a beadási üzenet validálása.",
 	"config.detectSubmodules": "Meghatározza, hogy automatikusan fel legyenek-e derítve a git almodulok.",
+	"config.detectSubmodulesLimit": "Korlátozza a felderített git almodulok számát.",
 	"colors.modified": "A módosított erőforrások színe.",
 	"colors.deleted": "A törölt erőforrások színe.",
 	"colors.untracked": "A nem követett erőforrások színe.",
diff --git a/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..8b705a97409
--- /dev/null
+++ b/i18n/hun/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML nyelvi szerver",
+	"folding.start": "Összecsukható tartomány kezdete",
+	"folding.end": "Összecsukható tartomány vége"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html-language-features/package.i18n.json b/i18n/hun/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..c4e070a679d
--- /dev/null
+++ b/i18n/hun/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás HTML-, Razor- és Handlebar-fájlokhoz.",
+	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
+	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
+	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
+	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
+	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
+	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
+	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
+	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
+	"html.format.endWithNewline.desc": "Lezárás új sorral.",
+	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
+	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
+	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
+	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
+	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
+	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
+	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
+	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
+	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
+	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
+	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
+	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
+	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/html/package.i18n.json b/i18n/hun/extensions/html/package.i18n.json
index 8718becb266..bb0ee17f709 100644
--- a/i18n/hun/extensions/html/package.i18n.json
+++ b/i18n/hun/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás HTML-, Razor- és Handlebar-fájlokhoz.",
-	"html.format.enable.desc": "Alapértelmezett HTML-formázó engedélyezése vagy letiltása.",
-	"html.format.wrapLineLength.desc": "Maximális karakterszám soronként (0 = letiltás)",
-	"html.format.unformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a https://www.w3.org/TR/html5/dom.html#phrasing-content oldalon listázott elemek lesznek használva.",
-	"html.format.contentUnformatted.desc": "Azon elemek vesszővel elválasztott listája, melyek ne legyenek újraformázva. 'null' érték esetén a 'pre' tag lesz használva.",
-	"html.format.indentInnerHtml.desc": "<head>- és <body>-szakaszok indentálása.",
-	"html.format.preserveNewLines.desc": "Az elemek előtt lévő sortörések meg legyenek-e hagyva. Csak elemek előtt működik, elemek belsejében vagy szövegben nem.",
-	"html.format.maxPreserveNewLines.desc": "Az egymás után megőrzött sortörések maximális száma. Ha nem szeretné korlátozni, használja a 'null' értéket!",
-	"html.format.indentHandlebars.desc": "{{#foo}} és {{/foo}} formázása és indentálása.",
-	"html.format.endWithNewline.desc": "Lezárás új sorral.",
-	"html.format.extraLiners.desc": "Azon elemek veszővel elválasztott listája, amelyek előtt lennie kell egy extra új sornak. 'null' érték esetén a \"head,body,/html\" érték van használva.",
-	"html.format.wrapAttributes.desc": "Attribútumok tördelése.",
-	"html.format.wrapAttributes.auto": "Az attribútumok csak akkor vannak tördelve, ha a sorhossz túl lett lépve.",
-	"html.format.wrapAttributes.force": "Minden egyes attribútum tördelve van, kivéve az elsőt.",
-	"html.format.wrapAttributes.forcealign": "Minden egyes attribútum tördelve van, kivéve az elsőt, és igazítva vannak.",
-	"html.format.wrapAttributes.forcemultiline": "Minden egyes attribútum tördelve van.",
-	"html.suggest.angular1.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Angular V1 elemeket és tulajdonságokat.",
-	"html.suggest.ionic.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e Ionic elemeket, tulajdonságokat és értékeket.",
-	"html.suggest.html5.desc": "Meghatározza, hogy a beépített HTML nyelvi támogatás ajánl-e HTML5-ös elemeket, tulajdonságokat és értékeket.",
-	"html.trace.server.desc": "A VS Code és a HTML nyelvi szerver közötti kommunikáció naplózása.",
-	"html.validate.scripts": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott parancsafájlokat.",
-	"html.validate.styles": "Meghatározza, hogy a beépített HTML nyelvi támogatás validálja-e a beágyazott stílusfájlokat.",
-	"html.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
-	"html.autoClosingTags": "HTML-elemek automatikus lezárásának engedélyezése vagy tetiltása."
+	"displayName": "HTML nyelvi alapok",
+	"description": "Szintaktikai kiemelést, összetartozó zárójelek kezelését és kódtöredékeket szolgáltat a HTML-fájlokhoz."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..7651ab518e4
--- /dev/null
+++ b/i18n/hun/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON nyelvi szerver"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json-language-features/package.i18n.json b/i18n/hun/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..ddfd0e82d10
--- /dev/null
+++ b/i18n/hun/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
+	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
+	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
+	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
+	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
+	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
+	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
+	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
+	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
+	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/json/package.i18n.json b/i18n/hun/extensions/json/package.i18n.json
index a4504577c67..55ffac6d3dd 100644
--- a/i18n/hun/extensions/json/package.i18n.json
+++ b/i18n/hun/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON nyelvi funkciók",
-	"description": "Széleskörű nyelvi támogatás JSON-fájlokhoz.",
-	"json.schemas.desc": "Sémák hozzárendelése JSON-fájlokhoz a jelenlegi projektben",
-	"json.schemas.url.desc": "Egy séma URL-címe vagy egy séma relatív elérési útja az aktuális könyvtárban",
-	"json.schemas.fileMatch.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva.",
-	"json.schemas.fileMatch.item.desc": "Fájlminták tömbje, amely a JSON-fájlok sémákhoz való rendelésénél van használva. Tartalmazhat '*'-ot.",
-	"json.schemas.schema.desc": "Az adott URL-cím sémadefiníciója. A sémát csak a séma URL-címéhez való fölösleges lekérdezések megakadályozása érdekében kell megadni.",
-	"json.format.enable.desc": "Alapértelmezett JSON-formázó engedélyezése vagy letiltása (újraindítást igényel)",
-	"json.tracing.desc": "A VS Code és a JSON nyelvi szerver közötti kommunikáció naplózása.",
-	"json.colorDecorators.enable.desc": "Színdekorátorok engedélyezése vagy letiltása",
-	"json.colorDecorators.enable.deprecationMessage": "A `json.colorDecorators.enable` beállítás elavult az `editor.colorDecorators` bevezetése miatt.",
-	"json.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása."
+	"displayName": "JSON nyelvi alapok",
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a JSON-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..9eab0fec461
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "A 'markdown.styles' nem tölthető be: {0}"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..a7a0c887484
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Előnézet] {0}",
+	"previewTitle": "{0} előnézete"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..0a920063d63
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "A tartalom egy része le van tiltva az aktuális dokumentumban",
+	"preview.securityMessage.title": "Potencionálisan veszélyes vagy nem biztonságos tartalom lett letiltva a markdown-előnézetben. Módosítsa a markdown-előnézet biztonsági beállításait a nem biztonságos tartalmak vagy parancsfájlok engedélyezéséhez!",
+	"preview.securityMessage.label": "Biztonsági figyelmeztetés: tartalom le van tiltva"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/out/security.i18n.json b/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..19ebd5b969e
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Szigorú",
+	"strict.description": "Csak biztonságos tartalmak betöltése",
+	"insecureLocalContent.title": "Nem biztonságos helyi tartalom engedélyezése",
+	"insecureContent.title": "Nem biztonságos tartalom engedélyezése",
+	"insecureContent.description": "Tartalom betöltésének engedélyezése HTTP-n keresztül.",
+	"disable.title": "Letiltás",
+	"disable.description": "Minden tartalom és parancsfájl futtatásának engedélyezése. Nem ajánlott.",
+	"moreInfo.title": "További információ",
+	"enableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések engedélyezése ezen a munkaterületen",
+	"disableSecurityWarning.title": "Előnézettel kapcsolatos biztonsági figyelmeztetések letiltása ezen a munkaterületen",
+	"toggleSecurityWarning.description": "Nem befolyásolja a tartalom biztonsági szintjét",
+	"preview.showPreviewSecuritySelector.title": "Válassza ki a munkaterület Markdown-előnézeteinek biztonsági beállítását!"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/markdown-language-features/package.i18n.json b/i18n/hun/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..5e8a8541227
--- /dev/null
+++ b/i18n/hun/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás Markdown-fájlokhoz.",
+	"markdown.preview.breaks.desc": "Meghatározza, hogy a sortörések hogyan vannak megjelenítve a markdown-előnézetben. Ha az értéke 'true', akkor minden egyes újsor esetén <br> jön létre.",
+	"markdown.preview.linkify": "URL-szerű szövegek hivatkozássá alakításának engedélyezése vagy letiltása a markdown-előnézetben.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Kattintson duplán a markdown-előnézetre a szerkesztőre való átváltáshoz.",
+	"markdown.preview.fontFamily.desc": "Meghatározza a markdown-előnézeten használt betűkészletet.",
+	"markdown.preview.fontSize.desc": "Meghatározza a markdown-előnézet betűméretét, pixelekben.",
+	"markdown.preview.lineHeight.desc": "Meghatározza a markdown-előnézeten használt sormagasságot. Az érték relatív a betűmérethez képest.",
+	"markdown.preview.markEditorSelection.desc": "Az aktuális kijelölés megjelölése a markdown-előnézeten",
+	"markdown.preview.scrollEditorWithPreview.desc": "Amikor a markdown-előnézetet görgetik, a szerkesztőnézet is aktualizálódik",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Amikor a markdown-szerkesztőnézetet görgetik, az előnézet is aktualizálódik.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Elavult] A markdown-előnézetet úgy görgeti, hogy látni lehessen az aktuálisan kijelölt sort.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Ezt a beállítást leváltotta a 'markdown.preview.scrollPreviewWithEditor' beállítás, és már nincs hatása.",
+	"markdown.preview.title": "Előnézet megnyitása",
+	"markdown.previewFrontMatter.dec": "Meghatározza, hogy a YAML konfiguráció (front matter) hogyan legyen megjelenítve a markdown-előnézetben. A 'hide' elrejti a konfigurációt, minden más esetben a front matter markdown-tartalomként van kezelve.",
+	"markdown.previewSide.title": "Előnézet megnyitása oldalt",
+	"markdown.showLockedPreviewToSide.title": "Rögzített előnézet megnyitása oldalt",
+	"markdown.showSource.title": "Forrás megjelenítése",
+	"markdown.styles.dec": "CSS-stíluslapok URL-címeinek vagy helyi elérési útjainak listája, amelyek a markdown-előnézeten használva vannak. A relatív elérési utak az intézőben megnyitott mappához képest vannak relatívan értelmezve. Ha nincs mappa megnyitva, akkor a markdown-fájl elréséi útjához képest. Minden '\\' karaktert '\\\\' formában kell megadni.",
+	"markdown.showPreviewSecuritySelector.title": "Az előnézet biztonsági beállításainak módosítása",
+	"markdown.trace.desc": "Hibakeresési napló engedélyezése a markdown kiterjesztésben.",
+	"markdown.preview.refresh.title": "Előnézet frissítése",
+	"markdown.preview.toggleLock.title": "Előnézet rögzítésének be- és kikapcsolása"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..d4851192c11
--- /dev/null
+++ b/i18n/hun/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Engedélyezi a(z) {0} (munkaterületi beállításként megadott) végrehajtását a PHP-fájlok linteléséhez?",
+	"php.yes": "Engedélyezés",
+	"php.no": "Tiltás",
+	"wrongExecutable": "A validáció nem sikerült, mivel a(z) {0} nem egy érvényes php végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
+	"noExecutable": "A validáció nem sikerült, mivel nincs beállítva PHP végrehajtható fájl. Használja a 'php.validate.executablePath' beállítást a PHP végrehajtható fájl konfigurálásához!",
+	"unknownReason": "Nem sikerült futtatni a PHP-t a következő elérési út használatával: {0}. Az ok ismeretlen."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php-language-features/package.i18n.json b/i18n/hun/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..1d6ca7197bd
--- /dev/null
+++ b/i18n/hun/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
+	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
+	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
+	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
+	"displayName": "PHP nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás PHP-fájlokhoz."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/php/package.i18n.json b/i18n/hun/extensions/php/package.i18n.json
index 2fd2af0d0e8..30301605646 100644
--- a/i18n/hun/extensions/php/package.i18n.json
+++ b/i18n/hun/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Meghatározza, hogy a beépített PHP nyelvi támogatás ajánl-e PHP globálisokat és változókat.",
-	"configuration.validate.enable": "Beépített PHP-validáció engedélyezése vagy letiltása",
-	"configuration.validate.executablePath": "A PHP végrehajtható fájljának elérési útja.",
-	"configuration.validate.run": "A linter mentéskor vagy gépeléskor fut-e.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP-validációs végrehajtható fájl letiltása (munkaterületi beállításként megadva)",
-	"displayName": "PHP nyelvi funkciók",
-	"description": "IntelliSense-t, lintelést és alapvető nyelvi funkciókat szolgáltat a PHP-fájlokban."
+	"description": "Szintaktikai kiemelést szolgáltat, valamint kezeli az összetartozó zárójeleket a PHP-fájlokban."
 }
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json b/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..2d667c10166
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!",
+	"typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus",
+	"typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet",
+	"typescript.noTypeScriptProjectConfig": "A fájl nem egy TypeScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
+	"typescript.noJavaScriptProjectConfig": "A fájl nem egy JavaScript-projekt része. További információkat [ide]({0}) kattintva tudhat meg.",
+	"typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása",
+	"typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..30437c7682c
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Válasszon végrehajtandó kódműveletet!",
+	"acquiringTypingsLabel": "Típusdefiníciók letöltése...",
+	"acquiringTypingsDetail": "Típusdefiníciók letöltése az IntelliSense-hez.",
+	"autoImportLabel": "Automatikus importálás a következő helyről: {0}"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..c7d2746fdb4
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Engedélyezi a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
+	"ts-nocheck": "Letiltja a JavaScript-fájlok szemantikai ellenőrzését. A fájl tetején kell szerepelnie.",
+	"ts-ignore": "Elfedi a fájl következő sorában található @ts-check-hibákat."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..7207bf3b210
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 implementáció",
+	"manyImplementationLabel": "{0} implementáció",
+	"implementationsErrorLabel": "Nem sikerült meghatározni az implementációkat"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..d6bb7d7c26e
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc-megjegyzés"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..4573e2028b6
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Importálások rendezése"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..e76bf145eff
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (összes javítása a fájlban)"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..ac0763b55e4
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 referencia",
+	"manyReferenceLabel": "{0} referencia",
+	"referenceErrorLabel": "Nem sikerült meghatározni a referenciákat"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..d7ad58409e7
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "buildelés – {0}",
+	"buildAndWatchTscLabel": "figyelés – {0}"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..5c3b49a6031
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "A(z) {0} elérési út nem egy érvényes tsserver-telepítésre mutat. A beépített TypeScript-verzió lesz használva.",
+	"serverCouldNotBeStarted": "Nem sikerült elindítani a TypeScript nyelvi szervert. Hibaüzenet: {0}",
+	"typescript.openTsServerLog.notSupported": "A TS-szerver naplózáshoz TS 2.2.2+ szükséges",
+	"typescript.openTsServerLog.loggingNotEnabled": "A TS-szervernaplózás ki van kapcsolva. Állítsa be a `typescript.tsserver.log` beállítást, majd indítsa újra a TS-szervert a naplózás engedélyezéséhez!",
+	"typescript.openTsServerLog.enableAndReloadOption": "Naplózás engedélyezése és TS-szerver újraindítása",
+	"typescript.openTsServerLog.noLogFile": "A TS-szerver nem kezdett el naplózni",
+	"openTsServerLog.openFileFailedFailed": "A TS-szervernapló nem nyitható meg",
+	"serverDiedAfterStart": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze rögtön azután, hogy el lett indítva. A szolgáltatás nem lesz újraindítva.",
+	"serverDiedReportIssue": "Probléma jelentése",
+	"serverDied": "A TypeScript nyelvi szolgáltatás öt alkalommal omlott össze az elmúlt öt percben."
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..93f5c9220fa
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "érvénytelen verzió"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..3e5d8de4e07
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki a sok fájlt tartalmazó mappákat. Például: {0}",
+	"hintExclude.generic": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik. ",
+	"large.label": "Kivételek konfigurálása",
+	"hintExclude.tooltip": "A JavaScript/TypeScript funkciók teljes projektre való engedélyezéséhez zárja ki azokat a mappákat, amelyben olyan forrásfájlok találhatók, melyen nem dolgozik. "
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..4e9549aeb04
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Adatok lekérése a jobb typescriptes IntelliSense-hez",
+	"typesInstallerInitializationFailed.title": "Nem sikerült telepíteni a típusdefiníciós fájlokat a javascriptes nyelvi funkciókhoz. Győződjön meg róla, hogy az NPM telepítve van vagy módosítsa a 'typescript.npm' beállítás értékét a felhasználói beállításokban. További információkat [ide]({0}) kattintva tudhat meg.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Ne jelenítse meg újra"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..919b1678312
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "A VSCode verziójának használata",
+	"useWorkspaceVersionOption": "A munkaterület verziójának használata",
+	"learnMore": "További információ",
+	"selectTsVersion": "Válassza ki a javascriptes és typescriptes nyelvi funkciókhoz használt TypeScript-verziót"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..4e8b25cde58
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Nem sikerült meghatározni a TypeScript-verziót ezen az elérési úton",
+	"noBundledServerFound": "A VSCode beépített tsserverét törölte egy másik alkalmazás, például egy hibásan viselkedő víruskereső eszköz. Telepítse újra a VSCode-ot!"
+}
\ No newline at end of file
diff --git a/i18n/hun/extensions/typescript-language-features/package.i18n.json b/i18n/hun/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..59e6eed00dc
--- /dev/null
+++ b/i18n/hun/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,58 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript és JavaScript nyelvi funkciók",
+	"description": "Széleskörű nyelvi támogatás JavaScripthez és TypeScripthez.",
+	"typescript.reloadProjects.title": "Projekt újratöltése",
+	"javascript.reloadProjects.title": "Projekt újratöltése",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Függvények kiegészítése paraméterdefiníciójukkal.",
+	"typescript.tsdk.desc": "A tsservert és a lib*.d.ts fájlokat tartalmazó mappa elérési útja.",
+	"typescript.disableAutomaticTypeAcquisition": "Automatikus típusdefiníció-letöltés letiltása. Legalább 2.0.6-os TypeScriptet igényel.",
+	"typescript.tsserver.log": "Engedélyezi a TS-szerver naplózását egy fájlba. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot.",
+	"typescript.tsserver.trace": "Engedélyezi a TS-szervernek küldött üzenetek naplózását. Ez a napló a TS-szerverrel kapcsolatos problémák diagnosztizálására használható. A napló tartalmazhat elérési utakat, forráskódot és más potenciálisan érzékeny, projekttel kapcsolatos adatot. ",
+	"typescript.validate.enable": "TypeScript-validálás engedélyezése vagy letiltása.",
+	"typescript.format.enable": "Alapértelmezett TypeScript-formázó engedélyezése vagy letiltása.",
+	"javascript.format.enable": "Alapértelmezett JavaScript-formázó engedélyezése vagy letiltása.",
+	"format.insertSpaceAfterCommaDelimiter": "Meghatározza a szóközök kezelését vessző elválasztókarakter után.",
+	"format.insertSpaceAfterConstructor": "Meghatározza a szóközök kezelését a constructor kulcsszó után. TypeScript >= 2.3.0-t igényel.",
+	"format.insertSpaceAfterSemicolonInForStatements": "Meghatározza a szóközök kezelését pontosvessző után a for ciklusban.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Meghatározza a szóközök kezelését bináris operátorok után.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Meghatározza a szóközök kezelését vezérlési szerkezetek kulcsszavai után.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Meghatározza a szóközök kezelését a névtelen függvényekben található function kulcsszó után.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Meghatározza a szóközök kezelését a függvényargumentumokat tartalmazó zárójel előtt. TypeScript >= 2.1.5-öt igényel.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Meghatározza a szóközök kezelését a sablonkarakterláncok (template stringek) kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Meghatározza a szóközök kezelését JSX-kifejezések kapcsos zárójeleinek nyitása után és zárása előtt. TypeScript >= 2.0.6-ot igényel.",
+	"format.insertSpaceAfterTypeAssertion": "Meghatározza a szóközök kezelését a típuskényszerítések utn. TypeScript >= 2.4-t igényel.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Meghatározza, hogy a függvények nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Meghatározza, hogy a vezérlőblokkok nyitó kapcsos zárójelei új sorba kerüljenek-e vagy sem.",
+	"javascript.validate.enable": "JavaScript-validálás engedélyezése vagy letiltása.",
+	"typescript.goToProjectConfig.title": "Projektkonfiguráció megkeresése",
+	"javascript.goToProjectConfig.title": "Projektkonfiguráció megkeresése",
+	"javascript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a JavaScript-fájlokban.",
+	"typescript.referencesCodeLens.enabled": "Referencia kódlencsék engedélyezése vagy letiltása a TypeScript-fájlokban. TypeScript >= 2.0.6-ot igényel.",
+	"typescript.implementationsCodeLens.enabled": "Implementációs kódlencsék engedélyezése vagy letiltása. TypeScript >= 2.2.0-t igényel.",
+	"typescript.openTsServerLog.title": "TS-szervernapló megnyitása",
+	"typescript.restartTsServer": "TS-szerver újraindítása",
+	"typescript.selectTypeScriptVersion.title": "TypeScript-verzió kiválasztása",
+	"typescript.reportStyleChecksAsWarnings": "Stílusellenőrzés során talált esetek figyelmeztetésként legyenek jelentve",
+	"jsDocCompletion.enabled": "Automatikus JSDoc-megjegyzések engedélyezése vagy letiltása",
+	"javascript.implicitProjectConfig.checkJs": "JavaScript-fájlok szemantikai ellenőrzésének engedélyezése vagy letiltása. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
+	"typescript.npm": "Az automatikus típusdefiníció-letöltéshez használt NPM végrehajtható fájl elérési útja. TypeScript 2.3.4-et igényel.",
+	"typescript.check.npmIsInstalled": "Ellenőrizze, hogy az NPM telepítve van-e az automatikus típusdefiníció-letöltéshez.",
+	"javascript.nameSuggestions": "Egyedi nevek listázásának engedélyezése a javascriptes javaslati listákban.",
+	"typescript.tsc.autoDetect": "Meghatározza a tsc-s feladatok automatikus felderítésének működését. 'off' érték esetén a funkció ki van kapcsolva. 'build' esetén egyszer lefutó, fordítást végző feladatok jönnek létre. 'watch' esetén csak fordítást és figyelést végző feladatok jönnek létre. 'on' esetén buildelési és figyelési feladatok is keletkeznek. Az alapértelmezett érték: 'on'.",
+	"typescript.problemMatchers.tsc.label": "TypeScript-problémák",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript-problémák (figyelő módban)",
+	"typescript.quickSuggestionsForPaths": "Kiegészítési javaslatok engedélyezése importált elérési utak beírásakor.",
+	"typescript.locale": "Meghatározza a TypeScript-hibák jelentésénél használt lokalizációt. TypeScript >= 2.6.0-t igényel. Az alapértelmezett 'null' érték esetén a VS Code-ban beállított nyelven jelennek meg a TypeScript-hibák.",
+	"javascript.implicitProjectConfig.experimentalDecorators": " 'experimentalDecorators' beállítás engedélyezése azon JavaScript-fájlok esetében, amelyek nem részei a projektnek. A meglévő jsconfig.json vagy tsconfig.json fájlok felülírják ezt a beállítást. TypeScript >= 2.3.1-et igényel.",
+	"typescript.autoImportSuggestions.enabled": "Automatikus importálási ajánlatok engedélyezése vagy letiltása. TypeScript >= 2.6.1-t igényel.",
+	"typescript.experimental.syntaxFolding": "Szintaxisalapú becsukható kódrészletek engedélyezése vagy letiltása.",
+	"taskDefinition.tsconfig.description": "A tsconfig-fájl, ami meghatározza a TS-buildet."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/base/node/processes.i18n.json b/i18n/hun/src/vs/base/node/processes.i18n.json
index 0dff4be115a..35229bd6699 100644
--- a/i18n/hun/src/vs/base/node/processes.i18n.json
+++ b/i18n/hun/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Rendszerparancsok UNC-meghajtókon nem hajthatók végre."
+	]
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index ed46a94304d..7be3fc5b86f 100644
--- a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "Előnézet GitHubon",
 	"loadingData": "Adatok betöltése...",
+	"rateLimited": "GitHub lekérdezési korlát túllépve. Kérem, várjon!",
 	"similarIssues": "Hasonló problémák",
 	"open": "Megnyitás",
 	"closed": "Bezárva",
-	"noResults": "Nincs találat",
+	"noSimilarIssues": "Nincs hasonló probléma",
 	"settingsSearchIssue": "Hiba a beállítások keresőjében",
 	"bugReporter": "hibát",
-	"performanceIssue": "teljesítményproblémát",
 	"featureRequest": "funkcióigényt",
+	"performanceIssue": "teljesítményproblémát",
 	"stepsToReproduce": "A probléma előidézésének lépései",
 	"bugDescription": "Ossza meg a probléma megbízható előidézéséhez szükséges részleteket! Írja le a valós és az elvárt működést! A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
 	"performanceIssueDesciption": "Mikor fordult elő ez a teljesítménybeli probléma? Például előfordul indulásnál vagy végre kell hajtani bizonyos műveleteket? A mezőben GitHub-stílusú markdown használható. A hibajelentés szerkeszthető lesz és képernyőfotók is csatolhatók a githubos előnézetnél.",
diff --git a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index a53b4129ee2..886cb41d49d 100644
--- a/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/hun/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,12 @@
 	],
 	"completeInEnglish": "Kérjük, hogy angolul töltse ki az űrlapot!",
 	"issueTypeLabel": "Ez egy",
+	"issueSourceLabel": "Komponens",
+	"vscode": "Visual Studio Code",
+	"extension": "Egy kiegészítő",
+	"disableExtensionsLabelText": "Próbálja meg előidézni a hibát {0}! Ha a hiba csak aktív kiegészítőkkel idézhető elő, akkor nagy valószínűséggel a kiegészítőben van a hiba.",
+	"disableExtensions": "az összes kiegészítő letiltása és az ablak újratöltése után",
+	"chooseExtension": "Kiegészítő",
 	"issueTitleLabel": "Cím",
 	"issueTitleRequired": "Kérjük, adja meg a címet!",
 	"titleLengthValidation": "A cím túl hosszú.",
@@ -18,13 +24,6 @@
 	"extensions": "Kiegészítők",
 	"searchedExtensions": "Keresett kiegészítők",
 	"settingsSearchDetails": "Beállításokban való keresés részletei",
-	"tryDisablingExtensions": "A probléma letiltott kiegészítőkkel is előidézhető?",
-	"yes": "Igen",
-	"no": "Nem",
-	"disableExtensionsLabelText": "Próbálja meg előidézni a hibát {0}!",
-	"disableExtensions": "az összes kiegészítő letiltása és az ablak újratöltése után",
-	"showRunningExtensionsLabelText": "Ha azt gyanítja, hogy a hiba egy kiegészítőben van, {0} a kiegészítővel kapcsolatos hiba jelentéséhez!",
-	"showRunningExtensions": "tekintse meg a futó kiegészítők listáját",
 	"details": "Írja le a részleteket!",
 	"loadingData": "Adatok betöltése..."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..27c0f1d3fcf
--- /dev/null
+++ b/i18n/hun/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "Processzor %",
+	"memory": "Memória (MB)",
+	"pid": "folyamatazonosító",
+	"name": "Név",
+	"killProcess": "Folyamat leállítása",
+	"forceKillProcess": "Folyamat kényszerített leállítása"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/code/electron-main/menus.i18n.json b/i18n/hun/src/vs/code/electron-main/menus.i18n.json
index e63be27f735..5b81e432f54 100644
--- a/i18n/hun/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/hun/src/vs/code/electron-main/menus.i18n.json
@@ -161,6 +161,7 @@
 	"mMergeAllWindows": "Összes ablak összeolvasztása",
 	"miToggleDevTools": "&&Fejlesztői eszközök be- és kikapcsolása",
 	"miAccessibilityOptions": "&&Kisegítő lehetőségek",
+	"miOpenProcessExplorerer": "&&Feladatkezelő megnyitása",
 	"miReportIssue": "H&&iba jelentése",
 	"miWelcome": "Üdvözlő&&oldal",
 	"miInteractivePlayground": "&&Interaktív játszótér",
diff --git a/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json
index 9ff041f3697..61a892df8cb 100644
--- a/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/hun/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Bezárás",
-	"header": "{0}. eltérés, összesen: {1}. Eredeti: {2}., {3}. sorok, módosított: {4}., {5}. sorok",
 	"blankLine": "üres",
 	"equalLine": "eredeti {0}., módosított {1}.: {2}",
 	"insertLine": "+ módosított {0}.: {1}",
diff --git a/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/hun/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 21532a3464d..0dfc2d84ed4 100644
--- a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti.",
 	"multiCursorModifier.alt": "Windows és Linux alatt az `Alt`, macOS alatt az `Option` billentyűt jelenti.",
 	"multiCursorModifier": "Több kurzor hozzáadásához használt módosítóbillentyű. A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A Definíció megkeresése és Hivatkozás megnyitása egérgesztusok automatikusan úgy lesznek beállítva, hogy ne ütközzenek a többkurzorhoz tartozó módosítóval.",
+	"multiCursorMergeOverlapping": "Több kurzor összeolvasztása, ha azok fedik egymást.",
 	"quickSuggestions.strings": "Kiegészítési javaslatok engedélyezése karakterláncokban (stringekben)",
 	"quickSuggestions.comments": "Kiegészítési javaslatok engedélyezése megjegyzésekben",
 	"quickSuggestions.other": "Kiegészítési javaslatok engedélyezése karakterláncokon (stringeken) és megjegyzéseken kívül",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "Meghatározza, hogy a szerkesztőablakban hogyan legyen kirajzolva az aktuális sor kiemelése. Lehetséges értékek: 'none', 'gutter', 'line', vagy 'all'.",
 	"codeLens": "Meghatározza, hogy megjelenjenek-e a kódlencsék",
 	"folding": "Meghatározza, hogy engedélyezve van-e a kódrészletek bezárása a szerkesztőablakban.",
+	"foldingStrategyAuto": "Nyelvspecifikus kódrész-bezárási stratégia használata, ha az rendelkezésre áll. Ha nem, akkor tartalékmegoldásként az indentálásalapú kódrész-bezárási stratégia használata.",
+	"foldingStrategyIndentation": "A kódrészek bezárása mindig az indentálásalapú kódrész-bezárási stratégia alapján történjen.",
+	"foldingStrategy": "Meghatározza, hogyan vannak meghatározva a bezárható kódrészek. Az 'auto' esetén a nyelvspecifikus kódbezárási stratégia van használva, ha az rendelkezésre áll. Az 'indentation' esetén minden esetben az indentálásalapú bezárási stratégia van használva.",
 	"showFoldingControls": "Meghatározza, hogy a kódrészletek bezárásához tartozó vezérlőelemek automatikusan el legyenek-e rejtve.",
 	"matchBrackets": "Zárójel kiválasztása esetén a hozzátartozó zárójel kiemelése.",
 	"glyphMargin": "Meghatározza, hogy legyen-e vertikális szimbólummargó a szerkesztőablakban. A szimbólummargó elsősorban hibakeresésnél van használva.",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "Meghatározza-e, hogy támogatva van-e az elsődleges vágólap Linux alatt",
 	"sideBySide": "Meghatározza, hogy a differenciaszerkesztő ablakban egymás mellett vagy a sorban jelenjenek meg az eltérések",
 	"ignoreTrimWhitespace": "Meghatározza, hogy a differenciaszerkesztő ablakban megjelenjenek-e a sor elején vagy végén a szóközökben talált különbségek",
+	"largeFileSize": "Meghatározza azt a fájlméretet, ami fölött speciális optimalizálási szabályok lépnek érvénybe.",
+	"largeFileLineCount": "Meghatározza azt a sorszámot, ami fölött speciális optimalizálási szabályok lépnek érvénybe. ",
 	"renderIndicators": "Meghatározza, hogy a differenciaszerkesztő ablakban megjelenjenek-e a +/- jelzők az hozzáadott/eltávolított változásoknál"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
index c76fc2901ea..05e0c0c13f7 100644
--- a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "A szerkesztőablak segédvonalainak színe.",
 	"editorLineNumbers": "A szerkesztőablak sorszámainak színe.",
 	"editorActiveLineNumber": "A szerkesztőablak aktív sorához tartozó sorszám színe.",
+	"deprecatedEditorActiveLineNumber": "Az Id elavult. Használja helyette az 'editorLineNumber.activeForeground' beállítást!",
 	"editorRuler": "A szerkesztőablak sávjainak színe.",
 	"editorCodeLensForeground": "A szerkesztőablakban található kódlencsék előtérszíne",
 	"editorBracketMatchBackground": "Hozzátartozó zárójelek háttérszíne",
@@ -28,7 +29,9 @@
 	"warningBorder": "A figyelmeztetéseket jelző hullámvonal keretszíne a szerkesztőablakban.",
 	"infoForeground": "Az információkat jelző hullámvonal előtérszíne a szerkesztőablakban.",
 	"infoBorder": "Az információkat jelző hullámvonal keretszíne a szerkesztőablakban. ",
-	"overviewRulerRangeHighlight": "A kiemelt tartományokat jelölő jelzések színe az áttekintősávon.",
+	"hintForeground": "Az utalásokat jelző hullámvonal előtérszíne a szerkesztőablakban.",
+	"hintBorder": "Az utalásokat jelző hullámvonal keretszíne a szerkesztőablakban.",
+	"overviewRulerRangeHighlight": "A kiemelt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"overviewRuleError": "A hibákat jelölő jelzések színe az áttekintősávon.",
 	"overviewRuleWarning": "A figyelmeztetéseket jelölő jelzések színe az áttekintősávon.",
 	"overviewRuleInfo": "Az információkat jelölő jelzések színe az áttekintősávon."
diff --git a/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..ca792d8bea6
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Javítások megjelenítése ({0})",
+	"quickFix": "Javítások megjelenítése",
+	"quickfix.trigger.label": "Gyorsjavítás...",
+	"editor.action.quickFix.noneMessage": "Nem áll rendelkezésre kódművelet",
+	"refactor.label": "Refaktorálás...",
+	"editor.action.refactor.noneMessage": "Nem áll rendelkezésre refaktorálási lehetőség",
+	"source.label": "Forrásművelet...",
+	"editor.action.source.noneMessage": "Nem áll rendelkezésre forrásművelet",
+	"organizeImports.label": "Importálások rendezése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index f1e97f6010a..0665568c203 100644
--- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Következő probléma (hiba, figyelmeztetés, információ)",
-	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)",
-	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
-	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
-	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
-	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
+	"markerAction.previous.label": "Előző probléma (hiba, figyelmeztetés, információ)"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..60534d6d43e
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "A szerkesztőablak jelzőnavigációs moduljának színe hiba esetén.",
+	"editorMarkerNavigationWarning": "A szerkesztőablak jelzőnavigációs moduljának színe figyelmeztetés esetén.",
+	"editorMarkerNavigationInfo": "A szerkesztőablak jelzőnavigációs moduljának színe információ esetén.",
+	"editorMarkerNavigationBackground": "A szerkesztőablak jelzőnavigációs moduljának háttérszíne."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/links/links.i18n.json b/i18n/hun/src/vs/editor/contrib/links/links.i18n.json
index 6feb52b9cb7..9ca7de76bcf 100644
--- a/i18n/hun/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "Hivatkozott oldal megnyitása Ctrl + kattintás paranccsal",
 	"links.command.mac": "Cmd + kattintás a parancs végrehajtásához",
 	"links.command": "Ctrl + kattintás a parancs végrehajtásához",
+	"links.navigate.al.mac": "Hivatkozás megnyitása az Option + kattintás paranccsal",
 	"links.navigate.al": "Hivatkozás megnyitása Alt + kattintás paranccsal",
+	"links.command.al.mac": "Option + kattintás a parancs végrehajtásához",
 	"links.command.al": "Alt + kattintás a parancs végrehajtásához",
 	"invalid.url": "A hivatkozást nem sikerült megnyitni, mert nem jól formázott: {0}",
 	"missing.url": "A hivatkozást nem sikerült megnyitni, hiányzik a célja.",
diff --git a/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..57dd858270a
--- /dev/null
+++ b/i18n/hun/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "vasárnap",
+	"Monday": "hétfő",
+	"Tuesday": "kedd",
+	"Wednesday": "szerda",
+	"Thursday": "csütörtök",
+	"Friday": "péntek",
+	"Saturday": "szombat",
+	"SundayShort": "vas",
+	"MondayShort": "hét",
+	"TuesdayShort": "kedd",
+	"WednesdayShort": "sze",
+	"ThursdayShort": "csüt",
+	"FridayShort": "pén",
+	"SaturdayShort": "szo",
+	"January": "január",
+	"February": "február",
+	"March": "március",
+	"April": "április",
+	"May": "május",
+	"June": "június",
+	"July": "július",
+	"August": "augusztus",
+	"September": "szeptember",
+	"October": "október",
+	"November": "november",
+	"December": "december",
+	"JanuaryShort": "jan",
+	"FebruaryShort": "feb",
+	"MarchShort": "márc",
+	"AprilShort": "ápr",
+	"MayShort": "máj",
+	"JuneShort": "jún",
+	"JulyShort": "júl",
+	"AugustShort": "aug",
+	"SeptemberShort": "szept",
+	"OctoberShort": "okt",
+	"NovemberShort": "nov",
+	"DecemberShort": "dec"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index a60448390b0..e66f795b53c 100644
--- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"wordHighlightBorder": "Szimbólumok háttérszíne olvasási hozzáférés, például változó olvasása esetén.",
 	"wordHighlightStrongBorder": "Szimbólumok háttérszíne írási hozzáférés, például változó írása esetén.",
-	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerWordHighlightStrongForeground": "A kiemelt, írási hozzáférésű szimbólumokat jelölő jelzések színe az áttekintősávon.",
+	"overviewRulerWordHighlightForeground": "A kiemelt szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"overviewRulerWordHighlightStrongForeground": "Az írási hozzáféréssel rendelkező szimbólumokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
 	"wordHighlight.previous.label": "Ugrás az előző kiemelt szimbólumhoz"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..43e1fb70709
--- /dev/null
+++ b/i18n/hun/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 további fájl nincs megjelenítve",
+	"moreFiles": "...{0} további fájl nincs megjelenítve"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..d1d33322cd8
--- /dev/null
+++ b/i18n/hun/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Mégse"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
index f26bd4d55da..19039e5513a 100644
--- a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.",
 	"prof-startup": "Processzorhasználat profilozása induláskor",
 	"disableExtensions": "Összes telepített kiegészítő letiltása.",
-	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.",
-	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ",
 	"disableGPU": "Hardveres gyorsítás letiltása.",
 	"uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.",
 	"maxMemory": "Egy ablak maximális memóriamérete (megabájtban).",
diff --git a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 0cfe9dca9e2..c2eaf97d09f 100644
--- a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}",
 	"MarketPlaceDisabled": "A piactér nincs engedélyezve",
 	"removeError": "Hiba történt a kiegészítő eltávolítása közben: {0}. Lépjen ki és indítsa el a VS Code-ot mielőtt újrapróbálná!",
-	"Not Market place extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
+	"Not a Marketplace extension": "Csak a piactérről származó kiegészítőket lehet újratelepíteni",
 	"notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.",
 	"malicious extension": "A kiegészítő nem telepíthető, mert jelentették, hogy problémás.",
 	"notFoundCompatibleDependency": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő függőség VS Code '{1}' verziójával kompatibilis változata nem található. ",
 	"quitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
 	"exitCode": "A kiegészítő telepítése nem sikerült. Lépjen ki és indítsa el a VS Code-ot az újratelepítés előtt!",
 	"uninstallDependeciesConfirmation": "Csak a(z) '{0}' kiegészítőt szeretné eltávolítani vagy annak függőségeit is?",
-	"uninstallOnly": "Csak ezt",
-	"uninstallAll": "Mindent",
+	"uninstallOnly": "Csak a kiegészítőt",
+	"uninstallAll": "Az összes eltávolítása",
 	"uninstallConfirmation": "Biztosan szeretné eltávolítani a(z) '{0}' kiegészítőt?",
 	"ok": "OK",
 	"singleDependentError": "Nem sikerült eltávolítani a(z) '{0}' kiegészítőt: a(z) '{1}' kiegészítő függ tőle.",
diff --git a/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json
index ebab6182648..2b680ac3f88 100644
--- a/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/hun/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Nem sikerült feldolgozni az `engines.vscode` beállítás értékét ({0}). Használja például a következők egyikét: ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x stb.",
+	"versionSyntax": "Nem sikerült feldolgozni az `engines.vscode` beállítás értékét ({0}). Használja például a következők egyikét: ^1.22.0, ^1.22.x stb.",
 	"versionSpecificity1": "Az `engines.vscode` beállításban megadott érték ({0}) nem elég konkrét. A vscode 1.0.0 előtti verzióihoz legalább a kívánt fő- és alverziót is meg kell adni. Pl.: ^0.10.0, 0.10.x, 0.11.0 stb.",
 	"versionSpecificity2": "Az `engines.vscode` beállításban megadott érték ({0}) nem elég konkrét. A vscode 1.0.0 utáni verzióihoz legalább a kívánt főverziót meg kell adni. Pl.: ^1.10.0, 1.10.x, 1.x.x, 2.x.x stb.",
 	"versionMismatch": "A kiegészítő nem kompatibilis a Code {0} verziójával. A következő szükséges hozzá: {1}."
diff --git a/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index e70aaa6271c..358f998df03 100644
--- a/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/hun/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "A feltelepített {0} hibásnak tűnik. Telepítse újra!",
 	"integrity.moreInformation": "További információ",
-	"integrity.dontShowAgain": "Ne jelenítse meg újra",
-	"integrity.prompt": "A feltelepített {0} hibásnak tűnik. Telepítse újra!"
+	"integrity.dontShowAgain": "Ne jelenítse meg újra"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
index 570645f055d..144cb0419cc 100644
--- a/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ b/i18n/hun/src/vs/platform/issue/electron-main/issueService.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"issueReporter": "Hibajelentő"
+	"issueReporter": "Hibajelentő",
+	"processExplorer": "Feladatkezelő"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
index c91ae24bd28..23a85678ca5 100644
--- a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Több elem kijelölése esetén újabb elem hozzáadásához használt módosítóbillentyű a fanézetekben és listákban (például a fájlkezelőben, a megnyitott szerkesztőablakok listájában és a verziókezelő rendszer nézeten). A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A 'Megnyitás oldalt\" egérgesztusok – ha támogatva vannak – automatikusan úgy lesznek beállítva, hogy ne ütközzenek a több elem kijelöléséhez tartozó módosító billentyűvel.",
 	"openMode.singleClick": "Elemek megnyitása egyetlen kattintásra.",
 	"openMode.doubleClick": "Elemek megnyitása dupla kattintásra.",
-	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. "
+	"openModeModifier": "Meghatározza, hogyan nyíljanak meg az elemek a fanézetekben és listákban egér használata esetén (ha támogatott). `singleClick` esetén egyetlen kattintásra megnyílnak az elemek, míg `doubleClick` esetén dupla kattintás szükséges. Fanézeteknél meghatározza, hogy a szülőelemek egyetlen vagy dupla kattintásra nyílnak ki. Megjegyzés: néhány fanézet és lista figyelmen kívül hagyja ezt a beállítást ott, ahol ez nem alkalmazható. ",
+	"horizontalScrolling setting": "Meghatározza, hogy a fák támogatják-e a vízszintes görgetést a munkaterületen."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/markers/common/markers.i18n.json b/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..ba6e96532e0
--- /dev/null
+++ b/i18n/hun/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Hiba",
+	"sev.warning": "Figyelmeztetés",
+	"sev.info": "Információ"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
index a77c528ab13..a470002b64a 100644
--- a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "A helyi tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
 	"overviewRulerIncomingContentForeground": "A beérkező tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén.",
 	"overviewRulerCommonContentForeground": "A közös ős tartalom előtérszíne az áttekintő sávon összeolvasztási konfliktusok esetén. ",
-	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon.",
-	"overviewRulerSelectionHighlightForeground": "A kiemelt kijelöléseket jelölő jelzések színe az áttekintősávon."
+	"overviewRulerFindMatchForeground": "A keresési találatokat jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"overviewRulerSelectionHighlightForeground": "A kijelölt területeket jelölő jelzések színe az áttekintősávon. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..3046160ac08
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie",
+	"showViewlet": "{0} megjelenítése",
+	"view": "Nézet"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 2eee713076e..2c12ec27c2c 100644
--- a/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/hun/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Nézeteket szolgáltat a szerkesztőhöz",
 	"views.explorer": "Fájlkezelő-nézet",
 	"views.debug": "Hibakeresési nézet",
-	"locationId.invalid": "A(z) `{0}` nem érvényes nézethelyszín",
 	"duplicateView1": "Nem regisztrálható több nézet `{0}` azonosítóval a következő helyen: `{1}`",
 	"duplicateView2": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 59c82a1f395..1a6a8a26fbe 100644
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Mentéskor végzett formázás megszakítva {0}ms után",
+	"timeout.onWillSave": "OnWillSaveTextDocument-esemény megszakítva 1750ms után",
 	"saveParticipants": "Mentési események futtatása..."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 983527bcdae..92725a915cc 100644
--- a/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"webview.editor.label": "webview-szerkesztő"
+	"errorMessage": "Hiba történt a nézet visszaállítása közben: {0}"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..c073dbed804
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (kiegészítő)"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 39a626587ee..2de10454592 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Váltás a következő csoportra",
 	"openToSide": "Megnyitás oldalt",
 	"closeEditor": "Szerkesztőablak bezárása",
+	"closeOneEditor": "Bezárás",
 	"revertAndCloseActiveEditor": "Visszaállítás és szerkesztőablak bezárása",
 	"closeEditorsToTheLeft": "Balra lévő szerkesztőablakok bezárása",
 	"closeAllEditors": "Összes szerkesztőablak bezárása",
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 768906f89d7..e563dd6f450 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,7 @@
 	"screenReaderDetectedExtra": "Ha nem használ képernyőolvasót, állítsa az `editor.accessibilitySupport` értékét \"off\"-ra.",
 	"disableTabMode": "Kisegítő mód letiltása",
 	"gotoLine": "Sor megkeresése",
-	"indentation": "Indentálás",
+	"selectIndentation": "Indentálás kiválasztása",
 	"selectEncoding": "Kódolás kiválasztása",
 	"selectEOL": "Sorvégjel kiválasztása",
 	"selectLanguageMode": "Nyelvmód kiválasztása",
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 3e1e7156096..4df3b505d36 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,11 @@
 	"sizeMB": "{0} MB",
 	"sizeGB": "{0} GB",
 	"sizeTB": "{0} TB",
-	"largeImageError": "A képfájl mérete túl nagy (>1 MB) a szerkesztőben való megjelenítéshez.",
+	"largeImageError": "A kép nincs megjelenítve, mert túl nagy ({0}).",
 	"resourceOpenExternalButton": "Kép megnyitása külső program használatával?",
-	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz, túl nagy vagy nem támogatott szövegkódolást használ.",
+	"nativeFileTooLargeError": "A fájl nem jeleníthető meg a szerkesztőben, mert túl nagy ({0}).",
+	"nativeBinaryError": "A fájl nem jeleníthető meg a szerkesztőben, mert bináris adatokat tartalmaz vagy nem támogatott szövegkódolást használ.",
+	"openAsText": "Mégis meg szeretné nyitni?",
 	"zoom.action.fit.label": "Teljes kép",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 74c48b61345..d823f6837d9 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Bezárás",
 	"araLabelEditorActions": "Szerkesztőablak-műveletek"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index b62321b07d6..a22a300f861 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Nincs új értesítés",
 	"notifications": "Értesítések",
 	"notificationsToolbar": "Értesítésiközpont-műveletek",
 	"notificationsList": "Értesítések listája"
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..21a3c1fb10f
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInput.countSelected": "{0} kiválasztva",
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..f402e9c2fed
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInputBox.ariaLabel": "Kezdjen el gépelni a találati lista szűkítéséhez!"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
index 616bbb21a05..37d0d251906 100644
--- a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json
@@ -32,6 +32,7 @@
 	"openRecent": "Legutóbbi megnyitása...",
 	"quickOpenRecent": "Legutóbbi gyors megnyitása...",
 	"reportIssueInEnglish": "Probléma jelentése",
+	"openProcessExplorer": "Feladatkezelő megnyitása",
 	"reportPerformanceIssue": "Teljesítményproblémák jelentése",
 	"keybindingsReference": "Billentyűparancs-referencia",
 	"openDocumentationUrl": "Dokumentáció",
diff --git a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 1360b8af1f1..cc21f47e7a5 100644
--- a/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Ablak",
 	"window.openFilesInNewWindow.on": "A fájlok új ablakban nyílnak meg",
 	"window.openFilesInNewWindow.off": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban",
-	"window.openFilesInNewWindow.default": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva (csak macOS-en)",
-	"openFilesInNewWindow": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva (csak macOS-en)\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"window.openFilesInNewWindow.defaultMac": "A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva",
+	"window.openFilesInNewWindow.default": "A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből)",
+	"openFilesInNewWindowMac": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban, kivéve, ha a dokkról vagy a Finderből lettek megnyitva\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"openFilesInNewWindow": "Meghatározza, hogy a fájlok új ablakban legyenek-e megnyitva.\n- default: A fájlok új ablakban nyílnak meg, kivéve akkor, ha az alkalmazáson belül lettek kiválasztva (pl. a Fájl menüből).\n- on: A fájlok új ablakban nyílnak meg.\n- off: A fájlok abban az ablakban nyílnak meg, ahol a mappájuk meg van nyitva vagy a legutoljára aktív ablakban\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
 	"window.openFoldersInNewWindow.on": "A mappák új ablakban nyílnak meg",
 	"window.openFoldersInNewWindow.off": "A mappák lecserélik a legutoljára aktív ablakot",
 	"window.openFoldersInNewWindow.default": "A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)",
 	"openFoldersInNewWindow": "Meghatározza, hogy a mappák új ablakban legyenek-e megnyitva.\n- alapértelmezett: A mappák új ablakban nyílnak meg, kivéve akkor, ha a mappát az alkalmazáson belül lett kiválasztva (pl. a Fájl menüből)\n- on: A mappák új ablakban nyílnak meg\n- off: A mappák lecserélik a legutoljára aktív ablakot\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
+	"window.openWithoutArgumentsInNewWindow.on": "Új, üres ablak megnyitása",
+	"window.openWithoutArgumentsInNewWindow.off": "Váltás a legutóbb aktív, futó példányra",
+	"openWithoutArgumentsInNewWindow": "Meghatározza, hogy egy új, üres ablak nyíljon-e meg, ha egy új példány indul paraméterek nélkül, vagy váltson a legutóbb aktív, futó példányra.\n- on: Új, üres ablak megnyitása.\n- off: váltás a legutóbb aktív, futó példányra\nMegjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva (pl. a -new-window vagy a -reuse-window parancssori beállítás használata esetén).",
 	"window.reopenFolders.all": "Összes ablak újranyitása.",
 	"window.reopenFolders.folders": "Összes mappa újranyitása. Az üres munkaterületek nem lesznek helyreállítva.",
 	"window.reopenFolders.one": "A legutóbbi aktív ablak újranyitása.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Meghatározza, hogy újraindítás után hogyan vannak ismét megnyitva az ablakok. A 'none' választása esetén mindig üres munkaterület indul, 'one' esetén a legutóbb használt ablak nyílik meg újra, a 'folders' megnyitja az összes megnyitott mappát, míg az 'all' újranyitja az összes ablakot az előző munkamenetből.",
 	"restoreFullscreen": "Meghatározza, hogy az ablak teljesképernyős módban nyíljon-e meg, ha kilépéskor teljes képernyős módban volt.",
 	"zoomLevel": "Meghatározza az ablak nagyítási szintjét. Az eredei méret 0, és minden egyes plusz (pl. 1) vagy mínusz (pl. -1) 20%-kal nagyobb vagy kisebb nagyítási szintet jelent. Tizedestört megadása esetén a nagyítási szint finomabban állítható.",
-	"title": "Meghatározza az ablak címét az aktív szerkesztőablak alapján. A változók a környezet alapján vannak behelyettesítve:\n${activeEditorShort}: a fájl neve (pl. myFile.txt)\n${activeEditorMedium}:  a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)\n${activeEditorLong}: a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)\n${folderPath}: azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)\n${rootName}: a munkaterület neve (pl. myFolder vagy myWorkspace)\n${rootPath}: a munkaterület elérési útja (pl. /Users/Development/myWorkspace)\n${appName}: pl. VS Code\n${dirty}: módosításjelző, ami jelzi, ha az aktív szerkesztőablak tartalma módosítva lett\n${separator}: feltételes elválasztó (\" - \"), ami akkor jelenik meg, ha olyan változókkal van körülvéve, amelyeknek van értéke",
+	"title": "Meghatározza az ablak címét az aktív szerkesztőablak alapján. A változók a környezet alapján vannak behelyettesítve:\n${activeEditorShort}: az aktív fájl neve (pl. myFile.txt)\n${activeEditorMedium}:  a fájl relatív elérési útja a munkaterület mappájához képest (pl. myFolder/myFile.txt)\n${activeEditorLong}: a fájl teljes elérési útja (pl. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: azon munkaterületi mappa a neve, amelyben a fájl található (pl. myFolder)\n${folderPath}: azon munkaterületi mappa elérési útja, amelyben a fájl található (pl. /Users/Development/myFolder)\n${rootName}: a munkaterület neve (pl. myFolder vagy myWorkspace)\n${rootPath}: a munkaterület elérési útja (pl. /Users/Development/myWorkspace)\n${appName}: pl. VS Code\n${dirty}: módosításjelző, ami jelzi, ha az aktív szerkesztőablak tartalma módosítva lett\n${separator}: feltételes elválasztó (\" - \"), ami akkor jelenik meg, ha statikus szöveggek vagy olyan változókkal van körülvéve, amelyeknek van értéke\n",
 	"window.newWindowDimensions.default": "Az új ablakok a képernyő közepén nyílnak meg.",
 	"window.newWindowDimensions.inherit": "Az új ablakok ugyanolyan méretben és ugyanazon a helyen jelennek meg, mint a legutoljára aktív ablak.",
 	"window.newWindowDimensions.maximized": "Az új ablakok teljes méretben nyílnak meg.",
@@ -74,6 +79,8 @@
 	"autoDetectHighContrast": "Ha engedélyezve van, az alkalmazás automatikusan átvált a nagy kontrasztos témára, ha a WIndows a nagy kontrasztos témát használ, és a sötét témára, ha a Windows átvált a nagy kontrasztos témáról.",
 	"titleBarStyle": "Módosítja az ablak címsorának megjelenését. A változtatás teljes újraindítást igényel.",
 	"window.nativeTabs": "Engedélyezi a macOS Sierra ablakfüleket. Megjegyzés: a változtatás teljes újraindítást igényel, és a natív fülek letiltják az egyedi címsorstílust, ha azok be vannak konfigurálva.",
+	"window.smoothScrollingWorkaround": "Akkor engedélyezze ezt a kerülőmegoldást, ha a görgetés nem egyenletes egy kis méretre rakott VS Code-ablak helyreállítása után. Ez egy kerülőmegoldás arra a problémára (https://github.com/Microsoft/vscode/issues/13612), amely a trackpadokkal rendelkező eszközöket érinti, például a Microsoft Surface készülékeit. A kerülőmegoldás engedélyezése a felület elrendezésének ugrálásával járhat az ablak kis méretből való helyreállítása után, de egyébként nem okoz más problémát.",
+	"window.clickThroughInactive": "Ha engedélyezve van, akkor egy inaktív ablakra való kattintás aktiválja az ablakot, valamint kattintási esemény keletkezik az egér alatt lévő elemen is, ha az kattintható. Ha le van tiltva, akkor az inaktív ablakra való kattintás csak az ablak aktiválását eredményezi, és egy újabb kattintás szükséges az elemen.",
 	"zenModeConfigurationTitle": "Zen-mód",
 	"zenMode.fullScreen": "Meghatározza, hogy zen-módban a munakterület teljes képernyős módba vált-e.",
 	"zenMode.centerLayout": "Meghatározza, hogy zen-módban középre igazított elrendezés van-e.",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 37fc52be33c..5c3b0b5f63e 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Töréspont szerkesztése...",
 	"functionBreakpointsNotSupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
 	"functionBreakpointPlaceholder": "A függvény, amin meg kell állni",
 	"functionBreakPointInputAriaLabel": "Adja meg a függvénytöréspontot",
@@ -14,6 +13,7 @@
 	"breakpointUnverifieddHover": "Nem megerősített töréspont",
 	"functionBreakpointUnsupported": "Ez a hibakereső nem támogatja a függvénytöréspontokat",
 	"breakpointDirtydHover": "Nem megerősített töréspont. A fájl módosult, indítsa újra a hibakeresési munkamenetet.",
+	"logBreakpointUnsupported": "Ez a hibakereső nem támogatja a naplózási pontokat",
 	"conditionalBreakpointUnsupported": "Ez a hibakereső nem támogatja a feltételes töréspontokat",
 	"hitBreakpointUnsupported": "Ez a hibakereső nem támogatja az érintési feltételes töréspontokat"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 21b6e93773f..621a6e08120 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Keret újraindítása",
 	"removeBreakpoint": "Töréspont eltávolítása",
 	"removeAllBreakpoints": "Összes töréspont eltávolítása",
-	"enableBreakpoint": "Töréspont engedélyezése",
-	"disableBreakpoint": "Töréspont letiltása",
 	"enableAllBreakpoints": "Összes töréspont engedélyezése",
 	"disableAllBreakpoints": "Összes töréspont letiltása",
 	"activateBreakpoints": "Töréspontok aktiválása",
 	"deactivateBreakpoints": "Töréspontok deaktiválása",
 	"reapplyAllBreakpoints": "Töréspontok felvétele ismét",
 	"addFunctionBreakpoint": "Függvénytöréspont hozzáadása",
-	"addConditionalBreakpoint": "Feltételes töréspont hozzáadása...",
-	"editConditionalBreakpoint": "Töréspont szerkesztése...",
 	"setValue": "Érték beállítása",
 	"addWatchExpression": "Kifejezés hozzáadása",
 	"editWatchExpression": "Kifejezés szerkesztése",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 37ae84d50a7..a6f8cf46fb3 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Hibakeresés: Töréspont be- és kikapcsolása",
 	"conditionalBreakpointEditorAction": "Hibakeresés: Feltételes töréspont...",
+	"logPointEditorAction": "Hibakeresés: Naplózási pont hozzáadása...",
 	"runToCursor": "Futtatás a kurzorig",
 	"debugEvaluate": "Hibakeresés: Kiértékelés",
 	"debugAddToWatch": "Hibakeresés: Hozzáadás a figyelőlistához",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..b6de2b15184
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "A töréspont érintése esetén naplózandó üzenet. A {} karakterek közötti kifejezések interpolálva lesznek. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"breakpointWidgetHitCountPlaceholder": "Futás megállítása, ha adott alkalommal érintve lett. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"breakpointWidgetExpressionPlaceholder": "Futás megállítása, ha a kifejezés értéke igazra értékelődik ki. 'Enter' a megerősítéshez vagy 'Escape' a megszakításhoz.",
+	"expression": "Kifejezés",
+	"hitCount": "Érintések száma",
+	"logMessage": "Üzenet naplózása"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 8f5ebe5ec40..2654914b2b8 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -27,5 +27,6 @@
 	"onFirstSessionStart": "A hibakeresés csak akkor jelenjen meg az állapotsoron, miután először el lett indítva a hibakeresés",
 	"showInStatusBar": "Meghatározza, hogy megjelenjen-e a hibakeresési állapotsáv",
 	"openDebug": "Meghatározza, hogy megnyíljon-e a hibakeresési modul a hibakeresési munkamenet indulásakor.",
-	"launch": "Globális hibakeresés indítási konfiguráció. Használható a 'launch.json' alternatívájaként, ami meg van osztva több munkaterület között"
+	"launch": "Globális hibakeresés indítási konfiguráció. Használható a 'launch.json' alternatívájaként, ami meg van osztva több munkaterület között",
+	"extensionHostDebugAdapter": "Hibakeresési illesztő futtatása egy kiegészítős gazdafolyamatban"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index b07cb0ef2cd..d038dd9dd4a 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,7 @@
 	"useUniqueNames": "Használjon egyedi konfigurációs neveket!",
 	"app.launch.json.compound.folder": "A mappa neve, ahol az összetett konfiguráció található.",
 	"app.launch.json.compounds.configurations": "Azon konfigurációk neve, melyek elindulnak ezen kombináció részeként.",
-	"debugNoType": "A hibakeresési illesztő 'type' tulajdonsága kötelező, és 'string' típusúnak kell lennie.",
+	"debugNoType": "A hibakereső 'type' tulajdonsága kötelező, és 'string' típusúnak kell lennie.",
 	"selectDebug": "Környezet kiválasztása",
 	"DebugConfig.failed": "Nem sikerült létrehozni a 'launch.json' fájlt a '.vscode' mappánan ({0}).",
 	"workspace": "munkaterület",
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 7b054714fb8..f8b204c30b7 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -18,5 +18,8 @@
 	"enableBreakpoints": "{0}. oszlopban található töréspont engedélyezése",
 	"enableBreakpointOnLine": "Sorszintű töréspont engedélyezése",
 	"addBreakpoint": "Töréspont hozzáadása",
+	"addConditionalBreakpoint": "Feltételes töréspont hozzáadása...",
+	"addLogPoint": "Naplózási pont hozzáadása...",
+	"cancel": "Mégse",
 	"addConfiguration": "Konfiguráció hozzáadása..."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 709e548fd91..d46bba56fc8 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Hibák megjelenítése",
 	"noFolderWorkspaceDebugError": "Az aktív fájlon nem lehet hibakeresést végezni. Bizonyosodjon meg róla, hogy el van mentve a lemezre, és hogy az adott fájltípushoz telepítve van a megfelelő hibakeresési kiegészítő.",
 	"cancel": "Mégse",
-	"DebugTaskNotFound": "A(z) '{0}' preLaunchTask nem található.",
-	"taskNotTracked": "A(z) ${0} preLaunchTaskot nem lehet követni."
+	"DebugTaskNotFound": "A(z) '{0}' feladat nem található.",
+	"taskNotTracked": "A(z) '{0}' feladatot nem lehet követni."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 944e14f9107..906f14a1739 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "További információ",
-	"unableToLaunchDebugAdapter": "Nem sikerült elindítani a hibakeresési illesztőt a következő helyről: '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Nem sikerült elindítani a hibakeresési illesztőt.",
-	"stoppingDebugAdapter": "{0}. Hibakeresési illesztő leállítása.",
 	"debugAdapterCrash": "A hibakeresési illesztő folyamata váratlanul leállt"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 1cd253cec32..27c4e8cd4a1 100644
--- a/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "A hibakeresési illesztő futtatható állománya ('{0}') nem létezik.",
 	"debugAdapterCannotDetermineExecutable": "Nem határozható meg a(z) '{0}' hibakeresési illesztő futtatható állománya.",
-	"launch.config.comment1": "IntelliSense használata a lehetséges attribútumok listázásához",
-	"launch.config.comment2": "Húzza fölé az egeret a létező attribútumok leírásának megtekintéséhez!",
-	"launch.config.comment3": "További információért látogassa meg a következőt: {0}",
-	"debugType": "A konfiguráció típusa.",
-	"debugTypeNotRecognised": "Ez a hibakeresési típus nem ismert. Bizonyosodjon meg róla, hogy telepítve és engedélyezve van a megfelelő hibakeresési kiegészítő.",
-	"node2NotSupported": "A \"node2\" már nem támogatott. Használja helyette a \"node\"-ot, és állítsa a \"protocol\" attribútum értékét \"inspector\"-ra.",
-	"debugName": "A konfiguráció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
-	"debugRequest": "A konfiguráció kérési típusa. Lehet \"launch\" vagy \"attach\".",
-	"debugServer": "Csak hibakeresési kiegészítők fejlesztéséhez: ha a port meg van adva, akkor a VS Code egy szerver módban futó hibakeresési illesztőhöz próbál meg csatlakozni.",
-	"debugPrelaunchTask": "A hibakeresési folyamat előtt futtatandó feladat.",
-	"debugWindowsConfiguration": "Windows-specifikus indítási konfigurációs attribútumok.",
-	"debugOSXConfiguration": "OS X-specifikus indítási konfigurációs attribútumok.",
-	"debugLinuxConfiguration": "Linux-specifikus indítási konfigurációs attribútumok.",
-	"deprecatedVariables": "Az 'env.', 'config.' és 'command.' tujdonságok elavultak, használja helyette az 'env:', 'config:' és 'command:' tulajdonságokat."
+	"unableToLaunchDebugAdapter": "Nem sikerült elindítani a hibakeresési illesztőt a következő helyről: '{0}'.",
+	"unableToLaunchDebugAdapterNoArgs": "Nem sikerült elindítani a hibakeresési illesztőt."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..b50ef5b76d2
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "IntelliSense használata a lehetséges attribútumok listázásához",
+	"launch.config.comment2": "Húzza fölé az egeret a létező attribútumok leírásának megtekintéséhez!",
+	"launch.config.comment3": "További információért látogassa meg a következőt: {0}",
+	"debugType": "A konfiguráció típusa.",
+	"debugTypeNotRecognised": "Ez a hibakeresési típus nem ismert. Bizonyosodjon meg róla, hogy telepítve és engedélyezve van a megfelelő hibakeresési kiegészítő.",
+	"node2NotSupported": "A \"node2\" már nem támogatott. Használja helyette a \"node\"-ot, és állítsa a \"protocol\" attribútum értékét \"inspector\"-ra.",
+	"debugName": "A konfiguráció neve. Az indítási konfiguráció lenyíló menüjében jelenik meg.",
+	"debugRequest": "A konfiguráció kérési típusa. Lehet \"launch\" vagy \"attach\".",
+	"debugServer": "Csak hibakeresési kiegészítők fejlesztéséhez: ha a port meg van adva, akkor a VS Code egy szerver módban futó hibakeresési illesztőhöz próbál meg csatlakozni.",
+	"debugPrelaunchTask": "A hibakeresési folyamat előtt futtatandó feladat.",
+	"debugPostDebugTask": "A hibakeresési folyamat vége után futtatandó feladat.",
+	"debugWindowsConfiguration": "Windows-specifikus indítási konfigurációs attribútumok.",
+	"debugOSXConfiguration": "OS X-specifikus indítási konfigurációs attribútumok.",
+	"debugLinuxConfiguration": "Linux-specifikus indítási konfigurációs attribútumok.",
+	"deprecatedVariables": "Az 'env.', 'config.' és 'command.' tujdonságok elavultak, használja helyette az 'env:', 'config:' és 'command:' tulajdonságokat."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..63c2dd4d544
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code-konzol",
+	"mac.terminal.script.failed": "A(z) '{0}' parancsfájl a következő hibakóddal lépett ki: {1}",
+	"mac.terminal.type.not.supported": "A(z) '{0}' nem támogatott",
+	"press.any.key": "A folytatáshoz nyomjon meg egy billentyűt...",
+	"linux.term.failed": "A(z) '{0}' a következő hibakóddal lépett ki: {1}"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index cea278e8b7c..7a913054b25 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Ajánlott kiegészítők konfigurálása (munkaterület-mappára vonatkozóan)",
 	"malicious tooltip": "A kiegészítőt korábban problémásnak jelezték.",
 	"malicious": "Rosszindulatú",
+	"disabled": "Letiltva",
+	"disabled globally": "Letiltva",
+	"disabled workspace": "Letiltva ezen a munkaterületen",
 	"disableAll": "Összes telepített kiegészítő letiltása",
 	"disableAllWorkspace": "Összes telepített kiegészítő letiltása a munkaterületre vonatkozóan",
 	"enableAll": "Összes kiegészítő engedélyezése",
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..70f8aa798f7
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Kiegészítő neve",
+	"extension id": "Kiegészítő azonosítója",
+	"preview": "Betekintő",
+	"builtin": "Beépített",
+	"publisher": "Kiadó neve",
+	"install count": "Telepítések száma",
+	"rating": "Értékelés",
+	"repository": "Forráskódtár",
+	"license": "Licenc",
+	"details": "Részletek",
+	"contributions": "Szolgáltatások",
+	"changelog": "Változtatási napló",
+	"dependencies": "Függőségek",
+	"noReadme": "Leírás nem található.",
+	"noChangelog": "Változtatási napló nem található.",
+	"noContributions": "Nincsenek szolgáltatások",
+	"noDependencies": "Nincsenek függőségek",
+	"settings": "Beállítások ({0})",
+	"setting name": "Név",
+	"description": "Leírás",
+	"default": "Alapértelmezett",
+	"debuggers": "Hibakeresők ({0})",
+	"debugger name": "Név",
+	"debugger type": "Típus",
+	"views": "Nézetek ({0})",
+	"view id": "Azonosító",
+	"view name": "Név",
+	"view location": "Hol?",
+	"localizations": "Lokalizációk ({0})",
+	"localizations language id": "Nyelv azonosítója",
+	"localizations language name": "Nyelv neve",
+	"localizations localized language name": "Nyelv neve (lokalizálva)",
+	"colorThemes": "Színtémák ({0})",
+	"iconThemes": "Ikontémák ({0})",
+	"colors": "Színek ({0})",
+	"colorId": "Azonosító",
+	"defaultDark": "Alapértelmezett sötét",
+	"defaultLight": "Alapértelmezett világos",
+	"defaultHC": "Alapértelmezett nagy kontrasztú",
+	"JSON Validation": "JSON-validációk ({0})",
+	"fileMatch": "Fájlegyezés",
+	"schema": "Séma",
+	"commands": "Parancsok ({0})",
+	"command name": "Név",
+	"keyboard shortcuts": "Billentyűparancsok",
+	"menuContexts": "Helyi menük",
+	"languages": "Nyelvek ({0})",
+	"language id": "Azonosító",
+	"language name": "Név",
+	"file extensions": "Fájlkiterjesztések",
+	"grammar": "Nyelvtan",
+	"snippets": "Kódtöredékek"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 51523b2194e..cc2d7bd950a 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -8,15 +8,15 @@
 	],
 	"neverShowAgain": "Ne jelenítse meg újra",
 	"searchMarketplace": "Keresés a piactéren",
-	"showLanguagePackExtensions": "A piactéren található olyan kiegészítő, ami lefordítja a(z) '.{0}' VS Code-ot '{0}' nyelvre",
+	"showLanguagePackExtensions": "A piactéren található olyan kiegészítő, ami lefordítja a VS Code-ot '{0}' nyelvre",
 	"dynamicWorkspaceRecommendation": "Ez a kiegészítő lehet, hogy érdekelni fogja, mert népszerű a(z) {0} forráskódtár felhasználói körében.",
 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
 	"reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.",
 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
-	"showRecommendations": "Ajánlatok megjelenítése",
 	"install": "Telepítés",
+	"showRecommendations": "Ajánlatok megjelenítése",
 	"showLanguageExtensions": "A piactéren található olyan kiegészítő, ami segíthet a(z) '.{0}' fájloknál",
 	"workspaceRecommended": "A munkaterülethez vannak javasolt kiegészítők",
 	"installAll": "Összes telepítése",
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 25fbc666463..716316b2449 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Letiltja a többi billentyűkonfigurációt ({0}) a billentyűparancsok közötti konfliktusok megelőzése érdekében?",
 	"yes": "Igen",
-	"no": "Nem",
-	"betterMergeDisabled": "A Better Merge kiegészítő most már be van építve. A telepített kiegészítő le lett tiltva és eltávolítható.",
-	"uninstall": "Eltávolítás"
+	"no": "Nem"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 33a83814b95..1c51e825f0a 100644
--- a/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "Ajánlott",
 	"otherRecommendedExtensions": "További ajánlatok",
 	"workspaceRecommendedExtensions": "Ajánlott a munkaterülethez",
-	"builtInExtensions": "Beépített",
+	"builtInExtensions": "Funkciók",
+	"builtInThemesExtensions": "Témák",
+	"builtInBasicsExtensions": "Programozási nyelvek",
 	"searchExtensions": "Kiegészítők keresése a piactéren",
 	"sort by installs": "Rendezés a telepítések száma szerint",
 	"sort by rating": "Rendezés értékelés szerint",
diff --git a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index 7b1855ae0b2..4baf355021f 100644
--- a/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "Szövegfájlszerkesztő",
 	"createFile": "Fájl létrehozása",
+	"relaunchWithIncreasedMemoryLimit": "Újraindítás {0} MB-tal",
+	"configureMemoryLimit": "Memóriakorlát beállítása",
 	"fileEditorWithInputAriaLabel": "{0}. Szövegfájlszerkesztő.",
 	"fileEditorAriaLabel": "Szövegfájlszerkesztő"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index fd4fbe037e7..27080d41e6c 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,11 @@
 	"confirmDeleteMessageFolder": "Törli a(z) '{0}' nevű mappát és annak teljes tartalmát? ",
 	"confirmDeleteMessageFile": "Véglegesen törli a(z) '{0}' nevű fájlt?",
 	"irreversible": "A művelet nem vonható vissza!",
-	"cancel": "Mégse",
-	"permDelete": "Végleges törlés",
-	"importFiles": "Fájlok importálása",
+	"binFailed": "Nem sikerült törölni a lomtár használatával. Szeretné helyette véglegesen törölni?",
+	"trashFailed": "Nem sikerült törölni a kuka használatával. Szeretné helyette véglegesen törölni?",
+	"deletePermanentlyButtonLabel": "&&Törlés véglegesen",
+	"retryButtonLabel": "Új&&rapróbálkozás",
+	"addFiles": "Fájlok hozzáadása",
 	"confirmOverwrite": "A célmappában már van ilyen nevű mappa vagy fájl. Le szeretné cserélni?",
 	"replaceButtonLabel": "&&Csere",
 	"fileIsAncestor": "A beillesztendő fájl a célmappa szülője",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 03c5761aece..edaae86a63a 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "Meghatározza, hogy a nem mentett fájlokra emlékezzen-e az alkalmazás a munkamenetek között, így ki lehet hagyni a mentéssel kapcsolatos felugró ablakokat kilépésnél.",
 	"useExperimentalFileWatcher": "Új, kísérleti fájlfigyelő használata.",
 	"defaultLanguage": "Az új fájlokhoz alapértelmezetten hozzárendelt nyelv.",
+	"maxMemoryForLargeFilesMB": "Meghatározza a VS Code számára elérhető memória mennyiségét újraindítás után, nagy fájlok megnyitása esetén. Hatása ugyanaz, mint a --max-memory=ÚJMÉRET kapcsoló megadása parancssorból való indítás esetén.",
 	"editorConfigurationTitle": "Szerkesztőablak",
 	"formatOnSave": "Fájlok formázása mentéskor. Az adott nyelvhez rendelkezésre kell állni formázónak, nem lehet beállítva automatikus mentés, és a szerkesztő nem állhat éppen lefelé.",
+	"formatOnSaveTimeout": "Időkorlát mentéskor végzett formázások esetén. Meghatároz egy időkorlátot ezredmásodpercben a formatOnSave-parancsok számára. Az ennél hosszabb ideig tartó parancsok meg lesznek szakítva.",
 	"explorerConfigurationTitle": "Fájlkezelő",
 	"openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma.",
 	"autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index c0be92f2f54..9db90ff7ab2 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Adja meg a fájl nevét. Nyomjon 'Enter'-t a megerősítéshez vagy 'Escape'-et a megszakításhoz.",
-	"constructedPath": "{0} létrehozása a következő helyen: **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Fájlkezelő",
 	"dropFolders": "Szeretné hozzáadni a mappákat a munkaterülethez?",
 	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
 	"addFolders": "Mappák hozzá&&adása",
 	"addFolder": "Mappa hozzá&&adása",
+	"confirmRootsMove": "Szeretné módosítani több gyökérmappa sorrendjét a munkaterületen belül?",
 	"confirmMultiMove": "Át szeretné helyezni a következő {0} fájlt?",
+	"confirmRootMove": "Szeretné módosítani a(z) '{0}' gyökérmappa sorrendjét a munkaterületen belül?",
 	"confirmMove": "Át szeretné helyezni a(z) '{0}' nevű fájlt?",
 	"doNotAskAgain": "Ne kérdezze meg újra",
 	"moveButtonLabel": "&&Áthelyezés",
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..c2a0ca800e8
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "HTML-előnézet"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..d5c321fd607
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Érvénytelen bemenet a szerkesztőablakból."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..6f1887b8477
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Fejlesztői"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..89f213109cf
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
+	"refreshWebviewLabel": "Webview-k újratöltése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index ecee49b1a31..626849ee9d1 100644
--- a/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Szeretné a VS Code felületét {0} nyelvűre állítani és újraindítani az alkalmazást?",
+	"yes": "Igen",
+	"no": "Nem",
+	"neverAgain": "Ne jelenítse meg újra",
 	"JsonSchema.locale": "A felhasználói felületen használt nyelv.",
 	"vscode.extension.contributes.localizations": "Lokalizációkat szolgáltat a szerkesztőhöz",
 	"vscode.extension.contributes.localizations.languageId": "Annak a nyelvnek az azonosítója, amelyre a megjelenített szövegek fordítva vannak.",
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..08d7b8601cf
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Másolás",
+	"copyMessage": "Üzenet másolása"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..9cc6717e0d4
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Összesen {0} probléma"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..e26c8c27c96
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Problémák",
+	"tooltip.1": "A fájlban 1 probléma található",
+	"tooltip.N": "A fájlban {0} probléma található",
+	"markers.showOnFile": "Fájlokban és mappákban található hibák és figyelmeztetések megjelenítése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..04de19e7bab
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Nézet",
+	"problems.view.toggle.label": "Problémák be- és kikapcsolása (hiba, figyelmeztetés, információ)",
+	"problems.view.focus.label": "Váltás a problémákra (hiba, figyelmeztetés, információ)",
+	"problems.panel.configuration.title": "Problémák-nézet",
+	"problems.panel.configuration.autoreveal": "Meghatározza, hogy a problémák nézet automatikusan felfedje-e a fájlokat, amikor megnyitja őket.",
+	"markers.panel.title.problems": "Problémák",
+	"markers.panel.aria.label.problems.tree": "Problémák fájlonként csoportosítva",
+	"markers.panel.no.problems.build": "A munkaterületen eddig egyetlen hiba sem lett érzékelve.",
+	"markers.panel.action.filter": "Problémák szűrése",
+	"markers.panel.filter.ariaLabel": "Problémák szűrése",
+	"markers.panel.filter.errors": "hibák",
+	"markers.panel.filter.warnings": "figyelmeztetések",
+	"markers.panel.filter.infos": "információk",
+	"markers.panel.single.error.label": "1 hiba",
+	"markers.panel.multiple.errors.label": "{0} hiba",
+	"markers.panel.single.warning.label": "1 figyelmeztetés",
+	"markers.panel.multiple.warnings.label": "{0} figyelmeztetés",
+	"markers.panel.single.info.label": "1 információ",
+	"markers.panel.multiple.infos.label": "{0} információ",
+	"markers.panel.single.unknown.label": "1 ismeretlen",
+	"markers.panel.multiple.unknowns.label": "{0} ismeretlen",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} {1} problémával",
+	"problems.tree.aria.label.marker.relatedInformation": "Ez a probléma {0} helyre hivatkozik.",
+	"problems.tree.aria.label.error.marker": "{0} által generált hiba: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Hiba: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "{0} által generált figyelmeztetés: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Figyelmeztetés: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.info.marker": "{0} által generált információ: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Információ: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.marker": "{0} által generált probléma: {1}, sor: {2}, oszlop: {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Probléma: {0}, sor: {1}, oszlop: {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0}, sor: {1}, oszlop: {2}, a következő helyen: {3}",
+	"errors.warnings.show.label": "Hibák és figyelmezetések megjelenítése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 65dac081944..b0047af883c 100644
--- a/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Kimenet be- és kikapcsolása",
 	"clearOutput": "Kimenet törlése",
 	"toggleOutputScrollLock": "Kimenet görgetési zárának be- és kikapcsolása",
-	"switchToOutput.label": "Váltás a kimenetre"
+	"switchToOutput.label": "Váltás a kimenetre",
+	"openInLogViewer": "Naplófájl megnyitása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 3745c84cea4..0e30f573276 100644
--- a/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Kimenet",
 	"logViewer": "Naplófájl-megjelenítő",
 	"viewCategory": "Nézet",
-	"clearOutput.label": "Kimenet törlése"
+	"clearOutput.label": "Kimenet törlése",
+	"openActiveLogOutputFile": "Nézet: Aktív napló kimeneti fájljának megnyitása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index e26ae7fdac0..c6560556f50 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Billentyűparancsok",
+	"showDefaultKeybindings": "Alapértelmezett billentyűparancsok megjelenítése",
+	"showUserKeybindings": "Felhasználói billentyűparancsok megjelenítése",
 	"SearchKeybindings.AriaLabel": "Billentyűparancsok keresése",
 	"SearchKeybindings.Placeholder": "Billentyűparancsok keresése",
 	"sortByPrecedene": "Rendezés precedencia szerint",
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index eafcce8d969..2a7ffa73a6d 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Nyers alapértelmezett beállítások megnyitása",
+	"openSettings": "Beállítások megnyitása",
 	"openGlobalSettings": "Felhasználói beállítások megnyitása",
 	"openGlobalKeybindings": "Billentyűparancsok megnyitása",
 	"openGlobalKeybindingsFile": "Billentyűparancsfájl megnyitása",
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 3f82c002188..b1b8e310251 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Alapértelmezett beállítások",
 	"SearchSettingsWidget.AriaLabel": "Beállítások keresése",
 	"SearchSettingsWidget.Placeholder": "Beállítások keresése",
 	"noSettingsFound": "Nincs eredmény",
@@ -16,6 +15,8 @@
 	"nlpResult": "Természetes nyelvi keresés eredményei",
 	"filterResult": "Szűrt találatok",
 	"defaultSettings": "Alapértelmezett beállítások",
+	"defaultUserSettings": "Alapértelmezett felhasználói beállítások",
+	"defaultWorkspaceSettings": "Alapértelmezett munkaterületi beállítások",
 	"defaultFolderSettings": "Alapértelmezett mappabeállítások",
 	"defaultEditorReadonly": "A jobb oldalon lévő szerkesztőablak tartalmának módosításával írhatja felül az alapértelmezett beállításokat.",
 	"preferencesAriaLabel": "Az alapértelmezett beállítások. Írásvédett szerkesztőablak."
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index bb7763d54a3..7fcd4f374ab 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "\"{0}\" kiegészítő megjelenítése",
 	"editTtile": "Szerkesztés",
 	"replaceDefaultValue": "Csere a beállításokban",
-	"copyDefaultValue": "Másolás a beállításokba",
-	"unsupportedPHPExecutablePathSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet. A PHP munkaterülethez történő konfigurálásához nyisson meg egy PHP-fájlt, majd kattintson a PHP-elérési útra az állapotsoron!",
-	"unsupportedWorkspaceSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
-	"unsupportedWorkbenchSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát.",
-	"unsupportedWorkbenchSettingDevMode": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha a hatóköre 'resource'-ként van megadva a regisztráció során vagy közvetlenül nyitja meg ezt a mappát."
+	"copyDefaultValue": "Másolás a beállításokba"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 62a27fb2806..eed65b480a8 100644
--- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...",
 	"no open repo": "Nincs aktív verziókezelő rendszer.",
 	"source control": "Verziókezelő rendszer",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Elrejtés"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 6c9f746df9e..ff26fdc4402 100644
--- a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Előző kizáró keresési minta megjelenítése",
 	"nextSearchTerm": "Következő keresőkifejezés megjelenítése",
 	"previousSearchTerm": "Előző keresőkifejezés megjelenítése",
-	"showSearchViewlet": "Keresés megjelenítése",
 	"findInFiles": "Keresés a fájlokban",
 	"replaceInFiles": "Csere a fájlokban",
 	"RefreshAction.label": "Frissítés",
diff --git a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index ffaed50c03f..d229aa88582 100644
--- a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,15 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Keresés",
+	"copyMatchLabel": "Másolás",
+	"copyPathLabel": "Elérési út másolása",
+	"copyAllLabel": "Összes másolása",
+	"toggleSearchViewPositionLabel": "Keresőnézet helyzetének váltása",
 	"findInFolder": "Keresés mappában...",
 	"findInWorkspace": "Keresés a munkaterületen...",
 	"showTriggerActions": "Szimbólum megkeresése a munkaterületen...",
 	"name": "Keresés",
-	"search": "Keresés",
 	"showSearchViewl": "Keresés megjelenítése",
 	"view": "Nézet",
 	"findInFiles": "Keresés a fájlokban",
@@ -26,5 +30,5 @@
 	"search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.",
 	"search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres",
 	"search.globalFindClipboard": "Meghatározza, hogy a keresőmodul olvassa és módosítsa-e a megosztott keresési vágólapot macOS-en.",
-	"search.location": "Előzetes funkció: meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több hely van vízszintesen. A következő kiadásban a panel megjelenése optimalizálva lesz a vízszintes megjelenítéshez, és a funkció nem lesz előzetes."
+	"search.location": "Meghatározza, hogy a keresés az oldalsávon jelenik meg vagy egy panelként a panelterületen, mely utóbbi esetén több hely van vízszintesen. A következő kiadásban a panel megjelenése optimalizálva lesz a vízszintes megjelenítéshez, és a funkció nem lesz előzetes."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 401c2d990b5..77d4506f265 100644
--- a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Segítsen javítani a {0}-támogatásunkat",
 	"takeShortSurvey": "Rövid felmérés kitöltése",
 	"remindLater": "Emlékeztessen később",
-	"neverAgain": "Ne jelenítse meg újra",
-	"helpUs": "Segítsen javítani a {0}-támogatásunkat"
+	"neverAgain": "Ne jelenítse meg újra"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 045f052b919..114c9ebb551 100644
--- a/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Lenne kedve egy gyors elégedettségi felméréshez?",
 	"takeSurvey": "Felmérés kitöltése",
 	"remindLater": "Emlékeztessen később",
-	"neverAgain": "Ne jelenítse meg újra",
-	"surveyQuestion": "Lenne kedve egy gyors elégedettségi felméréshez?"
+	"neverAgain": "Ne jelenítse meg újra"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 72c95a38758..45757d97a23 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Egy problémaminta vagy egy szolgáltatott vagy elődefiniált problémaminta neve. Elhagyható, ha az alapként használandó minta meg van adva.",
 	"ProblemMatcherSchema.base": "A alapként használni kívánt problémaillesztő neve.",
 	"ProblemMatcherSchema.owner": "A probléma tulajdonosa a Code-on belül. Elhagyható, ha az alapként használt minta meg van adva. Alapértelmezett értéke 'external', ha nem létezik és az alapként használt minta nincs meghatározva.",
+	"ProblemMatcherSchema.source": "A diagnosztika forrásának emberek által is értelmezhető leírása, pl. 'typescript' vagy 'super lint'.",
 	"ProblemMatcherSchema.severity": "Az elkapott problémák alapértelmezett súlyossága. Ez az érték van használva, ha a minta nem definiál illesztési csoportot a súlyossághoz.",
 	"ProblemMatcherSchema.applyTo": "Meghatározza, hogy a szöveges dokumentumhoz jelentett probléma megnyitott, bezárt vagy minden dokumentumra legyen alkalmazva.",
 	"ProblemMatcherSchema.fileLocation": "Meghatározza, hogy a problémamintában talált fájlnevek hogyan legyenek értelmezve.",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 65bf3fa4359..5971de78c2e 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "A feladatot egyetlen csoporthoz sem rendeli",
 	"JsonSchema.tasks.group": "Meghatározza a feladat végrehajtási csoportját. A \"build\" esetén a buildelési csoportba, a \"test\" esetén a tesztelési csoportba kerül bele a feladat.",
 	"JsonSchema.tasks.type": "Meghatározza, hogy a feladat folyamatként van-e végrehajtva vagy egy parancsként a shellben.",
+	"JsonSchema.command.quotedString.value": "A parancs tényleges értéke",
+	"JsonSchema.tasks.quoting.escape": "A karaktereket a shell saját feloldókarakterével oldja fel (pl. PowerShell alatt a `, míg bash alatt a \\ karakterrel).",
+	"JsonSchema.tasks.quoting.strong": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a \" karakterrel). ",
+	"JsonSchema.tasks.quoting.weak": "Az argumentumot a shell erős idézőjel-karakterével veszi körül (pl. PowerShell és bash alatt a ' karakterrel). ",
+	"JsonSchema.command.quotesString.quote": "Hogyan legyen idézőjelezve a parancs értéke.",
+	"JsonSchema.command": "A végrehajtandó parancs. Lehet egy külső parancs vagy egy rendszerparancs.",
+	"JsonSchema.args.quotedString.value": "Az argumentum tényleges értéke",
+	"JsonSchema.args.quotesString.quote": "Hogyan legyen idézőjelezve az argumentum értéke.",
+	"JsonSchema.tasks.args": "A parancs meghívásakor átadott argumentumok.",
 	"JsonSchema.tasks.label": "A feladat felhasználói felületen megjelenő neve",
 	"JsonSchema.version": "A konfiguráció verziószáma",
 	"JsonSchema.tasks.identifier": "A feladat felhasználó által definiált azonosítója, amivel hivatkozni lehet a feladatra a lauch.json-ban vagy egy dependsOn-utasításban.",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index efbb0ead2d7..f91b0b4ec32 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Feladatok",
 	"ConfigureTaskRunnerAction.label": "Feladat beállítása",
+	"totalErrors": "{0} hiba",
+	"totalWarnings": "{0} figyelmeztetés",
+	"totalInfos": "{0} információ",
 	"problems": "Problémák",
 	"building": "Buildelés...",
-	"manyMarkers": "99+",
+	"manyProblems": "10k+",
 	"runningTasks": "Futó feladatok megjelenítése",
 	"tasks": "Feladatok",
 	"TaskSystem.noHotSwap": "A feladatvégrehajtó motor megváltoztatása egy futó, aktív feladat esetén az ablak újraindítását igényli.",
@@ -28,8 +31,10 @@
 	"selectProblemMatcher": "Válassza ki, milyen típusú hibák és figyelmeztetések legyenek keresve a feladat kimenetében!",
 	"customizeParseErrors": "A jelenlegi feladatkonfigurációban hibák vannak. Feladat egyedivé tétele előtt javítsa a hibákat!",
 	"moreThanOneBuildTask": "Túl sok buildelési feladat van definiálva a tasks.json-ban. Az első lesz végrehajtva.\n",
-	"TaskSystem.activeSame.background": "A(z) '{0}' feladat már aktív és a háttérben fut. A feladat befejezéséhez használja az 'Feladat megszakítása...' parancsot a Feladatok menüből!",
-	"TaskSystem.activeSame.noBackground": "A(z) '{0}' feladat már aktív. A feladat befejezéséhez használja 'Feladat megszakítása' parancsot a Feladatok menüből!",
+	"TaskSystem.activeSame.background": "A(z) '{0}' azonosítójú feladat már aktiválva van és a háttérben fut.",
+	"TaskSystem.activeSame.noBackground": "A(z) '{0}' azonosítójú feladat már aktiválva van.",
+	"terminateTask": "Feladat megszakítása",
+	"restartTask": "Feladat újraindítása",
 	"TaskSystem.active": "Már fut egy feladat. Szakítsa meg, mielőtt egy másik feladatot futtatna.",
 	"TaskSystem.restartFailed": "Nem sikerült a(z) {0} feladat befejezése és újraindítása.",
 	"TaskService.noConfiguration": "Hiba: a(z) {0} feladatok felderítése nem szolgáltatott feladatot a következő konfigurációhoz:\n{1}\nA feladat figyelmen kívül lesz hagyva.\n",
diff --git a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 859b71eada3..fc54f4c27dc 100644
--- a/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Figyelmeztetés: az options.cwd értékének string típusúnak kell lennie. A következő érték figyelmen kívül van hagyva: {0}.",
+	"ConfigurationParser.inValidArg": "Hiba: a parancssori argumentum egy string vagy egy idézőjeles string lehet. A megadott érték:\n{0}",
 	"ConfigurationParser.noargs": "Hiba: a parancssori argumentumokat string típusú tömbként kell megadni. A megadott érték:\n{0}",
 	"ConfigurationParser.noShell": "Figyelmeztetés: a shellkonfiguráció csak akkor támogatott, ha a feladat a terminálban van végrehajtva.",
 	"ConfigurationParser.noName": "Hiba: a deklarációs hatókörben lévő problémailleszőnek kötelező nevet adni:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Hiba: a(z) '{0}' feladatkonfigurációból hiányzik a kötelező '{1}' tulajdonság. A feladatkonfiguráció figyelmen kívül lesz hagyva.",
 	"ConfigurationParser.notCustom": "Hiba: a feladat nem egyedi feladatként van definiálva. A konfiguráció figyelmen kívül lesz hagyva.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Hiba: a feladatnak rendelkeznie kell adni taskName tulajdonsággal. A feladat figyelmen kívül lesz hagyva.\n{0}\n",
-	"taskConfiguration.shellArgs": "Figyelmeztetés: a(z) '{0}' feladat egy rendszerparancs, és az argumentumok egyikében escape-elés nélküli szóköz található. A megfelelő idézőjelezés érdekében olvassza bele az argumentumokat a parancsba.",
 	"taskConfiguration.noCommandOrDependsOn": "Hiba: a(z) '{0}' feladat nem ad meg parancsot, és nem definiálja a dependsOn tulajdonságot sem. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
 	"taskConfiguration.noCommand": "Hiba: a(z) '{0}' feladathoz nincs definiálva a parancs. A feladat figyelmen kívül lesz hagyva. A definíciója:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "A feladatok 2.0.0-s verziója nem támogatja a globális, operációs rendszer-specifikus feladatokat. Alakítsa át őket operációs rendszer-specifikus parancsot tartalmazó feladattá. Az érintett feladatok:\n{0}"
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..e68d7791167
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "A terminál háttérszíne. Ez lehetővé teszi a terminál paneltől eltérő színezését.",
+	"terminal.foreground": "A terminál előtérszíne.",
+	"terminalCursor.foreground": "A terminál kurzorának előtérszíne.",
+	"terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
+	"terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.",
+	"terminal.border": "A terminálokat elválasztó keret színe. Alapértelmezett értéke megegyezik a panel.border értékével.",
+	"terminal.ansiColor": "'{0}' ANSI-szín a terminálban."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 6ebf74d1655..bb78a0034db 100644
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -21,6 +21,7 @@
 	"workbench.action.terminal.newWorkspacePlaceholder": "Az aktuális munkakönyvtár kiválasztása az új terminálhoz",
 	"workbench.action.terminal.newInActiveWorkspace": "Új integrált terminál létrehozása (az aktív munkaterületen)",
 	"workbench.action.terminal.split": "Terminál kettéosztása",
+	"workbench.action.terminal.splitInActiveWorkspace": "Terminál kettéosztása (az aktív munkaterületen)",
 	"workbench.action.terminal.focusPreviousPane": "Váltás az előző panelra",
 	"workbench.action.terminal.focusNextPane": "Ugrás a következő panelra",
 	"workbench.action.terminal.resizePaneLeft": "Méret növelése balra",
@@ -43,6 +44,7 @@
 	"workbench.action.terminal.scrollUpPage": "G9rgetés felfelé (oldalanként)",
 	"workbench.action.terminal.scrollToTop": "Görgetés a tetejére",
 	"workbench.action.terminal.clear": "Törlés",
+	"workbench.action.terminal.clearSelection": "Kijelölés megszüntetése",
 	"workbench.action.terminal.allowWorkspaceShell": "Munkaterületspecifikus shellkonfiguráció engedélyezése",
 	"workbench.action.terminal.disallowWorkspaceShell": "Munkaterületspecifikus shellkonfiguráció letiltása",
 	"workbench.action.terminal.rename": "Átnevezés",
@@ -51,5 +53,9 @@
 	"workbench.action.terminal.hideFindWidget": "Keresőmodul elrejtése",
 	"nextTerminalFindTerm": "Következő keresési kifejezés megjelenítése",
 	"previousTerminalFindTerm": "Előző keresési kifejezés megjelenítése",
-	"quickOpenTerm": "Aktív terminál váltása"
+	"quickOpenTerm": "Aktív terminál váltása",
+	"workbench.action.terminal.scrollToPreviousCommand": "Görgetés az előző parancshoz",
+	"workbench.action.terminal.scrollToNextCommand": "Görgetés a következő parancshoz",
+	"workbench.action.terminal.selectToPreviousCommand": "Előző parancs kiválasztása",
+	"workbench.action.terminal.selectToNextCommand": "Következő parancs kiválasztása"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index b869ee23431..f1c61bd70f2 100644
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Másolás",
+	"split": "Kettéosztás",
 	"paste": "Beillesztés",
 	"selectAll": "Összes kijelölése",
-	"clear": "Törlés",
-	"split": "Kettéosztás"
+	"clear": "Törlés"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index dc383e1092c..4f60626235a 100644
--- a/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "A munkaterület olyan beállításokat tartalmaz, amelyeket csak a felhasználói beállításoknál lehet megadni (({0}). További információhoz kattintson [ide]({1})!",
 	"openWorkspaceSettings": "Munkaterület beállításainak megnyitása",
-	"dontShowAgain": "Ne jelenítse meg újra",
-	"unsupportedWorkspaceSettings": "A munkaterület olyan beállításokat tartalmaz, amelyeket csak a felhasználói beállításoknál lehet megadni (({0}). További információhoz kattintson [ide]({1})!"
+	"dontShowAgain": "Ne jelenítse meg újra"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..d682cbdfb4c
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Kiadási jegyzék: {0}",
+	"unassigned": "nincs hozzárendelve"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 41b05f04072..ee159633915 100644
--- a/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Később",
-	"unassigned": "nincs hozzárendelve",
 	"releaseNotes": "Kiadási jegyzék",
 	"showReleaseNotes": "Kiadási jegyzék megjelenítése",
 	"read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?",
@@ -17,13 +15,14 @@
 	"updateIsReady": "Új {0}-frissítés érhető el.",
 	"noUpdatesAvailable": "Jelenleg nincs elérhető frissítés.",
 	"ok": "OK",
-	"download now": "Letöltés most",
 	"thereIsUpdateAvailable": "Van elérhető frissítés.",
-	"installUpdate": "Frissítés telepítése",
+	"download now": "Letöltés most",
+	"later": "Később",
 	"updateAvailable": "Frissítés érhető el: {0} {1}",
+	"installUpdate": "Frissítés telepítése",
 	"updateInstalling": "{0} {1} a háttérben települ. Jelzünk, ha elkészült.",
+	"updateAvailableAfterRestart": "A {0} újraindításával telepíthető a legújabb frissítés.",
 	"updateNow": "Frissítés most",
-	"updateAvailableAfterRestart": "A {0} frissül az újraindítás után.",
 	"commandPalette": "Parancskatalógus...",
 	"settings": "Beállítások",
 	"keyboardShortcuts": "Billentyűparancsok",
diff --git a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..d027e8f4428
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "webview-szerkesztő",
+	"developer": "Fejlesztői"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..89f213109cf
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview-fejlesztőeszközök megnyitása",
+	"refreshWebviewLabel": "Webview-k újratöltése"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..37523ae01ca
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja ki]({1}) ezt a funkciót.",
+	"telemetryOptOut.optInNotice": "Segítsen a VS Code tökéletesítésében azzal, hogy engedélyezi a Microsoft számára a használati adatok gyűjtését! Olvasssa el az [adatvédelmi nyilatkozatot]({0}), és tudja meg, hogyan [kapcsolhatja be]({1}) ezt a funkciót.",
+	"telemetryOptOut.readMore": "További információk"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index e2fd2549371..8e4e5a7201f 100644
--- a/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Eszközök és nyelvek",
 	"welcomePage.installExtensionPacksDescription": "{0} és {1} fejlesztőkörnyezetek telepítése ",
 	"welcomePage.moreExtensions": "további",
-	"welcomePage.installKeymapDescription": "Billentyűparancsok telepítése",
-	"welcomePage.installKeymapExtension": "{0} és {1} billentyűparancsok telepítése ",
 	"welcomePage.others": "további",
 	"welcomePage.colorTheme": "Színtéma",
 	"welcomePage.colorThemeDescription": "Alakítsa át szeretett szerkesztőjét úgy, ahogyan szeretné!",
diff --git a/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
index dc9b5a6e5f0..2d49c8ecc4a 100644
--- a/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"vscode.extension.contributes.configuration.title": "A beállítások összefoglaló leírása. Ez a címke jelenik meg a beállítások fájlban egy különálló megjegyzésként.",
 	"vscode.extension.contributes.configuration.properties": "A konfigurációs tulajdonságok leírása.",
+	"scope.application.description": "Alkalmazásspecifikus beállítás, ami csak a felhasználói beállításokban konfigurálható.",
 	"scope.window.description": "Ablakspecifikus beállítás, ami konfigurálható a felhasználói vagy munkaterületi beállításokban.",
 	"scope.resource.description": "Erőforrásspecifikus beállítás, ami beállítható a felhasználói, munkaterületi és mappaszintű beállításokban.",
 	"scope.description": "A hatókör, amire a beállítás vonatkozik. Az elérhető hatókörök: `window` és `resource`.",
diff --git a/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..e25641ff799
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedApplicationSetting": "Ez a beállítás csak a felhasználói beállításokban szerepelhet.",
+	"unsupportedWindowSetting": "Ez a beállítás jelenleg nem alkalmazható. Akkor van használatban, ha közvetlenül nyitja meg ezt a mappát."
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..4eade970e45
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"canNotResolveWorkspaceFolder": "A '${workspaceFolder}' értékét nem lehet feloldani. Nyisson meg egy mappát!",
+	"canNotResolveFolderBasename": "A '${workspaceFolderBasename}' értékét nem lehet feloldani. Nyisson meg egy mappát!"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..a1522b0bc3e
--- /dev/null
+++ b/i18n/hun/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Igen",
+	"cancelButton": "Mégse"
+}
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index e23237d0ba2..87c6a22e435 100644
--- a/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "A kiegészítő gazdafolyamata váratlanul leállt.",
 	"extensionHostProcess.unresponsiveCrash": "A kiegészítő gazdafolyamata le lett állítva, mert nem válaszolt.",
-	"devTools": "Fejlesztői eszközök",
 	"restart": "Kiegészítő gazdafolyamatának újraindítása",
 	"overwritingExtension": "A(z) {0} kiegészítő felülírása a következővel: {1}.",
 	"extensionUnderDevelopment": "A(z) {0} elérési úton található fejlesztői kiegészítő betöltése",
diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index b79eb0a2991..6db59384b1a 100644
--- a/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "A működéshez Microsoft .NET-keretrendszer 4.5 szükséges. A telepítéshez kövesse az alábbi hivatkozást!",
 	"installNet": ".NET Framework 4.5 letöltése",
 	"neverShowAgain": "Ne jelenítse meg újra",
-	"netVersionError": "A működéshez Microsoft .NET-keretrendszer 4.5 szükséges. A telepítéshez kövesse az alábbi hivatkozást!",
+	"enospcError": "A {0} nem tudja figyelni a fájlváltozásokat egy ilyen nagy munkaterületen. Kövesse az utasításokat az alábbi hivatkozáson a probléma megoldásához!",
 	"learnMore": "Utasítások",
-	"enospcError": "A {0} kezd kifogyni a fájlleírókból. Kövesse az utasításokat az alábbi hivatkozáson a probléma megoldásához!",
+	"fileInvalidPath": "Érvénytelen fájlerőforrás ({0})",
+	"fileIsDirectoryError": "A fájl egy könyvtár",
+	"fileNotModifiedError": "A fájl azóta nem módosult",
+	"fileTooLargeError": "A fájl túl nagy a megnyitáshoz",
+	"fileNotFoundError": "Fájl nem található ({0})",
+	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
+	"filePermission": "Engedély megtagadva a fájl írására ({0})",
+	"fileExists": "A létrehozandó fájl már létezik ({0})",
+	"fileModifiedError": "A fájl azóta módosult",
+	"fileReadOnlyError": "A fájl csak olvasható",
+	"fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen.",
+	"unableToMoveCopyError": "Nem lehet áthelyezni vagy másolni. A fájl felülírná a mappát, amiben található.",
 	"binFailed": "A következő fájlt nem sikerült a lomtárba helyezni: '{0}'",
 	"trashFailed": "A(z) {0} kukába helyezése nem sikerült"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index cbbafb80120..91e90e2f957 100644
--- a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Fájl nem található ({0})",
 	"fileIsDirectoryError": "A fájl egy könyvtár",
 	"fileNotModifiedError": "A fájl azóta nem módosult",
 	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként"
diff --git a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
index 64e3d8c1f61..639f690d07a 100644
--- a/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "Érvénytelen fájlerőforrás ({0})",
 	"fileIsDirectoryError": "A fájl egy könyvtár",
 	"fileNotModifiedError": "A fájl azóta nem módosult",
-	"fileTooLargeForHeapError": "A fájlméret nagyobb, mint az ablak memóriakorlátja. Próbálja meg a következő parancsot futtatni: code --max-memory=<ÚJ MÉRET>",
+	"fileTooLargeForHeapError": "A fájlméret túllépi az alapértelmezett memóriakorlátot.  A jelenlegi beállítás szerint az alkalmazás újraindul {0}MB-os korláttal.",
 	"fileTooLargeError": "A fájl túl nagy a megnyitáshoz",
 	"fileNotFoundError": "Fájl nem található ({0})",
 	"fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként",
diff --git a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index 9a73f11d6e7..d15b9a685b2 100644
--- a/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} – {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Mégse"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index ca563e236ba..b6c32f7bccf 100644
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -10,6 +10,7 @@
 	"vscode.extension.contributes.grammars.language": "Annak a nyelvnek az azonosítója, amely számára szolgáltatva van ez a szintaxis.",
 	"vscode.extension.contributes.grammars.scopeName": "A tmLanguage-fájl által használt TextMate-hatókör neve.",
 	"vscode.extension.contributes.grammars.path": "A tmLanguage-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához képest, és általában './syntaxes/'-zal kezdődik.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnév-nyelvazonosító kulcs-érték párokat tartalmazó objektum, ha a nyelvtan tartalmaz beágyazott nyelveket.",
+	"vscode.extension.contributes.grammars.embeddedLanguages": "Hatókörnevek leképezése nyelvazonosítókra, ha a nyelvtan tartalmaz beágyazott nyelveket.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Hatókörnevek leképezése tokentípusokra.",
 	"vscode.extension.contributes.grammars.injectTo": "Azon nyelvi hatókörök nevei, ahová be lesz ágyazva ez a nyelvtan."
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 2afc247830d..83e21414598 100644
--- a/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/hun/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
 	"invalid.injectTo": "A `contributes.{0}.injectTo` értéke érvénytelen. Az értéke egy tömb lehet, ami nyelvhatókörök neveit tartalmazza. A megadott érték: {1}",
 	"invalid.embeddedLanguages": "A `contributes.{0}.embeddedLanguages` értéke érvénytelen. Az értéke egy hatókörnév-nyelv kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
+	"invalid.tokenTypes": "A `contributes.{0}.tokenTypes` értéke érvénytelen. Az értéke egy hatókörnév-tokentípus kulcs-érték párokat tartalmazó objektum lehet. A megadott érték: {1}",
 	"invalid.path.1": "A `contributes.{0}.path` ({1}) nem a kiegészítő mappáján belül található ({2}). Emiatt előfordulhat, hogy a kiegészítő nem lesz hordozható.",
 	"no-tm-grammar": "Nincs TM Grammar regisztrálva ehhez a nyelvhez."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..49766496907
--- /dev/null
+++ b/i18n/ita/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "Server di linguaggio CSS",
+	"folding.start": "Inizio di una regione riducibile",
+	"folding.end": "Fine di una regione riducibile"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css-language-features/package.i18n.json b/i18n/ita/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..35517becb5b
--- /dev/null
+++ b/i18n/ita/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Funzionalità del linguaggio CSS",
+	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
+	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
+	"css.validate.desc": "Abilita o disabilita tutte le convalide",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
+	"less.validate.desc": "Abilita o disabilita tutte le convalide",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
+	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
+	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
+	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
+	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
+	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
+	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
+	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
+	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
+	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
+	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
+	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
+	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
+	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
+	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
+	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
+	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
+	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
+	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
+	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/css/package.i18n.json b/i18n/ita/extensions/css/package.i18n.json
index 35517becb5b..5f1a325b6da 100644
--- a/i18n/ita/extensions/css/package.i18n.json
+++ b/i18n/ita/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Funzionalità del linguaggio CSS",
-	"description": "Offre un supporto avanzato per i file CSS, LESS e SCSS",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"css.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"css.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"css.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"css.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"css.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"css.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"css.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"css.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"css.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"css.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"css.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"css.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"css.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"css.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"css.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio CSS.",
-	"css.validate.title": "Controlla la convalida CSS e le gravità dei problemi.",
-	"css.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"less.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"less.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"less.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"less.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"less.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"less.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"less.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"less.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"less.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"less.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"less.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"less.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"less.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"less.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"less.validate.title": "Controlla la convalida LESS e le gravità dei problemi.",
-	"less.validate.desc": "Abilita o disabilita tutte le convalide",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Numero di parametri non valido",
-	"scss.lint.boxModel.desc": "Non usare width o height con padding o border",
-	"scss.lint.compatibleVendorPrefixes.desc": "Quando si usa un prefisso specifico del fornitore, assicurarsi di includere anche tutte le altre proprietà specifiche del fornitore",
-	"scss.lint.duplicateProperties.desc": "Non usare definizioni di stile duplicate",
-	"scss.lint.emptyRules.desc": "Non usare set di regole vuoti",
-	"scss.lint.float.desc": "Evitare di usare 'float'. Con gli elementi float si ottiene codice CSS che causa facilmente interruzioni in caso di modifica di un aspetto del layout.",
-	"scss.lint.fontFaceProperties.desc": "La regola @font-face deve definire le proprietà 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "I colori esadecimali devono essere composti da tre o sei numeri esadecimali",
-	"scss.lint.idSelector.desc": "I selettori non devono contenere ID perché queste regole sono strettamente accoppiate al codice HTML.",
-	"scss.lint.ieHack.desc": "Gli hack IE sono necessari solo per il supporto di IE7 e versioni precedenti",
-	"scss.lint.important.desc": "Evitare di usare !important perché indica che la specificità dell'intero codice CSS non è più controllabile ed è necessario effettuarne il refactoring.",
-	"scss.lint.importStatement.desc": "Le istruzioni Import non vengono caricate in parallelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "La proprietà viene ignorata a causa della visualizzazione. Ad esempio, con 'display: inline', le proprietà width, height, margin-top, margin-bottom e float non hanno effetto",
-	"scss.lint.universalSelector.desc": "Il selettore universale (*) è notoriamente lento",
-	"scss.lint.unknownProperties.desc": "Proprietà sconosciuta.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Proprietà specifica del fornitore sconosciuta.",
-	"scss.lint.vendorPrefix.desc": "Quando si usa un prefisso specifico del fornitore, includere anche la proprietà standard",
-	"scss.lint.zeroUnits.desc": "Non è necessaria alcuna unità per lo zero",
-	"scss.validate.title": "Controlla la convalida SCSS e le gravità dei problemi.",
-	"scss.validate.desc": "Abilita o disabilita tutte le convalide",
-	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"css.colorDecorators.enable.deprecationMessage": "L'impostazione `css.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"scss.colorDecorators.enable.deprecationMessage": "L'impostazione `scss.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"less.colorDecorators.enable.deprecationMessage": "L'impostazione `less.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+	"displayName": "Nozioni di base del linguaggio CSS",
+	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file CSS, LESS e SCSS."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/emmet/package.i18n.json b/i18n/ita/extensions/emmet/package.i18n.json
index 4b669f7fc49..ed7d2e37205 100644
--- a/i18n/ita/extensions/emmet/package.i18n.json
+++ b/i18n/ita/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Percorso di una cartella contenente profili e snippet Emmet.'",
 	"emmetShowExpandedAbbreviation": "Mostra le abbreviazioni Emmet espanse come suggerimenti.\nL'opzione \"inMarkupAndStylesheetFilesOnly\" si applica a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nL'opzione \"sempre\" (always) si applica a tutte le parti del file indipendentemente dal markup/css.",
 	"emmetShowAbbreviationSuggestions": "Mostra possibili abbreviazioni Emmet come suggerimenti. Non si applica a fogli di stile o quando emmet.showExpandedAbbreviation è impostata a \"mai\" (never).",
-	"emmetIncludeLanguages": "Abilita le abbreviazioni Emmet in linguaggi che non sono normalmente supportati. Qui si può aggiungere un mapping tra il linguaggio ed il linguaggio supportato da Emmet.\n Ad esempio: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Variabili da utilizzare negli snippet Emmet",
 	"emmetTriggerExpansionOnTab": "Se abilitate, le abbreviazioni Emmet vengono espanse quando si preme TAB.",
 	"emmetPreferences": "Preferenze usate per modificare il comportamento di alcune azioni e i resolver di Emmet.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'webkit' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'webkit' impostare stringa vuota.",
 	"emmetPreferencesCssMozProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'moz' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'moz' impostare stringa vuota.",
 	"emmetPreferencesCssOProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'o' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'o' impostare stringa vuota.",
-	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota."
+	"emmetPreferencesCssMsProperties": "Proprietà CSS delimitate da virgola che assumono il prefisso 'ms' del vendor quando utilizzate nelle abbreviazioni di Emmet che iniziano per '-'. Per evitare sempre il prefisso 'ms' impostare stringa vuota.",
+	"emmetPreferencesCssFuzzySearchMinScore": "Il valore minimo (da 0 a 1) che dovrebbe raggiungere un'abbreviazione di fuzzy-match. I valori più bassi possono produrre molti falsi positivi, i valori più alti possono ridurre le possibili corrispondenze."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/commands.i18n.json b/i18n/ita/extensions/git/out/commands.i18n.json
index 3ce147e64bc..792f4a2d3dd 100644
--- a/i18n/ita/extensions/git/out/commands.i18n.json
+++ b/i18n/ita/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "Il push con tag è riuscito.",
 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
-	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
+	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}/[1]'.",
 	"never again": "OK, non visualizzare più",
 	"no remotes to publish": "Il repository non contiene elementi remoti configurati come destinazione della pubblicazione.",
 	"no changes stash": "Non ci sono modifiche da accantonare.",
diff --git a/i18n/ita/extensions/git/package.i18n.json b/i18n/ita/extensions/git/package.i18n.json
index 24f0b387a00..3e99eceff18 100644
--- a/i18n/ita/extensions/git/package.i18n.json
+++ b/i18n/ita/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Controlla se visualizzare un'azione Apri file inline nella visualizzazione modifiche GIT.",
 	"config.inputValidation": "Controlla quando visualizzare la convalida sull'input del messaggio di commit.",
 	"config.detectSubmodules": "Controlla se rilevare automaticamente i moduli secondari GIT.",
+	"config.detectSubmodulesLimit": "Controlla il limite dei sottomoduli git rilevati.",
 	"colors.modified": "Colore delle risorse modificate.",
 	"colors.deleted": "Colore delle risorse eliminate.",
 	"colors.untracked": "Colore delle risorse non tracciate.",
diff --git a/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..8313a5f7e1b
--- /dev/null
+++ b/i18n/ita/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "Server di linguaggio HTML",
+	"folding.start": "Inizio di una regione riducibile",
+	"folding.end": "Fine di una regione riducibile"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html-language-features/package.i18n.json b/i18n/ita/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..b237335f1d3
--- /dev/null
+++ b/i18n/ita/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Funzionalità del linguaggio HTML",
+	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
+	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
+	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
+	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
+	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
+	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
+	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
+	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
+	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
+	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
+	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
+	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
+	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
+	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
+	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
+	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
+	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
+	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
+	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
+	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
+	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/html/package.i18n.json b/i18n/ita/extensions/html/package.i18n.json
index 08d31d44db6..9015f75af4c 100644
--- a/i18n/ita/extensions/html/package.i18n.json
+++ b/i18n/ita/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Funzionalità del linguaggio HTML",
-	"description": "Offre un supporto avanzato sul linguaggio per i file HTML, Razor e Handlebars",
-	"html.format.enable.desc": "Abilita/Disabilita il formattatore HTML predefinito",
-	"html.format.wrapLineLength.desc": "Numero massimo di caratteri per riga (0 = disabilita).",
-	"html.format.unformatted.desc": "Elenco di tag, separati da virgole, che non devono essere riformattati. Con 'null' viene usata l'impostazione predefinita che prevede l'uso di tutti i tag elencati in https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Elenco di tag, separati da virgole, in cui il contenuto non deve essere riformattato. Per impostazione predefinita, con 'null' viene usato il tag 'pre'.",
-	"html.format.indentInnerHtml.desc": "Imposta un rientro per le sezioni <head> e <body>.",
-	"html.format.preserveNewLines.desc": "Indica se è necessario mantenere interruzioni di riga esistenti prima degli elementi. Funziona solo prima degli elementi e non all'interno di tag o per il testo.",
-	"html.format.maxPreserveNewLines.desc": "Numero massimo di interruzioni di riga da mantenere in un unico blocco. Per non impostare un numero massimo, usare 'null'.",
-	"html.format.indentHandlebars.desc": "Applica la formattazione e imposta un rientro per {{#foo}} e {{/foo}}.",
-	"html.format.endWithNewline.desc": "Termina con un carattere di nuova riga.",
-	"html.format.extraLiners.desc": "Elenco di tag, separati da virgole, che devono essere preceduti da un carattere di nuova riga. Con 'null' viene usata l'impostazione predefinita \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Esegue il wrapping degli attributi.",
-	"html.format.wrapAttributes.auto": "Esegue il wrapping degli attributi solo quando viene superata la lunghezza di riga.",
-	"html.format.wrapAttributes.force": "Esegue il wrapping di ogni attributo ad eccezione del primo.",
-	"html.format.wrapAttributes.forcealign": "Esegue il wrapping di ogni attributo ad eccezione del primo e mantiene l'allineamento.",
-	"html.format.wrapAttributes.forcemultiline": "Esegue il wrapping di ogni attributo.",
-	"html.suggest.angular1.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag e proprietà di Angular V1.",
-	"html.suggest.ionic.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di Ionic.",
-	"html.suggest.html5.desc": "Consente di configurare se il supporto del linguaggio HTML predefinito suggerisce tag, proprietà e valori di HTML5.",
-	"html.trace.server.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio HTML.",
-	"html.validate.scripts": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli script incorporati.",
-	"html.validate.styles": "Consente di configurare se il supporto del linguaggio HTML predefinito convalida gli stili incorporati.",
-	"html.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
-	"html.autoClosingTags": "Abilita/Disabilita la chiusura automatica dei tag HTML."
+	"displayName": "Nozioni di base del linguaggio HTML",
+	"description": "Fornisce l'evidenziazione della sintassi, la corrispondenza delle parentesi & frammenti nei file HTML."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..b9cca5241bb
--- /dev/null
+++ b/i18n/ita/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "Server di linguaggio JSON"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json-language-features/package.i18n.json b/i18n/ita/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..2b426a9eac1
--- /dev/null
+++ b/i18n/ita/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Funzionalità del linguaggio JSON",
+	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
+	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
+	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
+	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
+	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
+	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
+	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
+	"json.tracing.desc": "Traccia le comunicazioni tra Visual Studio Code e il server di linguaggio JSON.",
+	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
+	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/json/package.i18n.json b/i18n/ita/extensions/json/package.i18n.json
index b6f387db316..d1cf4899cfa 100644
--- a/i18n/ita/extensions/json/package.i18n.json
+++ b/i18n/ita/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Funzionalità del linguaggio JSON",
-	"description": "Fornisce supporto avanzato del linguaggio per i file JSON.",
-	"json.schemas.desc": "Associa schemi a file JSON nel progetto corrente",
-	"json.schemas.url.desc": "URL di uno schema o percorso relativo di uno schema nella directory corrente",
-	"json.schemas.fileMatch.desc": "Matrice di criteri dei file da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.fileMatch.item.desc": "Criteri dei file che possono contenere '*' da usare per la ricerca durante la risoluzione di file JSON in schemi.",
-	"json.schemas.schema.desc": "Definizione dello schema per l'URL specificato. È necessario specificare lo schema per evitare accessi all'URL dello schema.",
-	"json.format.enable.desc": "Abilita/Disabilita il formattatore JSON predefinito (richiede il riavvio)",
-	"json.tracing.desc": "Traccia la comunicazione tra VS Code e il server del linguaggio JSON.",
-	"json.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
-	"json.colorDecorators.enable.deprecationMessage": "L'impostazione `json.colorDecorators.enable` è stata deprecata e sostituita da `editor.colorDecorators`.",
-	"json.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi."
+	"displayName": "Nozioni di base del linguaggio JSON",
+	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file JSON."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..eb5c477e4c1
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "Impossibile caricare 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..c46a3464cc4
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Anteprima] {0}",
+	"previewTitle": "Anteprima {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..991ae221d10
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Alcuni contenuti sono stati disabilitati in questo documento",
+	"preview.securityMessage.title": "Contenuti potenzialmente non sicuri sono stati disattivati nell'anteprima del Markdown. Modificare l'impostazione di protezione dell'anteprima del Markdown per consentire la visualizzazione di contenuto insicuro o abilitare gli script",
+	"preview.securityMessage.label": "Avviso di sicurezza contenuto disabilitato"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/out/security.i18n.json b/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..17900416bd6
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Strict",
+	"strict.description": "Carica solo contenuto protetto",
+	"insecureContent.title": "Consenti contenuto non protetto",
+	"insecureContent.description": "Consente il caricamento di contenuti tramite HTTP",
+	"disable.title": "Disabilita",
+	"disable.description": "Consente l'esecuzione di tutti i contenuti e script. Scelta non consigliata",
+	"moreInfo.title": "Altre informazioni",
+	"enableSecurityWarning.title": "Abilita anteprima degli avvisi di protezione in questa area di lavoro",
+	"disableSecurityWarning.title": "Disabilita anteprima degli avvisi di protezione in questa area di lavoro",
+	"toggleSecurityWarning.description": "Non influisce sul livello di sicurezza del contenuto",
+	"preview.showPreviewSecuritySelector.title": "Seleziona impostazioni di protezione per le anteprime Markdown in questa area di lavoro"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/markdown-language-features/package.i18n.json b/i18n/ita/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..eeb708af9fa
--- /dev/null
+++ b/i18n/ita/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Funzionalità del linguaggio Markdown",
+	"description": "Fornisce un supporto avanzato del linguaggio per Markdown.",
+	"markdown.preview.breaks.desc": "Imposta come le interruzioni di riga vengono visualizzate nell'anteprima di markdown. Impostarlo a 'true' crea un <br>per ogni carattere di nuova riga.",
+	"markdown.preview.linkify": "Abilita o disabilita la conversione di testo simile a URL in collegamenti nell'anteprima markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Fare doppio clic nell'anteprima markdown per passare all'editor.",
+	"markdown.preview.fontFamily.desc": "Consente di controllare la famiglia di caratteri usata nell'anteprima markdown.",
+	"markdown.preview.fontSize.desc": "Consente di controllare le dimensioni del carattere in pixel usate nell'anteprima markdown.",
+	"markdown.preview.lineHeight.desc": "Consente di controllare l'altezza della riga usata nell'anteprima markdown. Questo numero è relativo alle dimensioni del carattere.",
+	"markdown.preview.markEditorSelection.desc": "Contrassegna la selezione dell'editor corrente nell'anteprima markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Quando si scorre l'anteprima markdown, aggiorna la visualizzazione dell'editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Quando si scorre l'editor markdown, aggiorna la visualizzazione dell'anteprima.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Deprecato] Scorre l'anteprima markdown in modo da visualizzare la riga attualmente selezionata dall'editor.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Questa impostazione è stata sostituita da 'markdown.preview.scrollPreviewWithEditor' e non ha più effetto.",
+	"markdown.preview.title": "Apri anteprima",
+	"markdown.previewFrontMatter.dec": "Consente di impostare il rendering del front matter YAML nell'anteprima markdown. Con 'hide' il front matter viene rimosso; altrimenti il front matter viene considerato come contenuto markdown.",
+	"markdown.previewSide.title": "Apri anteprima lateralmente",
+	"markdown.showLockedPreviewToSide.title": "Apri anteprima bloccata lateralmente",
+	"markdown.showSource.title": "Mostra origine",
+	"markdown.styles.dec": "Elenco di URL o percorsi locali dei fogli di stile CSS da usare dall'anteprima markdown. I percorsi relativi vengono interpretati come relativi alla cartella aperta nella finestra di esplorazione. Se non è presente alcuna cartella aperta, vengono interpretati come relativi al percorso del file markdown. Tutti i caratteri '\\' devono essere scritti come '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Modifica impostazioni di sicurezza anteprima",
+	"markdown.trace.desc": "Abilitare la registrazione debug per l'estensione markdown.",
+	"markdown.preview.refresh.title": "Aggiorna anteprima",
+	"markdown.preview.toggleLock.title": "Attiva/Disattiva blocco anteprima"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..7a30dfbedfe
--- /dev/null
+++ b/i18n/ita/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Consentire l'esecuzione di {0} (definito come impostazione dell'area di lavoro) per il lint dei file PHP?",
+	"php.yes": "Consenti",
+	"php.no": "Non consentire",
+	"wrongExecutable": "Non è possibile eseguire la convalida perché {0} non è un file eseguibile di PHP valido. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
+	"noExecutable": "Non è possibile eseguire la convalida perché non è impostato alcun file eseguibile di PHP. Usare l'impostazione 'php.validate.executablePath' per convalidare il file eseguibile di PHP.",
+	"unknownReason": "Non è stato possibile eseguire php con il percorso {0}. Il motivo è sconosciuto."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php-language-features/package.i18n.json b/i18n/ita/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..b68565b4e5b
--- /dev/null
+++ b/i18n/ita/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
+	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
+	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
+	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)",
+	"displayName": "Funzionalità del linguaggio PHP",
+	"description": "Fornisce supporto avanzato del linguaggio per i file PHP."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/php/package.i18n.json b/i18n/ita/extensions/php/package.i18n.json
index f2707697f23..6e9f75db20f 100644
--- a/i18n/ita/extensions/php/package.i18n.json
+++ b/i18n/ita/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Consente di configurare l'abilitazione dei suggerimenti predefiniti per il linguaggio PHP. Il supporto suggerisce variabili e variabili globali PHP.",
-	"configuration.validate.enable": "Abilita/Disabilita la convalida PHP predefinita.",
-	"configuration.validate.executablePath": "Punta all'eseguibile di PHP.",
-	"configuration.validate.run": "Indica se il linter viene eseguito durante il salvataggio o la digitazione.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Non consentire la convalida di PHP eseguibile (definito come impostazione dell'area di lavoro)",
-	"displayName": "Funzionalità del linguaggio PHP",
-	"description": "Offre IntelliSense, linting e nozioni di base sul linguaggio per i file PHP."
+	"description": "Offre l'evidenziazione della sintassi e la corrispondenza delle parentesi nei file PHP."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json b/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..ffa2bc44d1e
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript",
+	"typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato",
+	"typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript",
+	"typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript. Clicca [qui]({0}) per saperne di più.",
+	"typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript. Clicca [qui]({0}) per saperne di più.",
+	"typescript.configureTsconfigQuickPick": "Configura tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "Configura jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..86de96163a7
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Selezionare l'azione codice da applicare",
+	"acquiringTypingsLabel": "Acquisizione dei file typings...",
+	"acquiringTypingsDetail": "Acquisizione delle definizioni dei file typings per IntelliSense.",
+	"autoImportLabel": "Importazione automatica da {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..98bb57ed994
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Attiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
+	"ts-nocheck": "Disattiva il controllo semantico in un file JavaScript. Deve essere all'inizio del file.",
+	"ts-ignore": "Elimina errori di @ts-check sulla riga successiva di un file."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..cd8cac2d81a
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 implementazione",
+	"manyImplementationLabel": "{0} implementazioni",
+	"implementationsErrorLabel": "Non è stato possibile determinare le implementazioni"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..2e98125f88d
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "Commento JSDoc"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..40c311f3382
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Organizza gli Imports"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..9bccba0f7a0
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Correggi tutti nel file)"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..4c74ac0e94a
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 riferimento",
+	"manyReferenceLabel": "{0} riferimenti",
+	"referenceErrorLabel": "Non è stato possibile determinare i riferimenti"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..a5aca9552f5
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "Compila - {0}",
+	"buildAndWatchTscLabel": "Osserva - {0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..78e5e160a62
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "Il percorso {0} non punta a un'installazione valida di tsserver. Verrà eseguito il fallback alla versione in bundle di TypeScript.",
+	"serverCouldNotBeStarted": "Non è stato possibile avviare il server di linguaggio TypeScript. Messaggio di errore: {0}",
+	"typescript.openTsServerLog.notSupported": "Per la registrazione del server TypeScript è necessario almeno TypeScript 2.2.2",
+	"typescript.openTsServerLog.loggingNotEnabled": "La registrazione del server TypeScript è disattivata. Per abilitarla, impostare `typescript.tsserver.log` e riavviare il server TypeScript",
+	"typescript.openTsServerLog.enableAndReloadOption": "Abilita la registrazione e riavvia il server TypeScript",
+	"typescript.openTsServerLog.noLogFile": "Il server TypeScript non ha avviato la registrazione.",
+	"openTsServerLog.openFileFailedFailed": "Non è stato possibile aprire il file di log del server TypeScript",
+	"serverDiedAfterStart": "Il servizio di linguaggio TypeScript è stato arrestato in modo imprevisto per cinque volte dopo che è stato avviato e non verrà riavviato.",
+	"serverDiedReportIssue": "Segnala problema",
+	"serverDied": "Il servizio di linguaggio Typescript è stato arrestato in modo imprevisto per cinque volte negli ultimi cinque minuti."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..75f0f394012
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "versione non valida"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..ad1ac2efcc7
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle che contengono molti file, come {0}",
+	"hintExclude.generic": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
+	"large.label": "Configura esclusioni",
+	"hintExclude.tooltip": "Per abilitare le funzionalità del linguaggio JavaScript/TypeScript a livello di progetto, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..78cf90b25ab
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Recupero dei dati per ottimizzare IntelliSense in TypeScript",
+	"typesInstallerInitializationFailed.title": "Non è stato possibile installare i file di definizione tipi per le funzionalità del linguaggio JavaScript. Verificare che NPM sia installato e o configurare 'typescript.npm' nelle impostazioni utente. Clicca [qui]({0}) per saperne di più.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Non visualizzare più questo messaggio"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..c0e18983544
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Usa versione di VS Code",
+	"useWorkspaceVersionOption": "Usa versione dell'area di lavoro",
+	"learnMore": "Altre informazioni",
+	"selectTsVersion": "Selezionare la versione di TypeScript usata per le funzionalità del linguaggio JavaScript e TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..385cbc61377
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Non è stato possibile caricare la versione di TypeScript in questo percorso",
+	"noBundledServerFound": "Il file tsserver di VS Code è stato eliminato da un'altra applicazione, ad esempio uno strumento di rilevamento virus che non funziona correttamente. Reinstallare VS Code."
+}
\ No newline at end of file
diff --git a/i18n/ita/extensions/typescript-language-features/package.i18n.json b/i18n/ita/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..9329475d6ab
--- /dev/null
+++ b/i18n/ita/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,57 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Funzionalità dei linguaggi TypeScript e JavaScript",
+	"description": "Fornisce un supporto avanzato per JavaScript e TypeScript",
+	"typescript.reloadProjects.title": "Ricarica progetto",
+	"javascript.reloadProjects.title": "Ricarica progetto",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Completare le funzioni con la relativa firma del parametro.",
+	"typescript.tsdk.desc": "Specifica il percorso della cartella che contiene i file tsserver e lib*.d.ts da usare.",
+	"typescript.disableAutomaticTypeAcquisition": "Disabilita l'acquisizione automatica del tipo. Richiede TypeScript >= 2.0.6.",
+	"typescript.tsserver.log": "Abilita la registrazione del server TypeScript in un file. Questo registro può essere utilizzato per diagnosticare problemi del server TypeScript. Il registro può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate. ",
+	"typescript.tsserver.trace": "Abilita la traccia dei messaggi inviati al server TypeScript. Questa traccia può essere utilizzata per diagnosticare problemi del server TypeScript. La traccia può contenere percorsi di file, codice sorgente e altre informazioni del progetto potenzialmente riservate.",
+	"typescript.validate.enable": "Abilita/Disabilita la convalida TypeScript.",
+	"typescript.format.enable": "Abilita/Disabilita il formattatore TypeScript predefinito.",
+	"javascript.format.enable": "Abilita/Disabilita il formattatore JavaScript predefinito.",
+	"format.insertSpaceAfterCommaDelimiter": "Consente di definire la gestione dello spazio dopo una virgola di delimitazione6",
+	"format.insertSpaceAfterConstructor": "Definisce la gestione dello spazio dopo la parola chiave constructor. Richiede TypeScript >= 2.3.0.",
+	"format.insertSpaceAfterSemicolonInForStatements": " Consente di definire la gestione dello spazio dopo un punto e virgola in un'istruzione for.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Consente di definire la gestione dello spazio dopo un operatore binario.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Consente di definire la gestione dello spazio dopo le parole chiave in un'istruzione del flusso di controllo.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Consente di definire la gestione dello spazio dopo la parola chiave function per funzioni anonime.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Consente di definire la gestione dello spazio prima delle parentesi dell'argomento della funzione. Richiede TypeScript >= 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale della stringa del modello. Richiede TypeScript >= 2.0.6",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Consente di definire la gestione dello spazio dopo la parentesi graffa iniziale e prima della parentesi graffa finale dell'espressione JSX. Richiede TypeScript >= 2.0.6",
+	"format.insertSpaceAfterTypeAssertion": "Definisce la gestione dello spazio dopo le asserzioni di tipo in TypeScript. Richiede TypeScript >= 2.4.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per le funzioni.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Consente di definire se una parentesi graffa di apertura viene o meno inserita su una riga per i blocchi di controllo.",
+	"javascript.validate.enable": "Abilita/Disabilita la convalida JavaScript.",
+	"typescript.goToProjectConfig.title": "Passa a Configurazione progetto",
+	"javascript.goToProjectConfig.title": "Passa a Configurazione progetto",
+	"javascript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file JavaScript.",
+	"typescript.referencesCodeLens.enabled": "Abilita/disabilita riferimenti CodeLens nei file TypeScript. Richiede TypeScript >= 2.0.6.",
+	"typescript.implementationsCodeLens.enabled": "Abilita/Disabilita le finestre CodeLens per le implementazioni. Richiede una versione di TypeScript uguale o successiva alla 2.2.0.",
+	"typescript.openTsServerLog.title": "Apri il log del server TypeScript",
+	"typescript.restartTsServer": "Riavvia server TS",
+	"typescript.selectTypeScriptVersion.title": "Seleziona la versione di TypeScript",
+	"typescript.reportStyleChecksAsWarnings": "Evidenzia i controlli di stile come warning",
+	"jsDocCompletion.enabled": "Abilita/Disabilita commenti automatici JSDoc",
+	"javascript.implicitProjectConfig.checkJs": "Abilita/disabilita il controllo semantico di file JavaScript. File jsconfig.json o tsconfig.json esistenti sovrascrivono su questa impostazione. Richiede TypeScript >= 2.3.1.",
+	"typescript.npm": "Specifica il percorso dell'eseguibile NPM utilizzato per l'acquisizione automatica delle definizioni di tipi. Richiede TypeScript >= 2.3.4.",
+	"typescript.check.npmIsInstalled": "Controlla se NPM è installato per l'acquisizione automatica delle definizioni di tipi",
+	"javascript.nameSuggestions": "Abilita/disabilita l'inclusione di nomi univoci dal file negli elenchi di suggerimento di JavaScript.",
+	"typescript.tsc.autoDetect": "Controlla l'auto-rilevazione di attività di tsc. 'off' disabilita questa funzionalità. 'build' crea solo attività di singola compilazione esecuzione. 'watch' crea solo attività di compilazione e controllo. 'on' crea attività  sia di tipo 'build' che 'watch'. Il valore predefinito è 'on'.",
+	"typescript.problemMatchers.tsc.label": "Problemi TypeScript",
+	"typescript.problemMatchers.tscWatch.label": "Problemi TypeScript (modalità espressione di controllo)",
+	"typescript.locale": "Assegna le impostazioni internazionali utilizzate per riportare errori TypeScript. Richiede TypeScript > = 2.6.0. Il valore predefinito 'null' utilizza le impostazioni internazionali di VS Code.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Abilita/disabilita 'experimentalDecorators' per i file JavaScript che non fanno parte di un progetto. File jsconfig.json o tsconfig.json esistenti ignorano questa impostazione. Richiede TypeScript >= 2.3.1.",
+	"typescript.autoImportSuggestions.enabled": "Abilita/Disabilita suggerimenti importazione automatica. Richiede una versione di TypeScript >= 2.6.1",
+	"typescript.experimental.syntaxFolding": "Abilita/disabilita i marcatori di folding con riconoscimento della sintassi.",
+	"taskDefinition.tsconfig.description": "File tsconfig che definisce la compilazione TS."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/base/node/processes.i18n.json b/i18n/ita/src/vs/base/node/processes.i18n.json
index 15d77305511..35229bd6699 100644
--- a/i18n/ita/src/vs/base/node/processes.i18n.json
+++ b/i18n/ita/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Non è possibile eseguire un comando della shell su un'unità UNC."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 24c38320db5..0cbefebbb8f 100644
--- a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -11,11 +11,10 @@
 	"similarIssues": "Problemi simili",
 	"open": "Apri",
 	"closed": "Chiuso",
-	"noResults": "Non sono stati trovati risultati",
 	"settingsSearchIssue": "Problema di ricerca impostazioni",
 	"bugReporter": "Segnalazione bug",
-	"performanceIssue": "Problema di prestazioni",
 	"featureRequest": "Richiesta di funzionalità",
+	"performanceIssue": "Problema di prestazioni",
 	"stepsToReproduce": "Passi da riprodurre",
 	"bugDescription": "Indicare i passaggi necessari per riprodurre il problema in modo affidabile. Includere i risultati effettivi e quelli previsti. È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
 	"performanceIssueDesciption": "Quando si è verificato questo problema di prestazioni? All'avvio o dopo una serie specifiche di azioni? È supportato il linguaggio Markdown per GitHub. Sarà possibile modificare il problema e aggiungere screenshot quando verrà visualizzato in anteprima in GitHub.",
diff --git a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index bd90ead3d7e..d087b3cb7c7 100644
--- a/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/ita/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "Completare il modulo in lingua inglese.",
 	"issueTypeLabel": "Questo è un",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "disabilitando tutte le estensioni e ricaricando la finestra",
+	"chooseExtension": "Estensione",
 	"issueTitleLabel": "Titolo",
 	"issueTitleRequired": "Immettere un titolo.",
 	"titleLengthValidation": "Il titolo è troppo lungo.",
@@ -18,13 +21,6 @@
 	"extensions": "Estensioni personali",
 	"searchedExtensions": "Estensioni cercate",
 	"settingsSearchDetails": "Dettagli ricerca impostazioni",
-	"tryDisablingExtensions": "Il problema è riproducibile quando le estensioni sono disabilitate?",
-	"yes": "Sì",
-	"no": "No",
-	"disableExtensionsLabelText": "Provare a riprodurre il problema dopo {0}.",
-	"disableExtensions": "disabilitando tutte le estensioni e ricaricando la finestra",
-	"showRunningExtensionsLabelText": "Se si sospetta che il problema sia relativo all'estensione, {0} per segnalare il problema.",
-	"showRunningExtensions": "visualizzare tutte le estensioni in esecuzione",
 	"details": "Immettere i dettagli.",
 	"loadingData": "Caricamento dei dati..."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..d72487d0df2
--- /dev/null
+++ b/i18n/ita/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Nome"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json
index 33f8c847059..f77cf818806 100644
--- a/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/ita/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Chiudi",
-	"header": "Differenza {0} di {1}: originali {2}, {3} righe, modificate {4}, righe {5}",
 	"blankLine": "vuota",
 	"equalLine": "originali {0}, modificate {1}: {2}",
 	"insertLine": "+ modificate {0}: {1}",
diff --git a/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
index e88f3f97e71..214bd3b8cab 100644
--- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Rappresenta il tasto 'Control' (ctrl) su Windows e Linux e il tasto 'Comando' (cmd) su OSX.",
 	"multiCursorModifier.alt": "Rappresenta il tasto 'Alt' su Windows e Linux e il tasto 'Opzione' su OSX.",
 	"multiCursorModifier": "Il modificatore da utilizzare per aggiungere molteplici cursori con il mouse. 'ctrlCmd' rappresenta il tasto 'Control' su Windows e Linux e  il tasto 'Comando' su OSX. I gesti del mouse Vai a definizione e Apri il Link si adatteranno in modo da non entrare in conflitto con il modificatore multi-cursore.",
+	"multiCursorMergeOverlapping": "Unire i cursori multipli se sovrapposti.",
 	"quickSuggestions.strings": "Abilita i suggerimenti rapidi all'interno di stringhe.",
 	"quickSuggestions.comments": "Abilita i suggerimenti rapidi all'interno di commenti.",
 	"quickSuggestions.other": "Abilita i suggerimenti rapidi all'esterno di stringhe e commenti.",
diff --git a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
index d51e843ddbf..8456c0eb96c 100644
--- a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "Colore delle guide per i rientri dell'editor.",
 	"editorLineNumbers": "Colore dei numeri di riga dell'editor.",
 	"editorActiveLineNumber": "Colore dei numeri per la riga attiva dell'editor",
+	"deprecatedEditorActiveLineNumber": "Id è deprecato. In alternativa utilizzare 'editorLineNumber.activeForeground'.",
 	"editorRuler": "Colore dei righelli dell'editor.",
 	"editorCodeLensForeground": "Colore primo piano delle finestre di CodeLens dell'editor",
 	"editorBracketMatchBackground": "Colore di sfondo delle parentesi corrispondenti",
@@ -28,7 +29,9 @@
 	"warningBorder": "Colore del bordo degli squggle di avviso nell'editor.",
 	"infoForeground": "Colore primo piano degli squiggle di informazione nell'editor",
 	"infoBorder": "Colore del bordo degli squiggle di informazione nell'editor",
-	"overviewRulerRangeHighlight": "Colore del marcatore del righello delle annotazioni per le evidenziazioni degli intervalli.",
+	"hintForeground": "Colore primo piano degli squiggle di suggerimento nell'editor.",
+	"hintBorder": "Colore del bordo degli squiggle di suggerimento nell'editor.",
+	"overviewRulerRangeHighlight": "Colore del marcatore righello panoramica per evidenziazione intervalli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
 	"overviewRuleError": "Colore del marcatore del righello delle annotazioni per gli errori.",
 	"overviewRuleWarning": "Colore del marcatore del righello delle annotazioni per gli avvisi.",
 	"overviewRuleInfo": "Colore del marcatore del righello delle annotazioni per i messaggi di tipo informativo."
diff --git a/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..d3f4c9834ab
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Mostra correzioni ({0})",
+	"quickFix": "Mostra correzioni",
+	"organizeImports.label": "Organizza gli Imports"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 4a3430ffb99..a06753ebfa8 100644
--- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Vai al problema successivo (Errore, Avviso, Informazioni)",
-	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)",
-	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
-	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
-	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
+	"markerAction.previous.label": "Vai al problema precedente (Errore, Avviso, Info)"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a69e81d71e3
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Colore per gli errori del widget di spostamento tra marcatori dell'editor.",
+	"editorMarkerNavigationWarning": "Colore per gli avvisi del widget di spostamento tra marcatori dell'editor.",
+	"editorMarkerNavigationInfo": "Colore delle informazioni del widget di navigazione marcatori dell'editor.",
+	"editorMarkerNavigationBackground": "Sfondo del widget di spostamento tra marcatori dell'editor."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..af44bbbb9ea
--- /dev/null
+++ b/i18n/ita/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Domenica",
+	"Monday": "Lunedì",
+	"Tuesday": "Martedì",
+	"Wednesday": "Mercoledì",
+	"Thursday": "Giovedì",
+	"Friday": "Venerdì",
+	"Saturday": "Sabato",
+	"SundayShort": "Dom",
+	"MondayShort": "Lun",
+	"TuesdayShort": "Mar",
+	"WednesdayShort": "Mer",
+	"ThursdayShort": "Gio",
+	"FridayShort": "Ven",
+	"SaturdayShort": "Sab",
+	"January": "Gennaio",
+	"February": "Febbraio",
+	"March": "Marzo",
+	"April": "Aprile",
+	"May": "Maggio",
+	"June": "Giugno",
+	"July": "Luglio",
+	"August": "Agosto",
+	"September": "Settembre",
+	"October": "Ottobre",
+	"November": "Novembre",
+	"December": "Dicembre",
+	"JanuaryShort": "Gen",
+	"FebruaryShort": "Feb",
+	"MarchShort": "Mar",
+	"AprilShort": "Apr",
+	"MayShort": "Mag",
+	"JuneShort": "Giu",
+	"JulyShort": "Lug",
+	"AugustShort": "Ago",
+	"SeptemberShort": "Set",
+	"OctoberShort": "Ott",
+	"NovemberShort": "Nov",
+	"DecemberShort": "Dic"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 0129c5330e3..e0d29249698 100644
--- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Colore di sfondo di un simbolo durante l'accesso in scrittura, per esempio durante la scrittura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.",
 	"wordHighlightBorder": "Colore del bordo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.",
 	"wordHighlightStrongBorder": "Colore del bordo di un simbolo durante l'accesso in scrittura, ad esempio durante la scrittura in una variabile.",
-	"overviewRulerWordHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli.",
-	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni dei simboli di accesso in scrittura.",
+	"overviewRulerWordHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione simboli. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
+	"overviewRulerWordHighlightStrongForeground": "Colore del marcatore righello panoramica per evidenziazione simboli con accesso in scrittura. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
 	"wordHighlight.next.label": "Vai al prossimo simbolo evidenziato",
 	"wordHighlight.previous.label": "Vai al precedente simbolo evidenziato"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..6b01687be11
--- /dev/null
+++ b/i18n/ita/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 altro file non visualizzato",
+	"moreFiles": "...{0} altri file non visualizzati"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..37c77254e7c
--- /dev/null
+++ b/i18n/ita/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Annulla"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
index e75bcb71ed2..320bbcac4d1 100644
--- a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.",
 	"prof-startup": "Esegui il profiler della CPU durante l'avvio",
 	"disableExtensions": "Disabilita tutte le estensioni installate.",
-	"inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.",
-	"inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.",
 	"disableGPU": "Disabilita l'accelerazione hardware della GPU.",
 	"uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.",
 	"maxMemory": "Dimensione massima della memoria per una finestra (in Mbytes).",
diff --git a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 2dbb832ebf5..87d656a3dd0 100644
--- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}",
 	"MarketPlaceDisabled": "Il Marketplace non è abilitato",
 	"removeError": "Errore durante la rimozione dell'estensione: {0}. Chiudere e riavviare VS Code prima di riprovare.",
-	"Not Market place extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
+	"Not a Marketplace extension": "Solo le Estensioni del Marketplace possono essere reinstallate",
 	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
 	"malicious extension": "Non è possibile installare l'estensione poiché è stata segnalata come problematica.",
 	"notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.",
 	"quitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
 	"exitCode": "Impossibile installare l'estensione. Riavviare VS Code prima di procedere ad un nuovo setup.",
 	"uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?",
-	"uninstallOnly": "Solo",
-	"uninstallAll": "Tutto",
+	"uninstallOnly": "Solo Estensioni",
+	"uninstallAll": "Disinstalla tutti",
 	"uninstallConfirmation": "Disinstallare '{0}'?",
 	"ok": "OK",
 	"singleDependentError": "Non è possibile disinstallare l'estensione '{0}'. L'estensione '{1}' dipende da tale estensione.",
diff --git a/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json
index dc710b846d6..1a38b9222de 100644
--- a/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/ita/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Non è stato possibile analizzare il valore {0} di `engines.vscode`. Usare ad esempio: ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x e così via.",
 	"versionSpecificity1": "La versione specificata in `engines.vscode` ({0}) non è abbastanza specifica. Per le versioni di vscode precedenti alla 1.0.0, definire almeno le versioni principale e secondaria desiderate, ad esempio ^0.10.0, 0.10.x, 0.11.0 e così via.",
 	"versionSpecificity2": "La versione specificata in `engines.vscode` ({0}) non è abbastanza specifica. Per le versioni di vscode successive alla 1.0.0, definire almeno la versione principale desiderata, ad esempio ^1.10.0, 1.10.x, 1.x.x, 2.x.x e così via.",
 	"versionMismatch": "L'estensione non è compatibile con Visual Studio Code {0}. Per l'estensione è richiesto: {1}."
diff --git a/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 60001870a37..7abef1dc4df 100644
--- a/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/ita/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "L'installazione di {0} sembra danneggiata. Reinstallare.",
 	"integrity.moreInformation": "Altre informazioni",
-	"integrity.dontShowAgain": "Non visualizzare più questo messaggio",
-	"integrity.prompt": "L'installazione di {0} sembra danneggiata. Reinstallare."
+	"integrity.dontShowAgain": "Non visualizzare più questo messaggio"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/list/browser/listService.i18n.json b/i18n/ita/src/vs/platform/list/browser/listService.i18n.json
index adf48cd06e8..8a43e89f813 100644
--- a/i18n/ita/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/ita/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Modificatore da usare per aggiungere un elemento in alberi ed elenchi a una selezione multipla con il mouse (ad esempio editor aperti e visualizzazione Gestione controllo servizi in Esplora risorse). 'ctrlCmd' rappresenta il tasto 'CTRL' in Windows e Linux e  il tasto 'Cmd' in OSX. I gesti del mouse Apri lateralmente, se supportati, si adatteranno in modo da non entrare in conflitto con il modificatore di selezione multipla.",
 	"openMode.singleClick": "Apre elementi facendo un singolo clic col mouse.",
 	"openMode.doubleClick": "Apre elementi facendo doppio clic col mouse.",
-	"openModeModifier": "Controlla la modalità di apertura degli elementi in alberi ed elenchi con il mouse, se supportata. Impostare su `singleClick` per aprire gli elementi con un unico clic del mouse e `doubleClick` per aprirli solo se viene fatto doppio clic. Per gli elementi padre con elementi figlio negli alberi, questa impostazione controllerà se per espandere l'elemento padre è necessario fare clic una sola volta o fare doppio clic. Tenere presente che alcuni alberi ed elenchi potrebbero scegliere di ignorare questa impostazione se non è applicabile. "
+	"openModeModifier": "Controlla la modalità di apertura degli elementi in alberi ed elenchi con il mouse, se supportata. Impostare su `singleClick` per aprire gli elementi con un unico clic del mouse e `doubleClick` per aprirli solo se viene fatto doppio clic. Per gli elementi padre con elementi figlio negli alberi, questa impostazione controllerà se per espandere l'elemento padre è necessario fare clic una sola volta o fare doppio clic. Tenere presente che alcuni alberi ed elenchi potrebbero scegliere di ignorare questa impostazione se non è applicabile. ",
+	"horizontalScrolling setting": "Controlla se gli alberi supportano lo scorrimento orizzontale in workbench."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/markers/common/markers.i18n.json b/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..f585e5046c6
--- /dev/null
+++ b/i18n/ita/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Errore",
+	"sev.warning": "Avviso",
+	"sev.info": "Informazioni"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
index 52b0e204cb5..ff2aecc6fe1 100644
--- a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Colore primo piano righello panoramica attuale per i conflitti di merge in linea.",
 	"overviewRulerIncomingContentForeground": "Colore primo piano del righello panoramica modifiche in arrivo per i conflitti di merge in linea.",
 	"overviewRulerCommonContentForeground": "Colore primo piano righello panoramica dell'antenato comune per i conflitti di merge in linea.",
-	"overviewRulerFindMatchForeground": "Colore del marcatore del righello delle annotazioni per le corrispondenze della ricerca.",
-	"overviewRulerSelectionHighlightForeground": "Colore del marcatore del righello delle annotazioni per le evidenziazioni delle selezioni."
+	"overviewRulerFindMatchForeground": "Colore del marcatore righello panoramica per trovare corrispondenze. Il colore non deve essere opaco per non nascondere decorazioni sottostanti.",
+	"overviewRulerSelectionHighlightForeground": "Colore del marcatore righello panoramica per evidenziazione selezioni. Il colore non deve essere opaco per non nascondere decorazioni sottostanti."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..490942db41e
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`",
+	"showViewlet": "Mostra {0}",
+	"view": "Visualizza"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index e630b27b6a6..bad682f1630 100644
--- a/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/ita/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Contribuisce visualizzazioni all'editor",
 	"views.explorer": "Visualizzazione di esplorazione",
 	"views.debug": "Visualizzazione Debug",
-	"locationId.invalid": "'{0}' non è una posizione valida per la visualizzazione",
 	"duplicateView1": "Non è possibile registrare più visualizzazioni con stesso ID `{0}` nel percorso `{1}`",
 	"duplicateView2": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` "
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 8488ca775b8..ac0f699ab1e 100644
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Comando Formatta dopo salvataggio interrotto dopo {0} ms",
+	"timeout.onWillSave": "Evento onWillSaveTextDocument interrotto dopo 1750 ms",
 	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 6162c44dea8..35229bd6699 100644
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "editor Webview"
+	]
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..04c3870e62b
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (estensione)"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index d3570a7296b..52332d26b60 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Sposta stato attivo sul gruppo successivo",
 	"openToSide": "Apri lateralmente",
 	"closeEditor": "Chiudi editor",
+	"closeOneEditor": "Chiudi",
 	"revertAndCloseActiveEditor": "Ripristina e chiudi editor",
 	"closeEditorsToTheLeft": "Chiudi editor a sinistra",
 	"closeAllEditors": "Chiudi tutti gli editor",
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 6469f13b9ec..00854b582f8 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "Se non si utilizza un'utilità per la lettura dello schermo, si prega di impostare 'editor.accessibilitySupport' a \"off\".",
 	"disableTabMode": "Disabilita modalità accessibilità",
 	"gotoLine": "Vai alla riga",
-	"indentation": "Rientro",
 	"selectEncoding": "Seleziona codifica",
 	"selectEOL": "Seleziona sequenza di fine riga",
 	"selectLanguageMode": "Seleziona modalità linguaggio",
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 46399326736..7d190d76980 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0} MB",
 	"sizeGB": "{0} GB",
 	"sizeTB": "{0} TB",
-	"largeImageError": "Le dimensioni del file dell'immagine sono eccessive (maggiori di 1 MB) per la visualizzazione nell'editor. ",
 	"resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?",
-	"nativeBinaryError": "Il file non verrà visualizzato nell'editor perché è binario, è molto grande o usa una codifica testo non supportata.",
 	"zoom.action.fit.label": "Immagine intera",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 550f000183a..87ef247c949 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Chiudi",
 	"araLabelEditorActions": "Azioni editor"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 40f3e83a7db..a203ffaf2a0 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Nessuna nuova notifica",
 	"notifications": "Notifiche",
 	"notificationsToolbar": "Azioni del centro notifiche",
 	"notificationsList": "Elenco notifiche"
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..bcdf56e4849
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
index c4f1db5d289..b0716c351ce 100644
--- a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Finestra",
 	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
 	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-	"window.openFilesInNewWindow.default": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder (solo MacOS)",
-	"openFilesInNewWindow": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder (solo MacOS)\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
+	"window.openFilesInNewWindow.defaultMac": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder",
+	"window.openFilesInNewWindow.default": "I file verranno aperti in una nuova finestra a meno che non vengano selezionati all'interno dell'applicazione, ad esempio tramite il menu File",
+	"openFilesInNewWindowMac": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva a meno che non vengano aperti tramite il pannello Dock o da Finder\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
+	"openFilesInNewWindow": "Controlla se i file devono essere aperti in una nuova finestra.\n- default: i file verranno aperti in una nuova finestra a meno che non vengano selezionati all'interno dell'applicazione, ad esempio tramite il menu File\n- on: i file verranno aperti in una nuova finestra\n- off: i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
 	"window.openFoldersInNewWindow.on": "Le cartelle verranno aperte in una nuova finestra",
 	"window.openFoldersInNewWindow.off": "Le cartelle sostituiranno l'ultima finestra attiva",
 	"window.openFoldersInNewWindow.default": "Le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File",
 	"openFoldersInNewWindow": "Controlla se le cartelle devono essere aperte in una nuova finestra o sostituire l'ultima finestra attiva.\n- default: le cartelle verranno aperte in una nuova finestra a meno che non si selezioni una cartella dall'interno dell'applicazione, ad esempio tramite il menu File\n- on: le cartelle verranno aperte in una nuova finestra\n- off: le cartelle sostituiranno l'ultima finestra attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
+	"window.openWithoutArgumentsInNewWindow.on": "Apri una nuova finestra vuota",
+	"window.openWithoutArgumentsInNewWindow.off": "Imposta lo stato attivo sull'ultima istanza in esecuzione attiva",
+	"openWithoutArgumentsInNewWindow": "Controlla se deve essere aperta una nuova finestra vuota quando si avvia una seconda istanza senza argomento o se è necessario impostare lo stato attivo sull'ultima istanza in esecuzione.\n- on: apre una nuova finestra vuota\n- off: imposta lo stato attivo sull'ultima istanza in esecuzione attiva\nNota: possono comunque verificarsi casi in cui questa impostazione viene ignorata, ad esempio quando si usa l'opzione della riga di comando -new-window o -reuse-window.",
 	"window.reopenFolders.all": "Riapre tutte le finestre.",
 	"window.reopenFolders.folders": "Riapre tutte le cartelle. Le aree di lavoro vuote non verranno ripristinate.",
 	"window.reopenFolders.one": "Riapre l'ultima finestra attiva.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Controlla la modalità di riapertura delle finestre dopo un riavvio. Selezionare 'none' per iniziare sempre con un'area di lavoro vuota, 'one' per riaprire l'ultima finestra usata,  'folders' per riaprire tutte le finestre con cartelle aperte oppure 'all' per riaprire tutte le finestre dell'ultima sessione.",
 	"restoreFullscreen": "Controlla se una finestra deve essere ripristinata a schermo intero se è stata chiusa in questa modalità.",
 	"zoomLevel": "Consente di modificare il livello di zoom della finestra. Il valore originale è 0 e ogni incremento superiore (ad esempio 1) o inferiore (ad esempio -1) rappresenta un aumento o una diminuzione del 20% della percentuale di zoom. È anche possibile immettere valori decimali per modificare il livello di zoom con maggiore granularità.",
-	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: il nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: il percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: il percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: un separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori",
+	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite in base al contesto:\n${activeEditorShort}: nome del file (ad es. MyFile.txt)\n${activeEditorMedium}: percorso del file relativo alla cartella dell'area di lavoro (ad es. myFolder/myFile.txt)\n${activeEditorLong}: percorso completo del file (ad es. / Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: nome della cartella dell'area di lavoro in cui è contenuto il file (ad es. myFolder)\n${folderPath}: percorso della cartella dell'area di lavoro in cui è contenuto il file (ad es. /Users/Development/myFolder)\n${rootName}: nome dell'area di lavoro (ad es. myFolder o myWorkspace)\n${rootPath}: percorso dell'area di lavoro (ad es. /Users/Development/myWorkspace)\n$(appName): ad esempio VS Code\n${dirty}: indica se l'editor attivo è in fase di modifica\n${separator}: separatore condizionale (\" - \") che viene visualizzato solo quando circondato da variabili con valori o testo statico",
 	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
 	"window.newWindowDimensions.inherit": "Apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
 	"window.newWindowDimensions.maximized": "Apre nuove finestre ingrandite a schermo intero.",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "Se è abilitata, passa automaticamente a un tema a contrasto elevato se Windows usa un tema di questo tipo e al tipo scuro quando non si usa più un tema a contrasto elevato Windows.",
 	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
 	"window.nativeTabs": "Abilita le finestre di tab per macOS Sierra. La modifica richiede un riavvio. Eventuali personalizzazioni della barra del titolo verranno disabilitate",
+	"window.smoothScrollingWorkaround": "Abilitare questa soluzione alternativa se lo scorrimento non è più fluido dopo il ripristino di una finestra di VS Code ridotta a icona. Si tratta di una soluzione alternativa per un problema (https://github.com/Microsoft/vscode/issues/13612) in cui si verificano ritardi nello scorrimento in dispositivi con trackpad di precisione, come quelli Surface di Microsoft. Se si abilita questa soluzione alternativa, si potrebbe riscontrare un certo sfarfallio del layout dopo aver ripristinato la finestra ridotta a icona alle dimensioni normali, ma in altre situazioni non produce alcun effetto negativo.",
 	"zenModeConfigurationTitle": "Modalità Zen",
 	"zenMode.fullScreen": "Consente di controllare se attivando la modalità Zen anche l'area di lavoro passa alla modalità schermo intero.",
 	"zenMode.centerLayout": "Controlla se attivando la modalità Zen viene centrato anche il layout.",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 5e7acab8dbe..e07e9f6101f 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Modifica punto di interruzione...",
+	"breakpoint": "Punto di interruzione",
 	"functionBreakpointsNotSupported": "Punti di interruzione delle funzioni non sono supportati da questo tipo di debug",
 	"functionBreakpointPlaceholder": "Funzione per cui inserire il punto di interruzione",
 	"functionBreakPointInputAriaLabel": "Digitare il punto di interruzione della funzione",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Punto di interruzione non verificato",
 	"functionBreakpointUnsupported": "Punti di interruzione di funzione non supportati da questo tipo di debug",
 	"breakpointDirtydHover": "Punto di interruzione non verificato. Il file è stato modificato. Riavviare la sessione di debug.",
+	"logBreakpointUnsupported": "Punti di registrazione non supportati da questo tipo di debug",
 	"conditionalBreakpointUnsupported": "Punti di interruzione condizionali non supportati da questo tipo di debug",
 	"hitBreakpointUnsupported": "Sono stati raggiunti punti di interruzione condizionali non supportati da questo tipo di debug"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 3afac9d9582..7459163ddb4 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Riavvia frame",
 	"removeBreakpoint": "Rimuovi punto di interruzione",
 	"removeAllBreakpoints": "Rimuovi tutti i punti di interruzione",
-	"enableBreakpoint": "Abilita punto di interruzione",
-	"disableBreakpoint": "Disabilita punto di interruzione",
 	"enableAllBreakpoints": "Abilita tutti i punti di interruzione",
 	"disableAllBreakpoints": "Disabilita tutti i punti di interruzione",
 	"activateBreakpoints": "Attiva punti di interruzione",
 	"deactivateBreakpoints": "Disattiva punti di interruzione",
 	"reapplyAllBreakpoints": "Riapplica tutti i punti di interruzione",
 	"addFunctionBreakpoint": "Aggiungi punto di interruzione della funzione",
-	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
-	"editConditionalBreakpoint": "Modifica punto di interruzione...",
 	"setValue": "Imposta valore",
 	"addWatchExpression": "Aggiungi espressione",
 	"editWatchExpression": "Modifica espressione",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index f7b3467296b..d7d5ae4ad86 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Debug: Attiva/Disattiva punto di interruzione",
 	"conditionalBreakpointEditorAction": "Debug: Aggiungi Punto di interruzione condizionale...",
+	"logPointEditorAction": "Debug: Aggiungi punto di registrazione...",
 	"runToCursor": "Esegui fino al cursore",
 	"debugEvaluate": "Debug: Valuta",
 	"debugAddToWatch": "Debug: Aggiungi a espressione di controllo",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..330aaf0d3a7
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Interrompe quando viene soddisfatta la condizione del numero di passaggi. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
+	"breakpointWidgetExpressionPlaceholder": "Interrompe quando l'espressione restituisce true. Premere 'INVIO' per accettare oppure 'ESC' per annullare.",
+	"expression": "Espressione",
+	"hitCount": "Numero di passaggi",
+	"logMessage": "Messaggio di log"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 74e055397e3..1655f90169c 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Usare nomi di configurazione univoci.",
 	"app.launch.json.compound.folder": "Nome della cartella in cui si trova l'elemento compounds.",
 	"app.launch.json.compounds.configurations": "Nomi delle configurazioni che verranno avviate per questo elemento compounds.",
-	"debugNoType": "L'adattatore di debug 'type' non può essere omesso e deve essere di tipo 'string'.",
 	"selectDebug": "Seleziona ambiente",
 	"DebugConfig.failed": "Non è possibile creare il file 'launch.json' all'interno della cartella '.vscode' ({0}).",
 	"workspace": "area di lavoro",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index ce0f5ac7e16..423e65922d9 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "Punto di interruzione",
 	"removeBreakpoints": "Rimuovi punti di interruzione",
 	"removeBreakpointOnColumn": "Rimuovi punto di interruzione a colonna {0}",
 	"removeLineBreakpoint": "Rimuovi punto di interruzione riga",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "Abilita punto di interruzione a colonna {0}",
 	"enableBreakpointOnLine": "Abilita punto di interruzione riga",
 	"addBreakpoint": "Aggiungi punto di interruzione",
+	"addConditionalBreakpoint": "Aggiungi punto di interruzione condizionale...",
+	"addLogPoint": "Aggiungi punto di registrazione...",
+	"cancel": "Annulla",
 	"addConfiguration": "Aggiungi configurazione..."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 1418cb86caf..c085858a8c6 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Mostra errori",
 	"noFolderWorkspaceDebugError": "Non è possibile eseguire il debug del file attivo. Assicurarsi che sia salvato su disco e che sia installata un'estensione di debug per tale tipo di file.",
 	"cancel": "Annulla",
-	"DebugTaskNotFound": "L'attività di preavvio '{0}' non è stata trovata.",
-	"taskNotTracked": "Non è possibile tenere traccia del preLaunchTask '{0}'."
+	"DebugTaskNotFound": "Impossibile trovare l'attività '{0}'.",
+	"taskNotTracked": "L'attività '{0}' non può essere rintracciata."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 7334c58bd49..a77a1e4728d 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Altre info",
-	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug.",
-	"stoppingDebugAdapter": "{0}. L'adattatore di debug verrà arrestato.",
 	"debugAdapterCrash": "Il processo dell'adattatore di debug è stato terminato in modo imprevisto"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 98695801004..3a9023e4662 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "Il file eseguibile '{0}' dell'adattatore di debug non esiste.",
 	"debugAdapterCannotDetermineExecutable": "Non è possibile determinare il file eseguibile per l'adattatore di debug '{0}'.",
-	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
-	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
-	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
-	"debugType": "Tipo di configurazione.",
-	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
-	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
-	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
-	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
-	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
-	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
-	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
-	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
-	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
+	"unableToLaunchDebugAdapter": "Non è possibile avviare l'adattatore di debug da '{0}'.",
+	"unableToLaunchDebugAdapterNoArgs": "Non è possibile avviare l'adattatore di debug."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..c5d731b3ec8
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,23 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Usare IntelliSense per informazioni sui possibili attributi.",
+	"launch.config.comment2": "Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.",
+	"launch.config.comment3": "Per ulteriori informazioni, visitare: {0}",
+	"debugType": "Tipo di configurazione.",
+	"debugTypeNotRecognised": "Il tipo di debug non è riconosciuto. Assicurarsi di avere un'estensione appropriata per il debug installata e che sia abilitata.",
+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\".",
+	"debugName": "Nome della configurazione. Viene visualizzato nel menu a discesa della configurazione di avvio.",
+	"debugRequest": "Tipo della richiesta di configurazione. Può essere \"launch\" o \"attach\".",
+	"debugServer": "Solo per lo sviluppo dell'estensione di debug: se si specifica una porta, Visual Studio Code prova a connettersi a un adattatore di debug in esecuzione in modalità server",
+	"debugPrelaunchTask": "Attività da eseguire prima dell'avvio della sessione di debug.",
+	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
+	"debugOSXConfiguration": "Attributi della configurazione di avvio specifici di OS X.",
+	"debugLinuxConfiguration": "Attributi della configurazione di avvio specifici di Linux.",
+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..b2beae5d759
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "Console di Visual Studio Code",
+	"mac.terminal.script.failed": "Lo script '{0}' non è riuscito. Codice di uscita: {1}",
+	"mac.terminal.type.not.supported": "'{0}' non supportato",
+	"press.any.key": "Premere un tasto qualsiasi per continuare...",
+	"linux.term.failed": "'{0}' non riuscito. Codice di uscita: {1}"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 79c3b874203..8a9cb12815f 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Configura estensioni consigliate (cartella dell'area di lavoro)",
 	"malicious tooltip": "Questa estensione è stata segnalata come problematica.",
 	"malicious": "Dannosa",
+	"disabled": "Disabilitata",
+	"disabled globally": "Disabilitata",
+	"disabled workspace": "Disabilitata per questa area di lavoro",
 	"disableAll": "Disabilita tutte le estensioni installate",
 	"disableAllWorkspace": "Disabilita tutte le estensioni installate per questa area di lavoro",
 	"enableAll": "Abilita tutte le estensioni",
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..b89388c1e2b
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Nome dell'estensione",
+	"extension id": "Identificatore dell'estensione",
+	"preview": "Anteprima",
+	"builtin": "Predefinita",
+	"publisher": "Nome dell'editore",
+	"install count": "Conteggio delle installazioni",
+	"rating": "Valutazione",
+	"repository": "Repository",
+	"license": "Licenza",
+	"details": "Dettagli",
+	"contributions": "Contributi",
+	"changelog": "Log delle modifiche",
+	"dependencies": "Dipendenze",
+	"noReadme": "File LEGGIMI non disponibile.",
+	"noChangelog": "Changelog non disponibile.",
+	"noContributions": "Nessun contributo",
+	"noDependencies": "Nessuna dipendenza",
+	"settings": "Impostazioni ({0})",
+	"setting name": "Nome",
+	"description": "Descrizione",
+	"default": "Impostazione predefinita",
+	"debuggers": "Debugger ({0})",
+	"debugger name": "Nome",
+	"debugger type": "Tipo",
+	"views": "Visualizzazioni ({0})",
+	"view id": "ID",
+	"view name": "Nome",
+	"view location": "Dove",
+	"localizations": "Localizzazioni ({0})",
+	"localizations language id": "ID lingua",
+	"colorThemes": "Temi colore ({0})",
+	"iconThemes": "Temi icona ({0})",
+	"colors": "Colori ({0})",
+	"colorId": "ID",
+	"defaultDark": "Predefinito scuro",
+	"defaultLight": "Predefinito chiaro",
+	"defaultHC": "Predefinito contrasto elevato",
+	"JSON Validation": "Convalida JSON ({0})",
+	"fileMatch": "Corrispondenza file",
+	"schema": "Schema",
+	"commands": "Comandi ({0})",
+	"command name": "Nome",
+	"keyboard shortcuts": "Scelte rapide da tastiera",
+	"menuContexts": "Contesti menu",
+	"languages": "Linguaggi ({0})",
+	"language id": "ID",
+	"language name": "Nome",
+	"file extensions": "Estensioni di file",
+	"grammar": "Grammatica",
+	"snippets": "Frammenti"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index aeb7cee0d71..93bd9376516 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
 	"reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.",
 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
-	"showRecommendations": "Mostra gli elementi consigliati",
 	"install": "Installa",
+	"showRecommendations": "Mostra gli elementi consigliati",
 	"showLanguageExtensions": "Il Marketplace ha estensioni per i file '.{0}'",
 	"workspaceRecommended": "Per questa area di lavoro sono disponibili estensioni consigliate.",
 	"installAll": "Installa tutto",
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index afa57c88868..b78ce5a7c83 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Disabilitare altre mappature tastiera ({0}) per evitare conflitti tra tasti di scelta rapida?",
 	"yes": "Sì",
-	"no": "No",
-	"betterMergeDisabled": "L'estensione Better Merge (miglior merge) è ora incorporata: l'estensione installata è stata disattivata e può essere disinstallata.",
-	"uninstall": "Disinstalla"
+	"no": "No"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 96e949cb24a..bb58789eedb 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "Consigliate",
 	"otherRecommendedExtensions": "Altri consigli",
 	"workspaceRecommendedExtensions": "Consigli per l'area di lavoro",
-	"builtInExtensions": "Predefinite",
+	"builtInExtensions": "Funzionalità",
+	"builtInThemesExtensions": "Temi",
 	"searchExtensions": "Cerca le estensioni nel Marketplace",
 	"sort by installs": "Ordina per: conteggio installazioni",
 	"sort by rating": "Ordina per: classificazione",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 1dfea4391db..70fd8e87f6c 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -28,15 +28,16 @@
 	"confirmMoveTrashMessageFolder": "Eliminare '{0}' e il relativo contenuto?",
 	"confirmMoveTrashMessageFile": "Eliminare '{0}'?",
 	"undoBin": "È possibile ripristinare dal Cestino.",
-	"undoTrash": "È possibile ripristinare dal cestino.",
+	"undoTrash": "È possibile ripristinare dal Cestino.",
 	"doNotAskAgain": "Non chiedermelo di nuovo",
 	"confirmDeleteMessageMultiple": "Sei sicuro di voler eliminare permanentemente i seguenti {0} file?",
 	"confirmDeleteMessageFolder": "Eliminare definitivamente '{0}' e il relativo contenuto?",
 	"confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?",
 	"irreversible": "Questa azione è irreversibile.",
-	"cancel": "Annulla",
-	"permDelete": "Elimina definitivamente",
-	"importFiles": "Importa file",
+	"binFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
+	"trashFailed": "Impossibile eliminare utilizzando il Cestino. Si desidera eliminare definitivamente invece?",
+	"deletePermanentlyButtonLabel": "&& Eliminare in modo permanente",
+	"retryButtonLabel": "&& Riprova",
 	"confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?",
 	"replaceButtonLabel": "&&Sostituisci",
 	"fileIsAncestor": "Il file da incollare è un predecessore della cartella di destinazione",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 33e0072ede8..27f682715d4 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "Modalità linguaggio predefinita assegnata ai nuovi file.",
 	"editorConfigurationTitle": "Editor",
 	"formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.",
+	"formatOnSaveTimeout": "Timeout per Formatta dopo il salvataggio. Specifica un limite di tempo in millisecondi per i comandi formatOnSave. I comandi che richiedono più tempo del timeout specificato verranno annullati.",
 	"explorerConfigurationTitle": "Esplora file",
 	"openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti.",
 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index fffcdf8e562..43b7d826b9f 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Digitare il nome file. Premere INVIO per confermare oppure ESC per annullare.",
-	"constructedPath": "Crea {0} in **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Esplora file",
 	"dropFolders": "Aggiungere le cartelle all'area di lavoro?",
 	"dropFolder": "Aggiungere la cartella all'area di lavoro?",
 	"addFolders": "&& Aggiungi cartelle",
 	"addFolder": "&&Aggiungi cartella",
+	"confirmRootsMove": "Sei sicuro che si desidera modificare l'ordine di più cartelle root nell'area di lavoro?",
 	"confirmMultiMove": "Sei sicuro di voler spostare i seguenti {0} file?",
+	"confirmRootMove": "Sei sicuro che si desidera modificare l'ordine delle cartella principale '{0}' nell'area di lavoro?",
 	"confirmMove": "Sei sicuro di voler spostare '{0}'?",
 	"doNotAskAgain": "Non chiedermelo di nuovo",
 	"moveButtonLabel": "&&Sposta",
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..4d04454a2ac
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Anteprima HTML"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..6ad886b279b
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "L'input dell'editor non è valido."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..2011975d153
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Sviluppatore"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..ee36d0bcec9
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Apri strumenti di sviluppo Webview",
+	"refreshWebviewLabel": "Ricarica Webview"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 3e7cf3f5df4..d821a4ec5e0 100644
--- a/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Cambiare la lingua dell'interfaccia utente di VS Code in {0} e riavviare?",
+	"yes": "Sì",
+	"no": "No",
+	"neverAgain": "Non visualizzare più questo messaggio",
 	"JsonSchema.locale": "Linguaggio dell'interfaccia utente da usare.",
 	"vscode.extension.contributes.localizations": "Contribuisce traduzioni all'editor",
 	"vscode.extension.contributes.localizations.languageId": "Id della lingua in cui sono tradotte le stringhe visualizzate.",
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..c8c335d94e4
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Copia",
+	"copyMessage": "Copia messaggio "
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..f743668975c
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Totale {0} problemi"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..2fafad9b706
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Problemi",
+	"tooltip.1": "1 problema in questo file ",
+	"tooltip.N": "{0} problemi in questo file",
+	"markers.showOnFile": "Mostra errori e avvisi relativi a file e cartella. "
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..5a6174bd99e
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Visualizza",
+	"problems.view.toggle.label": "Attiva/Disattiva Problemi (Errori, Avvisi, Informazioni)",
+	"problems.view.focus.label": "Sposta lo stato attivo su problemi (Errori, Avvisi, Informazioni)",
+	"problems.panel.configuration.title": "Visualizzazione Problemi",
+	"problems.panel.configuration.autoreveal": "Controlla se la visualizzazione Problemi deve visualizzare automaticamente i file durante l'apertura",
+	"markers.panel.title.problems": "Problemi",
+	"markers.panel.aria.label.problems.tree": "Problemi raggruppati per file",
+	"markers.panel.no.problems.build": "Finora non sono stati rilevati problemi nell'area di lavoro.",
+	"markers.panel.action.filter": "Filtra problemi",
+	"markers.panel.filter.ariaLabel": "Filtra problemi",
+	"markers.panel.filter.errors": "errori",
+	"markers.panel.filter.warnings": "avvisi",
+	"markers.panel.filter.infos": "messaggi informativi",
+	"markers.panel.single.error.label": "1 errore",
+	"markers.panel.multiple.errors.label": "{0} errori",
+	"markers.panel.single.warning.label": "1 avviso",
+	"markers.panel.multiple.warnings.label": "{0} avvisi",
+	"markers.panel.single.info.label": "1 messaggio informativo",
+	"markers.panel.multiple.infos.label": "{0} messaggi informativi",
+	"markers.panel.single.unknown.label": "1 sconosciuto",
+	"markers.panel.multiple.unknowns.label": "{0} sconosciuti",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} con {1} problemi",
+	"problems.tree.aria.label.marker.relatedInformation": " Questo problema include riferimenti a {0} percorsi.",
+	"problems.tree.aria.label.error.marker": "Errore generato da {0}: {1} a riga {2} e carattere {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Errore: {0} a riga {1} e carattere {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "Avviso generato da {0}: {1} a riga {2} e carattere {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Avviso: {0} a riga {1} e carattere {2}.{3}",
+	"problems.tree.aria.label.info.marker": "Messaggio informativo generato da {0}: {1} a riga {2} e carattere {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Messaggio informativo: {0} a riga {1} e carattere {2}.{3}",
+	"problems.tree.aria.label.marker": "Problema generato da {0}: {1} a riga {2} e carattere {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Problema: {0} a riga {1} e carattere {2}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{0} a riga {1} e carattere {2} in {3}",
+	"errors.warnings.show.label": "Mostra errori e avvisi"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 3ab66459385..1aaa39797ad 100644
--- a/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Attiva/Disattiva output",
 	"clearOutput": "Cancella output",
 	"toggleOutputScrollLock": "Attiva/Disattiva blocco scorrimento per output",
-	"switchToOutput.label": "Passa all'output"
+	"switchToOutput.label": "Passa all'output",
+	"openInLogViewer": "Apri file di log"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index d18b35762b8..9800b7b0870 100644
--- a/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Output",
 	"logViewer": "Visualizzatore Log",
 	"viewCategory": "Visualizza",
-	"clearOutput.label": "Cancella output"
+	"clearOutput.label": "Cancella output",
+	"openActiveLogOutputFile": "Visualizza: Apri file di output del log attivo"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 915767115f7..ab7704c8c47 100644
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Scelte rapide da tastiera",
+	"showDefaultKeybindings": "Mostra tasti di scelta rapida predefiniti",
+	"showUserKeybindings": "Mostra tasti di scelta rapida utente",
 	"SearchKeybindings.AriaLabel": "Cerca tasti di scelta rapida",
 	"SearchKeybindings.Placeholder": "Cerca tasti di scelta rapida",
 	"sortByPrecedene": "Ordina per Precedenza",
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index b1521d61b1f..695670cf87c 100644
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Apri impostazioni predefinite non elaborate",
+	"openSettings": "Apri impostazioni",
 	"openGlobalSettings": "Apri impostazioni utente",
 	"openGlobalKeybindings": "Apri tasti di scelta rapida",
 	"openGlobalKeybindingsFile": "Apri file dei tasti di scelta rapida",
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 01dd3d9cc62..05ccccf41ee 100644
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Impostazioni predefinite",
 	"SearchSettingsWidget.AriaLabel": "Cerca impostazioni",
 	"SearchSettingsWidget.Placeholder": "Cerca impostazioni",
 	"noSettingsFound": "Nessun risultato",
diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index a4608aa9da5..acbb94499dd 100644
--- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Mostra l'estensione \"{0}\"",
 	"editTtile": "Modifica",
 	"replaceDefaultValue": "Sostituisci nelle impostazioni",
-	"copyDefaultValue": "Copia nelle impostazioni",
-	"unsupportedPHPExecutablePathSetting": "Questa deve essere un'impostazione utente. Per configurare PHP per l'area di lavoro, aprire un file PHP e fare clic su 'Percorso PHP' nella barra di stato.",
-	"unsupportedWorkspaceSetting": "Questa deve essere un'impostazione utente.",
-	"unsupportedWorkbenchSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella.",
-	"unsupportedWorkbenchSettingDevMode": "L'impostazione non può essere applicata in questo momento. Essa verrà applicata se il suo ambito sarà definito come 'risorsa' durante la registrazione, o quando si aprirà questa cartella direttamente."
+	"copyDefaultValue": "Copia nelle impostazioni"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index b11614a0056..781c9834bae 100644
--- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "Installa ulteriori provider SCM ...",
 	"no open repo": "Non esistono provider di controllo codice sorgente attivi.",
 	"source control": "Controllo del codice sorgente",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Nascondi"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index d4755072966..2e43beadd2d 100644
--- a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Mostra i criteri di esclusione per la ricerca precedenti",
 	"nextSearchTerm": "Mostra il termine di ricerca successivo",
 	"previousSearchTerm": "Mostra il termine di ricerca precedente",
-	"showSearchViewlet": "Mostra Cerca",
 	"findInFiles": "Cerca nei file",
 	"replaceInFiles": "Sostituisci nei file",
 	"RefreshAction.label": "Aggiorna",
diff --git a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 2990ba49e00..3f0b88cd28f 100644
--- a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Cerca",
+	"copyMatchLabel": "Copia",
+	"copyPathLabel": "Copia percorso",
+	"copyAllLabel": "Copia tutti",
 	"findInFolder": "Trova nella cartella...",
 	"findInWorkspace": "Trova nell'area di lavoro...",
 	"showTriggerActions": "Vai al simbolo nell'area di lavoro...",
 	"name": "Cerca",
-	"search": "Cerca",
 	"showSearchViewl": "Mostra Cerca",
 	"view": "Visualizza",
 	"findInFiles": "Cerca nei file",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Configurare questa opzione per includere i risultati di una ricerca di simboli globale nei risultati dei file per Quick Open.",
 	"search.followSymlinks": "Controlla se seguire i collegamenti simbolici durante la ricerca.",
 	"search.smartCase": "Cerca in modo insensibile alle maiuscole/minuscole se il criterio è tutto minuscolo, altrimenti cerca in modalità sensibile a maiuscole/minuscole",
-	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS",
-	"search.location": "Anteprima: controlla se la ricerca verrà mostrata in una visualizzazione della barra laterale o in un pannello nell'area pannelli in modo da disporre di maggiore spazio in orizzontale. Nella versione successiva la ricerca nel pannello sarà caratterizzata da un layout orizzontale ottimizzato e questa funzione non sarà più un'anteprima."
+	"search.globalFindClipboard": "Controlla se il viewlet di ricerca deve leggere o modificare gli appunti di ricerca condivisi in macOS"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index aa1a8710d4d..c0eba234792 100644
--- a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Aiutaci a migliorare il nostro supporto all'{0}",
 	"takeShortSurvey": "Partecipa a un breve sondaggio",
 	"remindLater": "Visualizza più tardi",
-	"neverAgain": "Non visualizzare più questo messaggio",
-	"helpUs": "Aiutaci a migliorare il nostro supporto all'{0}"
+	"neverAgain": "Non visualizzare più questo messaggio"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index a2e9e03a390..613cfcb5fd1 100644
--- a/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Partecipare a un breve sondaggio?",
 	"takeSurvey": "Partecipa a sondaggio",
 	"remindLater": "Visualizza più tardi",
-	"neverAgain": "Non visualizzare più questo messaggio",
-	"surveyQuestion": "Partecipare a un breve sondaggio?"
+	"neverAgain": "Non visualizzare più questo messaggio"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 65ecc6909d4..f2036927853 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Criterio di problema o nome di un criterio di problema predefinito o aggiunto come contributo. Può essere omesso se si specifica base.",
 	"ProblemMatcherSchema.base": "Nome di un matcher problemi di base da usare.",
 	"ProblemMatcherSchema.owner": "Proprietario del problema in Visual Studio Code. Può essere omesso se si specifica base. Se è omesso e non si specifica base, viene usato il valore predefinito 'external'.",
+	"ProblemMatcherSchema.source": "Stringa in formato leggibile che descrive l'origine di questa diagnostica, ad esempio 'typescript' o 'super lint'.",
 	"ProblemMatcherSchema.severity": "Gravità predefinita per i problemi di acquisizione. Viene usato se il criterio non definisce un gruppo di corrispondenze per la gravità.",
 	"ProblemMatcherSchema.applyTo": "Controlla se un problema segnalato in un documento di testo è valido solo per i documenti aperti o chiusi oppure per tutti i documenti.",
 	"ProblemMatcherSchema.fileLocation": "Consente di definire come interpretare i nomi file indicati in un criterio di problema.",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 8d36733b39a..a83add2496b 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "Non assegna l'attività ad alcun gruppo",
 	"JsonSchema.tasks.group": "Definisce il gruppo di esecuzione a cui appartiene questa attività. Supporta \"build\" per aggiungerlo al gruppo di compilazione e \"test\" per aggiungerlo al gruppo di test.",
 	"JsonSchema.tasks.type": "Definisce se l'attività viene eseguita come un processo o come un comando all'interno di una shell.",
+	"JsonSchema.command.quotedString.value": "Valore effettivo del comando",
+	"JsonSchema.tasks.quoting.escape": "Evita i caratteri utilizzando il carattere di escape della shell (per esempio ` sotto PowerShell e \\ sotto bash).",
+	"JsonSchema.tasks.quoting.strong": "Virgoletta l'argomento utilizzando il carattere di doppio apice della shell (per esempio \" sotto PowerShell e bash).",
+	"JsonSchema.tasks.quoting.weak": "Virgoletta l'argomento utilizzando il carattere di singolo apice della shell (per esempio ' sotto PowerShell e bash).",
+	"JsonSchema.command.quotesString.quote": "Come il valore del comando dovrebbe essere virgolettato",
+	"JsonSchema.command": "Comando da eseguire. Può essere un programma esterno o un comando della shell.",
+	"JsonSchema.args.quotedString.value": "Valore effettivo del comando",
+	"JsonSchema.args.quotesString.quote": "Come il valore dell'argomento dovrebbe essere virgolettato",
+	"JsonSchema.tasks.args": "Argomenti passati al comando quando viene richiamata questa attività.",
 	"JsonSchema.tasks.label": "Etichetta dell'attività per l'interfaccia utente ",
 	"JsonSchema.version": "Numero di versione della configurazione",
 	"JsonSchema.tasks.identifier": "Identificatore definito dall'utente per fare riferimento all'attività in launch.json o in una clausola dependsOn.",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index b2e3a492ebb..f4b25f34a5c 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Attività",
 	"ConfigureTaskRunnerAction.label": "Configura attività",
+	"totalErrors": "{0} errori",
+	"totalWarnings": "{0} avvisi",
+	"totalInfos": "{0} messaggi informativi",
 	"problems": "Problemi",
 	"building": "Compilazione in corso...",
-	"manyMarkers": "Più di 99",
+	"manyProblems": "Più di 10.000",
 	"runningTasks": "Visualizza attività in esecuzione",
 	"tasks": "Attività",
 	"TaskSystem.noHotSwap": "Se si cambia il motore di esecuzione delle attività con un'attività attiva in esecuzione, è necessario ricaricare la finestra",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Selezionare il tipo di errori e di avvisi per cui analizzare l'output dell'attività",
 	"customizeParseErrors": "La configurazione dell'attività corrente presenta errori. Per favore correggere gli errori prima di personalizzazione un'attività.",
 	"moreThanOneBuildTask": "tasks.json contiene molte attività di compilazione. È in corso l'esecuzione della prima.\n",
-	"TaskSystem.activeSame.background": "L'attività '{0}' è già attiva ed in modalità background. Per terminarla, usare 'Termina attività' dal menu Attività.",
-	"TaskSystem.activeSame.noBackground": "L'attività '{0}' è già attiva. Per terminarla, usare 'Termina attività' dal menu Attività.",
+	"terminateTask": "Termina attività",
+	"restartTask": "Riavvia attività",
 	"TaskSystem.active": "Al momento c'è già un'attività in esecuzione. Terminarla prima di eseguirne un'altra.",
 	"TaskSystem.restartFailed": "Non è stato possibile terminare e riavviare l'attività {0}",
 	"TaskService.noConfiguration": "Errore: Il rilevamento di attività {0} non ha contribuito un'attività nella seguente configurazione: \n{1} \nL'attività verrà ignorata.\n",
diff --git a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 5984bf9e6f1..b89a9a5d2c8 100644
--- a/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Avviso: options.cwd deve essere di tipo string. Il valore {0} verrà ignorato.\n",
+	"ConfigurationParser.inValidArg": "Errore: l'argomento del comando deve essere una stringa o una stringa virgolettata. Il valore specificato è:\n{0}",
 	"ConfigurationParser.noargs": "Errore: gli argomenti del comando devono essere un array di stringhe. Il valore specificato è:\n{0}",
 	"ConfigurationParser.noShell": "Avviso: la configurazione della shell è supportata solo quando si eseguono attività nel terminale.",
 	"ConfigurationParser.noName": "Errore: è necessario specificare un nome per il matcher problemi nell'ambito di dichiarazione:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Errore: nella configurazione di attività '{0}' manca la proprietà obbligatoria '{1}'. La configurazione dell'attività verrà ignorata.",
 	"ConfigurationParser.notCustom": "Errore: tasks non è dichiarato come un'attività personalizzata. La configurazione verrà ignorata.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Errore: un'attività deve specificare una proprietà label. L'attività verrà ignorata.\n{0}\n",
-	"taskConfiguration.shellArgs": "Avviso: l'attività '{0}' è un comando di shell e uno dei suoi argomenti potrebbe avere spazi indesiderati. Per garantire la correttezza della riga di comando unire args nel comando stesso.",
 	"taskConfiguration.noCommandOrDependsOn": "Errore: l'attività '{0}' non specifica un comando né una proprietà dependsOn. L'attività verrà ignorata. La sua definizione è:\n{1}",
 	"taskConfiguration.noCommand": "Errore: l'attività '{0}' non definisce un comando. L'attività verrà ignorata. Definizione dell'attività:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "L'attività versione 2.0.0 non supporta attività specifiche globali del sistema operativo. Convertirle in un'attività con un comando specifico del sistema operativo. Attività interessate:\n{0}"
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..7ae3aac58f6
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "Il colore di sfondo del terminale, questo consente di colorare il terminale in modo diverso dal pannello.",
+	"terminal.foreground": "Il colore di primo piano del terminale.",
+	"terminalCursor.foreground": "Colore di primo piano del cursore del terminale.",
+	"terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.",
+	"terminal.selectionBackground": "Colore di sfondo di selezione del terminale.",
+	"terminal.border": "Colore del bordo che separa i riquadri divisi all'interno del terminale. L'impostazione predefinita è panel.border.",
+	"terminal.ansiColor": "'{0}' colori ANSI nel terminale. "
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 183e933c6e1..d18ee9b5c9c 100644
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,7 @@
 	"workbench.action.terminal.hideFindWidget": "Nascondi widget Trova",
 	"nextTerminalFindTerm": "Mostra il termine di ricerca successivo",
 	"previousTerminalFindTerm": "Mostra il termine di ricerca precedente",
-	"quickOpenTerm": "Cambia terminale attivo"
+	"quickOpenTerm": "Cambia terminale attivo",
+	"workbench.action.terminal.selectToPreviousCommand": "Aggiungi selezione a comando precedente",
+	"workbench.action.terminal.selectToNextCommand": "Aggiungi selezione a comando successivo"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index e0033bb7d61..9e38fa8a7e0 100644
--- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copia",
+	"split": "Dividi",
 	"paste": "Incolla",
 	"selectAll": "Seleziona tutto",
-	"clear": "Cancella",
-	"split": "Dividi"
+	"clear": "Cancella"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index a2ee6206bbf..deb5b14b127 100644
--- a/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Quest'area di lavoro contiene impostazioni che è possibile specificare solo nelle impostazioni utente  ({0}). Per maggiori informazioni, fare clic [qui]({1}).",
 	"openWorkspaceSettings": "Apri impostazioni area di lavoro",
-	"dontShowAgain": "Non visualizzare più questo messaggio",
-	"unsupportedWorkspaceSettings": "Quest'area di lavoro contiene impostazioni che è possibile specificare solo nelle impostazioni utente  ({0}). Per maggiori informazioni, fare clic [qui]({1})."
+	"dontShowAgain": "Non visualizzare più questo messaggio"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..a720e18d093
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Note sulla versione: {0}",
+	"unassigned": "non assegnato"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index e675aaedcf6..c1d4fe9a7f2 100644
--- a/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "In seguito",
-	"unassigned": "non assegnato",
 	"releaseNotes": "Note sulla versione",
 	"showReleaseNotes": "Mostra note sulla versione",
 	"read the release notes": "Benvenuti in {0} versione {1}. Leggere le note sulla versione?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "Nuovo aggiornamento di {0} disponibile.",
 	"noUpdatesAvailable": "Al momento non sono disponibili aggiornamenti.",
 	"ok": "OK",
-	"download now": "Scarica ora",
 	"thereIsUpdateAvailable": "È disponibile un aggiornamento.",
+	"download now": "Scarica ora",
+	"later": "In seguito",
 	"installUpdate": "Installa aggiornamento",
-	"updateAvailable": "È disponibile un aggiornamento: {0} {1}",
 	"updateInstalling": "{0} {1} verrà installato in background. Al termine, verrà visualizzato un messaggio.",
 	"updateNow": "Aggiorna adesso",
-	"updateAvailableAfterRestart": "{0} verrà aggiornato dopo il riavvio.",
 	"commandPalette": "Riquadro comandi...",
 	"settings": "Impostazioni",
 	"keyboardShortcuts": "Scelte rapide da tastiera",
diff --git a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..09c98a26547
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "editor Webview",
+	"developer": "Sviluppatore"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..ee36d0bcec9
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Apri strumenti di sviluppo Webview",
+	"refreshWebviewLabel": "Ricarica Webview"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..647449f9420
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Per contribuire al miglioramento di VS Code, è possibile consentire a Microsoft di raccogliere i dati di utilizzo. Leggere l'[informativa sulla privacy]({0}) per informazioni su come [rifiutare esplicitamente]({1}).",
+	"telemetryOptOut.optInNotice": "Per contribuire al miglioramento di VS Code, è possibile consentire a Microsoft di raccogliere i dati di utilizzo. Leggere l'[informativa sulla privacy]({0}) per informazioni su come [acconsentire esplicitamente]({1}).",
+	"telemetryOptOut.readMore": "Altre informazioni"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 98e9bb87b0d..7d4936d889c 100644
--- a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Strumenti e linguaggi",
 	"welcomePage.installExtensionPacksDescription": "Installare il supporto per {0} e {1}",
 	"welcomePage.moreExtensions": "altro",
-	"welcomePage.installKeymapDescription": "Installa i tasti di scelta rapida",
-	"welcomePage.installKeymapExtension": "Installa i tasti di scelta rapida di {0} e {1}",
 	"welcomePage.others": "altri",
 	"welcomePage.colorTheme": "Tema colori",
 	"welcomePage.colorThemeDescription": "Tutto quel che serve per configurare editor e codice nel modo desiderato",
diff --git a/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..96561150bb5
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "Non è possibile applicare ora questa impostazione. Verrà applicata direttamente all'apertura della cartella."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..bb1f14b4fcf
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Sì",
+	"cancelButton": "Annulla"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 08ddb51d21f..05e96e21215 100644
--- a/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "L'host dell'estensione è stato terminato in modo imprevisto.",
 	"extensionHostProcess.unresponsiveCrash": "L'host dell'estensione è stato terminato perché non rispondeva.",
-	"devTools": "Strumenti di sviluppo",
 	"restart": "Riavvia host dell'estensione",
 	"overwritingExtension": "Sovrascrittura dell'estensione {0} con {1}.",
 	"extensionUnderDevelopment": "Caricamento dell'estensione di sviluppo in {0}",
diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 1b3859ecb50..5b7706bdc38 100644
--- a/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
 	"installNet": "Scarica .NET Framework 4.5",
 	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"netVersionError": "Microsoft .NET Framework 4.5 è obbligatorio. Selezionare il collegamento per installarlo.",
+	"enospcError": "{0} non è in grado di controllare le modifiche di una grande area di lavoro. Per risolvere questo problema, seguire il collegamento alle istruzioni. ",
 	"learnMore": "Istruzioni",
-	"enospcError": "{0} sta esaurendo gli handle di file. Per risolvere questo problema, seguire il collegamento alle istruzioni.",
+	"fileInvalidPath": "Risorsa del file non valida ({0})",
+	"fileIsDirectoryError": "Il File è una Directory",
+	"fileNotModifiedError": "File non modificato dal giorno",
+	"fileTooLargeError": "File troppo grande per essere aperto",
+	"fileNotFoundError": "Il file non è stato trovato ({0})",
+	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
+	"filePermission": "Autorizzazione di scrittura sul file negata ({0}) ",
+	"fileExists": "Il file da creare esiste già ({0})",
+	"fileModifiedError": "File modificato da",
+	"fileReadOnlyError": "Il file è di sola lettura",
+	"fileMoveConflict": "Non è possibile eseguire operazioni di spostamento/copia. Il file esiste già nella destinazione.",
+	"unableToMoveCopyError": "Non è possibile eseguire operazioni di spostamento/copia. Il file sostituirebbe la cartella in cui è contenuto.",
 	"binFailed": "Non è stato possibile spostare '{0}' nel Cestino",
 	"trashFailed": "Non è stato possibile spostare '{0}' nel Cestino"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index d95f7f919aa..0679938a47a 100644
--- a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Il file non è stato trovato ({0})",
 	"fileIsDirectoryError": "Il File è una Directory",
 	"fileNotModifiedError": "File non modificato dal giorno",
 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo"
diff --git a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
index 6e9f57076de..e98cc6a8898 100644
--- a/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Risorsa del file non valida ({0})",
 	"fileIsDirectoryError": "Il File è una Directory",
 	"fileNotModifiedError": "File non modificato dal giorno",
-	"fileTooLargeForHeapError": "Le dimensioni del file superano il limite di memoria della finestra. Provare a eseguire il codice --max-memory=NEWSIZE",
 	"fileTooLargeError": "File troppo grande per essere aperto",
 	"fileNotFoundError": "Il file non è stato trovato ({0})",
 	"fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo",
diff --git a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..4fa1f89e7ff 100644
--- a/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Annulla"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 10246e41a96..d8c6c0c8a17 100644
--- a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "Nome dell'ambito TextMate usato dal file tmLanguage.",
 	"vscode.extension.contributes.grammars.path": "Percorso del file tmLanguage. È relativo alla cartella delle estensioni e in genere inizia con './syntaxes/'.",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "Mapping tra nome ambito e ID linguaggio se questa grammatica contiene linguaggi incorporati.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Mapping tra nome di ambito e tipi di token.",
 	"vscode.extension.contributes.grammars.injectTo": "Elenco di nomi di ambito del linguaggio in cui viene inserita questa grammatica."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 5fb7d00f03d..1c4e6bd4f78 100644
--- a/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/ita/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}",
 	"invalid.injectTo": "Il valore in `contributes.{0}.injectTo` non è valido. Deve essere una matrice di nomi di ambito del linguaggio. Valore specificato: {1}",
 	"invalid.embeddedLanguages": "Il valore in `contributes.{0}.embeddedLanguages` non è valido. Deve essere un mapping di oggetti tra nome ambito e linguaggio. Valore specificato: {1}",
+	"invalid.tokenTypes": "Il valore in `contributes.{0}.tokenTypes` non è valido. Deve essere un mapping di oggetti tra nome ambito e tipo di token. Valore specificato: {1}",
 	"invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.",
 	"no-tm-grammar": "Non è stata registrata alcuna grammatica TM per questo linguaggio."
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..6d6b061cb73
--- /dev/null
+++ b/i18n/jpn/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS 言語サーバー",
+	"folding.start": "折りたたみ領域の開始",
+	"folding.end": "折りたたみ領域の終了"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css-language-features/package.i18n.json b/i18n/jpn/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..f77f0b75a07
--- /dev/null
+++ b/i18n/jpn/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS 言語機能",
+	"description": "CSS、LESS、SCSS ファイルに豊富な言語サポートを提供。",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"css.lint.unknownProperties.desc": "不明なプロパティ。",
+	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
+	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
+	"css.validate.desc": "すべての検証を有効または無効にします",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"less.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"less.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"less.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"less.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"less.lint.unknownProperties.desc": "不明なプロパティ。",
+	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"less.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
+	"less.validate.desc": "すべての検証を有効または無効にします",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
+	"scss.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
+	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
+	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
+	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
+	"scss.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
+	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
+	"scss.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
+	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
+	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
+	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
+	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
+	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
+	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
+	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
+	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
+	"scss.lint.zeroUnits.desc": "0 に単位は必要ありません",
+	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
+	"scss.validate.desc": "すべての検証を有効または無効にします",
+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
+	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
+	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/css/package.i18n.json b/i18n/jpn/extensions/css/package.i18n.json
index 920c3c933e8..afbe11a31b6 100644
--- a/i18n/jpn/extensions/css/package.i18n.json
+++ b/i18n/jpn/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 言語機能",
-	"description": "CSS、LESS、SCSS ファイルに豊富な言語サポートを提供。",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "無効なパラメーター数値",
-	"css.lint.boxModel.desc": "padding や border を使用するときに width や height を使用しないでください",
-	"css.lint.compatibleVendorPrefixes.desc": "ベンダー プレフィックス を使用するときは、他すべてのベンダー プレフィックスも必ず含めてください",
-	"css.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"css.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"css.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"css.lint.hexColorLength.desc": "Hex には 3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"css.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"css.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"css.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"css.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display によってプロパティを無視します。例: 'display: inline' の場合、width、height、margin-top、margin-bottom、float プロパティには効果がありません。",
-	"css.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"css.lint.unknownProperties.desc": "不明なプロパティ。",
-	"css.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"css.lint.zeroUnits.desc": "0 に単位は必要ありません",
-	"css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。",
-	"css.validate.title": "CSS の検証と問題の重大度を制御します。",
-	"css.validate.desc": "すべての検証を有効または無効にします",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-	"less.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"less.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"less.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"less.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"less.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"less.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"less.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"less.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"less.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-	"less.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"less.lint.unknownProperties.desc": "不明なプロパティ。",
-	"less.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
-	"less.validate.title": "LESS の検証と問題の重大度を制御します。",
-	"less.validate.desc": "すべての検証を有効または無効にします",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
-	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
-	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
-	"scss.lint.duplicateProperties.desc": "重複するスタイル定義を使用しないでください",
-	"scss.lint.emptyRules.desc": "空の規則セットを使用しないでください",
-	"scss.lint.float.desc": "'float' は使用しないでください。float を使用すると、レイアウトの一部が変更されたときに CSS が破損しやすくなります。",
-	"scss.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります",
-	"scss.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります",
-	"scss.lint.idSelector.desc": "セレクターには ID を含めないでください。これらの規則と HTML の結合が密接すぎます。",
-	"scss.lint.ieHack.desc": "IE ハックは、IE7 以前をサポートする場合にのみ必要です",
-	"scss.lint.important.desc": "!important は使用しないでください。これは CSS 全体の特定性が制御不能になり、リファクタリングが必要なことを示しています。",
-	"scss.lint.importStatement.desc": "複数の Import ステートメントを同時に読み込むことはできません",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "表示によりプロパティが無視されます。たとえば、'display: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません",
-	"scss.lint.universalSelector.desc": "ユニバーサル セレクター (*) を使用すると処理速度が低下することが分かっています",
-	"scss.lint.unknownProperties.desc": "不明なプロパティ。",
-	"scss.lint.unknownVendorSpecificProperties.desc": "不明なベンダー固有のプロパティ。",
-	"scss.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
-	"scss.lint.zeroUnits.desc": "0 の単位は必要ありません",
-	"scss.validate.title": "SCSS の検証と問題の重大度を制御します。",
-	"scss.validate.desc": "すべての検証を有効または無効にします",
-	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"css.colorDecorators.enable.deprecationMessage": "設定 `css.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"scss.colorDecorators.enable.deprecationMessage": "設定 `scss.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"less.colorDecorators.enable.deprecationMessage": "設定 `less.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+	"displayName": "CSS の基本言語サポート",
+	"description": "CSS、LESS、SCSS ファイル内で構文ハイライト、かっこ一致を提供します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/emmet/package.i18n.json b/i18n/jpn/extensions/emmet/package.i18n.json
index b9dfede7063..2ea428b8ba7 100644
--- a/i18n/jpn/extensions/emmet/package.i18n.json
+++ b/i18n/jpn/extensions/emmet/package.i18n.json
@@ -35,7 +35,7 @@
 	"emmetExtensionsPath": "Emmet のプロファイルとスニペットを含むフォルダーへのパス。",
 	"emmetShowExpandedAbbreviation": "展開された Emmet 省略記法を候補として表示します。\n\"inMarkupAndStylesheetFilesOnly\" オプションは、html、haml、jade、slim、xml、xsl、css、scss、sass、less、stylus に適用されます。\n\"always\" オプションは markup/css に関係なくファイルのすべての部分に適用されます。",
 	"emmetShowAbbreviationSuggestions": "利用できる Emmet 省略記法を候補として表示します。スタイルシートや emmet.showExpandedAbbreviation を \"never\" に設定していると適用されません。",
-	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 省略記法を有効にします。 言語と Emmet がサポートする言語の間にマッピングを追加します。\n例: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetIncludeLanguages": "既定でサポートされていない言語で Emmet 略語を有効にします。ここに、その言語と Emmet でサポートされる言語のマッピングを追加します。\n 例: {\"vue-html\":\"html\"、\"javascript\":\"javascriptreact\"}",
 	"emmetVariables": "Emmet のスニペットで使用される変数",
 	"emmetTriggerExpansionOnTab": "有効にすると、TAB キーを押したときに Eemmet 省略記法が展開されます。",
 	"emmetPreferences": "Emmet の一部のアクションやリゾルバーの動作の変更に使用される基本設定。",
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'webkit' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'webkit' プレフィックスを避ける場合は空の文字列に設定します。",
 	"emmetPreferencesCssMozProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'moz' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'moz' プレフィックスを避ける場合は空の文字列に設定します。",
 	"emmetPreferencesCssOProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'o' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'o' プレフィックスを避ける場合は空の文字列に設定します。",
-	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。"
+	"emmetPreferencesCssMsProperties": "Emmet 省略記法で使用される場合に `-` で始まる 'ms' ベンダー プレフィックスを取得するカンマ区切りの CSS プロパティ。常に 'ms' プレフィックスを避ける場合は空の文字列に設定します。",
+	"emmetPreferencesCssFuzzySearchMinScore": "あいまい検索の省略形が達成すべき (0 から 1 の) 最小スコア。値が低ければ多くの誤検出が発生する可能性があります。値が高ければ一致する見込みが減る可能性があります。",
+	"emmetOptimizeStylesheetParsing": "false に設定すると、現在位置が Emmet 略語の展開位置として有効かどうかを判定するためにファイル全体を解析します。true に設定すると、css/scss/less ファイルの現在位置周辺のコンテンツのみを解析します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/commands.i18n.json b/i18n/jpn/extensions/git/out/commands.i18n.json
index 8b6874c3974..9b386d3755b 100644
--- a/i18n/jpn/extensions/git/out/commands.i18n.json
+++ b/i18n/jpn/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "タグが正常にプッシュされました。",
 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
-	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
+	"sync is unpredictable": "このアクションはコミットを '{0}/{1}' との間でプッシュしたりプルしたりします。",
 	"never again": "OK、今後は表示しない",
 	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
 	"no changes stash": "スタッシュする変更がありません。",
diff --git a/i18n/jpn/extensions/git/package.i18n.json b/i18n/jpn/extensions/git/package.i18n.json
index ed4c2c13c62..5f3a79c4800 100644
--- a/i18n/jpn/extensions/git/package.i18n.json
+++ b/i18n/jpn/extensions/git/package.i18n.json
@@ -7,7 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"displayName": "Git",
-	"description": "Git SCM の統合",
+	"description": "Git SCM統合",
 	"command.clone": "クローン",
 	"command.init": "リポジトリの初期化",
 	"command.close": "リポジトリを閉じる",
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Git 変更の表示内にインラインのファイルを開くアクションを表示するかどうかを制御します。",
 	"config.inputValidation": "コミット メッセージの入力検証をいつ表示するかを制御します。",
 	"config.detectSubmodules": "Git のサブモジュールを自動的に検出するかどうかを制御します。",
+	"config.detectSubmodulesLimit": "Git サブモジュールの検出の制限を制御します。",
 	"colors.modified": "リソースを改変した場合の配色",
 	"colors.deleted": "リソースを検出した場合の配色",
 	"colors.untracked": "リソースを追跡しない場合の配色",
diff --git a/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..ed3272fd709
--- /dev/null
+++ b/i18n/jpn/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML 言語サーバー",
+	"folding.start": "折りたたみ領域の開始",
+	"folding.end": "折りたたみ領域の終了"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html-language-features/package.i18n.json b/i18n/jpn/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..18b6e348d48
--- /dev/null
+++ b/i18n/jpn/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML 言語機能",
+	"description": "HTML、Razor、Handlebar ファイルに豊富な言語サポートを提供。",
+	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
+	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
+	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
+	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
+	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
+	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
+	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
+	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
+	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
+	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
+	"html.format.wrapAttributes.desc": "属性を折り返します。",
+	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
+	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
+	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
+	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
+	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
+	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
+	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
+	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
+	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
+	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
+	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/html/package.i18n.json b/i18n/jpn/extensions/html/package.i18n.json
index 047a45d6e23..965c8b85db9 100644
--- a/i18n/jpn/extensions/html/package.i18n.json
+++ b/i18n/jpn/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 言語機能",
-	"description": "HTML、Razor、Handlebar ファイルに豊富な言語サポートを提供。",
-	"html.format.enable.desc": "既定の HTML フォーマッタを有効/無効にします",
-	"html.format.wrapLineLength.desc": "1 行あたりの最大文字数 (0 = 無効にする)。",
-	"html.format.unformatted.desc": "再フォーマットしてはならないタグの、コンマ区切りの一覧。'null' の場合、既定で https://www.w3.org/TR/html5/dom.html#phrasing-content にリストされているすべてのタグになります。",
-	"html.format.contentUnformatted.desc": "コンテンツを再フォーマットしてはならないタグをコンマで区切ってリストにします。'null' は、既定値の 'pre' タグを表します。",
-	"html.format.indentInnerHtml.desc": "<head> セクションと <body> セクションをインデントします。",
-	"html.format.preserveNewLines.desc": "要素の前にある既存の改行を保持するかどうか。要素の前でのみ機能し、タグの内側やテキストに対しては機能しません。",
-	"html.format.maxPreserveNewLines.desc": "1 つのチャンク内に保持できる改行の最大数。無制限にするには、'null' を使います。",
-	"html.format.indentHandlebars.desc": "書式設定とインデント {{#foo}} および {{/foo}}。",
-	"html.format.endWithNewline.desc": "末尾に改行を入れます。",
-	"html.format.extraLiners.desc": "直前に改行を 1 つ入れるタグの、コンマで区切られたリストです。'null' は、既定値の \"head, body, /html\" を表します。",
-	"html.format.wrapAttributes.desc": "属性を折り返します。",
-	"html.format.wrapAttributes.auto": "行の長さが超過した場合のみ属性を折り返します。",
-	"html.format.wrapAttributes.force": "先頭以外の各属性を折り返します。",
-	"html.format.wrapAttributes.forcealign": "先頭以外の各属性を折り返して位置を合わせます。",
-	"html.format.wrapAttributes.forcemultiline": "各属性を折り返します。",
-	"html.suggest.angular1.desc": "ビルトイン HTML 言語サポートが Angular V1 のタグおよびプロパティを候補表示するかどうかを構成します。",
-	"html.suggest.ionic.desc": "ビルトイン HTML 言語サポートが Ionic のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.suggest.html5.desc": "ビルトイン HTML 言語サポートが HTML5 のタグ、プロパティ、および値を候補表示するかどうかを構成します。",
-	"html.trace.server.desc": "VS Code と HTML 言語サーバー間の通信をトレースします。",
-	"html.validate.scripts": "ビルトイン HTML 言語サポートが埋め込みスクリプトを検証するかどうかを構成します。",
-	"html.validate.styles": "ビルトイン HTML 言語サポートが埋め込みスタイルを検証するかどうかを構成します。",
-	"html.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。",
-	"html.autoClosingTags": "HTML タグの自動クローズを有効/無効にします。"
+	"displayName": "HTML の基本言語サポート",
+	"description": "HTML ファイル内で構文ハイライト、かっこ一致、スニペットを提供"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..2700229f8e7
--- /dev/null
+++ b/i18n/jpn/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON 言語サーバー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json-language-features/package.i18n.json b/i18n/jpn/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..2960f3fa69e
--- /dev/null
+++ b/i18n/jpn/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON 言語機能",
+	"description": "JSON ファイルに豊富な言語サポートを提供。",
+	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
+	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
+	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
+	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
+	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
+	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
+	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
+	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
+	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/json/package.i18n.json b/i18n/jpn/extensions/json/package.i18n.json
index e060790f4dc..2ec4d67b799 100644
--- a/i18n/jpn/extensions/json/package.i18n.json
+++ b/i18n/jpn/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 言語機能",
-	"description": "JSON ファイルに豊富な言語サポートを提供。",
-	"json.schemas.desc": "スキーマを現在のプロジェクトの JSON ファイルに関連付けます",
-	"json.schemas.url.desc": "スキーマへの URL または現在のディレクトリのスキーマへの相対パス",
-	"json.schemas.fileMatch.desc": "JSON ファイルをスキーマに解決する場合に一致するファイル パターンの配列です。",
-	"json.schemas.fileMatch.item.desc": "JSON ファイルをスキーマに解決する場合に一致するよう '*' を含む可能性があるファイル パターンです。",
-	"json.schemas.schema.desc": "指定された URL のスキーマ定義です。スキーマは、スキーマ URL へのアクセスを避けるためにのみ指定する必要があります。",
-	"json.format.enable.desc": "既定の JSON フォーマッタを有効/無効にします (再起動が必要です)",
-	"json.tracing.desc": "VS Code と JSON 言語サーバー間の通信をトレースします。",
-	"json.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
-	"json.colorDecorators.enable.deprecationMessage": "設定 `json.colorDecorators.enable` は使用されなくなりました。`editor.colorDecorators` を使用してください。",
-	"json.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。"
+	"displayName": "JSON の基本言語サポート",
+	"description": "JSON ファイル内で構文ハイライト、かっこ一致を提供"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..0489b0c3667
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' を読み込むことができません: {0}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..21f810889f0
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[プレビュー] {0}",
+	"previewTitle": "プレビュー {0}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..8031d3c647d
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "このドキュメントで一部のコンテンツが無効になっています",
+	"preview.securityMessage.title": "安全でない可能性があるか保護されていないコンテンツは、マークダウン プレビューで無効化されています。保護されていないコンテンツやスクリプトを有効にするには、マークダウン プレビューのセキュリティ設定を変更してください",
+	"preview.securityMessage.label": "セキュリティが無効なコンテンツの警告"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json b/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..4e88fd4f8be
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "高レベル",
+	"strict.description": "セキュリティで保護されたコンテンツのみを読み込む",
+	"insecureLocalContent.title": "安全でないローカル コンテンツを許可する",
+	"insecureLocalContent.description": "localhost から http で提供されるコンテンツの読み込みを有効にします",
+	"insecureContent.title": "セキュリティで保護されていないコンテンツを許可する",
+	"insecureContent.description": "HTTP を介したコンテンツの読み込みを有効にする",
+	"disable.title": "無効にする",
+	"disable.description": "すべてのコンテンツとスクリプトの実行を許可します。推奨されません。",
+	"moreInfo.title": "詳細情報",
+	"enableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
+	"disableSecurityWarning.title": "このワークスペースでプレビューのセキュリティ警告を有効にする",
+	"toggleSecurityWarning.description": "コンテンツのセキュリティ レベルに影響しません",
+	"preview.showPreviewSecuritySelector.title": "ワークスペースのマークダウン プレビューに関するセキュリティ設定を選択 "
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/markdown-language-features/package.i18n.json b/i18n/jpn/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..58b68df0b74
--- /dev/null
+++ b/i18n/jpn/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown 言語機能",
+	"description": "Markdown に豊富な言語サポートを提供。",
+	"markdown.preview.breaks.desc": "マークダウン プレビューで改行をレンダリングする方法を設定します。'true' に設定すると改行ごとに <br> を作成します。",
+	"markdown.preview.linkify": "マークダウン プレビューで URL 形式のテキストからリンクへの変換を有効または無効にします。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "マークダウンのプレビューでダブルクリックすると、エディターに切り替わります。",
+	"markdown.preview.fontFamily.desc": "マークダウン プレビューで使用されるフォント ファミリを制御します。",
+	"markdown.preview.fontSize.desc": "マークダウン プレビューで使用されるフォント サイズ (ピクセル単位) を制御します。",
+	"markdown.preview.lineHeight.desc": "マークダウン プレビューで使用される行の高さを制御します。この数値はフォント サイズを基準とします。",
+	"markdown.preview.markEditorSelection.desc": "マークダウンのプレビューに、エディターの現在の選択範囲を示すマークが付きます。",
+	"markdown.preview.scrollEditorWithPreview.desc": "マークダウンのプレビューをスクロールすると、エディターのビューが更新されます 。",
+	"markdown.preview.scrollPreviewWithEditor.desc": "マークダウンのエディターをスクロールすると、プレビューのビューが更新されます。",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[非推奨] エディターの現在選択されている行を表示するためにマークダウン プレビューをスクロールします。",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "この設定は 'markdown.preview.scrollPreviewWithEditor' に置き換えられ、もはや有効ではありません。",
+	"markdown.preview.title": "プレビューを開く",
+	"markdown.previewFrontMatter.dec": "マークダウン プレビューで YAML front matter がレンダリングされる方法を設定します。'hide' の場合、front matter が削除されます。その他の場合には、front matter はマークダウン コンテンツとして処理されます。",
+	"markdown.previewSide.title": "プレビューを横に表示",
+	"markdown.showLockedPreviewToSide.title": "ロックされたプレビューを横に表示",
+	"markdown.showSource.title": "ソースの表示",
+	"markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。",
+	"markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更",
+	"markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。",
+	"markdown.preview.refresh.title": "プレビューを更新",
+	"markdown.preview.toggleLock.title": "プレビュー ロックの切り替え"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..3f34bb85eac
--- /dev/null
+++ b/i18n/jpn/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "PHP ファイルを lint するために {0} (ワークスペースの設定として定義されている) を実行することを許可しますか?",
+	"php.yes": "許可",
+	"php.no": "許可しない",
+	"wrongExecutable": "{0} が有効な PHP 実行可能ファイルではないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
+	"noExecutable": "PHP 実行可能ファイルが設定されていないため、検証できません。設定 'php.validate.executablePath' を使用して PHP 実行可能ファイルを構成してください。",
+	"unknownReason": "パス {0} を使用して php を実行できませんでした。理由は不明です。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php-language-features/package.i18n.json b/i18n/jpn/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..15a98a885de
--- /dev/null
+++ b/i18n/jpn/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
+	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
+	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
+	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
+	"displayName": "PHP 言語機能",
+	"description": "PHP ファイルに豊富な言語サポートを提供します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/php/package.i18n.json b/i18n/jpn/extensions/php/package.i18n.json
index c5c7d5d62ef..16bb0ef7ca1 100644
--- a/i18n/jpn/extensions/php/package.i18n.json
+++ b/i18n/jpn/extensions/php/package.i18n.json
@@ -6,13 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。",
-	"configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。",
-	"configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。",
-	"configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP の検証を無効にします (ワークスペース設定として定義)。",
-	"displayName": "PHP 言語機能",
-	"description": "PHP ファイルの IntelliSense、リンティング、および基本言語サポートを提供します。"
+	"displayName": "PHP の基本言語サポート",
+	"description": "PHP ファイル内に構文ハイライト、かっこ一致を提供します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..e69dc45423d
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください",
+	"typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です",
+	"typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした",
+	"typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
+	"typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではありません。詳細情報は [こちら]({1}) をクリックしてください。",
+	"typescript.configureTsconfigQuickPick": "tsconfig.json を構成する",
+	"typescript.configureJsconfigQuickPick": "jsconfig.json を構成する"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..adb307b9768
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "適用するコード アクションを選択",
+	"acquiringTypingsLabel": "Typings の定義ファイルを取得中...",
+	"acquiringTypingsDetail": "IntelliSense の Typings の定義ファイルを取得しています。",
+	"autoImportLabel": "{0} から自動インポート"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..19d9bea48dd
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "JavaScript ファイルのセマンティック チェックを有効にします。 ファイルの先頭にある必要があります。",
+	"ts-nocheck": "JavaScript ファイルのセマンティック チェックを無効にします。 ファイルの先頭にある必要があります。",
+	"ts-ignore": "ファイルの次の行で @ts-check エラーを抑制します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..64c5084a0d1
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 個の実装",
+	"manyImplementationLabel": "{0} 個の実装",
+	"implementationsErrorLabel": "実装を特定できませんでした"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..26a29c2851a
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc コメント"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..7882c9fa95f
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "インポートを整理"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..453c92d6195
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (ファイルの中のすべてを修正する)"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..71699891f3b
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 個の参照",
+	"manyReferenceLabel": "{0} 個の参照",
+	"referenceErrorLabel": "参照を判別できませんでした"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..bb8e166d153
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "ビルド - {0}",
+	"buildAndWatchTscLabel": "ウォッチ - {0}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..904634944f4
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "パス {0} は、有効な tsserver インストールを指していません。バンドルされている TypeScript バージョンにフォールバックしています。",
+	"serverCouldNotBeStarted": "TypeScript 言語サーバーを起動できません。エラー メッセージ: {0}",
+	"typescript.openTsServerLog.notSupported": "TS サーバーのログには TS 2.2.2 以降が必要です",
+	"typescript.openTsServerLog.loggingNotEnabled": "TS サーバーのログがオフになっています。ログを有効にするには、`typescript.tsserver.log` を設定して TS サーバーを再起動してください",
+	"typescript.openTsServerLog.enableAndReloadOption": "ログを有効にして、TS サーバーを再起動する",
+	"typescript.openTsServerLog.noLogFile": "TS サーバーはログを開始していません。",
+	"openTsServerLog.openFileFailedFailed": "TS サーバーのログ ファイルを開くことができませんでした",
+	"serverDiedAfterStart": "TypeScript 言語サービスは、開始直後に 5 回停止しました。サービスは再開されません。",
+	"serverDiedReportIssue": "問題の報告",
+	"serverDied": "TypeScript 言語サービスは、直前の 5 分間に 5 回、予期せずに停止しました。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..4b09d67cea3
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "バージョンが無効です"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..d4f07accea4
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
+	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
+	"large.label": "除外の構成",
+	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..416302dc017
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "より適した TypeScript IntelliSense に関するデータをフェッチしています",
+	"typesInstallerInitializationFailed.title": "JavaScript 言語機能のための型定義ファイルをインストールできませんでした。NPM のインストールを確認するか、ユーザー設定で  'typescript.npm' を構成してください。詳細は [こちら]({0}) をクリックしてください。",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "今後は表示しない"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..e9aaf978151
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "VS Code のバージョンを使用",
+	"useWorkspaceVersionOption": "ワークスペースのバージョンを使用",
+	"learnMore": "詳細情報",
+	"selectTsVersion": "JavaScript および TypeScript 言語の機能に使用する TypeScript バージョンを選択します"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..bb98209ca70
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "このパスでは TypeScript のバージョンを読み込むことができません",
+	"noBundledServerFound": "VS Code の tsserver が適切に動作しないウイルス検出ツールなどの他アプリケーションにより削除されました。VS Code を再インストールしてください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/extensions/typescript-language-features/package.i18n.json b/i18n/jpn/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..9cfdd473386
--- /dev/null
+++ b/i18n/jpn/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,65 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript と JavaScript の言語機能",
+	"description": "JavaScript と TypeScript ファイルに豊富な言語サポートを提供。",
+	"typescript.reloadProjects.title": "プロジェクトの再読み込み",
+	"javascript.reloadProjects.title": "プロジェクトの再読み込み",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "パラメーター シグネチャを含む完全な関数。",
+	"typescript.tsdk.desc": "使用する tsserver と lib*.d.ts ファイルが含まれているフォルダーのパスを指定します。",
+	"typescript.disableAutomaticTypeAcquisition": "型定義の自動取得を無効にします。TypeScript 2.0.6 以上が必要です。",
+	"typescript.tsserver.log": "ファイルへの TS サーバーのログを有効にします。このログは TS サーバーの問題を診断するために使用できます。ログには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
+	"typescript.tsserver.pluginPaths": "Typescript 言語サービス プラグインを検出する追加のパス。TypeScript 2.3.0以上が必要。",
+	"typescript.tsserver.pluginPaths.item": "絶対または相対パスのいずれか。相対パスはワークスペース フォルダーに対して解決されます。",
+	"typescript.tsserver.trace": "TS サーバーに送信されるメッセージのトレースを有効にします。このトレースは TS サーバーの問題を診断するために使用できます。トレースには、プロジェクトのファイルパス、ソースコード、その他の潜在的に機密性の高い情報が含まれている場合があります。",
+	"typescript.validate.enable": "TypeScript の検証を有効/無効にします。",
+	"typescript.format.enable": "既定の TypeScript フォーマッタを有効/無効にします。",
+	"javascript.format.enable": "既定の JavaScript フォーマッタを有効/無効にします。",
+	"format.insertSpaceAfterCommaDelimiter": "コンマ区切り記号の後のスペース処理を定義します。",
+	"format.insertSpaceAfterConstructor": "コンストラクター キーワードの後にスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
+	"format.insertSpaceAfterSemicolonInForStatements": " for ステートメント内のセミコロンの後のスペース処理を定義します。",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "2 項演算子の後のスペース処理を定義します。",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "制御フロー ステートメント内のキーワードの後のスペース処理を定義します。",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "匿名関数の関数キーワードの後のスペース処理を定義します。",
+	"format.insertSpaceBeforeFunctionParenthesis": "関数の引数のかっこの前にあるスペース処理を定義します。TypeScript が 2.1.5. 以上である必要があります。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "左右の空でないかっこの間のスペース処理を定義します。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "左右の空でない角かっこの間のスペース処理を定義します。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": "左右の空でないかっこの間のスペース処理を定義します。TypeScript が 2.3.0 以上である必要があります。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "テンプレート文字列の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 式の始め波かっこの後と終わり波かっこの前のスペース処理を定義します。TypeScript が 2.0.6 以上である必要があります。",
+	"format.insertSpaceAfterTypeAssertion": "TypeScript の型アサーションの後のスペース処理を定義します。TypeScript が 2.4 以上である必要があります。",
+	"format.placeOpenBraceOnNewLineForFunctions": "新しい行に関数の始め波かっこを配置するかどうかを定義します。",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "新しい行にコントロール ブロックの始め波かっこを配置するかどうかを定義します。",
+	"javascript.validate.enable": "JavaScript の検証を有効/無効にします。",
+	"typescript.goToProjectConfig.title": "プロジェクト構成に移動",
+	"javascript.goToProjectConfig.title": "プロジェクト構成に移動",
+	"javascript.referencesCodeLens.enabled": "JavaScript ファイル内で CodeLens の参照を有効/無効にします。",
+	"typescript.referencesCodeLens.enabled": "TypeScript ファイル内で CodeLens の参照を有効/無効にします。TypeScript 2.0.6 以上が必要です。",
+	"typescript.implementationsCodeLens.enabled": "CodeLens の実装を有効/無効にします。TypeScript 2.2.0 以上が必要です。",
+	"typescript.openTsServerLog.title": "TS サーバーのログを開く",
+	"typescript.restartTsServer": "TS サーバーを再起動",
+	"typescript.selectTypeScriptVersion.title": "TypeScript のバージョンの選択",
+	"typescript.reportStyleChecksAsWarnings": "スタイルチェックレポートを警告扱いとする",
+	"jsDocCompletion.enabled": " 自動 JSDoc コメントを有効/無効にします",
+	"javascript.implicitProjectConfig.checkJs": "JavaScript ファイルのセマンティック チェックを有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上である必要があります。",
+	"typescript.npm": "型定義の自動取得に使用される NPM 実行可能ファイルへのパスを指定します。TypeScript 2.3.4 以上が必要です。",
+	"typescript.check.npmIsInstalled": "型定義の自動取得に NPM がインストールされているかどうかを確認します。",
+	"javascript.nameSuggestions": "JavaScript の候補リスト内でファイルから一意の名前を含むかどうかを有効/無効にします。",
+	"typescript.tsc.autoDetect": "tsc タスクの自動検出を制御します。'off' はこの機能を無効にします。'build' は 1 つのコンパイル実行タスクのみを表示します。'watch' はコンパイルとウォッチ タスクのみを表示します。'on' はビルド タスクとウォッチ タスクの両方を表示します。既定値は 'on' です。",
+	"typescript.problemMatchers.tsc.label": "TypeScript の問題",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript の問題 (ウォッチ モード)",
+	"typescript.quickSuggestionsForPaths": "Import パスを入力するときのクイック候補を有効/無効にします。",
+	"typescript.locale": "TypeScript のエラーを報告するために使用するロケールを設定します。TypeScript 2.6.0 以上が必要です。'null' の規定値は TypeScript のエラーに VS Code のロケールを使用します。",
+	"javascript.implicitProjectConfig.experimentalDecorators": "プロジェクト外の JavaScript ファイルの 'experimentalDecorators' を有効/無効にします。既存の jsconfi.json や tsconfi.json ファイルの設定はこれより優先されます。TypeScript は 2.3.1 以上である必要があります。",
+	"typescript.autoImportSuggestions.enabled": "自動 import 提案を有効/無効にします。TypeScript 2.6.1 以上が必要です",
+	"typescript.experimental.syntaxFolding": "構文の折りたたみマーカー認識を有効/無効にします。",
+	"taskDefinition.tsconfig.description": "TS ビルドを定義する tsconfig ファイル。",
+	"javascript.suggestionActions.enabled": "エディター内で JavaScript ファイルの診断の提案を有効または無効にします。TypeScript 2.8 以上である必要があります。",
+	"typescript.suggestionActions.enabled": "エディター内で TypeScript ファイルの診断の提案を有効または無効にします。TypeScript 2.8 以上である必要があります。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/node/processes.i18n.json b/i18n/jpn/src/vs/base/node/processes.i18n.json
index 1a69c4ed49d..35229bd6699 100644
--- a/i18n/jpn/src/vs/base/node/processes.i18n.json
+++ b/i18n/jpn/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "UNC ドライブでシェル コマンドを実行できません。"
+	]
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json b/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
index ce4101ffa70..bb65d0f69b0 100644
--- a/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
+++ b/i18n/jpn/src/vs/base/parts/quickopen/browser/quickOpenModel.i18n.json
@@ -6,6 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"quickOpenAriaLabelEntry": "{0}、選択",
+	"quickOpenAriaLabelEntry": "{0}, ピッカー",
 	"quickOpenAriaLabel": "選択"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 2abf82cf890..e06ec774240 100644
--- a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "GitHub 上でプレビュー",
 	"loadingData": "データを読み込んでいます...",
+	"rateLimited": "GitHub クエリの制限を超えました。お待ちください。",
 	"similarIssues": "類似の問題",
 	"open": "Open",
 	"closed": "Closed",
-	"noResults": "一致する項目はありません",
+	"noSimilarIssues": "類似の問題は見つかりませんでした",
 	"settingsSearchIssue": "設定検索の問題",
 	"bugReporter": "バグ レポート",
-	"performanceIssue": "パフォーマンスの問題",
 	"featureRequest": "機能欲求",
+	"performanceIssue": "パフォーマンスの問題",
 	"stepsToReproduce": "再現手順",
 	"bugDescription": "問題を再現するための正確な手順を共有します。このとき、期待する結果と実際の結果を提供してください。GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
 	"performanceIssueDesciption": "このパフォーマンスの問題はいつ発生しましたか? それは起動時ですか? それとも特定のアクションのあとですか? GitHub-flavored Markdown に対応しています。GitHub 上で確認するときに問題を編集してスクリーンショットを追加できます。",
diff --git a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 4222ad5ea5d..06d09e1c611 100644
--- a/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/jpn/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,12 @@
 	],
 	"completeInEnglish": "英語で記入して下さい。",
 	"issueTypeLabel": "種類",
+	"issueSourceLabel": "記録",
+	"vscode": "Visual Studio Code",
+	"extension": "拡張機能",
+	"disableExtensionsLabelText": "{0} を実行後に問題を再現してみてください。拡張機能がアクティブな場合にのみ問題が再現する場合は、拡張機能の問題である可能性があります。",
+	"disableExtensions": "すべての拡張機能を無効にしてウィンドウを再読みする",
+	"chooseExtension": "拡張機能",
 	"issueTitleLabel": "題名",
 	"issueTitleRequired": "題名を入力してください",
 	"titleLengthValidation": "タイトルが長すぎます。",
@@ -18,13 +24,6 @@
 	"extensions": "私の拡張機能",
 	"searchedExtensions": "見つかった拡張機能",
 	"settingsSearchDetails": "設定検索の詳細",
-	"tryDisablingExtensions": "拡張機能が無効な場合に問題は再現可能ですか?",
-	"yes": "はい",
-	"no": "いいえ",
-	"disableExtensionsLabelText": "{0} を実行後に問題を再現してみてください。",
-	"disableExtensions": "すべての拡張機能を無効にしてウィンドウを再読みする",
-	"showRunningExtensionsLabelText": "拡張機能の問題と疑われる場合、拡張機能の問題を報告するために {0} を実行してください。",
-	"showRunningExtensions": "すべての実行中の拡張機能を表示する",
 	"details": "詳細を入力してください。",
 	"loadingData": "データを読み込んでいます..."
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..fb628eb4d5d
--- /dev/null
+++ b/i18n/jpn/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "CPU %",
+	"memory": "メモリ (MB)",
+	"pid": "pid",
+	"name": "名前",
+	"killProcess": "プロセスの終了",
+	"forceKillProcess": "プロセスの強制終了"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
index 93732a981f0..64e268008b7 100644
--- a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json
@@ -57,7 +57,7 @@
 	"miPaste": "貼り付け(&&P)",
 	"miFind": "検索(&&F)",
 	"miReplace": "置換(&&R)",
-	"miFindInFiles": "ファイル内を検索(&&I)",
+	"miFindInFiles": "複数ファイルから検索(&&I)",
 	"miReplaceInFiles": "複数のファイルで置換(&&I)",
 	"miEmmetExpandAbbreviation": "Emmet: 略語の展開(&&X)",
 	"miShowEmmetCommands": "Emmet(&&M)...",
@@ -161,6 +161,7 @@
 	"mMergeAllWindows": "すべてのウィンドウを統合",
 	"miToggleDevTools": "開発者ツールの切り替え(&&T)",
 	"miAccessibilityOptions": "ユーザー補助オプション(&&O)",
+	"miOpenProcessExplorerer": "プロセス エクスプローラーを開く(&&P)",
 	"miReportIssue": "問題の報告(&&I)",
 	"miWelcome": "ようこそ(&&W)",
 	"miInteractivePlayground": "対話型プレイグラウンド(&&I)",
diff --git a/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json
index 427defd525a..fde5f743633 100644
--- a/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/jpn/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "閉じる",
-	"header": "{1} の差分 {0}: 変更前の {2}、{3} 行、変更後の {4}、{5} 行",
 	"blankLine": "空白",
 	"equalLine": "変更前の {0}、変更後の {1}: {2}",
 	"insertLine": "+ 変更後の {0}: {1}",
diff --git a/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 1024574c477..f0fdce2980a 100644
--- a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。",
 	"multiCursorModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。",
 	"multiCursorModifier": "マウスを使用して複数のカーソルを追加するときに使用する修飾キーです。`ctrlCmd` は Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。「定義に移動」や「リンクを開く」のマウス操作は、マルチカーソルの修飾キーと競合しないように適用されます。",
+	"multiCursorMergeOverlapping": "複数のカーソルが重なっているときは、マージします。",
 	"quickSuggestions.strings": "文字列内でクイック候補を有効にします。",
 	"quickSuggestions.comments": "コメント内でクイック候補を有効にします。",
 	"quickSuggestions.other": "文字列およびコメント外でクイック候補を有効にします。",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "エディターが現在の行をどのように強調表示するかを制御します。考えられる値は 'none'、'gutter'、'line'、'all' です。",
 	"codeLens": "エディターで CodeLens を表示するかどうかを制御する",
 	"folding": "エディターでコードの折りたたみを有効にするかどうかを制御します",
+	"foldingStrategyAuto": "利用可能であれば、言語に特有の折りたたみ方式を使用して、そうでない場合はインデント方式に戻ります。",
+	"foldingStrategyIndentation": "常にインデントに基づく折りたたみ方式を使用します",
+	"foldingStrategy": "折りたたみ範囲の計算方法を制御します。'auto' は利用可能であれば言語固有の折りたたみ方式を使用します。'indentation' は常にインデントに基づく折りたたみ方式を使用します。",
 	"showFoldingControls": "余白上の折りたたみコントロールを自動的に非表示にするかどうかを制御します 。",
 	"matchBrackets": "かっこを選択すると、対応するかっこを強調表示します。",
 	"glyphMargin": "エディターで縦のグリフ余白が表示されるかどうかを制御します。ほとんどの場合、グリフ余白はデバッグに使用されます。",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "Linux の PRIMARY クリップボードをサポートするかどうかを制御します。",
 	"sideBySide": "差分エディターが差分を横に並べて表示するか、行内に表示するかを制御します",
 	"ignoreTrimWhitespace": "差分エディターが、先頭または末尾の空白の変更を差分として表示するかどうかを制御します。",
+	"largeFileSize": "特別な最適化ルールが適用されるバイト単位でファイルサイズのしきい値を制御します",
+	"largeFileLineCount": "特別な最適化ルールが適用される行数の観点からファイルサイズのしきい値を制御します",
 	"renderIndicators": "差分エディターが追加/削除された変更に +/- インジケーターを示すかどうかを制御します"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
index be93b06c5a6..3edd17c221f 100644
--- a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "エディター インデント ガイドの色。",
 	"editorLineNumbers": "エディターの行番号の色。",
 	"editorActiveLineNumber": "エディターのアクティブ行番号の色",
+	"deprecatedEditorActiveLineNumber": "id は使用しないでください。代わりに 'EditorLineNumber.activeForeground' を使用してください。",
 	"editorRuler": "エディター ルーラーの色。",
 	"editorCodeLensForeground": "CodeLens エディターの前景色。",
 	"editorBracketMatchBackground": "一致するかっこの背景色",
@@ -28,7 +29,9 @@
 	"warningBorder": "エディターで警告を示す波線の境界線の色。",
 	"infoForeground": "エディターで情報を示す波線の前景色。",
 	"infoBorder": "エディターで情報を示す波線の境界線の色。",
-	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。",
+	"hintForeground": "エディターでヒントを示す波線の前景色。",
+	"hintBorder": "エディターでヒントを示す波線の境界線の色。",
+	"overviewRulerRangeHighlight": "範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
 	"overviewRuleError": "エラーを示す概要ルーラーのマーカー色。",
 	"overviewRuleWarning": "警告を示す概要ルーラーのマーカー色。",
 	"overviewRuleInfo": "情報を示す概要ルーラーのマーカー色。"
diff --git a/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..8afb4eaf750
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "修正プログラム ({0}) を表示する",
+	"quickFix": "修正プログラムを表示する",
+	"quickfix.trigger.label": "クイック フィックス...",
+	"editor.action.quickFix.noneMessage": "利用可能なコード アクションはありません",
+	"refactor.label": "リファクター...",
+	"editor.action.refactor.noneMessage": "利用可能なリファクタリングはありません",
+	"source.label": "ソース アクション...",
+	"editor.action.source.noneMessage": "利用可能なソース アクションはありません",
+	"organizeImports.label": "インポートを整理"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json b/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json
index 2f1848eb3b1..a95eddbcb87 100644
--- a/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/format/formatActions.i18n.json
@@ -12,5 +12,6 @@
 	"hintnn": "行 {1} と {2} の間で {0} 個の書式設定を編集",
 	"no.provider": "インストールされた '{0}'ファイル用のフォーマッターが存在しません。",
 	"formatDocument.label": "ドキュメントのフォーマット",
+	"no.documentprovider": "インストールされた '{0}'ファイル用のドキュメント フォーマッターが存在しません。",
 	"formatSelection.label": "選択範囲のフォーマット"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 765d78bc6cf..3f023b18ed0 100644
--- a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動",
-	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動",
-	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
-	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
-	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
-	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
+	"markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..a523dd78325
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。",
+	"editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。",
+	"editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。",
+	"editorMarkerNavigationBackground": "エディターのマーカー ナビゲーション ウィジェットの背景。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json b/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json
index 0b3715fb4e0..5bdb5b2382d 100644
--- a/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/links/links.i18n.json
@@ -10,7 +10,9 @@
 	"links.navigate": "Ctrl キーを押しながらクリックしてリンク先を表示",
 	"links.command.mac": "command キーを押しながらクリックしてコマンドを実行",
 	"links.command": "Ctrl キーを押しながらクリックしてコマンドを実行",
+	"links.navigate.al.mac": "Option キーを押しながらクリックしてリンク先を表示",
 	"links.navigate.al": "Altl キーを押しながらクリックしてリンク先を表示",
+	"links.command.al.mac": "Option キーを押しながらクリックしてコマンドを実行",
 	"links.command.al": "Alt キーを押しながらクリックしてコマンドを実行",
 	"invalid.url": "このリンクは形式が正しくないため開くことができませんでした: {0}",
 	"missing.url": "このリンクはターゲットが存在しないため開くことができませんでした。",
diff --git a/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..7c0d7d8f473
--- /dev/null
+++ b/i18n/jpn/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "日曜日",
+	"Monday": "月曜日",
+	"Tuesday": "火曜日",
+	"Wednesday": "水曜日",
+	"Thursday": "木曜日",
+	"Friday": "金曜日",
+	"Saturday": "土曜日",
+	"SundayShort": "日",
+	"MondayShort": "月",
+	"TuesdayShort": "火",
+	"WednesdayShort": "水",
+	"ThursdayShort": "木",
+	"FridayShort": "金",
+	"SaturdayShort": "土",
+	"January": "1 月",
+	"February": "2 月",
+	"March": "3 月",
+	"April": "4 月",
+	"May": "5 月",
+	"June": "6 月",
+	"July": "7 月",
+	"August": "8 月",
+	"September": "9 月",
+	"October": "10 月",
+	"November": "11 月",
+	"December": "12 月",
+	"JanuaryShort": "1 月",
+	"FebruaryShort": "2 月",
+	"MarchShort": "3 月",
+	"AprilShort": "4 月",
+	"MayShort": "5 月",
+	"JuneShort": "6 月",
+	"JulyShort": "7 月",
+	"AugustShort": "8 月",
+	"SeptemberShort": "9 月",
+	"OctoberShort": "10 月",
+	"NovemberShort": "11 月",
+	"DecemberShort": "12 月"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index b0186480893..04ae521063b 100644
--- a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。",
 	"wordHighlightBorder": "変数の読み取りなど読み取りアクセス中のシンボルの境界線の色。",
 	"wordHighlightStrongBorder": "変数への書き込みなど書き込みアクセス中のシンボルの境界線の色。",
-	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。",
-	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。",
+	"overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
+	"overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
 	"wordHighlight.next.label": "次のシンボル ハイライトに移動",
 	"wordHighlight.previous.label": "前のシンボル ハイライトに移動"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..7921873c1f8
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 つの追加ファイルが表示されていません",
+	"moreFiles": "...{0} 個の追加ファイルが表示されていません"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..c2ef06b51ea
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "キャンセル"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
index ac1989254f6..80c47f9bca0 100644
--- a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "'Developer: Startup Performance' コマンドを有効にして開始します。",
 	"prof-startup": "起動中に CPU プロファイラーを実行する",
 	"disableExtensions": "インストールされたすべての拡張機能を無効にします。",
-	"inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
-	"inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。",
 	"disableGPU": "GPU ハードウェア アクセラレータを無効にします。",
 	"uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。",
 	"maxMemory": "ウィンドウの最大メモリ サイズ (バイト単位)。",
diff --git a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index d9c8c1e7d10..9b0afc0667c 100644
--- a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}",
 	"MarketPlaceDisabled": "Marketplace が有効になっていません",
 	"removeError": "拡張機能の削除中にエラーが発生しました: {0}。もう一度やり直す前に、VS Code の終了と起動を実施してください。",
-	"Not Market place extension": "Marketplace の拡張機能のみ再インストールできます",
+	"Not a Marketplace extension": "Marketplace の拡張機能のみ再インストールできます",
 	"notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。",
 	"malicious extension": "問題が報告されたので、拡張機能をインストールできません。",
 	"notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}'  と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。",
 	"quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
 	"exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。",
 	"uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?",
-	"uninstallOnly": "限定",
-	"uninstallAll": "すべて",
+	"uninstallOnly": "拡張機能のみ",
+	"uninstallAll": "すべてアンインストール",
 	"uninstallConfirmation": "'{0}' をアンインストールしてもよろしいですか?",
 	"ok": "OK",
 	"singleDependentError": "拡張機能 '{0}' をアンインストールできません。拡張機能 '{1}' がこの拡張機能に依存しています。",
diff --git a/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 4b14b839908..96e0f8571e1 100644
--- a/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/jpn/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "`engines.vscode` 値 {0} を解析できませんでした。使用可能な値の例: ^0.10.0、^1.2.3、^0.11.0、^0.10.x など。",
+	"versionSyntax": "`engines.vscode` の値 {0} を解析できませんでした。使用可能な値の例: ^1.22.0、^1.22.x など。",
 	"versionSpecificity1": "`engines.vscode` ({0}) で指定されたバージョンが十分に特定されていません。1.0.0 より前の vscode バージョンの場合は、少なくとも想定されているメジャー バージョンとマイナー バージョンを定義してください。例 ^0.10.0、0.10.x、0.11.0 など。",
 	"versionSpecificity2": "`engines.vscode` ({0}) で指定されたバージョンが明確ではありません。1.0.0 より後のバージョンの vscode の場合は、少なくとも、想定されているメジャー バージョンを定義してください。例 ^1.10.0、1.10.x、1.x.x、2.x.x など。",
 	"versionMismatch": "拡張機能が Code {0} と互換性がありません。拡張機能に必要なバージョン: {1}。"
diff --git a/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 020c403fa83..fca35bd3e43 100644
--- a/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/jpn/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "{0} インストールが壊れている可能性があります。再インストールしてください。",
 	"integrity.moreInformation": "詳細情報",
-	"integrity.dontShowAgain": "今後は表示しない",
-	"integrity.prompt": "{0} インストールが壊れている可能性があります。再インストールしてください。"
+	"integrity.dontShowAgain": "今後は表示しない"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json b/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json
index 40973f69053..3e52b3813de 100644
--- a/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json
+++ b/i18n/jpn/src/vs/platform/issue/electron-main/issueService.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"issueReporter": "問題のレポーター"
+	"issueReporter": "問題のレポーター",
+	"processExplorer": "プロセス エクスプローラー"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
index 92abbc3a7e9..b221fed5770 100644
--- a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "マウスで複数の選択肢にツリーおよびリストの項目を追加するために使用される修飾子 (たとえば、エクスプローラーでエディターと scm ビューを開くなど)。`ctrlCmd` は、Windows と Linux では `Control` にマップされ、macOS では `Command` にマップされます。'横に並べて開く' マウス ジェスチャー (サポートされている場合) は、複数選択修飾子と競合しないように調整されます。",
 	"openMode.singleClick": "マウスのシングル クリックで項目を開きます。",
 	"openMode.doubleClick": "マウスのダブル クリックで項目を開きます。",
-	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。"
+	"openModeModifier": "マウスを使用して、ツリーとリストで項目を開く方法を制御します (サポートされている場合)。'SingleClick' に設定すると、項目をマウスのシングル クリックで開き、'doubleClick' に設定すると、ダブル クリックでのみ開きます。ツリーで子を持つ親の場合、この設定で、親をシングル クリックで展開するか、ダブル クリックで展開するかを制御します。該当しない場合、一部のツリーとリストでは、この設定が無視される場合があることに注意してください。",
+	"horizontalScrolling setting": "ワークベンチでツリーが水平スクロールをサポートするかどうかを制御します。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json b/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..5842e6fd343
--- /dev/null
+++ b/i18n/jpn/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "エラー",
+	"sev.warning": "警告",
+	"sev.info": "情報"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
index 66a264ff6b9..9652da2b67e 100644
--- a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "行内マージ競合の現在の概要ルーラー前景色。",
 	"overviewRulerIncomingContentForeground": "行内マージ競合の入力側の概要ルーラー前景色。",
 	"overviewRulerCommonContentForeground": "行内マージ競合の共通の祖先概要ルーラー前景色。",
-	"overviewRulerFindMatchForeground": "一致項目を示す概要ルーラーのマーカー色。",
-	"overviewRulerSelectionHighlightForeground": "選択対象を強調表示するときの概要ルーラーのマーカー色。"
+	"overviewRulerFindMatchForeground": "検索一致項目を示す概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。",
+	"overviewRulerSelectionHighlightForeground": "選択範囲を強調表示するときの概要ルーラーのマーカー色。この色は下地の色に紛れないよう不明瞭であってはいけません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..badee921d01
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": " `{0}`  プロパティは必須で、`string` 型でなければなりません",
+	"showViewlet": "{0} を表示",
+	"view": "表示"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 34c3b6de4d3..d69af0170e1 100644
--- a/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/jpn/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "ビューをエディターに提供します",
 	"views.explorer": "エクスプローラー ビュー",
 	"views.debug": "デバッグ ビュー",
-	"locationId.invalid": "`{0}` は有効なビューの場所ではありません",
 	"duplicateView1": "location `{1}` で同じ id `{0}` を使用する複数のビューを登録できません",
 	"duplicateView2": "location `{1}` で id `{0}` のビューが既に登録されています"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index d396a84c05a..68ec7e9afd8 100644
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "保存時のフォーマットは {0}ms 後に中止されました",
+	"timeout.onWillSave": "onWillSaveTextDocument-event は 1750ms 後に中止されました",
 	"saveParticipants": "Save Participants が実行中です..."
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 01bd67d78ca..b0aba9ae620 100644
--- a/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"webview.editor.label": "webview エディター"
+	"errorMessage": "view:{0} を復元中にエラーが発生しました"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..c56e83de881
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (拡張機能)"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 658a3853560..9d31ab7234a 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "次のグループにフォーカス",
 	"openToSide": "横に並べて開く",
 	"closeEditor": "エディターを閉じる",
+	"closeOneEditor": "閉じる",
 	"revertAndCloseActiveEditor": "元に戻してエディターを閉じる",
 	"closeEditorsToTheLeft": "左側のエディターを閉じる",
 	"closeAllEditors": "すべてのエディターを閉じる",
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 7c41e9e639c..e7c0107e6c1 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,7 @@
 	"screenReaderDetectedExtra": "スクリーン リーダーを使用しない場合、`editor.accessibilitySupport` を \"off\" にしてください。",
 	"disableTabMode": "アクセシビリティ モードを無効にする",
 	"gotoLine": "行へ移動",
-	"indentation": "インデント",
+	"selectIndentation": "インデントを選択",
 	"selectEncoding": "エンコードの選択",
 	"selectEOL": "改行コードの選択",
 	"selectLanguageMode": "言語モードの選択",
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 93c2b61746d..9be51e2dac8 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,11 @@
 	"sizeMB": "{0}MB",
 	"sizeGB": "{0}GB",
 	"sizeTB": "{0}TB",
-	"largeImageError": "画像のファイル サイズが非常に大きい (>1MB) ため、エディターに表示されません。 ",
+	"largeImageError": "画像が大きすぎるため、エディターに表示されません ({0})。",
 	"resourceOpenExternalButton": "外部のプログラムを使用して画像を開きますか?",
-	"nativeBinaryError": "このファイルはバイナリか、非常に大きいか、またはサポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
+	"nativeFileTooLargeError": "ファイルが大きすぎるため、エディターに表示されません ({0})。",
+	"nativeBinaryError": "このファイルはバイナリか、サポートされていないテキスト エンコードを使用しているため、エディターに表示されません。",
+	"openAsText": "このまま開きますか?",
 	"zoom.action.fit.label": "画像全体",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index ea110628335..8d15ea098f8 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "閉じる",
 	"araLabelEditorActions": "エディター操作"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 75172e53e1f..9cfb4721d40 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "新しい通知はありません",
 	"notifications": "通知",
 	"notificationsToolbar": "通知センターのアクション",
 	"notificationsList": "通知リスト"
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..82b9f0d836c
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInput.countSelected": "{0} 個選択済み",
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..f4c7eecf0db
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickInputBox.ariaLabel": "入力すると結果が絞り込まれます。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
index e28495c07d9..bb47142b456 100644
--- a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json
@@ -32,6 +32,7 @@
 	"openRecent": "最近開いた項目…",
 	"quickOpenRecent": "最近使用したものを開く...",
 	"reportIssueInEnglish": "問題の報告",
+	"openProcessExplorer": "プロセス エクスプローラーを開く",
 	"reportPerformanceIssue": "パフォーマンスの問題のレポート",
 	"keybindingsReference": "キーボード ショートカットの参照",
 	"openDocumentationUrl": "ドキュメント",
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 3f7b9fa43c0..3b03f305576 100644
--- a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "ウィンドウ",
 	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
 	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.default": "ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ)",
-	"openFilesInNewWindow": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"window.openFilesInNewWindow.defaultMac": "Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
+	"window.openFilesInNewWindow.default": "アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます",
+	"openFilesInNewWindowMac": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: Dock または Finder を使用して開いたときを除き、ファイルのフォルダーを開いているウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"openFilesInNewWindow": "ファイルを新しいウィンドウで開くかどうかを制御します。\n- default: アプリケーション内から選択したとき (例: ファイル メニュー介したとき) を除き 、新しいウィンドウでファイルを開きます\n- on: 新しいウィンドウでファイルを開きます\n- off: ファイルのフォルダーを開いているフォルダーまたは最後のアクティブ ウィンドウでファイルを開きます\nこの設定は無視される場合もあります (例: -new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
 	"window.openFoldersInNewWindow.on": "新しいウィンドウでフォルダーを開きます",
 	"window.openFoldersInNewWindow.off": "フォルダーは、最後のアクティブ ウィンドウで開きます",
 	"window.openFoldersInNewWindow.default": "フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
 	"openFoldersInNewWindow": "フォルダーを新しいウィンドウで開くか、最後のアクティブ ウィンドウで開くかを制御します。\n- default: アプリケーション内で ([ファイル] メニューなどから) 選択したものでなければ、新しいウィンドウでフォルダーを開く\n- on: 新しいウィンドウでフォルダーを開く\n- off: 最後のアクティブ ウィンドウでフォルダーを開く\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
+	"window.openWithoutArgumentsInNewWindow.on": "新しい空のウィンドウを開く",
+	"window.openWithoutArgumentsInNewWindow.off": "最後にアクティブだった実行中のインスタンスにフォーカスする",
+	"openWithoutArgumentsInNewWindow": "引数なしで 2 つ目のインスタンスを起動するとき、新しい空のウィンドウを開くか、最後に実行されていたウィンドウにフォーカスするかを制御します。\n- on: 新しい空のウィンドウを開く\n- off: 最後に実行されていたウィンドウにフォーカスする\nこの設定は無視される場合もあります (-new-window または -reuse-window コマンド ライン オプションを使用する場合など)。",
 	"window.reopenFolders.all": "すべてのウィンドウを再度開きます。",
 	"window.reopenFolders.folders": "すべてのフォルダーを再度開きます。空のワークスペースは復元されません。",
 	"window.reopenFolders.one": "最後にアクティブだったウィンドウを再び開きます。",
@@ -58,7 +63,7 @@
 	"restoreWindows": "再起動後にワークスペースを再度開く方法を制御します。'none' を選択すると常に空のワークスペースで開始します。'one' を選択すると最後に使用したウィンドウを再度開きます。'folders' を選択すると開かれていたフォルダーとすべてのウィンドウを再度開きます。'all' を選択すると前回のセッションのすべてのウィンドウを再度開きます。",
 	"restoreFullscreen": "全画面表示モードで終了した場合に、ウィンドウを全画面表示モードに復元するかどうかを制御します。",
 	"zoomLevel": "ウィンドウのズーム レベルを調整します。元のサイズは 0 で、1 つ上げるごとに (1 など) 20% ずつ拡大することを表し、1 つ下げるごとに (-1 など) 20% ずつ縮小することを表します。小数点以下の桁数を入力して、さらに細かくズーム レベルを調整することもできます。",
-	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: ファイル名 (例: myFile.txt)\n${activeEditorMedium}: ワークスペース フォルダーへの相対パス (例: myFolder/myFile.txt)\n${activeEditorLong}: ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: ファイルが含まれているワークスペース フォルダー名 (例: myFolder)\n${folderPath}: ァイルが含まれているワークスペース フォルダーのファイルパス (例: /Users/Development/myFolder)\n${rootName}: ワークスペースの名前 (例: myFolder や myWorkspace)\n${rootPath}: ワークスペースのファイル パス (例: /Users/Development/myWorkspace)\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジゲーター\n${separator}: 値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
+	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorShort}: ファイル名 (例: myFile.txt)\n${activeEditorMedium}: ワークスペース フォルダーへの相対パス (例: myFolder/myFile.txt)\n${activeEditorLong}: ファイルの完全なパス (例: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: ファイルが含まれているワークスペース フォルダー名 (例: myFolder)\n${folderPath}: ァイルが含まれているワークスペース フォルダーのファイルパス (例: /Users/Development/myFolder)\n${rootName}: ワークスペースの名前 (例: myFolder や myWorkspace)\n${rootPath}: ワークスペースのファイル パス (例: /Users/Development/myWorkspace)\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジゲーター\n${separator}: 値のある変数かスタティック テキストで囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
 	"window.newWindowDimensions.default": "新しいウィンドウを画面の中央に開きます。",
 	"window.newWindowDimensions.inherit": "新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
 	"window.newWindowDimensions.maximized": "新しいウィンドウを最大化した状態で開きます。",
@@ -74,6 +79,8 @@
 	"autoDetectHighContrast": "有効にすると、Windows でハイ コントラスト テーマが使用されている場合にはハイ コントラスト テーマに自動的に変更され、Windows のハイ コントラスト テーマから切り替えられている場合にはダーク テーマに自動的に変更されます。",
 	"titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。",
 	"window.nativeTabs": "macOS Sierra ウィンドウ タブを有効にします。この変更を適用するには完全な再起動が必要であり、ネイティブ タブでカスタムのタイトル バー スタイルが構成されていた場合はそれが無効になることに注意してください。",
+	"window.smoothScrollingWorkaround": "最小化した VS Code ウィンドウを元のサイズに戻したあと、スクロールが滑らかにならない場合はこの回避策を有効にしてください。これは Microsoft Surface のような高精度タッチパッドを備えたデバイスで、スクロールの開始が遅れる問題 (https://github.com/Microsoft/vscode/issues/13612) の回避策です。有効にすると、最小化の状態からウィンドウを元に戻したあとに少しレイアウトがちらつきますが、そうでなければ無害です。",
+	"window.clickThroughInactive": "有効な場合、非アクティブなウィンドウをクリックするとウィンドウがアクティブになり、クリック可能な場合はマウスの下の要素がトリガーされます。無効にすると、非アクティブなウィンドウの任意の場所をクリックするとそのウィンドウがアクティブになり、要素には 2 回目のクリックが必要になります。",
 	"zenModeConfigurationTitle": "Zen Mode",
 	"zenMode.fullScreen": "Zen Mode をオンにするとワークベンチを自動的に全画面モードに切り替えるかどうかを制御します。",
 	"zenMode.centerLayout": "Zen Mode をオンにしたときにレイアウトを中央揃えにするかどうかを制御します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 0d52dc72f30..0338237fdd3 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "ブレークポイントの編集...",
+	"breakpoint": "ブレークポイント",
 	"functionBreakpointsNotSupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
 	"functionBreakpointPlaceholder": "中断対象の関数",
 	"functionBreakPointInputAriaLabel": "関数ブレークポイントを入力します",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "未確認のブレークポイント",
 	"functionBreakpointUnsupported": "このデバッグの種類では関数ブレークポイントはサポートされていません",
 	"breakpointDirtydHover": "未確認のブレークポイント。ファイルは変更されているので、デバッグ セッションを再起動してください。",
+	"logBreakpointUnsupported": "このデバッグの種類では、ログ ポイントはサポートされていません。",
 	"conditionalBreakpointUnsupported": "このデバッグの種類では、条件付きブレークポイントはサポートされていません。",
 	"hitBreakpointUnsupported": "このデバッグの種類では、ヒットした条件付きブレークポイントはサポートされていません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 5a8bec4a4a4..f3b08e50093 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "フレームの再起動",
 	"removeBreakpoint": "ブレークポイントの削除",
 	"removeAllBreakpoints": "すべてのブレークポイントを削除する",
-	"enableBreakpoint": "ブレークポイントの有効化",
-	"disableBreakpoint": "ブレークポイントの無効化",
 	"enableAllBreakpoints": "すべてのブレークポイントを有効にする",
 	"disableAllBreakpoints": "すべてのブレークポイントを無効にする",
 	"activateBreakpoints": "ブレークポイントのアクティブ化",
 	"deactivateBreakpoints": "ブレークポイントの非アクティブ化",
 	"reapplyAllBreakpoints": "すべてのブレークポイントを再適用する",
 	"addFunctionBreakpoint": "関数ブレークポイントの追加",
-	"addConditionalBreakpoint": "条件付きブレークポイントの追加...",
-	"editConditionalBreakpoint": "ブレークポイントの編集...",
 	"setValue": "値の設定",
 	"addWatchExpression": "式の追加",
 	"editWatchExpression": "式の編集",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 6a9b071674e..f610bb7f3a1 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "デバッグ: ブレークポイントの切り替え",
 	"conditionalBreakpointEditorAction": "デバッグ: 条件付きブレークポイントの追加...",
+	"logPointEditorAction": "デバッグ: ログ ポイントの追加...",
 	"runToCursor": "カーソル行の前まで実行",
 	"debugEvaluate": "デバッグ: 評価",
 	"debugAddToWatch": "デバッグ: ウォッチに追加",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..46a0d6b70e2
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetLogMessagePlaceholder": "ブレークポイントにヒットしたときにログに記録するメッセージ。{} 内の式は補間されます。受け入れるには 'Enter' を、キャンセルするには 'esc' を押します。",
+	"breakpointWidgetHitCountPlaceholder": "ヒット カウント条件が満たされる場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
+	"breakpointWidgetExpressionPlaceholder": "式が true と評価される場合に中断します。'Enter' を押して受け入れるか 'Esc' を押して取り消します。",
+	"expression": "式",
+	"hitCount": "ヒット カウント",
+	"logMessage": "ログ メッセージ"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 54068276642..87ac8b86e6a 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -27,5 +27,6 @@
 	"onFirstSessionStart": "初めてデバッグが開始されたときのみステータス バーにデバッグを表示する",
 	"showInStatusBar": "デバッグのステータス バーが表示されるタイミングを制御",
 	"openDebug": "デバッグ ビューを開くか、デバッグ セッションを開始するかを制御します。",
-	"launch": "グローバル デバッグ起動構成。ワークスペース間で共有される 'launch.json' の代わりとして使用する必要があります"
+	"launch": "グローバル デバッグ起動構成。ワークスペース間で共有される 'launch.json' の代わりとして使用する必要があります",
+	"extensionHostDebugAdapter": "拡張機能ホストのデバッグ アダプターを実行します"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 4964b4c61de..8d180e08a3d 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,7 @@
 	"useUniqueNames": "一意の構成名を使用してください。",
 	"app.launch.json.compound.folder": "複合があるフォルダーの名前。",
 	"app.launch.json.compounds.configurations": "この複合の一部として開始される構成の名前。",
-	"debugNoType": "デバッグ アダプター 'type' は省略不可で、'string' 型でなければなりません。",
+	"debugNoType": "デバッガー 'type' は省略不可で、'string' 型でなければなりません。",
 	"selectDebug": "環境の選択",
 	"DebugConfig.failed": "'launch.json' ファイルを '.vscode' フォルダー ({0}) 内に作成できません。",
 	"workspace": "ワークスペース",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b72557e3925..8856e9d9942 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "ブレークポイント",
 	"removeBreakpoints": "ブレークポイントの削除",
 	"removeBreakpointOnColumn": "列 {0} のブレークポイントの削除",
 	"removeLineBreakpoint": "行のブレークポイントの削除",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "列 {0} のブレークポイントの有効化",
 	"enableBreakpointOnLine": "行のブレークポイントの有効化",
 	"addBreakpoint": "ブレークポイントの追加",
+	"addConditionalBreakpoint": "条件付きブレークポイントの追加...",
+	"addLogPoint": "ログ ポイントを追加...",
+	"cancel": "キャンセル",
 	"addConfiguration": "構成の追加..."
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 252388aea65..94c8c8c8a16 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "エラーの表示",
 	"noFolderWorkspaceDebugError": "アクティブ ファイルをデバッグできません。ファイルがディスクに保存されており、そのファイル タイプのデバッグ拡張機能がインストールされていることを確認してください。",
 	"cancel": "キャンセル",
-	"DebugTaskNotFound": "preLaunchTask '{0}' が見つかりませんでした。",
-	"taskNotTracked": "preLaunchTask '{0}' を追跡できません。"
+	"DebugTaskNotFound": "タスク '{0}' を見つけられませんでした。",
+	"taskNotTracked": "タスク '{0}' を追跡できません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index fa6decef9ba..262d8dacd54 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "詳細情報",
-	"unableToLaunchDebugAdapter": "デバッグ アダプターを {0} から起動できません。",
-	"unableToLaunchDebugAdapterNoArgs": "デバッグ アダプターを起動できません。",
-	"stoppingDebugAdapter": "{0}。デバッグ アダプターを停止しています。",
 	"debugAdapterCrash": "デバッグ アダプター プロセスが予期せず終了しました"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index f065f55154a..152d9f1c423 100644
--- a/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "デバッグ アダプターの実行可能ファイル '{0}' がありません。",
 	"debugAdapterCannotDetermineExecutable": "デバッグ アダプター '{0}' の実行可能ファイルを判別できません。",
-	"launch.config.comment1": "IntelliSense を使用して利用可能な属性を学べます。",
-	"launch.config.comment2": "既存の属性の説明をホバーして表示します。",
-	"launch.config.comment3": "詳細情報は次を確認してください: {0}",
-	"debugType": "構成の種類。",
-	"debugTypeNotRecognised": "デバッグの種類は認識されませんでした。対応するデバッグの拡張機能がインストールされており、有効になっていることを確認してください。",
-	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。",
-	"debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。",
-	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
-	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
-	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
-	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
-	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
-	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
-	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。"
+	"unableToLaunchDebugAdapter": "デバッグ アダプターを {0} から起動できません。",
+	"unableToLaunchDebugAdapterNoArgs": "デバッグ アダプターを起動できません。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..af1ed513222
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "IntelliSense を使用して利用可能な属性を学べます。",
+	"launch.config.comment2": "既存の属性の説明をホバーして表示します。",
+	"launch.config.comment3": "詳細情報は次を確認してください: {0}",
+	"debugType": "構成の種類。",
+	"debugTypeNotRecognised": "デバッグの種類は認識されませんでした。対応するデバッグの拡張機能がインストールされており、有効になっていることを確認してください。",
+	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。",
+	"debugName": "構成の名前。起動構成のドロップダウン メニューに表示されます。",
+	"debugRequest": "構成の要求の種類。\"launch\" または \"attach\" です。",
+	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
+	"debugPrelaunchTask": "デバッグ セッションの開始前に実行するタスク。",
+	"debugPostDebugTask": "デバッグ セッションの終了前に実行するタスク。",
+	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
+	"debugOSXConfiguration": "OS X 固有の起動構成の属性。",
+	"debugLinuxConfiguration": "Linux 固有の起動構成の属性。",
+	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..3b21863f9bf
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code コンソール",
+	"mac.terminal.script.failed": "スクリプト '{0}' が終了コード {1} で失敗しました",
+	"mac.terminal.type.not.supported": "'{0}' はサポートされていません",
+	"press.any.key": "続行するには、任意のキーを押してください...",
+	"linux.term.failed": "'{0}' が終了コード {1} で失敗しました"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index 66b62080027..a123669adde 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "推奨事項の拡張機能を構成 (ワークスペース フォルダー)",
 	"malicious tooltip": "この拡張機能は問題ありと報告されました。",
 	"malicious": "悪意がある",
+	"disabled": "無効",
+	"disabled globally": "無効",
+	"disabled workspace": "このワークスペースでは無効",
 	"disableAll": "インストール済みのすべての拡張機能を無効にする",
 	"disableAllWorkspace": "このワークスペースのインストール済みの拡張機能をすべて無効にする",
 	"enableAll": "すべての拡張機能を有効にする",
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..6012be2dbf3
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,61 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "拡張機能名",
+	"extension id": "拡張機能の識別子",
+	"preview": "プレビュー",
+	"builtin": "ビルトイン",
+	"publisher": "発行者名",
+	"install count": "インストール数",
+	"rating": "評価",
+	"repository": "リポジトリ",
+	"license": "ライセンス",
+	"details": "詳細",
+	"contributions": "コントリビューション",
+	"changelog": "変更ログ",
+	"dependencies": "依存関係",
+	"noReadme": "利用できる README はありません。",
+	"noChangelog": "使用可能な変更ログはありません。",
+	"noContributions": "コントリビューションはありません",
+	"noDependencies": "依存関係はありません",
+	"settings": "設定 ({0})",
+	"setting name": "名前",
+	"description": "説明",
+	"default": "既定",
+	"debuggers": "デバッガー ({0})",
+	"debugger name": "名前",
+	"debugger type": "種類",
+	"views": "ビュー ({0})",
+	"view id": "ID",
+	"view name": "名前",
+	"view location": "場所",
+	"localizations": "ローカライズ ({0})",
+	"localizations language id": "言語 ID",
+	"localizations language name": "言語名",
+	"localizations localized language name": "言語名 (ローカライズ)",
+	"colorThemes": "配色テーマ ({0})",
+	"iconThemes": "アイコン テーマ ({0})",
+	"colors": "配色 ({0})",
+	"colorId": "Id",
+	"defaultDark": "ダーク テーマの既定値",
+	"defaultLight": "ライト テーマの既定値",
+	"defaultHC": "ハイ コントラストの既定値",
+	"JSON Validation": "JSON 検証 ({0})",
+	"fileMatch": "対象ファイル",
+	"schema": "スキーマ",
+	"commands": "コマンド ({0})",
+	"command name": "名前",
+	"keyboard shortcuts": "キーボード ショートカット",
+	"menuContexts": "メニュー コンテキスト",
+	"languages": "言語 ({0})",
+	"language id": "ID",
+	"language name": "名前",
+	"file extensions": "ファイル拡張子",
+	"grammar": "文章校正",
+	"snippets": "スニペット"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 23443bd8220..cea0c685ac7 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
 	"reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。",
 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
-	"showRecommendations": "推奨事項を表示",
 	"install": "インストール",
+	"showRecommendations": "推奨事項を表示",
 	"showLanguageExtensions": "'.{0}' ファイルに役立つ拡張機能が Marketplace にあります",
 	"workspaceRecommended": "このワークスペースには拡張機能の推奨事項があります。",
 	"installAll": "すべてインストール",
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 75dbb45c728..22837a8d961 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "キーバインド間の競合を回避するために、他のキーマップ ({0}) を無効にしますか?",
 	"yes": "はい",
-	"no": "いいえ",
-	"betterMergeDisabled": "拡張機能 Better Merge は現在ビルトインです。インストール済みの拡張機能は無効化され、アンインストールできます。",
-	"uninstall": "アンインストール"
+	"no": "いいえ"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index b1fa2a06853..5d9d43e41b5 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,9 @@
 	"recommendedExtensions": "推奨",
 	"otherRecommendedExtensions": "その他の推奨事項",
 	"workspaceRecommendedExtensions": "ワークスペースの推奨事項",
-	"builtInExtensions": "ビルトイン",
+	"builtInExtensions": "機能",
+	"builtInThemesExtensions": "テーマ",
+	"builtInBasicsExtensions": "プログラミング言語",
 	"searchExtensions": "Marketplace で拡張機能を検索する",
 	"sort by installs": "並べ替え: インストール数",
 	"sort by rating": "並べ替え: 評価",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
index df5c875d8b5..0c2ececf19e 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/browser/editors/textFileEditor.i18n.json
@@ -8,6 +8,8 @@
 	],
 	"textFileEditor": "テキスト ファイル エディター",
 	"createFile": "ファイルの作成",
+	"relaunchWithIncreasedMemoryLimit": "{0} MB で再起動",
+	"configureMemoryLimit": "メモリ制限を構成する",
 	"fileEditorWithInputAriaLabel": "{0}。テキスト ファイル エディター。",
 	"fileEditorAriaLabel": "テキスト ファイル エディター。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 84ba2651ad8..9887d214dcb 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -17,7 +17,7 @@
 	"createNewFile": "新しいファイル",
 	"createNewFolder": "新しいフォルダー",
 	"deleteButtonLabelRecycleBin": "ごみ箱に移動(&&M)",
-	"deleteButtonLabelTrash": "ゴミ箱に移動(&&M)",
+	"deleteButtonLabelTrash": "ごみ箱に移動(&&M)",
 	"deleteButtonLabel": "削除(&&D)",
 	"dirtyMessageFilesDelete": "保存されていない変更があるファイルを削除します。続行しますか?",
 	"dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?",
@@ -28,15 +28,17 @@
 	"confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?",
 	"confirmMoveTrashMessageFile": "'{0}' を削除しますか?",
 	"undoBin": "ごみ箱から復元できます。",
-	"undoTrash": "ゴミ箱から復元できます。",
+	"undoTrash": "ごみ箱から復元できます。",
 	"doNotAskAgain": "再度表示しない",
 	"confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?",
 	"confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?",
 	"confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?",
 	"irreversible": "このアクションは元に戻すことができません。",
-	"cancel": "キャンセル",
-	"permDelete": "完全に削除",
-	"importFiles": "ファイルのインポート",
+	"binFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
+	"trashFailed": "ごみ箱を使用した削除に失敗しました。代わりに完全に削除しますか?",
+	"deletePermanentlyButtonLabel": "完全に削除(&&D)",
+	"retryButtonLabel": "再試行(&&R)",
+	"addFiles": "ファイルを追加",
 	"confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?",
 	"replaceButtonLabel": "置換(&&R)",
 	"fileIsAncestor": "ペーストするファイルは送り先フォルダの上位にいます",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 1e7ca7ba732..fa96297a410 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -35,8 +35,10 @@
 	"hotExit": "エディターを終了するときに保存を確認するダイアログを省略し、保存されていないファイルをセッション後も保持するかどうかを制御します。",
 	"useExperimentalFileWatcher": "新しい試験的な File Watcher を使用します。",
 	"defaultLanguage": "新しいファイルに割り当てられる既定の言語モード。",
+	"maxMemoryForLargeFilesMB": "大きなファイルを開こうとしたとき、VS Code の再起動後に使用できるメモリを制御します。コマンド ラインで --max-memory=NEWSIZE を指定するのと同じ効果があります。",
 	"editorConfigurationTitle": "エディター",
 	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
+	"formatOnSaveTimeout": "保存時フォーマットのタイムアウトを制御します。formatOnSave-コマンドの時間制限をミリ秒単位で指定してください。指定したタイムアウトよりも時間がかかるコマンドはキャンセルされます。",
 	"explorerConfigurationTitle": "エクスプローラー",
 	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index b087bed0bc3..49eca2ec9c5 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "ファイル名を入力します。Enter キーを押して確認するか、Esc キーを押して取り消します。",
-	"constructedPath": "**{1}** に {0} を作成",
 	"filesExplorerViewerAriaLabel": "{0}、ファイル エクスプローラー",
 	"dropFolders": "ワークスペースにフォルダーを追加しますか?",
 	"dropFolder": "ワークスペースにフォルダーを追加しますか?",
 	"addFolders": "フォルダーの追加(&&A)",
 	"addFolder": "フォルダーの追加(&&A)",
+	"confirmRootsMove": "ワークスペース内の複数のルート フォルダーの順序が変更されますがよろしいですか?",
 	"confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?",
+	"confirmRootMove": "ワークスペース内のルート フォルダー '{0}' の順序が変更されますがよろしいですか?",
 	"confirmMove": "'{0}' を移動しますか?",
 	"doNotAskAgain": "再度表示しない",
 	"moveButtonLabel": "移動(&&M)",
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..47e72aa69e4
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "HTML プレビュー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..d8a322eb85e
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "エディター入力が正しくありません。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..e619da1dc8b
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "開発者"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..14a4dc22123
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview 開発者ツールを開く",
+	"refreshWebviewLabel": "WebView の再読み込み"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index a1fa540c1c5..19b3916384b 100644
--- a/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "VS Code の UI 言語を {0} にして再起動しますか?",
+	"yes": "はい",
+	"no": "いいえ",
+	"neverAgain": "今後は表示しない",
 	"JsonSchema.locale": "使用する UI 言語。",
 	"vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します",
 	"vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。",
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..c26e068a735
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "コピー",
+	"copyMessage": "メッセージのコピー"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..182631b8761
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "合計 {0} 個の問題"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..c361cf56e9a
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "問題",
+	"tooltip.1": "このファイルに 1 つの問題",
+	"tooltip.N": "このファイルに {0} 個の問題",
+	"markers.showOnFile": "ファイルとフォルダーにエラーと警告を表示します。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..d91b356dc32
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"disableFilesExclude": "ファイルの除外を無効。",
+	"clearFilter": "フィルターの解除。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..568a2eaf8e4
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"showing filtered problems": "{0}  / {1} を表示しています"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..58202066e48
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,48 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "表示",
+	"problems.view.toggle.label": "問題  (エラー、警告、情報) の切り替え",
+	"problems.view.focus.label": "問題 (エラー、警告、情報) にフォーカス",
+	"problems.panel.configuration.title": "問題ビュー",
+	"problems.panel.configuration.autoreveal": "ファイルを開くときに問題ビューに自動的にそのファイルを表示するかどうかを制御します",
+	"markers.panel.title.problems": "問題",
+	"markers.panel.aria.label.problems.tree": "ファイル別にグループ化した問題",
+	"markers.panel.no.problems.build": "現時点でワークスペースの問題は検出されていません。",
+	"markers.panel.no.problems.filters": "指定されたフィルター条件による結果はありません。",
+	"markers.panel.no.problems.file.exclusions": "ファイルの除外設定が有効なため、すべての問題が非表示になっています。",
+	"markers.panel.action.useFilesExclude": "ファイルの除外設定を使用してフィルター処理",
+	"markers.panel.action.donotUseFilesExclude": "ファイルの除外設定を使用しない",
+	"markers.panel.action.filter": "問題のフィルター処理",
+	"markers.panel.filter.ariaLabel": "問題のフィルター処理",
+	"markers.panel.filter.placeholder": "フィルター。例: text, **/*.ts, !**/node_modules/**",
+	"markers.panel.filter.errors": "エラー",
+	"markers.panel.filter.warnings": "警告",
+	"markers.panel.filter.infos": "情報",
+	"markers.panel.single.error.label": "エラー 1",
+	"markers.panel.multiple.errors.label": "エラー {0}",
+	"markers.panel.single.warning.label": "警告 1",
+	"markers.panel.multiple.warnings.label": "警告 {0}",
+	"markers.panel.single.info.label": "情報 1",
+	"markers.panel.multiple.infos.label": "情報 {0}",
+	"markers.panel.single.unknown.label": "不明 1",
+	"markers.panel.multiple.unknowns.label": "不明 {0}",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} (問題あり {1})",
+	"problems.tree.aria.label.marker.relatedInformation": "この問題は {0} 個の箇所へ参照を持っています。",
+	"problems.tree.aria.label.error.marker": "{0}: {1} によって生成されたエラー (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.error.marker.nosource": "エラー: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.warning.marker": "{0}: {1} によって生成された警告 (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.warning.marker.nosource": "警告: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.info.marker": "{0}: {1} によって生成された情報 (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.info.marker.nosource": "情報: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.marker": "{0} によって生成された問題: {1} (行 {2}、文字 {3}.{4})",
+	"problems.tree.aria.label.marker.nosource": "問題: {0} (行 {1}、文字 {2}.{3})",
+	"problems.tree.aria.label.relatedinfo.message": "{0} ({3} の行 {1}、文字 {2})",
+	"errors.warnings.show.label": "エラーと警告の表示"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 539e4feb174..e980f87baa4 100644
--- a/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "出力の切り替え",
 	"clearOutput": "出力のクリア",
 	"toggleOutputScrollLock": "出力スクロール ロックの切り替え",
-	"switchToOutput.label": "出力に切り替え"
+	"switchToOutput.label": "出力に切り替え",
+	"openInLogViewer": "ログ ファイルを開く"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 0cae9a24bb3..7ce6bdc9900 100644
--- a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "出力",
 	"logViewer": "ログ ビューアー",
 	"viewCategory": "表示",
-	"clearOutput.label": "出力のクリア"
+	"clearOutput.label": "出力のクリア",
+	"openActiveLogOutputFile": "表示: アクティブなログ出力ファイルを開く"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 1662eba1d89..efda21bd767 100644
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "キーボード ショートカット",
+	"showDefaultKeybindings": "既定のキーバインドを表示",
+	"showUserKeybindings": "ユーザーのキーバインドを表示",
 	"SearchKeybindings.AriaLabel": "キー バインドの検索",
 	"SearchKeybindings.Placeholder": "キー バインドの検索",
 	"sortByPrecedene": "優先順位で並べ替え",
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index dd841c1f6e7..4cea9d36a1a 100644
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "既定の設定を Raw で開く",
+	"openSettings": "設定を開く",
 	"openGlobalSettings": "ユーザー設定を開く",
 	"openGlobalKeybindings": "キーボード ショートカットを開く",
 	"openGlobalKeybindingsFile": "キーボード ショートカット ファイルを開く",
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index b7e7f03ad0d..e3cca40ad76 100644
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "既定の設定",
 	"SearchSettingsWidget.AriaLabel": "設定の検索",
 	"SearchSettingsWidget.Placeholder": "設定の検索",
 	"noSettingsFound": "結果なし",
@@ -16,6 +15,8 @@
 	"nlpResult": "自然文 (natural language) の結果",
 	"filterResult": "フィルター後の結果",
 	"defaultSettings": "既定の設定",
+	"defaultUserSettings": "既定のユーザー設定",
+	"defaultWorkspaceSettings": "既定のワークスペース設定",
 	"defaultFolderSettings": "既定のフォルダー設定",
 	"defaultEditorReadonly": "既定値を上書きするには、右側のエディターを編集します。",
 	"preferencesAriaLabel": "既定の基本設定。読み取り専用のテキスト エディター。"
diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 4a81bb3201b..c8dc571e62a 100644
--- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "拡張機能 \"{0}\" を表示",
 	"editTtile": "編集",
 	"replaceDefaultValue": "設定を置換",
-	"copyDefaultValue": "設定にコピー",
-	"unsupportedPHPExecutablePathSetting": "この設定はユーザー設定でなければなりません。ワークスペースのために PHP を構成するには、PHP ファイルを開き、ステータス バーの [PHP パス] をクリックします。",
-	"unsupportedWorkspaceSetting": "この設定はユーザー設定でなければなりません。",
-	"unsupportedWorkbenchSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。",
-	"unsupportedWorkbenchSettingDevMode": "この設定は現在適用できません。登録時にスコープを 'resource' と定義している場合かこのフォルダーを直接開いたときに適用されます。"
+	"copyDefaultValue": "設定にコピー"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index cb6f2096d64..fadead296a9 100644
--- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...",
 	"no open repo": "有効なソース管理プロバイダーがありません。",
 	"source control": "ソース管理",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "非表示"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 64ef0f72b82..3e97075b786 100644
--- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "前の検索除外パターンを表示",
 	"nextSearchTerm": "次の検索語句を表示",
 	"previousSearchTerm": "前の検索語句を表示",
-	"showSearchViewlet": "検索の表示",
 	"findInFiles": "フォルダーを指定して検索",
 	"replaceInFiles": "複数のファイルで置換",
 	"RefreshAction.label": "最新の情報に更新",
diff --git a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 2fde4d268c7..f6fb99713ec 100644
--- a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,15 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "検索",
+	"copyMatchLabel": "コピー",
+	"copyPathLabel": "パスのコピー",
+	"copyAllLabel": "すべてコピー",
+	"toggleSearchViewPositionLabel": "検索ビュー位置の切り替え",
 	"findInFolder": "フォルダー内を検索...",
 	"findInWorkspace": "ワークスペース内を検索...",
 	"showTriggerActions": "ワークスペース内のシンボルへ移動...",
 	"name": "検索",
-	"search": "検索",
 	"showSearchViewl": "検索の表示",
 	"view": "表示",
 	"findInFiles": "フォルダーを指定して検索",
@@ -26,5 +30,5 @@
 	"search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。",
 	"search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する",
 	"search.globalFindClipboard": "macOS で検索ビューが共有の検索クリップボードを読み取りまたは変更するかどうかを制御します",
-	"search.location": "プレビュー: 検索をサイドバーのビューとして表示するか、より水平方向の空間をとるためにパネル領域のパネルとして表示するかを制御します。次のリリースのパネル内の検索で水平レイアウトが改善され、プレビューではなくなります。"
+	"search.location": "検索をサイドバーのビューとして、または、より水平的なパネルとして表示するかを制御します。次期リリースではパネル内検索の水平レイアウトが改善され、プレビューではなくなります。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
index 2b6db6f461c..21441eaa272 100644
--- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -7,7 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
-	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
+	"invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}",
 	"invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}",
 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
 	"vscode.extension.contributes.snippets": "スニペットを提供します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 1219aeec2ac..a1569ecbff5 100644
--- a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "{0} のサポートの改善にご協力ください",
 	"takeShortSurvey": "簡単なアンケートの実施",
 	"remindLater": "後で通知する",
-	"neverAgain": "今後は表示しない",
-	"helpUs": "{0} のサポートの改善にご協力ください"
+	"neverAgain": "今後は表示しない"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 0592d0f299f..8a3c261d16c 100644
--- a/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "短いフィードバック アンケートにご協力をお願いできますか?",
 	"takeSurvey": "アンケートの実施",
 	"remindLater": "後で通知する",
-	"neverAgain": "今後は表示しない",
-	"surveyQuestion": "短いフィードバック アンケートにご協力をお願いできますか?"
+	"neverAgain": "今後は表示しない"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index ed592ce8db9..c541ac646ed 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "問題パターン、あるいは提供されたか事前定義された問題パターンの名前。基本問題パターンが指定されている場合は省略できます。",
 	"ProblemMatcherSchema.base": "使用する基本問題マッチャーの名前。",
 	"ProblemMatcherSchema.owner": "Code 内の問題の所有者。base を指定すると省略できます。省略して base を指定しない場合、既定は 'external' になります。",
+	"ProblemMatcherSchema.source": "'typescript' または 'super lint' のような、この診断のソースを記述する解読可能な文字列",
 	"ProblemMatcherSchema.severity": "キャプチャされた問題の既定の重大度。パターンが重要度の一致グループを定義していない場合に使用されます。",
 	"ProblemMatcherSchema.applyTo": "テキスト ドキュメントで報告された問題が、開いているドキュメントのみ、閉じられたドキュメントのみ、すべてのドキュメントのいずれに適用されるかを制御します。",
 	"ProblemMatcherSchema.fileLocation": "問題パターンで報告されたファイル名を解釈する方法を定義します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index e7430be8b03..d81994154b1 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "タスクをグループに割り当てない",
 	"JsonSchema.tasks.group": "このタスクが属する実行グループを定義します。ビルド グループに追加する \"build\" とテスト グループに追加する \"test\" をサポートしています。",
 	"JsonSchema.tasks.type": "タスクをプロセスとして実行するか、またはシェル内部でコマンドとして実行するかどうかを定義します。",
+	"JsonSchema.command.quotedString.value": "実際のコマンド値",
+	"JsonSchema.tasks.quoting.escape": "シェルのエスケープ文字を使用して文字をエスケープします (例: PowerShell の ` 、bash の \\)。",
+	"JsonSchema.tasks.quoting.strong": "シェルの strong quote 文字を使用して引数を引用します (例: PowerShell や bash の下の \")。",
+	"JsonSchema.tasks.quoting.weak": "シェルの weak quote 文字を使用して引数を引用します (例: PowerShell や bash の下の ')。",
+	"JsonSchema.command.quotesString.quote": "どのようにコマンドの値を引用符で囲うかを制御します。",
+	"JsonSchema.command": "実行されるコマンド。外部プログラムかシェル コマンドです。",
+	"JsonSchema.args.quotedString.value": "実際の引数値",
+	"JsonSchema.args.quotesString.quote": "どのように引数の値を引用符で囲うかを制御します。",
+	"JsonSchema.tasks.args": "このタスクの起動時にコマンドに渡される引数。",
 	"JsonSchema.tasks.label": "タスクのユーザー インターフェイス ラベル",
 	"JsonSchema.version": "構成のバージョン番号",
 	"JsonSchema.tasks.identifier": "launch.json または dependsOn 句のタスクを参照するユーザー定義の識別子。",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 27d7f12255e..8021ef7847f 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "タスク",
 	"ConfigureTaskRunnerAction.label": "タスクの構成",
+	"totalErrors": "エラー {0}",
+	"totalWarnings": "警告 {0}",
+	"totalInfos": "情報 {0}",
 	"problems": "問題",
 	"building": "ビルド中...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "実行中のタスクを表示",
 	"tasks": "タスク",
 	"TaskSystem.noHotSwap": "アクティブなタスクを実行しているタスク実行エンジンを変更するには、ウィンドウの再読み込みが必要です",
@@ -28,8 +31,10 @@
 	"selectProblemMatcher": "スキャンするタスク出力のエラーと警告の種類を選択",
 	"customizeParseErrors": "現在のタスクの構成にはエラーがあります。タスクをカスタマイズする前にエラーを修正してください。",
 	"moreThanOneBuildTask": "tasks.json で複数のビルド タスクが定義されています。最初のタスクのみを実行します。\\n",
-	"TaskSystem.activeSame.background": "'{0}' タスクは既にバックグラウンド モードでアクティブです。タスクを終了するにはタスク メニューから `タスクの終了...` を使用します。",
-	"TaskSystem.activeSame.noBackground": "{0}' タスクは既にアクティブです。タスクを終了するにはタスク メニューから `タスクの終了...` を使用します。",
+	"TaskSystem.activeSame.background": "タスク '{0}' は既にバックグラウンド モードでアクティブです。",
+	"TaskSystem.activeSame.noBackground": "タスク '{0}' は既にアクティブです。",
+	"terminateTask": "タスクの終了",
+	"restartTask": "タスクの再開",
 	"TaskSystem.active": "既に実行中のタスクがあります。まずこのタスクを終了してから、別のタスクを実行してください。",
 	"TaskSystem.restartFailed": "タスク {0} を終了して再開できませんでした",
 	"TaskService.noConfiguration": "エラー: {0} タスク検出は次の構成に対してタスクを提供していません:\n{1}\nこのタスクは無視されます。\n",
diff --git a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index f540ee615ca..c7a264707a6 100644
--- a/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "警告: options.cwd は、string 型でなければなりません。値 {0} を無視します",
+	"ConfigurationParser.inValidArg": "エラー: コマンド引数は文字列もしくは引用文字列のどちらかである必要があります。指定された値:\n{0}",
 	"ConfigurationParser.noargs": "エラー: コマンド引数は文字列の配列でなければなりません。指定された値:\n{0}",
 	"ConfigurationParser.noShell": "警告: シェル構成がサポートされるのは、ターミナルでタスクを実行している場合のみです。",
 	"ConfigurationParser.noName": "エラー: 宣言スコープ内の問題マッチャーに次の名前がなければなりません:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "エラー: タスク構成 '{0}' に必要な '{1}' プロパティがありません。構成は無視されます。 ",
 	"ConfigurationParser.notCustom": "エラー: タスクがカスタム タスクとして定義されていません。この構成は無視されます。\n{0}\n",
 	"ConfigurationParser.noTaskName": "エラー: タスクが label プロパティを提供しなければなりません。このタスクは無視されます。\n{0}\n",
-	"taskConfiguration.shellArgs": "警告: タスク '{0}' はシェル コマンドであり、その引数の 1 つにエスケープされていないスペースが含まれている可能性があります。コマンド ラインの引用が正しく解釈されるように、引数をコマンドにマージしてください。",
 	"taskConfiguration.noCommandOrDependsOn": "エラー: タスク '{0}' は、コマンドも dependsOn プロパティも指定していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
 	"taskConfiguration.noCommand": "エラー: タスク '{0}' はコマンドを定義していません。このタスクは無視されます。定義は次のとおりです:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "バージョン 2.0.0 のタスクでは、OS に固有のグローバル タスクはサポートされません。OS に固有のコマンドを使用したタスクに変換してください。影響を受けるタスクは次のとおりです。\n{0}"
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..1941d0b6328
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "ターミナルの背景色。パネルごとに異なる色を指定できます。",
+	"terminal.foreground": "ターミナルの前景色。",
+	"terminalCursor.foreground": "ターミナルのカーソル前景色。",
+	"terminalCursor.background": "ターミナルのカーソルの背景色。ブロックカーソルで重ねた文字の色をカスタマイズできます。",
+	"terminal.selectionBackground": "ターミナルの選択範囲の背景色。",
+	"terminal.border": "ターミナル内の分割パネルを区切る境界線色。デフォルトは panel.border です。",
+	"terminal.ansiColor": "ターミナルの '{0}' ANSI カラー。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index de2f0795edc..3d8b5a103a8 100644
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -19,8 +19,9 @@
 	"workbench.action.terminal.new": "新しい統合ターミナルの作成",
 	"workbench.action.terminal.new.short": "新しいターミナル",
 	"workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください",
-	"workbench.action.terminal.newInActiveWorkspace": "新しい統合ターミナルを作成 (アクティブなワークスペースに)",
+	"workbench.action.terminal.newInActiveWorkspace": "(アクティブなワークスペースで) 新しいターミナルの作成",
 	"workbench.action.terminal.split": "ターミナルの分割",
+	"workbench.action.terminal.splitInActiveWorkspace": "(アクティブなワークスペースで) ターミナルの分割",
 	"workbench.action.terminal.focusPreviousPane": "前のペインにフォーカス",
 	"workbench.action.terminal.focusNextPane": "次のペインにフォーカス",
 	"workbench.action.terminal.resizePaneLeft": "ペインを左にリサイズ",
@@ -43,6 +44,7 @@
 	"workbench.action.terminal.scrollUpPage": "スクロール アップ (ページ)",
 	"workbench.action.terminal.scrollToTop": "一番上にスクロール",
 	"workbench.action.terminal.clear": "クリア",
+	"workbench.action.terminal.clearSelection": "選択のクリア",
 	"workbench.action.terminal.allowWorkspaceShell": "ワークスペースでシェルを構成することを許可する",
 	"workbench.action.terminal.disallowWorkspaceShell": "ワークスペースでシェルを構成することを許可しない",
 	"workbench.action.terminal.rename": "名前変更",
@@ -51,5 +53,9 @@
 	"workbench.action.terminal.hideFindWidget": "検索ウィジェットを非表示にする",
 	"nextTerminalFindTerm": "次の検索語句を表示",
 	"previousTerminalFindTerm": "前の検索語句を表示",
-	"quickOpenTerm": "アクティブなターミナルの切り替え"
+	"quickOpenTerm": "アクティブなターミナルの切り替え",
+	"workbench.action.terminal.scrollToPreviousCommand": "前のコマンドにスクロール",
+	"workbench.action.terminal.scrollToNextCommand": "次のコマンドにスクロール",
+	"workbench.action.terminal.selectToPreviousCommand": "前のコマンドを選択",
+	"workbench.action.terminal.selectToNextCommand": "次のコマンドを選択"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index ea4ba1b2cc4..ae2af92bf59 100644
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "コピー",
+	"split": "分割",
 	"paste": "貼り付け",
 	"selectAll": "すべて選択",
-	"clear": "クリア",
-	"split": "分割"
+	"clear": "クリア"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index e57be05971a..c4c322cdd54 100644
--- a/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "このワークスペースには、ユーザー設定でのみ設定可能な設定が含まれています ({0})。詳細情報は[こちら]({1})をクリックしてください。",
 	"openWorkspaceSettings": "ワークスペース設定を開く",
-	"dontShowAgain": "今後は表示しない",
-	"unsupportedWorkspaceSettings": "このワークスペースには、ユーザー設定でのみ設定可能な設定が含まれています ({0})。詳細情報は[こちら]({1})をクリックしてください。"
+	"dontShowAgain": "今後は表示しない"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..8bfa1cc30f1
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "リリース ノート: {0}",
+	"unassigned": "未割り当て"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 07e679a1ed8..be4c3ee187a 100644
--- a/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "後で",
-	"unassigned": "未割り当て",
 	"releaseNotes": "リリース ノート",
 	"showReleaseNotes": "リリース ノートの表示",
 	"read the release notes": "{0} v{1} へようこそ! リリース ノートを確認しますか?",
@@ -17,13 +15,14 @@
 	"updateIsReady": "新しい更新 {0} が利用可能です。",
 	"noUpdatesAvailable": "現在入手可能な更新はありません。",
 	"ok": "OK",
-	"download now": "今すぐダウンロード",
 	"thereIsUpdateAvailable": "利用可能な更新プログラムがあります。",
-	"installUpdate": "更新プログラムのインストール",
+	"download now": "今すぐダウンロード",
+	"later": "後で",
 	"updateAvailable": "利用可能な更新プログラムがあります: {0} {1}",
+	"installUpdate": "更新プログラムのインストール",
 	"updateInstalling": "バックグラウンドで {0} {1} がインストールされています。処理が完了次第、お知らせします。",
+	"updateAvailableAfterRestart": "最新の更新プログラムを適用するために {0} を再起動してください。",
 	"updateNow": "今すぐ更新",
-	"updateAvailableAfterRestart": "{0} は再起動後に更新されます。",
 	"commandPalette": "コマンド パレット...",
 	"settings": "設定",
 	"keyboardShortcuts": "キーボード ショートカット",
diff --git a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..4dfeb1219a9
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "webview エディター",
+	"developer": "開発者"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..14a4dc22123
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview 開発者ツールを開く",
+	"refreshWebviewLabel": "WebView の再読み込み"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..635368f9425
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト アウト]({1}) する方法を確認してください。",
+	"telemetryOptOut.optInNotice": "Microsoft による利用状況のデータ収集を許可することで VS Code の改善に役立てることができます。私たちの [プライバシーに関する声明]({0}) 参照し、[オプト イン]({1}) する方法を確認してください。",
+	"telemetryOptOut.readMore": "詳細を参照"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
index 7ea668065a4..335e27fbbcd 100644
--- a/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.i18n.json
@@ -13,6 +13,7 @@
 	"welcomeOverlay.extensions": "拡張機能の管理",
 	"welcomeOverlay.problems": "エラーおよび警告の表示",
 	"welcomeOverlay.commandPalette": "すべてのコマンドの検索と実行",
+	"welcomeOverlay.notifications": "通知を表示",
 	"welcomeOverlay": "ユーザー インターフェイスの概要",
 	"hideWelcomeOverlay": "インターフェイスの概要を非表示にします",
 	"help": "ヘルプ"
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 047af6a333f..f7166ecfc88 100644
--- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "ツールと言語",
 	"welcomePage.installExtensionPacksDescription": "{0} と {1} のサポートをインストールする ",
 	"welcomePage.moreExtensions": "その他",
-	"welcomePage.installKeymapDescription": "キーボード ショートカットをインストールします",
-	"welcomePage.installKeymapExtension": "{0} と {1} のキーボード ショートカットをインストール",
 	"welcomePage.others": "その他",
 	"welcomePage.colorTheme": "配色テーマ",
 	"welcomePage.colorThemeDescription": "エディターとコードの外観を自由に設定します",
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
index 9b3063f1b25..56d40c7d548 100644
--- a/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/configuration/common/configurationExtensionPoint.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"vscode.extension.contributes.configuration.title": "設定の概要です。このラベルは、設定ファイルでコメントの区切り文字として使用します。",
 	"vscode.extension.contributes.configuration.properties": "構成のプロパティの説明です。",
+	"scope.application.description": "ユーザー設定でのみ構成できるアプリケーション固有の構成。",
 	"scope.window.description": "ウィンドウ固有の構成。ユーザーまたはワークスペースの設定で構成できます。",
 	"scope.resource.description": "リソース固有の構成。ユーザー、ワークスペース、またはフォルダーの設定で構成できます。",
 	"scope.description": "構成が適用される範囲。 使用可能なスコープは `window` と ` resource` です。",
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
index 2b7849ba68a..627b2d01b48 100644
--- a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
@@ -11,6 +11,7 @@
 	"open": "設定を開く",
 	"saveAndRetry": "保存して再試行",
 	"errorUnknownKey": "{1} は登録済みの構成ではないため、{0} に書き込むことができません。",
+	"errorInvalidWorkspaceConfigurationApplication": "{0} をワークスペース設定に書き込めません。この設定はユーザー設定にのみ書き込めます。",
 	"errorInvalidFolderConfiguration": "{0} はフォルダーのリソース スコープをサポートしていないため、フォルダー設定に書き込むことができません。",
 	"errorInvalidUserTarget": "{0} はグローバル スコープをサポートしていないため、ユーザー設定に書き込むことができません。",
 	"errorInvalidWorkspaceTarget": "{0} はマルチ フォルダー ワークスペースでワークスペース スコープをサポートしていないため、ワークスペース設定を書き込むことができません。",
diff --git a/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..8283d684b01
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedApplicationSetting": "この設定はユーザー設定でのみ適用できます",
+	"unsupportedWindowSetting": "この設定は現在適用できません。このフォルダーを直接開いたときに適用されます。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..9ca110727dd
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,21 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"canNotResolveWorkspaceFolderMultiRoot": "'${workspaceFolder}' はマルチ フォルダー ワークスペースで解決できません。 ':' とフォルダー名を使用して、この変数のスコープを指定してください。",
+	"canNotResolveWorkspaceFolder": "'${workspaceFolder}' を解決できません。フォルダーを開いてください。",
+	"canNotResolveFolderBasenameMultiRoot": "'${workspaceFolderBasename}' はマルチ フォルダー ワークスペースで解決できません。 ':' とフォルダー名を使用して、この変数のスコープを指定してください。",
+	"canNotResolveFolderBasename": "'${workspaceFolderBasename}' を解決できません。フォルダーを開いてください。",
+	"canNotResolveLineNumber": "'${lineNumber}' を解決できません。エディターを開いてください。",
+	"canNotResolveSelectedText": "'${selectedText}' を解決できません。エディターを開いてください。",
+	"canNotResolveFile": "'${file}' を解決できません。エディターを開いてください。",
+	"canNotResolveRelativeFile": "'${relativeFile}' を解決できません。エディターを開いてください。",
+	"canNotResolveFileDirname": "'${fileDirname}' を解決できません。エディターを開いてください。",
+	"canNotResolveFileExtname": "'${fileExtname}' を解決できません。エディターを開いてください。",
+	"canNotResolveFileBasename": "'${fileBasename}' を解決できません。エディターを開いてください。",
+	"canNotResolveFileBasenameNoExtension": "'${fileBasenameNoExtension}' を解決できません。エディターを開いてください。"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..d51266c5310
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "はい(&&Y)",
+	"cancelButton": "キャンセル"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
index 96725800f80..5fe7c380aea 100644
--- a/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
@@ -6,10 +6,12 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"vscode.extension.engines": "エンジンの互換性。",
 	"vscode.extension.engines.vscode": "VS Code 拡張機能の場合、拡張機能と互換性のある VS Code バージョンを指定します。* を指定することはできません。たとえば、^0.10.5 は最小の VS Code バージョン 0.10.5 との互換性を示します。",
 	"vscode.extension.publisher": "VS Code 拡張機能の公開元。",
 	"vscode.extension.displayName": "VS Code ギャラリーで使用される拡張機能の表示名。",
 	"vscode.extension.categories": "VS Code ギャラリーで拡張機能の分類に使用されるカテゴリ。",
+	"vscode.extension.category.languages.deprecated": "代わりに 'Programming Languages' を使用してください",
 	"vscode.extension.galleryBanner": "VS Code マーケットプレースで使用されるバナー。",
 	"vscode.extension.galleryBanner.color": "VS Code マーケットプレース ページ ヘッダー上のバナーの色。",
 	"vscode.extension.galleryBanner.theme": "バナーで使用されるフォントの配色テーマ。",
@@ -28,6 +30,8 @@
 	"vscode.extension.badges.url": "バッジのイメージ URL。",
 	"vscode.extension.badges.href": "バッジのリンク。",
 	"vscode.extension.badges.description": "バッジの説明。",
+	"vscode.extension.markdown": "Marketplace で使用される Markdown レンダリング エンジンを制御します。github (既定) か standard のいずれかを指定できます。",
+	"vscode.extension.qna": "Marketplace の Q&A リンクを制御します。既定の Marketplace Q & A サイトを有効にするには marketplace を設定します。カスタム Q & A サイトの URL を提供するには文字列を設定します。Q & A を完全に無効にするには false を設定します。",
 	"vscode.extension.extensionDependencies": "他の拡張機能に対する依存関係。拡張機能の識別子は常に ${publisher}.${name} です。例: vscode.csharp。",
 	"vscode.extension.scripts.prepublish": "パッケージが VS Code 拡張機能として公開される前に実行されるスクリプト。",
 	"vscode.extension.scripts.uninstall": "VS コード拡張機能のフックをアンインストールします。 VS コードから拡張機能を完全にアンインストールした時に実行されるスクリプトです。スクリプトは、拡張機能をアンインストールした後に VS コードを再起動 (シャット ダウンしてから起動) したときに実行されます。Node スクリプトのみがサポートされます。",
diff --git a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 13e9e7d526d..ebdf2bc38d9 100644
--- a/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -6,9 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionsDisabled": "すべての拡張機能が無効化されています。",
 	"extensionHostProcess.crash": "拡張機能のホストが予期せずに終了しました。",
 	"extensionHostProcess.unresponsiveCrash": "拡張機能のホストが応答しないため終了しました。",
-	"devTools": "開発者ツール",
+	"devTools": "開発者ツールを開く",
 	"restart": "拡張機能のホストを再起動",
 	"overwritingExtension": "拡張機能 {0} を {1} で上書きしています。",
 	"extensionUnderDevelopment": "開発の拡張機能を {0} に読み込んでいます",
diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index bf9d744746a..ae5be60aaaf 100644
--- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,24 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5 が必要です。リンクに移動してインストールしてください。",
 	"installNet": ".NET Framework 4.5 をダウンロードします",
 	"neverShowAgain": "今後は表示しない",
-	"netVersionError": "Microsoft .NET Framework 4.5 が必要です。リンクに移動してインストールしてください。",
+	"enospcError": "{0} はこの大規模なワークスペース内のファイル変更を監視できません。この問題を解決するには、リンクの手順に従ってください。",
 	"learnMore": "説明書",
-	"enospcError": "{0} はファイル ハンドルを使い果たしています。この問題を解決するには、リンクの手順に従ってください。",
+	"fileInvalidPath": "ファイルのリソース ({0}) が無効です",
+	"fileIsDirectoryError": "ファイルはディレクトリです",
+	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
+	"fileTooLargeForHeapError": "このサイズのファイルを開くには、VS Code を再起動してより多くのメモリ使用を許可する必要があります",
+	"fileTooLargeError": "開くファイルが大きすぎます",
+	"fileNotFoundError": "ファイルが見つかりません ({0})",
+	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
+	"filePermission": "ファイルへの書き込み許可が拒否されました ({0})",
+	"fileExists": "生成しようとしているファイル ({0}) は既に存在しています",
+	"fileModifiedError": "ファイルは次の時点以後に更新されました:",
+	"fileReadOnlyError": "ファイルは読み取り専用です",
+	"fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。",
+	"unableToMoveCopyError": "移動/コピーできません。ファイルが含まれるフォルダーが置き換わることになります。",
 	"binFailed": "'{0}' をごみ箱に移動できませんでした",
 	"trashFailed": "'{0}' をごみ箱に移動できませんでした"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 8d829d16685..660883f87f6 100644
--- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "ファイルが見つかりません ({0})",
 	"fileIsDirectoryError": "ファイルはディレクトリです",
 	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
 	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません"
diff --git a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
index e27a42f7132..15dc46337bb 100644
--- a/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,7 @@
 	"fileInvalidPath": "ファイルのリソース ({0}) が無効です",
 	"fileIsDirectoryError": "ファイルはディレクトリです",
 	"fileNotModifiedError": "ファイルは次の時点以後に変更されていません:",
-	"fileTooLargeForHeapError": "ファイル サイズがウィンドウのメモリ制限を超えました。code --max-memory=NEWSIZE をお試しください",
+	"fileTooLargeForHeapError": "ファイル サイズが既定のメモリ制限を超えています。より大きい制限値で再起動してください。現在の設定では {0}MB で再起動するよう構成されています",
 	"fileTooLargeError": "開くファイルが大きすぎます",
 	"fileNotFoundError": "ファイルが見つかりません ({0})",
 	"fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません",
diff --git a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..0814f6f9f96 100644
--- a/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "キャンセル"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 43184408e5b..e2962bb3983 100644
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage ファイルにより使用される TextMate スコープ名。",
 	"vscode.extension.contributes.grammars.path": "tmLanguage ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './syntaxes/' で始まります。",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "この文法に言語が埋め込まれている場合は、言語 ID に対するスコープ名のマップ。",
+	"vscode.extension.contributes.grammars.tokenTypes": "スコープ名のトークン タイプへの割当て。",
 	"vscode.extension.contributes.grammars.injectTo": "この文法が挿入される言語の範囲名の一覧。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index dc2fe3903e3..26bc6832aeb 100644
--- a/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/jpn/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}",
 	"invalid.injectTo": "`contributes.{0}.injectTo` の値が無効です。言語の範囲名の配列である必要があります。指定された値: {1}",
 	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` の値が無効です。スコープ名から言語へのオブジェクト マップである必要があります。指定された値: {1}",
+	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` の値が無効です。オブジェクトはスコープ名からトークン タイプへ割り当てられている必要があります。指定された値: {1}",
 	"invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。",
 	"no-tm-grammar": "この言語に対して TM 文法は登録されていません。"
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..18013d8de41
--- /dev/null
+++ b/i18n/kor/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS 언어 서버",
+	"folding.start": "영역 접기 시작",
+	"folding.end": "접기 영역 끝"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css-language-features/package.i18n.json b/i18n/kor/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..43cc6cb4724
--- /dev/null
+++ b/i18n/kor/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS 언어 기능",
+	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
+	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"scss.title": "SCSS(Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
+	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
+	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
+	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
+	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
+	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
+	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
+	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
+	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
+	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
+	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
+	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
+	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
+	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
+	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
+	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
+	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
+	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/css/package.i18n.json b/i18n/kor/extensions/css/package.i18n.json
index 43cc6cb4724..2d4d9da9391 100644
--- a/i18n/kor/extensions/css/package.i18n.json
+++ b/i18n/kor/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS 언어 기능",
-	"description": "CSS, LESS 및 SCSS 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"css.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"css.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"css.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"css.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"css.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"css.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"css.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"css.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"css.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"css.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"css.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"css.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"css.trace.server.desc": "VS Code와 CSS 언어 서버 간 통신을 추적합니다.",
-	"css.validate.title": "CSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"less.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"less.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"less.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"less.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"less.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"less.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"less.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"less.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"less.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"less.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"less.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"less.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"less.validate.title": "LESS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"scss.title": "SCSS(Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
-	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
-	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
-	"scss.lint.duplicateProperties.desc": "중복된 스타일 정의를 사용하지 마세요.",
-	"scss.lint.emptyRules.desc": "빈 규칙 집합을 사용하지 마세요.",
-	"scss.lint.float.desc": "'float'를 사용하지 않도록 합니다. Float를 사용하면 레이아웃의 한쪽이 바뀔 경우 CSS가 쉽게 깨질 수 있습니다.",
-	"scss.lint.fontFaceProperties.desc": "@font-face 규칙에서 'src' 및 'font-family' 속성을 정의해야 합니다.",
-	"scss.lint.hexColorLength.desc": "16진수 색은 3개 또는 6개의 16진수로 구성되어야 합니다.",
-	"scss.lint.idSelector.desc": "이러한 규칙은 HTML과 긴밀하게 결합되므로 선택기에 ID를 포함하면 안 됩니다.",
-	"scss.lint.ieHack.desc": "IE 핵(Hack)은 IE7 이상을 지원할 때만 필요합니다.",
-	"scss.lint.important.desc": "!important는 사용하지 않도록 합니다. 이것은 전체 CSS의 특정성에 문제가 있어서 리팩터링해야 함을 나타냅니다.",
-	"scss.lint.importStatement.desc": "Import 문은 병렬로 로드되지 않습니다.",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "display 때문에 속성이 무시됩니다. 예를 들어 'display: inline'을 사용할 경우 width, height, margin-top, margin-bottom 및 float 속성은 적용되지 않습니다.",
-	"scss.lint.universalSelector.desc": "범용 선택기 (*)는 느린 것으로 알려져 있습니다.",
-	"scss.lint.unknownProperties.desc": "알 수 없는 속성입니다.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "알 수 없는 공급업체 관련 속성입니다.",
-	"scss.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
-	"scss.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
-	"scss.validate.title": "SCSS 유효성 검사 및 문제 심각도를 제어합니다.",
-	"scss.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
-	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+	"displayName": "CSS 언어 기본",
+	"description": "CSS,LESS,SCSS 파일에서 구문 강조 표시와 괄호 일치를 제공합니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/emmet/package.i18n.json b/i18n/kor/extensions/emmet/package.i18n.json
index d4ae14fedae..11c3bae8db4 100644
--- a/i18n/kor/extensions/emmet/package.i18n.json
+++ b/i18n/kor/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Emmet 프로필 및 코드 조각이 포함된 폴더의 경로입니다.'",
 	"emmetShowExpandedAbbreviation": "확장된 emmet 약어를 제안으로 표시합니다.\n\"inMarkupAndStylesheetFilesOnly\" 옵션이 html, haml, jade, slim, xml, xsl, css, scss, sass, less 및 stylus에 적용됩니다.\n\"always\" 옵션이 마크업/css에 관계없이 파일의 모든 부분에 적용됩니다.",
 	"emmetShowAbbreviationSuggestions": "가능한 emmet 약어를 제안으로 표시합니다. 스타일시트에는 적용되지 않고 emmet.showExpandedAbbreviation이 \"never\"로 설정되어 있을 때도 적용되지 않습니다.",
-	"emmetIncludeLanguages": "기본 지원되지 않는 언어에서 emmet 약어를 사용합니다. 언어와 emmet 지원 언어 사이에 매핑을 추가합니다.\n예: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "emmet 조각에 사용되는 변수",
 	"emmetTriggerExpansionOnTab": "사용하도록 설정하면 emmet 약어는 Tab 키를 눌렀을 때 확장됩니다.",
 	"emmetPreferences": "Emmet의 일부 작업 및 해결 프로그램의 동작을 수정하는 데 사용되는 기본 설정입니다.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'webkit' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'webkit' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
 	"emmetPreferencesCssMozProperties": "`-`로 시작하는 Emmet 약어에서 사용될 때 'moz' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'moz' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
 	"emmetPreferencesCssOProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'o' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'o' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
-	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다."
+	"emmetPreferencesCssMsProperties": "`-`로 시작하는 emmet 약어에서 사용할 때 'ms' 공급업체 접두사를 가져오는 쉼표로 구분된 CSS 속성입니다. 항상 'ms' 접두사를 사용하지 않으려면 빈 문자열로 설정합니다.",
+	"emmetPreferencesCssFuzzySearchMinScore": "유사 일치 약어가 획득해야 하는 최소 점수(0에서 1 사이)입니다. 값이 낮을수록 가양성 일치 항목이 늘 수 있고, 값이 높을수록 가능한 일치 항목이 줄 수 있습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/commands.i18n.json b/i18n/kor/extensions/git/out/commands.i18n.json
index 69fccaefa9f..e1ccbbf253f 100644
--- a/i18n/kor/extensions/git/out/commands.i18n.json
+++ b/i18n/kor/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "확인",
 	"push with tags success": "태그와 함께 푸시되었습니다.",
 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
-	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
+	"sync is unpredictable": "이 작업은 '{0}/{1}' 간에 커밋을 푸시하고 풀합니다. ",
 	"never again": "다시 표시 안 함",
 	"no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.",
 	"no changes stash": "스태시할 변경 내용이 없습니다.",
diff --git a/i18n/kor/extensions/git/package.i18n.json b/i18n/kor/extensions/git/package.i18n.json
index 07838b84a85..3703ac48f99 100644
--- a/i18n/kor/extensions/git/package.i18n.json
+++ b/i18n/kor/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Git 변경점 보기에서 파일 열기 동작 줄을 표시할지의 여부를 제어합니다.",
 	"config.inputValidation": "커밋 메시지 입력 유효성 검사를 언제 표시할지 제어합니다.",
 	"config.detectSubmodules": "Git 하위 모듈을 자동으로 검색할지 여부를 제어합니다.",
+	"config.detectSubmodulesLimit": "Git submodules 검출 개수의 제한을 제어합니다.",
 	"colors.modified": "수정된 리소스의 색상입니다.",
 	"colors.deleted": "삭제된 리소스의 색상입니다.",
 	"colors.untracked": "추적되지 않은 리소스의 색상입니다.",
diff --git a/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..d112b7520ae
--- /dev/null
+++ b/i18n/kor/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML 언어 서버",
+	"folding.start": "영역 접기 시작",
+	"folding.end": "접기 영역 끝"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html-language-features/package.i18n.json b/i18n/kor/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..064a37a9634
--- /dev/null
+++ b/i18n/kor/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML 언어 기능",
+	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
+	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
+	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
+	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
+	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
+	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
+	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
+	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
+	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
+	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
+	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
+	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
+	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
+	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
+	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
+	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
+	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
+	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
+	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
+	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
+	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
+	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/html/package.i18n.json b/i18n/kor/extensions/html/package.i18n.json
index a71b4df8880..0801cef7b57 100644
--- a/i18n/kor/extensions/html/package.i18n.json
+++ b/i18n/kor/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML 언어 기능",
-	"description": "HTML, Razor 및 Handlebar 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"html.format.enable.desc": "기본 HTML 포맷터를 사용하거나 사용하지 않습니다.",
-	"html.format.wrapLineLength.desc": "한 줄당 최대 문자 수입니다(0 = 사용 안 함).",
-	"html.format.unformatted.desc": "쉼표로 분리된 태그 목록으로, 서식을 다시 지정해서는 안 됩니다. https://www.w3.org/TR/html5/dom.html#phrasing-content에 나열된 모든 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.contentUnformatted.desc": "쉼표로 분리된 태그 목록으로, 콘텐츠의 서식을 다시 지정해서는 안 됩니다. 'pre' 태그의 기본값은 'null'로 설정됩니다.",
-	"html.format.indentInnerHtml.desc": "<head> 및 <body> 섹션을 들여쓰기합니다.",
-	"html.format.preserveNewLines.desc": "요소 앞에 있는 기존 줄 바꿈의 유지 여부입니다. 요소 앞에만 적용되며 태그 안이나 텍스트에는 적용되지 않습니다.",
-	"html.format.maxPreserveNewLines.desc": "청크 한 개에 유지할 수 있는 최대 줄 바꿈 수입니다. 무제한일 때는 'null'을 사용합니다.",
-	"html.format.indentHandlebars.desc": "{{#foo}} 및 {{/foo}}를 서식 지정하고 들여쓰기합니다.",
-	"html.format.endWithNewline.desc": "줄 바꿈으로 끝납니다.",
-	"html.format.extraLiners.desc": "쉼표로 분리된 태그 목록으로 앞에 줄 바꿈을 추가로 넣어야 합니다. \"head, body, /html\"의 기본값은 'null'로 설정됩니다.",
-	"html.format.wrapAttributes.desc": "특성을 래핑합니다.",
-	"html.format.wrapAttributes.auto": "줄 길이를 초과하는 경우에만 특성을 래핑합니다.",
-	"html.format.wrapAttributes.force": "첫 번째 특성을 제외한 각 특성을 래핑합니다.",
-	"html.format.wrapAttributes.forcealign": "첫 번째 특성을 제외한 각 특성을 래핑하고 정렬된 상태를 유지합니다.",
-	"html.format.wrapAttributes.forcemultiline": "각 특성을 래핑합니다.",
-	"html.suggest.angular1.desc": "기본 제공 HTML 언어 지원에서 Angular V1 태그 및 속성을 제안하는지 여부를 구성합니다.",
-	"html.suggest.ionic.desc": "기본 제공 HTML 언어 지원에서 Ionic 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.suggest.html5.desc": "기본 제공 HTML 언어 지원에서 HTML5 태그, 속성 및 값을 제안하는지 여부를 구성합니다.",
-	"html.trace.server.desc": "VS Code와 HTML 언어 서버 간 통신을 추적합니다.",
-	"html.validate.scripts": "기본 제공 HTML 언어 지원에서 포함 스크립트의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.validate.styles": "기본 제공 HTML 언어 지원에서 포함 스타일의 유효성을 검사하는지 여부를 구성합니다.",
-	"html.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
-	"html.autoClosingTags": "HTML 태그의 자동 닫기를 사용하거나 사용하지 않습니다."
+	"displayName": "HTML 언어 기본",
+	"description": "HTML 파일에서 구문 강조 표시, 괄호 일치 및 코드 조각을 제공합니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/jake/package.i18n.json b/i18n/kor/extensions/jake/package.i18n.json
index 2dcfc03464b..f83be6fbb64 100644
--- a/i18n/kor/extensions/jake/package.i18n.json
+++ b/i18n/kor/extensions/jake/package.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"description": "VSCode에 Jake 기능을 추가할 확장입니다.",
 	"displayName": "VSCode에 대한 Jake 지원",
 	"jake.taskDefinition.type.description": "사용자 지정할 Jake 작업입니다.",
 	"jake.taskDefinition.file.description": "작업을 제공하는 Jake 파일이며 생략할 수 있습니다.",
diff --git a/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..115ea612718
--- /dev/null
+++ b/i18n/kor/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON 언어 서버"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json-language-features/package.i18n.json b/i18n/kor/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..d86c7ffa3da
--- /dev/null
+++ b/i18n/kor/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON 언어 기능",
+	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
+	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
+	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
+	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
+	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
+	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
+	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
+	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
+	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/json/package.i18n.json b/i18n/kor/extensions/json/package.i18n.json
index 3adf4f967d1..c63982946ed 100644
--- a/i18n/kor/extensions/json/package.i18n.json
+++ b/i18n/kor/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON 언어 기능",
-	"description": "JSON 파일에 대한 다양한 언어 지원을 제공합니다.",
-	"json.schemas.desc": "현재 프로젝트에서 스키마를 JSON 파일에 연결",
-	"json.schemas.url.desc": "현재 디렉터리에 있는 스키마의 URL 또는 상대 경로",
-	"json.schemas.fileMatch.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 파일 패턴의 배열입니다.",
-	"json.schemas.fileMatch.item.desc": "스키마에 대한 JSON 파일을 확인할 때 일치할 '*'를 포함할 수 있는 파일 패턴입니다.",
-	"json.schemas.schema.desc": "지정된 URL에 대한 스키마 정의입니다. 스키마 URL에 대한 액세스 방지를 위해서만 스키마를 제공해야 합니다.",
-	"json.format.enable.desc": "기본 JSON 포맷터 사용/사용 안 함(다시 시작해야 함)",
-	"json.tracing.desc": "VS Code와 JSON 언어 서버 간 통신을 추적합니다.",
-	"json.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` 설정은 `editor.colorDecorators`를 위해 사용되지 않습니다.",
-	"json.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다."
+	"displayName": "JSON 언어 기본",
+	"description": "JSON 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..84643755d0a
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles': {0}을 불러올 수 없음"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..4bc763aedcc
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[미리 보기] {0}",
+	"previewTitle": "미리 보기 {0}"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..01370fa604b
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "이 문서에서 일부 콘텐츠가 사용하지 않도록 설정되었습니다.",
+	"preview.securityMessage.title": "Markdown 미리 보기에서 잠재적으로 안전하지 않거나 보안되지 않은 콘텐츠가 사용하지 않도록 설정되어 있습니다. 이 콘텐츠나 스크립트를 허용하려면 Markdown 미리 보기 보안 설정을 변경하세요.",
+	"preview.securityMessage.label": "콘텐츠 사용할 수 없음 보안 경고"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/out/security.i18n.json b/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..b7fd641e493
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Strict",
+	"strict.description": "보안 콘텐츠만 로드",
+	"insecureContent.title": "안전하지 않은 콘텐츠 허용",
+	"insecureContent.description": "http를 통한 콘텐츠 로드 사용",
+	"disable.title": "사용 안 함",
+	"disable.description": "모든 콘텐츠 및 스크립트 실행을 허용합니다. 권장하지 않습니다.",
+	"moreInfo.title": "추가 정보",
+	"enableSecurityWarning.title": "이 작업 영역에서 미리 보기 보안 경고 사용",
+	"disableSecurityWarning.title": "이 작업 영역에서 미리보기 보안 경고 사용 안 함",
+	"toggleSecurityWarning.description": "콘텐츠 보안 수준에 영향을 주지 않습니다.",
+	"preview.showPreviewSecuritySelector.title": "이 작업 영역에 대해 Markdown 미리 보기의 보안 설정 선택"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/markdown-language-features/package.i18n.json b/i18n/kor/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..83878314ebe
--- /dev/null
+++ b/i18n/kor/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown 언어 기능",
+	"description": "Markdown에 대한 다양한 언어 지원을 제공합니다.",
+	"markdown.preview.breaks.desc": "마크다운 미리 보기에서 줄바꿈 렌더링 방식을 설정합니다. 'true'로 설정하면 모든 행에 대해 <br>이(가) 생성됩니다.",
+	"markdown.preview.linkify": "Markdown 미리 보기에서 URL 같은 텍스트를 링크로 변환을 사용하거나 사용하지 않도록 설정합니다.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "markdown 미리 보기에서 두 번 클릭하여 편집기로 전환합니다.",
+	"markdown.preview.fontFamily.desc": "markdown 미리 보기에서 사용되는 글꼴 패밀리를 제어합니다.",
+	"markdown.preview.fontSize.desc": "markdown 미리 보기에서 사용되는 글꼴 크기(픽셀)를 제어합니다.",
+	"markdown.preview.lineHeight.desc": "markdown 미리 보기에 사용되는 줄 높이를 제어합니다. 이 숫자는 글꼴 크기에 상대적입니다.",
+	"markdown.preview.markEditorSelection.desc": "markdown 미리 보기에 현재 편집기 선택을 표시합니다.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Markdown 미리 보기를 스크롤할 때 편집기의 보기를 업데이트합니다.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown 편집기를 스크롤할 때 미리 보기의 보기를 업데이트합니다.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[사용되지 않음] markdown 미리 보기를 스크롤하여 편집기에서 현재 선택한 줄을 표시합니다.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "이 설정은 'markdown.preview.scrollPreviewWithEditor'로 대체되었으며 더 이상 영향을 주지 않습니다.",
+	"markdown.preview.title": "미리 보기 열기",
+	"markdown.previewFrontMatter.dec": "markdown 미리 보기에서 YAML 전문을 렌더링할 방법을 설정합니다. '숨기기' 기능을 사용하면 전문이 제거되고, 그러지 않으면 전문이 markdown 콘텐츠로 처리됩니다.",
+	"markdown.previewSide.title": "측면에서 미리 보기 열기",
+	"markdown.showLockedPreviewToSide.title": "측면에서 잠긴 미리 보기 열기",
+	"markdown.showSource.title": "소스 표시",
+	"markdown.styles.dec": "markdown 미리 보기에서 사용할 CSS 스타일시트의 URL 또는 로컬 경로 목록입니다. 상대 경로는 탐색기에서 열린 폴더를 기준으로 해석됩니다. 열린 폴더가 없으면 markdown 파일의 위치를 기준으로 해석됩니다. 모든 '\\'는 '\\\\'로 써야 합니다.",
+	"markdown.showPreviewSecuritySelector.title": "미리 보기 보안 설정 변경",
+	"markdown.trace.desc": "Markdown 확장에 대해 디버그 로깅을 사용하도록 설정합니다.",
+	"markdown.preview.refresh.title": "미리 보기 새로 고침",
+	"markdown.preview.toggleLock.title": "미리 보기 잠금 설정/해제"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..e88d0e75520
--- /dev/null
+++ b/i18n/kor/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "PHP 파일을 lint하기 위해 {0}(작업 영역 설정으로 정의됨)의 실행을 허용하시겠습니까?",
+	"php.yes": "허용",
+	"php.no": "허용 안 함",
+	"wrongExecutable": "{0}은(는) 유효한 PHP 실행 파일이 아니기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
+	"noExecutable": "PHP 실행 파일이 설정되지 않았기 때문에 유효성을 검사할 수 없습니다. 'php.validate.executablePath' 설정을 사용하여 PHP 실행 파일을 구성하세요.",
+	"unknownReason": "{0} 경로를 사용하여 php를 실행하지 못했습니다. 이유를 알 수 없습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php-language-features/package.i18n.json b/i18n/kor/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..462c5348bcc
--- /dev/null
+++ b/i18n/kor/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
+	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
+	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
+	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
+	"displayName": "PHP 언어 기능",
+	"description": "PHP 파일에 대한 다양한 언어 지원을 제공합니다. "
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/php/package.i18n.json b/i18n/kor/extensions/php/package.i18n.json
index c12a9f13cf2..7ffd59966bb 100644
--- a/i18n/kor/extensions/php/package.i18n.json
+++ b/i18n/kor/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "기본 제공 PHP 언어 제안을 사용하는지 여부를 구성합니다. 지원에서는 PHP 전역 및 변수를 제안합니다.",
-	"configuration.validate.enable": "기본 제공 PHP 유효성 검사를 사용하거나 사용하지 않습니다.",
-	"configuration.validate.executablePath": "PHP 실행 파일을 가리킵니다.",
-	"configuration.validate.run": "저장 시 또는 입력 시 Linter의 실행 여부입니다.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP 유효성 검사 실행 파일을 허용하지 않음(작업\n 영역 설정으로 정의됨)",
-	"displayName": "PHP 언어 기능",
-	"description": "PHP 파일에 대해 IntelliSense, lint 및 언어 기본을 제공합니다."
+	"description": "PHP 파일에서 구문 강조 표시 및 괄호 일치를 제공합니다. "
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json b/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..dd43847bd6e
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.",
+	"typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식",
+	"typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.",
+	"typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
+	"typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다. 자세히 알아보려면 [여기]({0})를 클릭하세요.",
+	"typescript.configureTsconfigQuickPick": "tsconfig.json 구성",
+	"typescript.configureJsconfigQuickPick": "jsconfig.json 구성"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..65d840cf0b5
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "적용할 코드 동작 선택",
+	"acquiringTypingsLabel": "typings를 가져오는 중...",
+	"acquiringTypingsDetail": "IntelliSense에 대한 typings 정의를 가져오는 중입니다.",
+	"autoImportLabel": "{0}에서 자동으로 가져오기"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..365792bc459
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "JavaScript 파일에서 의미 검사를 사용합니다. 파일의 최상단에 있어야 합니다.",
+	"ts-nocheck": "JavaScript 파일에서 의미 검사를 사용하지 않습니다. 파일의 최상단에 있어야 합니다.",
+	"ts-ignore": "파일의 다음 행에서 @ts-check 오류를 억제합니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..272312dad8e
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1개 구현",
+	"manyImplementationLabel": "{0}개 구현",
+	"implementationsErrorLabel": "구현을 확인할 수 없음"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..de5777d4c7a
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc 주석"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..86003226d94
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "가져오기 구성"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..b91c84de957
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (파일에서 모두 수정)"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..69609e31fcb
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "참조 1개",
+	"manyReferenceLabel": "참조 {0}개",
+	"referenceErrorLabel": "참조를 확인할 수 없음"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..6982eedcfd9
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "빌드 - {0}",
+	"buildAndWatchTscLabel": "보기 - {0}"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..3f50eeec8ab
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "경로 {0}이(가) 올바른 tsserver 설치를 가리키지 않습니다. 포함된 TypeScript 버전을 대신 사용합니다.",
+	"serverCouldNotBeStarted": "TypeScript 언어 서버를 시작할 수 없습니다. 오류 메시지: {0}",
+	"typescript.openTsServerLog.notSupported": "TS 서버 로깅을 사용하려면 TS 2.2.2 이상이 필요합니다.",
+	"typescript.openTsServerLog.loggingNotEnabled": "TS 서버 로깅이 꺼져 있습니다. `typescript.tsserver.log`를 설정하고 TS 서버를 다시 시작하여 로깅을 사용하도록 설정하세요.",
+	"typescript.openTsServerLog.enableAndReloadOption": "로깅 사용 및 TS 서버 다시 시작",
+	"typescript.openTsServerLog.noLogFile": "TS 서버에서 로깅을 시작하지 않았습니다.",
+	"openTsServerLog.openFileFailedFailed": "TS 서버 로그 파일을 열 수 없습니다.",
+	"serverDiedAfterStart": "TypeScript 언어 서비스가 시작된 직후 5번 종료되었습니다. 서비스가 다시 시작되지 않습니다.",
+	"serverDiedReportIssue": "문제 보고",
+	"serverDied": "TypeScript 언어 서비스가 지난 5분 동안 예기치 않게 5번 종료되었습니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..f57994230cb
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "잘못된 버전"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..49fa81ab46e
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
+	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
+	"large.label": "제외 구성",
+	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..0fad82fa51a
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "TypeScript IntelliSense를 향상하기 위해 데이터를 페치하는 중",
+	"typesInstallerInitializationFailed.title": "JavaScript 언어 기능에 대한 입력 파일을 설치할 수 없습니다. NPM이 설치되어 있는지 확인하거나 사용자 설정에서 'typescript.npm'을 구성하세요.  자세히 알아보려면 [여기]({0})를 클릭하세요.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "다시 표시 안 함"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..bdd4f232c51
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "VS Code의 버전 사용",
+	"useWorkspaceVersionOption": "작업 영역 버전 사용",
+	"learnMore": "자세한 정보",
+	"selectTsVersion": "JavaScript 및 TypeScript 언어 기능에 사용되는 TypeScript 버전 선택"
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..979038a5298
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noBundledServerFound": "잘못 동작하는 바이러스 감지 도구와 같은 다른 응용 프로그램에서 VS Code의 tsserver가 삭제되었습니다. VS Code를 다시 설치하세요."
+}
\ No newline at end of file
diff --git a/i18n/kor/extensions/typescript-language-features/package.i18n.json b/i18n/kor/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..3f2230bf284
--- /dev/null
+++ b/i18n/kor/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,58 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript 및 JavaScript 언어 기능",
+	"description": "JavaScript 및 TypeScript에 대한 다양한 언어 지원을 제공합니다.",
+	"typescript.reloadProjects.title": "프로젝트 다시 로드",
+	"javascript.reloadProjects.title": "프로젝트 다시 로드",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "매개 변수 서명으로 함수를 완료하세요.",
+	"typescript.tsdk.desc": "사용할 tsserver 및 lib*.d.ts 파일이 들어 있는 폴더 경로를 지정합니다.",
+	"typescript.disableAutomaticTypeAcquisition": "자동 형식 인식을 사용하지 않습니다. TypeScript >= 2.0.6이 필요합니다.",
+	"typescript.tsserver.log": "파일에 대해 TS 서버 로깅을 사용하도록 설정합니다. 이 로그는 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 로그에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한 기타 정보가 포함될 수 있습니다.",
+	"typescript.tsserver.trace": "TS 서버로 전송한 메시지 추적을 사용하도록 설정합니다. 이\n 추적은 TS 서버 문제를 진단하는 데 사용될 수 있습니다. 추적에는 파일 경로, 소스 코드 및 프로젝트에서 잠재적으로 중요한\n 기타 정보가 포함될 수 있습니다.",
+	"typescript.validate.enable": "TypeScript 유효성 검사를 사용하거나 사용하지 않습니다.",
+	"typescript.format.enable": "기본 TypeScript 포맷터를 사용하거나 사용하지 않습니다.",
+	"javascript.format.enable": "기본 JavaScript 포맷터를 사용하거나 사용하지 않습니다.",
+	"format.insertSpaceAfterCommaDelimiter": "쉼표 구분 기호 뒤에 오는 공백 처리를 정의합니다.",
+	"format.insertSpaceAfterConstructor": "컨스트럭터 키워드 뒤 공백 처리를 정의합니다. TypeScript >= 2.3.0이 필요합니다.",
+	"format.insertSpaceAfterSemicolonInForStatements": " for 문에서 세미콜론 뒤에 오는 공백 처리를 정의합니다.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "이항 연산자 뒤에 오는 공백 처리를 정의합니다.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "제어 흐름 문의 키워드 뒤에 오는 공백 처리를 정의합니다.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "익명 함수의 function 키워드 뒤에 오는 공백 처리를 정의합니다.",
+	"format.insertSpaceBeforeFunctionParenthesis": "함수 인수 괄호 앞에 오는 공백 처리를 정의합니다. TypeScript 2.1.5 이상이 필요합니다.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "템플릿 문자열의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX 식의 여는 중괄호 뒤와 닫는 중괄호 앞의 공백 처리를 정의합니다. TypeScript >= 2.0.6이 필요합니다.",
+	"format.insertSpaceAfterTypeAssertion": "TypeScript에서 유형 어설션 이후 공백 처리를 정의합니다. TypeScript >= 2.4가 필요합니다.",
+	"format.placeOpenBraceOnNewLineForFunctions": "함수의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "제어 블록의 새 줄에 여는 중괄호를 넣을지 정의합니다.",
+	"javascript.validate.enable": "JavaScript 유효성 검사를 사용하거나 사용하지 않습니다.",
+	"typescript.goToProjectConfig.title": "프로젝트 구성으로 이동",
+	"javascript.goToProjectConfig.title": "프로젝트 구성으로 이동",
+	"javascript.referencesCodeLens.enabled": "JavaScript 파일에서 CodeLense 참조를 사용/사용 안 함으로 설정합니다.",
+	"typescript.referencesCodeLens.enabled": "TypeScript 파일에서 참조 CodeLense를 사용/사용 안 함으로 설정합니다. TypeScript >= 2.0.6이 필요합니다.",
+	"typescript.implementationsCodeLens.enabled": "구현 CodeLens를 사용하거나 사용하지 않도록 설정합니다. TypeScript >= 2.2.0이 필요합니다.",
+	"typescript.openTsServerLog.title": "TS 서버 로그 열기",
+	"typescript.restartTsServer": "TS 서버 다시 시작",
+	"typescript.selectTypeScriptVersion.title": "TypeScript 버전 선택",
+	"typescript.reportStyleChecksAsWarnings": "스타일 검사를 경고로 보고",
+	"jsDocCompletion.enabled": "자동 JSDoc 주석 사용/사용 안 함",
+	"javascript.implicitProjectConfig.checkJs": "JavaScript 파일의 의미 체계 검사를 사용/사용하지 않습니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript >=2.3.1이 필요합니다. ",
+	"typescript.npm": "자동 입력 인식에 사용된 NPM 실행 파일 경로를 지정합니다. TypeScript >= 2.3.4가 필요합니다.",
+	"typescript.check.npmIsInstalled": "자동 입력 인식에 대해 NPM이 설치되어 있는지 확인합니다.",
+	"javascript.nameSuggestions": "JavaScript 제안 목록의 파일에서 고유한 이름 포함을 사용/사용 안 함으로 설정합니다.",
+	"typescript.tsc.autoDetect": "tsc 작업의 자동 검색을 제어합니다. '해제'는 이 기능을 사용하지 않도록 설정합니다. '빌드'는 단일 실행 컴파일 작업만 만듭니다. '보기'는 컴파일 및 보기 작업만 만듭니다. '설정'은 빌드 및 보기 작업을 모두 만듭니다. 기본 옵션은 '설정'입니다.",
+	"typescript.problemMatchers.tsc.label": "TypeScript 문제",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript 문제(감시 모드)",
+	"typescript.quickSuggestionsForPaths": "가져오기 경로를 입력할 때 빠른 제안을 사용하거나 사용하지 않습니다.",
+	"typescript.locale": "TypeScript 오류를 보고하는 데 사용하는 로캘을 설정합니다. TypeScript >= 2.6.0이 필요합니다. 기본값 'null'은 TypeScript 오류에 대해 VS Code의 로캘을 사용합니다.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "프로젝트의 일부가 아닌 JavaScript 파일에 대해 'experimentalDecorators'를 사용하거나 사용하지 않도록 설정합니다. 기존 jsconfig.json 또는 tsconfig.json 파일은 이 설정을 재정의합니다. TypeScript >=2.3.1이 필요합니다.",
+	"typescript.autoImportSuggestions.enabled": "자동 가져오기 제안을 사용하거나 사용하지 않도록 설정합니다. TypeScript >=2.6.1이 필요합니다.",
+	"typescript.experimental.syntaxFolding": "구문 인식 접기 마커를 설정하거나 해제합니다.",
+	"taskDefinition.tsconfig.description": "TS 빌드를 정의하는 tsconfig 파일입니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/node/processes.i18n.json b/i18n/kor/src/vs/base/node/processes.i18n.json
index 05a4cd5f14f..35229bd6699 100644
--- a/i18n/kor/src/vs/base/node/processes.i18n.json
+++ b/i18n/kor/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "UNC 드라이브에서 셸 명령을 실행할 수 없습니다."
+	]
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index f09203d420b..0d6f74e08a2 100644
--- a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -11,11 +11,10 @@
 	"similarIssues": "유사한 문제",
 	"open": "열기",
 	"closed": "닫힘",
-	"noResults": "결과 없음",
 	"settingsSearchIssue": "설정 검색 문제",
 	"bugReporter": "버그 보고서",
-	"performanceIssue": "성능 문제",
 	"featureRequest": "기능 요청",
+	"performanceIssue": "성능 문제",
 	"stepsToReproduce": "재현 단계",
 	"bugDescription": "문제를 안정적으로 재현시킬 수 있는 방법을 공유해주세요. 실제 결과와 예상 결과를 포함하세요. GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
 	"performanceIssueDesciption": "이 성능 문제가 언제 발생합니까? 시작할 때 발생합니까? 특정 작업을 진행한 이후에 발생합니까? GitHub 버전의 Markdown을 지원합니다. GitHub에서 미리 볼 때 문제를 편집하고 스크린샷을 추가할 수 있습니다.",
diff --git a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 838b50751aa..00754823fe4 100644
--- a/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/kor/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "양식을 영어로 작성해 주세요.",
 	"issueTypeLabel": "이것은",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "모든 확장을 사용하지 않도록 설정하고 창 다시 로드",
+	"chooseExtension": "확장",
 	"issueTitleLabel": "제목",
 	"issueTitleRequired": "제목을 입력하세요.",
 	"titleLengthValidation": "제목이 너무 깁니다.",
@@ -18,13 +21,6 @@
 	"extensions": "내 확장",
 	"searchedExtensions": "검색된 확장",
 	"settingsSearchDetails": "설정 검색 세부 정보",
-	"tryDisablingExtensions": "확장을 사용하지 않도록 설정해도 문제 재현이 가능한가요?",
-	"yes": "예",
-	"no": "아니요",
-	"disableExtensionsLabelText": "{0} 후 문제를 재현해 보세요.",
-	"disableExtensions": "모든 확장을 사용하지 않도록 설정하고 창 다시 로드",
-	"showRunningExtensionsLabelText": "확장 문제로 의심되면 {0}에서 확장에 대한 문제를 보고하세요.",
-	"showRunningExtensions": "모든 실행 중인 확장 보기",
 	"details": "상세 내용을 입력하세요.",
 	"loadingData": "데이터 로드 중..."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..d2f76643375
--- /dev/null
+++ b/i18n/kor/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "이름"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json
index 801e8c450ff..1839bc77e72 100644
--- a/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/kor/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "닫기",
-	"header": "다른 항목 {0} / {1}: 원본 {2}, {3}행, 수정 {4}, {5}행",
 	"blankLine": "비어 있음",
 	"equalLine": "원본 {0}, 수정 {1}: {2}",
 	"insertLine": "+ 수정됨 {0}: {1}",
diff --git a/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 37b49551575..f226af7ac85 100644
--- a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,9 +16,10 @@
 	"editorIndentGuides": "편집기 들여쓰기 안내선 색입니다.",
 	"editorLineNumbers": "편집기 줄 번호 색입니다.",
 	"editorActiveLineNumber": "편집기 활성 영역 줄번호 색상",
+	"deprecatedEditorActiveLineNumber": "Id는 사용 되지 않습니다. 대신 'editorLineNumber.activeForeground'를 사용 합니다.",
 	"editorRuler": "편집기 눈금의 색상입니다.",
 	"editorCodeLensForeground": "편집기 코드 렌즈의 전경색입니다.",
-	"editorBracketMatchBackground": "일치하는 브래킷 뒤의 배경색입니다.",
+	"editorBracketMatchBackground": "일치하는 괄호 뒤의 배경색",
 	"editorBracketMatchBorder": "일치하는 브래킷 박스의 색상",
 	"editorOverviewRulerBorder": "개요 눈금 경계의 색상입니다.",
 	"editorGutter": "편집기 거터의 배경색입니다. 거터에는 글리프 여백과 행 수가 있습니다.",
@@ -28,7 +29,9 @@
 	"warningBorder": "편집기 내 경고 표시선의 테두리 색입니다.",
 	"infoForeground": "편집기 내 정보 표시선의 전경색입니다.",
 	"infoBorder": "편집기 내 정보 표시선의 테두리 색입니다.",
-	"overviewRulerRangeHighlight": "범위 강조 표시의 개요 눈금자 마커 색입니다.",
+	"hintForeground": "편집기에서 힌트 표시선의 전경색입니다.",
+	"hintBorder": "편집기에서 힌트 표시선의 테두리 색입니다.",
+	"overviewRulerRangeHighlight": "범위 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
 	"overviewRuleError": "오류의 개요 눈금자 마커 색입니다.",
 	"overviewRuleWarning": "경고의 개요 눈금자 마커 색입니다.",
 	"overviewRuleInfo": "정보의 개요 눈금자 마커 색입니다."
diff --git a/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..cc5bf67d866
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "수정 사항 표시({0})",
+	"quickFix": "수정 사항 표시",
+	"organizeImports.label": "가져오기 구성"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 96b96049dd7..bdb84052201 100644
--- a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "다음 문제로 이동 (오류, 경고, 정보)",
-	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)",
-	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
-	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
-	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
-	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
+	"markerAction.previous.label": "이전 문제로 이동 (오류, 경고, 정보)"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..ff17e99717f
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.",
+	"editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.",
+	"editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.",
+	"editorMarkerNavigationBackground": "편집기 표식 탐색 위젯 배경입니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..7078503b8e1
--- /dev/null
+++ b/i18n/kor/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "일요일",
+	"Monday": "월요일",
+	"Tuesday": "화요일",
+	"Wednesday": "수요일",
+	"Thursday": "목요일",
+	"Friday": "금요일",
+	"Saturday": "토요일",
+	"SundayShort": "일",
+	"MondayShort": "월",
+	"TuesdayShort": "화",
+	"WednesdayShort": "수",
+	"ThursdayShort": "목",
+	"FridayShort": "금",
+	"SaturdayShort": "토",
+	"January": "1 월",
+	"February": "2 월",
+	"March": "3 월",
+	"April": "4 월",
+	"May": "5 월",
+	"June": "6 월",
+	"July": "7 월",
+	"August": "8 월",
+	"September": "9 월",
+	"October": "10 월",
+	"November": "11 월",
+	"December": "12 월",
+	"JanuaryShort": "1 월",
+	"FebruaryShort": "2 월",
+	"MarchShort": "3 월",
+	"AprilShort": "4 월",
+	"MayShort": "5 월",
+	"JuneShort": "6 월",
+	"JulyShort": "7 월",
+	"AugustShort": "8 월",
+	"SeptemberShort": "9 월",
+	"OctoberShort": "10 월",
+	"NovemberShort": "11 월",
+	"DecemberShort": "12 월"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 509c0378067..aaaf9225abd 100644
--- a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다. 색상은 밑에 깔린 꾸밈을 가리지 않도록 반드시 불투명이 아니어야 합니다.",
 	"wordHighlightBorder": "변수 읽기와 같은 읽기 액세스 중 기호의 테두리 색입니다.",
 	"wordHighlightStrongBorder": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 테두리 색입니다.",
-	"overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.",
-	"overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.",
+	"overviewRulerWordHighlightForeground": "기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
+	"overviewRulerWordHighlightStrongForeground": "쓰기 액세스 기호 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
 	"wordHighlight.next.label": "다음 강조 기호로 이동",
 	"wordHighlight.previous.label": "이전 강조 기호로 이동"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..e770ddd1642
--- /dev/null
+++ b/i18n/kor/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1개의 추가 파일이 표시되지 않음",
+	"moreFiles": "...{0}개의 추가 파일이 표시되지 않음"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..a32e01e761e
--- /dev/null
+++ b/i18n/kor/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "취소"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
index 4542715a33c..9fa2e539d0c 100644
--- a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.",
 	"prof-startup": "시작하는 동안 CPU 프로파일러 실행",
 	"disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.",
-	"inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.",
-	"inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.",
 	"disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.",
 	"uploadLogs": "현재의 세션에서 안전한 종점으로 로그 업로드",
 	"maxMemory": "윈도우에 대한 최대 메모리 크기 (단위 MB).",
diff --git a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 76ee8e87f46..29a28e29329 100644
--- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "의존성 설치 중 오류가 발생했습니다. {0}",
 	"MarketPlaceDisabled": "Marketplace를 사용할 수 없습니다.",
 	"removeError": "확장을 제거하는 동안 오류가 발생했습니다. {0}. 다시 시도하기 전에 VS Code를 종료하고 다시 시작하세요.",
-	"Not Market place extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
+	"Not a Marketplace extension": "마켓플레이스 확장만 다시 설치할 수 있습니다.",
 	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
 	"malicious extension": "문제가 있다고 보고되었으므로 확장을 설치할 수 없습니다.",
 	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
 	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
-	"uninstallOnly": "만",
-	"uninstallAll": "모두",
+	"uninstallOnly": "확장만",
+	"uninstallAll": "모두 제거",
 	"uninstallConfirmation": "'{0}'을(를) 제거할까요?",
 	"ok": "확인",
 	"singleDependentError": "확장 '{0}'을(를) 제거할 수 없습니다. 확장 '{1}'이(가) 이 확장에 종속됩니다.",
diff --git a/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json
index a87a8f4f639..660bdbdaf9c 100644
--- a/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/kor/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "`engines.vscode` 값 {0}을(를) 구문 분석할 수 없습니다. ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x 등을 사용하세요.",
 	"versionSpecificity1": "`engines.vscode`({0})에 지정된 버전이 명확하지 않습니다. vscode 버전이 1.0.0 이전이면 최소한 원하는 주 버전과 부 버전을 정의하세요( 예: ^0.10.0, 0.10.x, 0.11.0 등).",
 	"versionSpecificity2": "`engines.vscode`({0})에 지정된 버전이 명확하지 않습니다. vscode 버전이 1.0.0 이후이면 최소한 원하는 주 버전을 정의하세요(예: ^1.10.0, 1.10.x, 1.x.x, 2.x.x 등).",
 	"versionMismatch": "확장이 Code {0}과(와) 호환되지 않습니다. 확장에 {1}이(가) 필요합니다."
diff --git a/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index cac1d48881f..78585e502ec 100644
--- a/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/kor/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "{0} 설치가 손상된 것 같습니다. 다시 설치하세요.",
 	"integrity.moreInformation": "추가 정보",
-	"integrity.dontShowAgain": "다시 표시 안 함",
-	"integrity.prompt": "{0} 설치가 손상된 것 같습니다. 다시 설치하세요."
+	"integrity.dontShowAgain": "다시 표시 안 함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/list/browser/listService.i18n.json b/i18n/kor/src/vs/platform/list/browser/listService.i18n.json
index 26cbc3957bc..8b32c5188c5 100644
--- a/i18n/kor/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/kor/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "마우스로 트리와 목록의 항목을 다중 선택에 추가할 때 사용할 한정자입니다(예를 들어 탐색기에서 편집기와 SCM 보기를 여는 경우). `ctrlCmd`는 Windows와 Linux에서 `Control`로 매핑되고 macOS에서 `Command`로 매핑됩니다. '옆에서 열기' 마우스 제스처(지원되는 경우)는 다중 선택 한정자와 충돌하지 않도록 조정됩니다.",
 	"openMode.singleClick": "마우스를 한 번 클릭하여 항목을 엽니다.",
 	"openMode.doubleClick": "마우스를 두 번 클릭하여 항목을 엽니다.",
-	"openModeModifier": "트리와 목록에서 마우스를 사용하여 항목을 여는 방법을 제어합니다(지원되는 경우). 마우스을 한 번 클릭하여 항목을 열려면 `singleClick` 으로 설정하고 마우스 두 번 클릭을 통해서만 열려면 `doubleClick`으로 설정합니다. 트리에서 하위 항목이 있는 상위 항목의 경우 이 설정은 상위 항목을 한 번 클릭으로 확장할지 두 번 클릭으로 확장할지를 제어합니다. 일부 트리와 목록에서는 이 설정을 적용할 수 없는 경우  무시하도록 선택할 수 있습니다. "
+	"openModeModifier": "트리와 목록에서 마우스를 사용하여 항목을 여는 방법을 제어합니다(지원되는 경우). 마우스을 한 번 클릭하여 항목을 열려면 `singleClick` 으로 설정하고 마우스 두 번 클릭을 통해서만 열려면 `doubleClick`으로 설정합니다. 트리에서 하위 항목이 있는 상위 항목의 경우 이 설정은 상위 항목을 한 번 클릭으로 확장할지 두 번 클릭으로 확장할지를 제어합니다. 일부 트리와 목록에서는 이 설정을 적용할 수 없는 경우  무시하도록 선택할 수 있습니다. ",
+	"horizontalScrolling setting": "워크벤치에서 수평 스크롤 지원 여부를 제어 합니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/markers/common/markers.i18n.json b/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..d0a8772dd00
--- /dev/null
+++ b/i18n/kor/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "오류",
+	"sev.warning": "경고",
+	"sev.info": "정보"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
index fb0ab90f546..2e819fd951d 100644
--- a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.",
 	"overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.",
 	"overviewRulerCommonContentForeground": "인라인 병합 충돌에서 공통 과거 개요 눈금 전경색입니다.",
-	"overviewRulerFindMatchForeground": "찾기 일치 항목의 개요 눈금자 마커 색입니다.",
-	"overviewRulerSelectionHighlightForeground": "선택 영역 강조 표시의 개요 눈금자 마커 색입니다."
+	"overviewRulerFindMatchForeground": "일치하는 항목 찾기의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다.",
+	"overviewRulerSelectionHighlightForeground": "선택 영역 강조의 개요 눈금자 표식 색입니다. 이 색은 불투명해야만 내부 장식을 가리지 않습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..354f883f4b8
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.",
+	"showViewlet": "{0} 표시",
+	"view": "보기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index e621977a343..224d3705a5f 100644
--- a/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/kor/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "뷰를 에디터에 적용합니다.",
 	"views.explorer": "탐색기 뷰",
 	"views.debug": "디버그 보기",
-	"locationId.invalid": "`{0}`은(는) 유효한 뷰 위치가 아닙니다.",
 	"duplicateView1": "위치 '{1}'에서 동일한 ID '{0}'(으)로된 여러 개의 보기를 등록할 수 없습니다.",
 	"duplicateView2": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 45094f9c862..c4d54f1034d 100644
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "저장 시 {0}ms 후에 서식 지정이 중단됨",
+	"timeout.onWillSave": "1750ms 후에 onWillSaveTextDocument-event가 중단됨",
 	"saveParticipants": "실행중인 저장 관계자..."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 4a956b0bd25..35229bd6699 100644
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "webview 편집기"
+	]
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..b3d4a235518
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (확장)"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 52020df2eb3..c3a38e203dc 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "다음 그룹에 포커스",
 	"openToSide": "측면에서 열기",
 	"closeEditor": "편집기 닫기",
+	"closeOneEditor": "닫기",
 	"revertAndCloseActiveEditor": "편집기 되돌리기 및 닫기",
 	"closeEditorsToTheLeft": "왼쪽에 있는 편집기 닫기",
 	"closeAllEditors": "모든 편집기 닫기",
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index c08ed22ae06..54b686eb140 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "화면 읽기 프로그램을 사용하지 않는 경우 `editor.accessibilitySupport` 설정을 \"off\"로 변경하세요.",
 	"disableTabMode": "접근성 모드 사용 안 함",
 	"gotoLine": "줄 이동",
-	"indentation": "들여쓰기",
 	"selectEncoding": "인코딩 선택",
 	"selectEOL": "줄 시퀀스의 끝 선택",
 	"selectLanguageMode": "언어 모드 선택",
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 2eb6210e93a..2a9e8323db8 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0}MB",
 	"sizeGB": "{0}GB",
 	"sizeTB": "{0}TB",
-	"largeImageError": "이미지의 파일 크기가 너무 커서(>1MB) 편집기에서 표시할 수 없습니다. ",
 	"resourceOpenExternalButton": " 외부 프로그램으로 이미지를 열까요?",
-	"nativeBinaryError": "파일이 이진이거나 매우 크거나 지원되지 않는 텍스트 인코딩을 사용하기 때문에 편집기에서 표시되지 않습니다.",
 	"zoom.action.fit.label": "전체 이미지",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index e8aa35ae8a0..2acca1606b7 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "닫기",
 	"araLabelEditorActions": "편집기 작업"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 26c8431a513..68b015e8455 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "새 알림 없음",
 	"notifications": "알림",
 	"notificationsToolbar": "알림 센터 작업",
 	"notificationsList": "알림 목록"
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..e9877e526b5
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "확인"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 451b959a9ea..641eb3e2062 100644
--- a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "창",
 	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
 	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.default": "Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-	"openFilesInNewWindow": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고, 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
+	"window.openFilesInNewWindow.defaultMac": "Dock 또는 Finder를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
+	"window.openFilesInNewWindow.default": "응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 파일이 새 창에서 열립니다. ",
+	"openFilesInNewWindowMac": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: Dock 또는 Finder를 통해 파일을 연 경우를 제외하고, 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 reuse-window 명령줄 옵션을 사용할 경우).",
+	"openFilesInNewWindow": "파일을 새 창에서 열지 여부를 제어합니다.\n- default: 응용 프로그램 내에서 [파일] 메뉴 등을 통해 파일을 선택하는 경우를 제외하고, 파일이 새 창에서 열립니다.\n- on: 파일이 새 창에서 열립니다.\n- off: 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 reuse-window 명령줄 옵션을 사용할 경우).",
 	"window.openFoldersInNewWindow.on": "폴더가 새 창에서 열립니다.",
 	"window.openFoldersInNewWindow.off": "폴더가 마지막 활성 창을 바꿉니다.",
 	"window.openFoldersInNewWindow.default": "폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
 	"openFoldersInNewWindow": "폴더를 새 창에서 열지, 마지막 활성 창과 바꿀지를 제어합니다.\n- default: 응용 프로그램 내에서 [파일] 메뉴 등을 통해 폴더를 선택하는 경우를 제외하고, 폴더는 새 창에서 열립니다.\n- on: 폴더가 새 창에서 열립니다.\n- off: 폴더가 마지막 활성 창을 대체합니다\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
+	"window.openWithoutArgumentsInNewWindow.on": "새로운 빈 창 열기",
+	"window.openWithoutArgumentsInNewWindow.off": "실행 중인 마지막 활성 인스턴스에 포커스",
+	"openWithoutArgumentsInNewWindow": "인수 없이 두 번째 인스턴스를 시작할 때 새로운 빈 창을 열지 또는 실행 중인 마지막 인스턴스에 포커스가 생길지 여부를 제어합니다.\n- on: 새로운 빈 창을 엽니다.\n- off: 실행 중인 마지막 활성 인스턴스에 포커스가 생깁니다.\n이 설정이 무시되는 경우도 있을 수 있습니다(예: -new-window 또는 -reuse-window 명령줄 옵션을 사용할 경우).",
 	"window.reopenFolders.all": "모든 창을 다시 엽니다.",
 	"window.reopenFolders.folders": "모든 폴더를 다시 엽니다. 빈 작업 영역은 복원되지 않습니다.",
 	"window.reopenFolders.one": "마지막 활성 창을 다시 엽니다.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "다시 시작한 이후에 창을 다시 여는 방법을 설정합니다. 'none'을 선택하면 항상 빈 작업 영역으로 시작하고 'one'을 선택하면 마지막으로 작업한 창이 다시 열리고 'folders'를 선택하면 열었던 폴더가 포함된 모든 창이 다시 열리며 'all'을 선택하면 지난 세션의 모든 창이 다시 열립니다.",
 	"restoreFullscreen": "창이 전체 화면 모드에서 종료된 경우 창을 전체 화면 모드로 복원할지 여부를 제어합니다.",
 	"zoomLevel": "창의 확대/축소 수준을 조정합니다. 원래 크기는 0이고 각 상한 증분(예: 1) 또는 하한 증분(예: -1)은 20% 더 크거나 더 작게 확대/축소하는 것을 나타냅니다. 10진수를 입력하여 확대/축소 수준을 세부적으로 조정할 수도 있습니다.",
-	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기반으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더에 상대적인 파일 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역 이름(예: myFolder 또는 myWorkspace)\n${rootPath}: 작업 영역 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
+	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기준으로 대체됩니다.\n${activeEditorShort}: 파일 이름(예: myFile.txt)\n${activeEditorMedium}: 작업 영역 폴더를 기준으로 하는 파일에 대한 상대 경로(예: myFolder/myFile.txt)\n${activeEditorLong}: 파일의 전체 경로(예: /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: 파일이 포함된 작업 영역 폴더의 이름(예: myFolder)\n${folderPath}: 파일이 포함된 작업 영역 폴더의 파일 경로(예: /Users/Development/myFolder)\n${rootName}: 작업 영역의 이름(예: myFolder or myWorkspace)\n${rootPath}: 작업 영역의 파일 경로(예: /Users/Development/myWorkspace)\n${appName}: 예: VS Code\n${dirty}: 활성 편집기가 더티인 경우 더티 표시기\n${separator}: 값 또는 정적 텍스트가 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \")",
 	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
 	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
 	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "사용하도록 설정한 경우 Windows에서 고대비 테마를 사용 중이면 고대비 테마로 자동으로 변경되고 Windows 고대비 테마를 해제하면 어두운 테마로 변경됩니다.",
 	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
 	"window.nativeTabs": "macOS Sierra 창 탭을 사용하도록 설정합니다. 변경\n 내용을 적용하려면 전체 다시 시작해야 하고, 기본 탭에서\n 사용자 지정 제목 표시줄 스타일(구성된 경우)을 비활성화합니다.",
+	"window.smoothScrollingWorkaround": "최소화된 VS Code 창을 복원한 후 더 이상 원활하게 스크롤되지 않으면 이 해결 방법을 사용하도록 설정하세요. 이 해결 방법은 Microsoft의 Surface 장치와 같이 정밀 트랙 패드가 장착된 장치에서 스크롤이 지연되기 시작하는 문제(https://github.com/Microsoft/vscode/issues/13612)를 해결합니다. 이 해결 방법을 사용하도록 설정하면 최소화된 상태에서 창을 복원한 후 약간의 레이아웃 깜박거림이 발생할 수 있지만 그 외의 해는 없습니다.",
 	"zenModeConfigurationTitle": "Zen 모드",
 	"zenMode.fullScreen": "Zen 모드를 켜면 워크벤치도 전체 화면 모드로 전환되는지 여부를 제어합니다.",
 	"zenMode.centerLayout": "Zen 모드를 켜면 레이아웃도 가운데로 맞춰지는지 여부를 제어합니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 8a6f29b83bf..88ab766249d 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "중단점 편집...",
+	"breakpoint": "중단점",
 	"functionBreakpointsNotSupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
 	"functionBreakpointPlaceholder": "중단할 함수",
 	"functionBreakPointInputAriaLabel": "함수 중단점 입력",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "확인되지 않은 중단점",
 	"functionBreakpointUnsupported": "이 디버그 형식은 함수 중단점을 지원하지 않습니다.",
 	"breakpointDirtydHover": "확인되지 않은 중단점입니다. 파일이 수정되었습니다. 디버그 세션을 다시 시작하세요.",
+	"logBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 로그 지점",
 	"conditionalBreakpointUnsupported": "이 디버그 형식에서 지원되지 않는 조건부 중단점",
 	"hitBreakpointUnsupported": "이 디버그 형식은 조건부 중단점 적중을 지원하지 않습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index c355ed115b9..28e7371a153 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "프레임 다시 시작",
 	"removeBreakpoint": "중단점 제거",
 	"removeAllBreakpoints": "모든 중단점 제거",
-	"enableBreakpoint": "중단점 사용",
-	"disableBreakpoint": "중단점 사용 안 함",
 	"enableAllBreakpoints": "모든 중단점 설정",
 	"disableAllBreakpoints": "모든 중단점 해제",
 	"activateBreakpoints": "중단점 활성화",
 	"deactivateBreakpoints": "중단점 비활성화",
 	"reapplyAllBreakpoints": "모든 중단점 다시 적용",
 	"addFunctionBreakpoint": "함수 중단점 추가",
-	"addConditionalBreakpoint": "조건부 중단점 추가...",
-	"editConditionalBreakpoint": "중단점 편집...",
 	"setValue": "값 설정",
 	"addWatchExpression": "식 추가",
 	"editWatchExpression": "식 편집",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 782e05fd2a4..a942f921e39 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "디버그: 중단점 설정/해제",
 	"conditionalBreakpointEditorAction": "디버그: 조건부 중단점 추가...",
+	"logPointEditorAction": "디버그: 로그 지점 추가...",
 	"runToCursor": "커서까지 실행",
 	"debugEvaluate": "디버그: 평가",
 	"debugAddToWatch": "디버그: 조사식에 추가",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..37973e78856
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "적중 횟수 조건이 충족될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
+	"breakpointWidgetExpressionPlaceholder": "식이 true로 계산될 경우 중단합니다. 적용하려면 'Enter' 키를 누르고 취소하려면 'Esc' 키를 누릅니다.",
+	"expression": "식",
+	"hitCount": "적중 횟수",
+	"logMessage": "로그 메시지"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 31d9ef02895..2b16fc7aa13 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "고유한 구성 이름을 사용하세요.",
 	"app.launch.json.compound.folder": "복합형 항목이 있는 폴더의 이름입니다.",
 	"app.launch.json.compounds.configurations": "이 복합의 일부로 시작되는 구성의 이름입니다.",
-	"debugNoType": "디버그 어댑터 '형식'은 생략할 수 없으며 '문자열' 형식이어야 합니다.",
 	"selectDebug": "환경 선택",
 	"DebugConfig.failed": "'.vscode' 폴더({0}) 내에 'launch.json' 파일을 만들 수 없습니다.",
 	"workspace": "작업 영역",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 31114fa760b..f17252c082d 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "중단점",
 	"removeBreakpoints": "중단점 제거",
 	"removeBreakpointOnColumn": "{0} 열에서 중단점 제거",
 	"removeLineBreakpoint": "줄 중단점 제거",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "{0} 열에서 중단점 사용",
 	"enableBreakpointOnLine": "줄 중단점 사용",
 	"addBreakpoint": "중단점 추가",
+	"addConditionalBreakpoint": "조건부 중단점 추가...",
+	"addLogPoint": "로그 지점 추가...",
+	"cancel": "취소",
 	"addConfiguration": "구성 추가..."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 53bf2dac9a8..f0485e490c5 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "오류 표시",
 	"noFolderWorkspaceDebugError": "활성 파일은 디버그할 수 없습니다. 이 파일이 디스크에 저장되어 있고 해당 파일 형식에 대한 디버그 확장이 설치되어 있는지 확인하세요.",
 	"cancel": "취소",
-	"DebugTaskNotFound": "preLaunchTask '{0}'을(를) 찾을 수 없습니다.",
-	"taskNotTracked": "PreLaunchTask '{0}'을(를) 추적할 수 없습니다."
+	"DebugTaskNotFound": "작업 '{0}' 을(를) 찾을 수 없습니다.",
+	"taskNotTracked": "작업 '{0}' 을(를) 추적할 수 없습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 7818afada97..742e35e3d50 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "추가 정보",
-	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
-	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다.",
-	"stoppingDebugAdapter": "{0}. 디버그 어댑터를 중지합니다.",
 	"debugAdapterCrash": "디버그 어댑터 프로세스가 예기치 않게 종료되었습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 75d5a498631..e49f8a732d5 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "디버그 어댑터 실행 파일 '{0}'이(가) 없습니다.",
 	"debugAdapterCannotDetermineExecutable": "디버그 어댑터 '{0}'에 대한 실행 파일을 확인할 수 없습니다.",
-	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
-	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
-	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
-	"debugType": "구성의 형식입니다.",
-	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
-	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
-	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
-	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
-	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
-	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
-	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
-	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
-	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
+	"unableToLaunchDebugAdapter": "'{0}'에서 디버그 어댑터를 시작할 수 없습니다.",
+	"unableToLaunchDebugAdapterNoArgs": "디버그 어댑터를 시작할 수 없습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..ded2c6ad581
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "IntelliSense를 사용하여 가능한 특성에 대해 알아보세요.",
+	"launch.config.comment2": "기존 특성에 대한 설명을 보려면 가리킵니다.",
+	"launch.config.comment3": "자세한 내용을 보려면 {0}을(를) 방문하세요.",
+	"debugType": "구성의 형식입니다.",
+	"debugTypeNotRecognised": "디버그 형식이 인식되지 않습니다. 해당하는 디버그 확장을 설치하고 사용하도록 설정했는지 확인하세요.",
+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요.",
+	"debugName": "구성 이름이며, 구성 시작 드롭다운 메뉴에 표시됩니다.",
+	"debugRequest": "구성 형식을 요청합니다. \"시작\" 또는 \"연결\"일 수 있습니다.",
+	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
+	"debugPrelaunchTask": "디버그 세션이 시작되기 이전에 실행할 작업입니다.",
+	"debugPostDebugTask": "디버그 세션 종료 후 실행할 작업입니다.",
+	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
+	"debugOSXConfiguration": "OS X 특정 시작 구성 특성입니다.",
+	"debugLinuxConfiguration": "Linux 특정 시작 구성 특성입니다.",
+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..850e1c758d6
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code 콘솔",
+	"mac.terminal.script.failed": "스크립트 '{0}'이(가) 실패했습니다(종료 코드: {1}).",
+	"mac.terminal.type.not.supported": "'{0}'이(가) 지원되지 않습니다.",
+	"press.any.key": "계속하려면 아무 키나 누르세요.",
+	"linux.term.failed": "'{0}'에서 실패했습니다(종료 코드: {1})."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index d1ad83723cb..3b79008f444 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "권장 확장 구성(작업 영역 폴더)",
 	"malicious tooltip": "이 확장은 문제가 있다고 보고되었습니다.",
 	"malicious": "악성",
+	"disabled": "사용 안 함",
+	"disabled globally": "사용 안 함",
+	"disabled workspace": "이 작업 영역에 대해  사용 안 함",
 	"disableAll": "설치된 모든 확장 사용 안 함",
 	"disableAllWorkspace": "이 작업 영역에 대해 설치된 모든 확장 사용 안 함",
 	"enableAll": "모든 확장 사용",
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..1de6037ae75
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "확장 이름",
+	"extension id": "확장 ID",
+	"preview": "미리 보기",
+	"builtin": "기본 제공",
+	"publisher": "게시자 이름",
+	"install count": "설치 수",
+	"rating": "등급",
+	"repository": "리포지토리",
+	"license": "라이선스",
+	"details": "세부 정보",
+	"contributions": "기여",
+	"changelog": "변경 로그",
+	"dependencies": "종속성",
+	"noReadme": "사용 가능한 추가 정보가 없습니다.",
+	"noChangelog": "CHANGELOG를 사용할 수 없습니다.",
+	"noContributions": "참여 없음",
+	"noDependencies": "종속성 없음",
+	"settings": "설정({0})",
+	"setting name": "이름",
+	"description": "설명",
+	"default": "기본값",
+	"debuggers": "디버거({0})",
+	"debugger name": "이름",
+	"debugger type": "유형",
+	"views": "뷰({0})",
+	"view id": "ID",
+	"view name": "이름",
+	"view location": "위치",
+	"localizations": "지역화({0})",
+	"localizations language id": "언어 ID",
+	"colorThemes": "색 테마({0})",
+	"iconThemes": "아이콘 테마({0})",
+	"colors": "색({0})",
+	"colorId": "ID",
+	"defaultDark": "어둡게 기본값",
+	"defaultLight": "밝게 기본값",
+	"defaultHC": "고대비 기본값",
+	"JSON Validation": "JSON 유효성 검사({0})",
+	"fileMatch": "파일 일치",
+	"schema": "스키마",
+	"commands": "명령({0})",
+	"command name": "이름",
+	"keyboard shortcuts": "바로 가기 키(&&K)",
+	"menuContexts": "메뉴 컨텍스트",
+	"languages": "언어({0})",
+	"language id": "ID",
+	"language name": "이름",
+	"file extensions": "파일 확장명",
+	"grammar": "문법",
+	"snippets": "코드 조각"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index c2d64485c12..b497dd8ac6a 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
 	"reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.",
 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
-	"showRecommendations": "권장 사항 표시",
 	"install": "설치",
+	"showRecommendations": "권장 사항 표시",
 	"showLanguageExtensions": "Marketplace에 '.{0}' 파일이 지원되는 확장이 있습니다.",
 	"workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다.",
 	"installAll": "모두 설치",
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 0a1652fb592..b4035d78429 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "키 바인딩 간 충돌을 피하기 위해 다른 키 맵({0})을 사용하지 않도록 설정할까요?",
 	"yes": "예",
-	"no": "아니요",
-	"betterMergeDisabled": "Better Merge 확장이 이제 빌드되었습니다. 설치된 확장은 사용하지 않도록 설정되었으며 제거할 수 있습니다.",
-	"uninstall": "제거"
+	"no": "아니요"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index c764c2061a4..adaba790ee3 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "권장",
 	"otherRecommendedExtensions": "기타 권장 사항",
 	"workspaceRecommendedExtensions": "작업 영역 권장 사항",
-	"builtInExtensions": "기본 제공",
+	"builtInExtensions": "기능",
+	"builtInThemesExtensions": "테마",
 	"searchExtensions": "마켓플레이스에서 확장 검색",
 	"sort by installs": "정렬 기준: 설치 수",
 	"sort by rating": "정렬 기준: 등급",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 3c5dd9bb459..9e37e959f54 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,10 @@
 	"confirmDeleteMessageFolder": "'{0}'과(와) 해당 내용을 영구히 삭제할까요?",
 	"confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?",
 	"irreversible": "이 작업은 취소할 수 없습니다.",
-	"cancel": "취소",
-	"permDelete": "영구히 삭제",
-	"importFiles": "파일 가져오기",
+	"binFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
+	"trashFailed": "휴지통을 사용하여 삭제하지 못했습니다. 대신 영구히 삭제하시겠습니까?",
+	"deletePermanentlyButtonLabel": "영구 삭제 (&&D)",
+	"retryButtonLabel": "다시 시도 (&&R)",
 	"confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?",
 	"replaceButtonLabel": "바꾸기(&&R)",
 	"fileIsAncestor": "붙여 넣을 파일이 대상 폴더의 상위 항목입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 60fac1e96fa..5f7b04e2b00 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "새 파일에 할당되는 기본 언어 모드입니다.",
 	"editorConfigurationTitle": "편집기",
 	"formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.",
+	"formatOnSaveTimeout": "저장 시 서식 지정의 시간 제한. FormatOnSave 명령에 대한 시간 제한을 밀리초로 지정합니다. 지정된 시간 제한보다 오래 걸리는 명령은 취소됩니다.",
 	"explorerConfigurationTitle": "파일 탐색기",
 	"openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다.",
 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index b6d91a6d575..39635da205e 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "파일 이름을 입력합니다. 확인하려면 Enter 키를 누르고, 취소하려면 Esc 키를 누릅니다.",
-	"constructedPath": "**{1}**에 {0} 만들기",
 	"filesExplorerViewerAriaLabel": "{0}, 파일 탐색기",
 	"dropFolders": "작업 영역에 폴더를 추가하시겠습니까?",
 	"dropFolder": "작업 영역에 폴더를 추가하시겠습니까?",
 	"addFolders": "폴더 추가(&&A)",
 	"addFolder": "폴더 추가(&&A)",
+	"confirmRootsMove": "작업 영역에서 다중 루트 폴더의 순서를 변경하시겠습니까? ",
 	"confirmMultiMove": "다음 {0}개 파일을 이동하시겠습니까?",
+	"confirmRootMove": "작업 영역에서 루트 폴더 '{0}'의 순서를 변경하시겠습니까? ",
 	"confirmMove": "'{0}'을(를) 이동하시겠습니까?",
 	"doNotAskAgain": "이 메시지를 다시 표시 안 함",
 	"moveButtonLabel": "이동(&&M)",
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..72937e2691d
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Html 미리 보기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a9bf2716767
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "잘못된 편집기 입력입니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..73fa26c6394
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "개발자"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..3a107e5fb3a
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview 개발자 도구 열기",
+	"refreshWebviewLabel": "Webview 다시 로드"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 4e28a5c3f06..2fdfcbff78e 100644
--- a/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "VS Code의 UI 언어를 {0}(으)로 변경하고 다시 시작하시겠습니까?",
+	"yes": "예",
+	"no": "아니요",
+	"neverAgain": "다시 표시 안 함",
 	"JsonSchema.locale": "사용할 UI 언어입니다.",
 	"vscode.extension.contributes.localizations": "편집기에 지역화를 적용합니다.",
 	"vscode.extension.contributes.localizations.languageId": "표시 문자열이 번역되는 언어의 ID입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..6422e6f88c1
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "복사"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..dae3babf1ff
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "총 {0}개 문제"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..2103b0440bb
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "문제",
+	"tooltip.1": "이 파일의 문제 1개",
+	"tooltip.N": "이 파일의 문제 {0}개",
+	"markers.showOnFile": "파일과 폴더의 오류 및 경고 표시"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..3efd6d563c7
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "보기",
+	"problems.view.toggle.label": "문제 토글(오류, 경고, 정보)",
+	"problems.view.focus.label": "포커스 문제(오류, 경고, 정보)",
+	"problems.panel.configuration.title": "문제 보기",
+	"problems.panel.configuration.autoreveal": "문제 보기를 열 때 문제 보기에 자동으로 파일이 표시되어야 하는지를 제어합니다.",
+	"markers.panel.title.problems": "문제",
+	"markers.panel.aria.label.problems.tree": "파일별로 그룹화된 문제",
+	"markers.panel.no.problems.build": "지금까지 작업 영역에서 문제가 감지되지 않았습니다.",
+	"markers.panel.action.filter": "문제 필터링",
+	"markers.panel.filter.ariaLabel": "문제 필터링",
+	"markers.panel.filter.errors": "오류",
+	"markers.panel.filter.warnings": "경고",
+	"markers.panel.filter.infos": "정보",
+	"markers.panel.single.error.label": "오류 1개",
+	"markers.panel.multiple.errors.label": "오류 {0}개",
+	"markers.panel.single.warning.label": "경고 1개",
+	"markers.panel.multiple.warnings.label": "경고 {0}개",
+	"markers.panel.single.info.label": "정보 1개",
+	"markers.panel.multiple.infos.label": "정보 {0}개",
+	"markers.panel.single.unknown.label": "알 수 없음 1개",
+	"markers.panel.multiple.unknowns.label": "알 수 없음 {0}개",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0}에 {1}개의 문제가 있음",
+	"problems.tree.aria.label.marker.relatedInformation": " 이 문제에는 {0} 위치에 대한 참조가 있습니다.",
+	"problems.tree.aria.label.error.marker": "{0}에 의해 오류 발생: 줄 {2} 및 문자 {3}.{4}의 {1}",
+	"problems.tree.aria.label.error.marker.nosource": "오류: 줄 {1} 및 문자 {2}의 {0}.{3}",
+	"problems.tree.aria.label.warning.marker": "{0}에 의해 경고 발생: 줄 {2} 및 문자 {3}의 {1}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "경고: 줄 {1} 및 문자 {2}의 {0}.{3}",
+	"problems.tree.aria.label.info.marker": "{0}에 의해 정보가 생성됨: 줄 {2} 및 문자 {3}의 {1}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "정보: 줄 {1} 및 문자 {2}의 {0}.{3}",
+	"problems.tree.aria.label.marker": "{0}에 의해 문제 발생: 줄 {2} 및 문자 {3}의 {1}.{4}",
+	"problems.tree.aria.label.marker.nosource": "문제: 줄 {1} 및 문자 {2}의 {0}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{3}에서 줄 {1} 및 문자 {2}의 {0}",
+	"errors.warnings.show.label": "오류 및 경고 표시"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 17ffb17a533..bce61a36cfe 100644
--- a/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "출력 설정/해제",
 	"clearOutput": "출력 내용 지우기",
 	"toggleOutputScrollLock": "출력 스크롤 잠금 설정/해제",
-	"switchToOutput.label": "출력으로 전환"
+	"switchToOutput.label": "출력으로 전환",
+	"openInLogViewer": "로그 파일 열기"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index bb2fd60239e..1b45ff7d927 100644
--- a/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "출력",
 	"logViewer": "로그 표시기",
 	"viewCategory": "보기",
-	"clearOutput.label": "출력 내용 지우기"
+	"clearOutput.label": "출력 내용 지우기",
+	"openActiveLogOutputFile": "보기: 활성 로그 출력 파일 열기"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index e80e5a7a2f1..6a6e7f15271 100644
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "바로 가기 키(&&K)",
+	"showDefaultKeybindings": "기본 키 바인딩 표시",
+	"showUserKeybindings": "사용자 키 바인딩 표시",
 	"SearchKeybindings.AriaLabel": "키 바인딩 검색",
 	"SearchKeybindings.Placeholder": "키 바인딩 검색",
 	"sortByPrecedene": "우선 순위별 정렬",
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index 7aa0e3bd202..96e3df98eee 100644
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "원시 기본 설정 열기",
+	"openSettings": "설정 열기",
 	"openGlobalSettings": "사용자 설정 열기",
 	"openGlobalKeybindings": "바로 가기 키 열기",
 	"openGlobalKeybindingsFile": "바로 가기 키 파일 열기",
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 845d9b2416b..4839ff6ed8b 100644
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "기본 설정",
 	"SearchSettingsWidget.AriaLabel": "설정 검색",
 	"SearchSettingsWidget.Placeholder": "설정 검색",
 	"noSettingsFound": "결과 없음",
diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 2af08d6ae4a..952972db109 100644
--- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "\"{0}\" 확장 표시",
 	"editTtile": "편집",
 	"replaceDefaultValue": "설정에서 바꾸기",
-	"copyDefaultValue": "설정에 복사",
-	"unsupportedPHPExecutablePathSetting": "이 설정은 사용자 설정이어야 합니다. 작업 영역에 대해 PHP를 구성하려면 PHP 파일을 열고 상태 표시줄에서 'PHP 경로'를 클릭합니다.",
-	"unsupportedWorkspaceSetting": "이 설정은 사용자 설정이어야 합니다.",
-	"unsupportedWorkbenchSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다.",
-	"unsupportedWorkbenchSettingDevMode": "현재 이 설정을 적용할 수 없습니다. 등록하는 동안 범위를 '리소스'로 정의하거나 이 폴더를 직접 여는 경우 적용됩니다."
+	"copyDefaultValue": "설정에 복사"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index ada854f50d6..6dd3b8d0504 100644
--- a/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -8,11 +8,8 @@
 	],
 	"nextSearchIncludePattern": "다음 검색 포함 패턴 표시",
 	"previousSearchIncludePattern": "이전 검색 포함 패턴 표시",
-	"nextSearchExcludePattern": "다음 검색 제외 패턴 표시",
-	"previousSearchExcludePattern": "이전 검색 제외 패턴 표시",
 	"nextSearchTerm": "다음 검색어 표시",
 	"previousSearchTerm": "이전 검색어 표시",
-	"showSearchViewlet": "검색 표시",
 	"findInFiles": "파일에서 찾기",
 	"replaceInFiles": "파일에서 바꾸기",
 	"RefreshAction.label": "새로 고침",
diff --git a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 40920aa65c0..a894a8df8a0 100644
--- a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "검색",
+	"copyMatchLabel": "복사",
+	"copyPathLabel": "경로 복사",
+	"copyAllLabel": "모두 복사",
 	"findInFolder": "폴더에서 찾기...",
 	"findInWorkspace": "작업 영역에서 찾기...",
 	"showTriggerActions": "작업 영역에서 기호로 이동...",
 	"name": "검색",
-	"search": "검색",
 	"showSearchViewl": "검색 표시",
 	"view": "보기",
 	"findInFiles": "파일에서 찾기",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Quick Open에 대한 파일 결과에 전역 기호 검색 결과를 포함하도록 구성합니다.",
 	"search.followSymlinks": "검색하는 동안 symlink를 누를지 여부를 제어합니다.",
 	"search.smartCase": "패턴이 모두 소문자인 경우 대/소문자를 구분하지 않고 검색하고, 그렇지 않으면 대/소문자를 구분하여 검색합니다.",
-	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다.",
-	"search.location": "미리 보기: 검색을 사이드바의 보기로 표시할지 또는 가로 간격을 늘리기 위해 패널 영역의 패널로 표시할지를 제어합니다. 다음 릴리스의 패널에서의 검색은 가로 레이아웃이 개선되며 더 이상 미리 보기가 아닙니다."
+	"search.globalFindClipboard": "macOS에서 검색 보기가 공유 클립보드 찾기를 읽거나 수정해야 할지를 제어합니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 2e803e32bfa..e6bd5e0a444 100644
--- a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "{0}에 대한 지원을 개선하는 데 도움을 주세요.",
 	"takeShortSurvey": "간단한 설문 조사 참여",
 	"remindLater": "나중에 알림",
-	"neverAgain": "다시 표시 안 함",
-	"helpUs": "{0}에 대한 지원을 개선하는 데 도움을 주세요."
+	"neverAgain": "다시 표시 안 함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 76f84d4a43e..9e0d0c2fac7 100644
--- a/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "간단한 피드백 설문 조사에 참여하시겠어요?",
 	"takeSurvey": "설문 조사 참여",
 	"remindLater": "나중에 알림",
-	"neverAgain": "다시 표시 안 함",
-	"surveyQuestion": "간단한 피드백 설문 조사에 참여하시겠어요?"
+	"neverAgain": "다시 표시 안 함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 5c6abe93d98..a6d3822b0a1 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -10,6 +10,7 @@
 	"ProblemPatternParser.problemPattern.kindProperty.notFirst": "문제 패턴이 잘못되었습니다. Kind 속성은 첫 번째 요소에만 지정해야 합니다.",
 	"ProblemPatternParser.problemPattern.missingRegExp": "문제 패턴에 정규식이 없습니다.",
 	"ProblemPatternParser.problemPattern.missingProperty": "문제 패턴이 잘못되었습니다. 하나 이상의 파일 및 메시지를 포함해야 합니다.",
+	"ProblemPatternParser.problemPattern.missingLocation": "문제 패턴이 잘못되었습니다. \"파일\" 종류, 줄 또는 위치 일치 그룹을 포함해야 합니다.",
 	"ProblemPatternParser.invalidRegexp": "오류: {0} 문자열은 유효한 정규식이 아닙니다.\n",
 	"ProblemPatternSchema.regexp": "출력에서 오류, 경고 또는 정보를 찾는 정규식입니다.",
 	"ProblemPatternSchema.kind": "패턴이 위치(파일 및 줄)와 일치하는지 또는 파일하고만 일치하는지 여부입니다.",
@@ -44,6 +45,7 @@
 	"PatternTypeSchema.description": "문제 패턴 또는 제공되거나 미리 정의된 문제 패턴의 이름입니다. 기본이 지정된 경우 생략할 수 있습니다.",
 	"ProblemMatcherSchema.base": "사용할 기본 문제 선택기의 이름입니다.",
 	"ProblemMatcherSchema.owner": "Code 내부의 문제 소유자입니다. 기본값을 지정한 경우 생략할 수 있습니다. 기본값을 지정하지 않고 생략한 경우 기본값은 '외부'입니다.",
+	"ProblemMatcherSchema.source": "이 진단의 소스를 설명하는 사람이 읽을 수 있는 문자열입니다(예: 'typescript' 또는 'super lint').",
 	"ProblemMatcherSchema.severity": "캡처 문제에 대한 기본 심각도입니다. 패턴에서 심각도에 대한 일치 그룹을 정의하지 않은 경우에 사용됩니다.",
 	"ProblemMatcherSchema.applyTo": "텍스트 문서에 복된 문제가 열린 문서, 닫힌 문서 또는 모든 문서에 적용되는지를 제어합니다.",
 	"ProblemMatcherSchema.fileLocation": "문제 패턴에 보고된 파일 이름을 해석하는 방법을 정의합니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 58e2a3a2594..abf1b203d31 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "작업을 그룹에 할당 안 함",
 	"JsonSchema.tasks.group": "이 작업을 할당할 실행 그룹을 정의합니다. 빌드 그룹에 추가를 위한 \"build'와 테스트 그룹에 추가를 위한 \"test\"를 지원합니다.",
 	"JsonSchema.tasks.type": "작업이 프로세스로 실행되는지 또는 셸 내의 명령으로 실행되는지를 제어합니다.",
+	"JsonSchema.command.quotedString.value": "실제 명령 값",
+	"JsonSchema.tasks.quoting.escape": "셸의 이스케이프 문자를 사용하여 문자를 이스케이프합니다(예: ` under PowerShell 및 \\ under bash).",
+	"JsonSchema.tasks.quoting.strong": "셸의 강력한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: \" under PowerShell and bash).",
+	"JsonSchema.tasks.quoting.weak": "셸의 약한 따옴표 문자를 사용하여 인수를 따옴표 처리합니다(예: PowerShell 및 bash의 경우 ').",
+	"JsonSchema.command.quotesString.quote": "명령 값을 따옴표로 묶을 방법입니다.",
+	"JsonSchema.command": "실행할 명령이며, 외부 프로그램 또는 셸 명령입니다.",
+	"JsonSchema.args.quotedString.value": "실제 인수 값",
+	"JsonSchema.args.quotesString.quote": "인수 값을 따옴표로 묶을 방법입니다.",
+	"JsonSchema.tasks.args": "이 작업이 호출될 때 명령에 전달되는 인수입니다.",
 	"JsonSchema.tasks.label": "작업 사용자 인터페이스 레이블",
 	"JsonSchema.version": "구성의 버전 번호입니다.",
 	"JsonSchema.tasks.identifier": "작업을 launch.json 또는 dependsOn 구문에서 참조할 사용자 정의 식별자입니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 82af7f681be..4d86707ccea 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "작업",
 	"ConfigureTaskRunnerAction.label": "작업 구성",
+	"totalErrors": "오류 {0}개",
+	"totalWarnings": "경고 {0}개",
+	"totalInfos": "정보 {0}개",
 	"problems": "문제",
 	"building": "빌드하고 있습니다...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "실행 중인 작업 표시",
 	"tasks": "작업",
 	"TaskSystem.noHotSwap": "실행 중인 활성 작업이 있는 작업 실행 엔진을 변경하면 Window를 다시 로드해야 합니다.",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "작업 출력에서 스캔할 오류 및 경고 유형을 선택",
 	"customizeParseErrors": "현재 작성 구성에 오류가 있습니다. 작업을 사용자 지정하기 전에 오류를 수정하세요.\n",
 	"moreThanOneBuildTask": "tasks.json에 여러 빌드 작업이 정의되어 있습니다. 첫 번째 작업을 실행합니다.\n",
-	"TaskSystem.activeSame.background": "'{0}' 작업이 이미 활성 상태로 백그라운드 모드에 있습니다. 종료하려면 [작업] 메뉴에서 '작업 종료...'를 사용하세요.",
-	"TaskSystem.activeSame.noBackground": "'{0}' 작업이 이미 활성 상태입니다. 종료하려면 [작업] 메뉴에서 '작업 종료...'를 사용하세요.",
+	"terminateTask": "작업 종료",
+	"restartTask": "작업 다시 시작",
 	"TaskSystem.active": "이미 실행 중인 작업이 있습니다. 다른 작업을 실행하려면 먼저 이 작업을 종료하세요.",
 	"TaskSystem.restartFailed": "{0} 작업을 종료하고 다시 시작하지 못했습니다.",
 	"TaskService.noConfiguration": "오류: {0} 작업 검색에서는 다음 구성에 대한 작업을 제공하지 않습니다:\n{1}\n이 작업이 무시됩니다.\n",
@@ -46,6 +49,7 @@
 	"recentlyUsed": "최근에 사용한 작업",
 	"configured": "구성된 작업",
 	"detected": "감지된 작업",
+	"TaskService.ignoredFolder": "작업 버전 0.1.0을 사용하기 때문에 다음 작업 영역 폴더는 무시됩니다. {0}",
 	"TaskService.notAgain": "다시 표시 안 함",
 	"TaskService.pickRunTask": "실행할 작업 선택",
 	"TaslService.noEntryToRun": "실행할 작업이 없습니다. 작업 구성...",
diff --git a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index f136929d825..13963265fec 100644
--- a/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "경고: options.cwd는 string 형식이어야 합니다. {0} 값을 무시합니다.\n",
+	"ConfigurationParser.inValidArg": "오류: 명령 인수는 문자열 또는 따옴표 붙은 문자열이어야 합니다. 제공된 값:\n{0}",
 	"ConfigurationParser.noargs": "오류: 명령 인수는 문자열의 배열이어야 합니다. 제공된 값:\n{0}",
 	"ConfigurationParser.noShell": "경고: 셸 구성은 작업을 터미널에서 실행 중일 때에만 지원됩니다.",
 	"ConfigurationParser.noName": "오류: 선언 범위 내의 문제 선택기는 이름이 있어야 합니다.\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "오류: 작업 구성 '{0}'에 필요한 속성 '{1}'이(가) 없습니다. 작업 구성이 무시됩니다.",
 	"ConfigurationParser.notCustom": "오류: 작업이 사용자 지정 작업으로 선언되지 않았습니다. 이 구성은 무시됩니다.\n{0}\n",
 	"ConfigurationParser.noTaskName": "오류: 작업에서 레이블 속성을 제공해야 합니다. 이 작업은 무시됩니다.\n{0}\n",
-	"taskConfiguration.shellArgs": "경고: '{0}' 작업은 셸 명령이며 인수 중 하나에 이스케이프되지 않은 공백이 있을 수 있습니다. 올바른 명령줄 인용인지 확인하려면 인수를 명령으로 병합하세요.",
 	"taskConfiguration.noCommandOrDependsOn": "오류: 작업 '{0}'에서 명령이나 dependsOn 속성을 지정하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는 {1}입니다.",
 	"taskConfiguration.noCommand": "오류: 작업 '{0}'에서 명령을 정의하지 않습니다. 이 작업은 무시됩니다. 해당 작업의 정의는\n{1}입니다.",
 	"TaskParse.noOsSpecificGlobalTasks": "작업 버전 2.0.0은 글로벌 OS별 작업을 지원하지 않습니다. OS별 명령을 사용하여 작업으로 변환하세요. 영향을 받는 작업::\n{0}"
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..28e78284f3f
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "터미널의 배경색입니다. 이 설정을 사용하면 터미널\n 색을 패널과 다르게 지정할 수 있습니다.",
+	"terminal.foreground": "터미널의 전경색입니다.",
+	"terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.",
+	"terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.",
+	"terminal.border": "터미널 내의 분할 창을 구분하는 테두리의 색입니다. 기본값은 panel.border입니다.",
+	"terminal.ansiColor": "터미널의 '{0}' ANSI 색상"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index ba974a50480..1d3dab07b1f 100644
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,7 @@
 	"workbench.action.terminal.hideFindWidget": "파인드 위젯 숨기기",
 	"nextTerminalFindTerm": "다음 검색어 표시",
 	"previousTerminalFindTerm": "이전 검색어 표시",
-	"quickOpenTerm": "활성 터미널 전환"
+	"quickOpenTerm": "활성 터미널 전환",
+	"workbench.action.terminal.selectToPreviousCommand": "이전 명령까지 선택",
+	"workbench.action.terminal.selectToNextCommand": "다음 명령까지 선택"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index b95ca94304a..6260df300a8 100644
--- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "복사",
+	"split": "분할",
 	"paste": "붙여넣기",
 	"selectAll": "모두 선택",
-	"clear": "지우기",
-	"split": "분할"
+	"clear": "지우기"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index 1dfa3710832..9eeadb37e3c 100644
--- a/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "이 작업 영역에는 사용자 설정({0})에서만 지정할 수 있는 설정이 포함되어 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요.",
 	"openWorkspaceSettings": "작업 영역 설정 열기",
-	"dontShowAgain": "다시 표시 안 함",
-	"unsupportedWorkspaceSettings": "이 작업 영역에는 사용자 설정({0})에서만 지정할 수 있는 설정이 포함되어 있습니다. 자세히 알아보려면 [여기]({1})를 클릭하세요."
+	"dontShowAgain": "다시 표시 안 함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..3314e92b45d
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "릴리스 정보: {0}",
+	"unassigned": "할당되지 않음"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index b925a01c2ad..a8da9f65b7b 100644
--- a/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "나중에",
-	"unassigned": "할당되지 않음",
 	"releaseNotes": "릴리스 정보",
 	"showReleaseNotes": "릴리스 정보 표시",
 	"read the release notes": "{0} v{1}을(를) 시작합니다. 릴리스 정보를 확인하시겠습니까?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "새 {0} 업데이트를 사용할 수 있습니다.",
 	"noUpdatesAvailable": "현재 사용할 수 있는 업데이트가 없습니다.",
 	"ok": "확인",
-	"download now": "지금 다운로드",
 	"thereIsUpdateAvailable": "사용 가능한 업데이트가 있습니다.",
+	"download now": "지금 다운로드",
+	"later": "나중에",
 	"installUpdate": "업데이트 설치",
-	"updateAvailable": "사용 가능한 업데이트가 있습니다. {0} {1}",
 	"updateInstalling": "{0} {1}이(가) 백그라운드로 설치되고 있습니다. 완료되면 알려드리겠습니다.",
 	"updateNow": "지금 업데이트",
-	"updateAvailableAfterRestart": "다시 시작하면 {0}이(가) 업데이트됩니다.",
 	"commandPalette": "명령 팔레트...",
 	"settings": "설정",
 	"keyboardShortcuts": "바로 가기 키(&&K)",
diff --git a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..d6b00d87854
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "webview 편집기",
+	"developer": "개발자"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..3a107e5fb3a
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Webview 개발자 도구 열기",
+	"refreshWebviewLabel": "Webview 다시 로드"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..88ec2a103e6
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Microsoft에서 사용 데이터를 수집하도록 허용하여 VS Code 개선에 도움을 주세요. Microsoft [개인정보처리방침]({0})을 읽고 [옵트아웃]({1})하는 방법을 알아보세요.",
+	"telemetryOptOut.optInNotice": "Microsoft에서 사용 데이터를 수집하도록 허용하여 VS Code 개선에 도움을 주세요. Microsoft [개인정보처리방침]({0})을 읽고 [옵트인]({1})하는 방법을 알아보세요.",
+	"telemetryOptOut.readMore": "자세히 알아보기"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index cd8e176a8e2..ea167dd210d 100644
--- a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "도구 및 언어",
 	"welcomePage.installExtensionPacksDescription": "{0} 및 {1}에 대한 지원 설치",
 	"welcomePage.moreExtensions": "자세히",
-	"welcomePage.installKeymapDescription": "바로 가기 키 설치",
-	"welcomePage.installKeymapExtension": "{0} 및 {1}의 바로 가기 키 설치",
 	"welcomePage.others": "기타",
 	"welcomePage.colorTheme": "색 테마",
 	"welcomePage.colorThemeDescription": "편집기 및 코드가 좋아하는 방식으로 표시되게 만들기",
diff --git a/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..78e97f64704
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "이 설정은 지금 적용할 수 없으며 이 폴더를 직접 열 경우에 적용됩니다."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..96048859920
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "예(&&Y)",
+	"cancelButton": "취소"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 44b8401265d..8d3f616011b 100644
--- a/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "확장 호스트가 예기치 않게 종료되었습니다.",
 	"extensionHostProcess.unresponsiveCrash": "확장 호스트가 응답하지 않아서 종료되었습니다.",
-	"devTools": "개발자 도구",
 	"restart": "확장 호스트 다시 시작",
 	"overwritingExtension": "확장 {0}을(를) {1}(으)로 덮어쓰는 중입니다.",
 	"extensionUnderDevelopment": "{0}에서 개발 확장 로드 중",
diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 0622ba5a8bb..a5a6d77d42c 100644
--- a/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
 	"installNet": ".NET Framework 4.5 다운로드",
 	"neverShowAgain": "다시 표시 안 함",
-	"netVersionError": "Microsoft .NET Framework 4.5가 필요합니다. 설치하려면 링크를 클릭하세요.",
+	"enospcError": "{0}은(는) 이 큰 작업 영역에서 파일 변경 내용을 감시할 수 없습니다. 지침 링크에 따라 이 문제를 해결하세요.",
 	"learnMore": "지침",
-	"enospcError": "{0}에 파일 핸들이 부족합니다. 지침 링크를 클릭하여 문제를 해결하세요.",
+	"fileInvalidPath": "잘못된 파일 리소스({0})",
+	"fileIsDirectoryError": "파일이 디렉터리입니다.",
+	"fileNotModifiedError": "파일 수정 안 됨",
+	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
+	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
+	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
+	"filePermission": "파일 쓰기 권한이 거부되었습니다. ({0})",
+	"fileExists": "만드려는 파일이 이미 있음({0})",
+	"fileModifiedError": "파일 수정됨",
+	"fileReadOnlyError": "파일이 읽기 전용입니다.",
+	"fileMoveConflict": "이동/복사할 수 없습니다. 대상에 파일이 이미 있습니다.",
+	"unableToMoveCopyError": "이동/복사할 수 없습니다. 파일이 포함된 폴더를 파일로 대체합니다.",
 	"binFailed": "'{0}'을(를) 휴지통으로 이동하지 못함",
 	"trashFailed": "'{0}'을(를) 휴지통으로 이동하지 못함"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 181d6e0ea56..cdcbe91c8d9 100644
--- a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
 	"fileNotModifiedError": "파일 수정 안 됨",
 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다."
diff --git a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
index 92d933fa231..d411f384a72 100644
--- a/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "잘못된 파일 리소스({0})",
 	"fileIsDirectoryError": "파일이 디렉터리입니다.",
 	"fileNotModifiedError": "파일 수정 안 됨",
-	"fileTooLargeForHeapError": "파일 크기가 창 메모리 제한을 초과합니다. --max-memory=NEWSIZE 코드를 실행해 보세요.",
 	"fileTooLargeError": "파일이 너무 커서 열 수 없음",
 	"fileNotFoundError": "파일을 찾을 수 없습니다({0}).",
 	"fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다.",
diff --git a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..d4f0c4c0f4d 100644
--- a/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "취소"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 32ea33e3988..9535580ff01 100644
--- a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 파일에 사용되는 Textmate 범위 이름입니다.",
 	"vscode.extension.contributes.grammars.path": "tmLanguage 파일의 경로입니다. 확장 폴더의 상대 경로이며 일반적으로 './syntaxes/'로 시작합니다.",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "이 문법에 포함된 언어가 있는 경우 언어 ID에 대한 범위 이름의 맵입니다.",
+	"vscode.extension.contributes.grammars.tokenTypes": "토큰 형식에 대한 범위 이름의 맵입니다.",
 	"vscode.extension.contributes.grammars.injectTo": "이 문법이 삽입되는 언어 범위 이름 목록입니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index b13ed2dcb37..1b87a0da7e9 100644
--- a/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/kor/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}",
 	"invalid.injectTo": "`contributes.{0}.injectTo`의 값이 잘못되었습니다. 언어 범위 이름 배열이어야 합니다. 제공된 값: {1}",
 	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}",
+	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` 값이 잘못되었습니다. 범위 이름에서 언어까지의 개체 맵이어야 합니다. 제공된 값: {1}",
 	"invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.",
 	"no-tm-grammar": "이 언어에 대해 등록된 TM 문법이 없습니다."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/clojure/package.i18n.json b/i18n/ptb/extensions/clojure/package.i18n.json
index 978c999faf1..d146e27fa42 100644
--- a/i18n/ptb/extensions/clojure/package.i18n.json
+++ b/i18n/ptb/extensions/clojure/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Clojure"
+	"displayName": "Noções Básicas Sobre a Linguagem Clojure",
+	"description": "Fornece realce de sintaxe e correspondência de suporte e dobramento em arquivos Clojure."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/coffeescript/package.i18n.json b/i18n/ptb/extensions/coffeescript/package.i18n.json
index 03d413fad32..95fe95501c9 100644
--- a/i18n/ptb/extensions/coffeescript/package.i18n.json
+++ b/i18n/ptb/extensions/coffeescript/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript"
+	"displayName": "Noções Básicas Sobre a Linguagem CoffeeScript",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos CoffeeScript."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 3a30e02d2db..7e7a9ca7e1d 100644
--- a/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/ptb/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -13,7 +13,7 @@
 	"rootPath": "caminho do arquivo da área de trabalho (por exemplo, /Usuarios/Desenvolvimento/minhaAreadeTrabalho)",
 	"folderName": "nome do diretório da área de trabalho onde arquivo está localizado (por exemplo, myFolder)",
 	"folderPath": "caminho do arquivo no diretório da área de trabalho onde o arquivo está localizado (por exemplo, /Users/Development/myFolder)",
-	"appName": "e.g. VS Code",
+	"appName": "por exemplo VS Code",
 	"dirty": "Um indicador de alteração se o editor ativo foi alterado",
 	"separator": "um separador condicional (' - ') que somente é mostrado quando envolvido por variáveis com valores",
 	"assocLabelFile": "Arquivos com Extensão",
diff --git a/i18n/ptb/extensions/configuration-editing/package.i18n.json b/i18n/ptb/extensions/configuration-editing/package.i18n.json
index ff707c572bc..10996414b61 100644
--- a/i18n/ptb/extensions/configuration-editing/package.i18n.json
+++ b/i18n/ptb/extensions/configuration-editing/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Edição de Configuração"
+	"displayName": "Edição de Configuração",
+	"description": "Fornece recursos (IntelliSense avançado, correção automática) em arquivos de configuração, como configurações, inicialização e arquivos de recomendação de extensão."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/cpp/package.i18n.json b/i18n/ptb/extensions/cpp/package.i18n.json
index 0ef1e68fec5..08236c7ff81 100644
--- a/i18n/ptb/extensions/cpp/package.i18n.json
+++ b/i18n/ptb/extensions/cpp/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem C/C++"
+	"displayName": "Noções Básicas Sobre a Linguagem C/C++",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de suporte e dobramento em arquivos C/C++."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..d8cc2994174
--- /dev/null
+++ b/i18n/ptb/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "Servidor de linguagem CSS",
+	"folding.start": "Início da Região Expansível",
+	"folding.end": "Fim da Região Expansível"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css-language-features/package.i18n.json b/i18n/ptb/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..a05cdcfbdc2
--- /dev/null
+++ b/i18n/ptb/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Recursos da Linguagem CSS",
+	"description": "Fornece suporte de linguagem rico para arquivos CSS, LESS e SCSS.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
+	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
+	"css.validate.desc": "Habilita ou desabilita todas as validações",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
+	"less.validate.desc": "Habilita ou desabilita todas as validações",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
+	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
+	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
+	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
+	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
+	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
+	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
+	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
+	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
+	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
+	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
+	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
+	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
+	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
+	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
+	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
+	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
+	"scss.validate.desc": "Habilita ou desabilita todas as validações",
+	"less.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"scss.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"css.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
+	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
+	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/css/package.i18n.json b/i18n/ptb/extensions/css/package.i18n.json
index 420064cea8b..b5a1c26e58b 100644
--- a/i18n/ptb/extensions/css/package.i18n.json
+++ b/i18n/ptb/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Recursos da Linguagem CSS",
-	"description": "Fornece suporte de linguagem rico para arquivos CSS, LESS e SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"css.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"css.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"css.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"css.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"css.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"css.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"css.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"css.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"css.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"css.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"css.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"css.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"css.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"css.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"css.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"css.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem CSS.",
-	"css.validate.title": "Controla a validação CSS and a gravidade dos problemas.",
-	"css.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"less.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"less.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"less.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"less.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"less.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"less.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"less.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"less.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"less.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"less.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"less.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"less.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"less.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"less.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"less.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"less.validate.title": "Controla MENOS as severidades de validação e problemas.",
-	"less.validate.desc": "Habilita ou desabilita todas as validações",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Número inválido de parâmetros",
-	"scss.lint.boxModel.desc": "Não use largura ou altura ao usar preenchimento ou borda",
-	"scss.lint.compatibleVendorPrefixes.desc": "Ao usar um prefixo específico de fornecedor, certifique-se de também incluir todas as outras propriedades específicas do fornecedor",
-	"scss.lint.duplicateProperties.desc": "Não use as definições de estilo duplicadas",
-	"scss.lint.emptyRules.desc": "Não use conjuntos de regra em branco",
-	"scss.lint.float.desc": "Evite usar 'float'. Floats levam a CSS frágil, que é fácil de quebrar se um aspecto do layout for alterado.",
-	"scss.lint.fontFaceProperties.desc": "A regra @font-face deve definir propriedades 'src' e 'font-family'",
-	"scss.lint.hexColorLength.desc": "Cores hexadecimais devem consistir em três ou seis números hexadecimais",
-	"scss.lint.idSelector.desc": "Seletores não devem conter IDs, pois essas regras estão firmemente acopladas ao HTML.",
-	"scss.lint.ieHack.desc": "IE hacks somente são necessários ao dar suporte ao IE7 e mais antigos",
-	"scss.lint.important.desc": "Evite usar !important. Esta é uma indicação de que a especificidade do CSS inteiro saiu de controle e precisa ser fatorada novamente.",
-	"scss.lint.importStatement.desc": "Instruções de importação não carregam em paralelo",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Propriedade ignorada devido à exibição. Por exemplo, com 'display: inline', as propriedades width, height, margin-top, margin-bottom e float não têm efeito",
-	"scss.lint.universalSelector.desc": "O seletor universal (*) é conhecido por ser lento",
-	"scss.lint.unknownProperties.desc": "Propriedade desconhecida.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Propriedade específica do fornecedor desconhecida.",
-	"scss.lint.vendorPrefix.desc": "Ao usar um prefixo específico do fornecedor, inclua também a propriedade padrão",
-	"scss.lint.zeroUnits.desc": "Nenhuma unidade para zero é necessária",
-	"scss.validate.title": "Controla severidades de validação e problemas SCSS.",
-	"scss.validate.desc": "Habilita ou desabilita todas as validações",
-	"less.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"scss.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"css.colorDecorators.enable.desc": "Habilita ou desabilita decoradores de cores",
-	"css.colorDecorators.enable.deprecationMessage": "A configuração 'css.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"scss.colorDecorators.enable.deprecationMessage": "A configuração 'scss.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"less.colorDecorators.enable.deprecationMessage": "A configuração 'less.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+	"displayName": "Noções Básicas da Linguagem CSS",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes para arquivos CSS, LESS e SCSS."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/emmet/package.i18n.json b/i18n/ptb/extensions/emmet/package.i18n.json
index f66c3b617c3..bd44dd5d552 100644
--- a/i18n/ptb/extensions/emmet/package.i18n.json
+++ b/i18n/ptb/extensions/emmet/package.i18n.json
@@ -35,7 +35,7 @@
 	"emmetExtensionsPath": "Caminho para uma pasta que contém os perfis Emmet e trechos de códigos.'",
 	"emmetShowExpandedAbbreviation": "Mostrar abreviaturas Emmet expandidas como sugestões.\nA opção \"inMarkupAndStylesheetFilesOnly\" aplica-se a html, haml, jade, slim, xml, xsl, css, scss, sass, less e stylus.\nA opção \"always\" se aplica a todas as partes do arquivo independentemente de marcação/css.",
 	"emmetShowAbbreviationSuggestions": "Mostra abreviações Emmet possíveis como sugestões. Não aplicável em folhas de estilo ou quando emmet.showExpandedAbbreviation é definido como \"never\".",
-	"emmetIncludeLanguages": "Habilita as abreviaturas Emmet em linguagens que não são suportados por padrão. Adicionar um mapeamento aqui entre a linguagem e a linguagem emmet suportada.\n Por exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
+	"emmetIncludeLanguages": "Ative abreviações do Emmet em idiomas que não são suportados por padrão. Adicione um mapeamento aqui entre o idioma e a linguagem suportada emmet.\nPor exemplo: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Variáveis a serem usadas em trechos de código Emmet",
 	"emmetTriggerExpansionOnTab": "Quando habilitado, abreviações Emmet são expandidas ao pressionar TAB.",
 	"emmetPreferences": "Preferências usadas para modificar o comportamento de algumas ações e resolvedores de Emmet.",
@@ -59,5 +59,7 @@
 	"emmetPreferencesCssWebkitProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'webkit' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'webkit'.",
 	"emmetPreferencesCssMozProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'moz' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'moz'.",
 	"emmetPreferencesCssOProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'o' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'o'.",
-	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'."
+	"emmetPreferencesCssMsProperties": "Propriedades CSS separadas por vírgula que recebem o prefixo vendor 'ms' quando utilizado em abreviações do Emmet que iniciam com `-`. Defina como string vazia para sempre evitar o prefixo 'ms'.",
+	"emmetPreferencesCssFuzzySearchMinScore": "A pontuação mínima (de 0 a 1) que a abreviação difusa deve alcançar. Os valores mais baixos podem produzir muitas correspondências falso-positivas, valores mais elevados podem reduzir possíveis correspondências.\n",
+	"emmetOptimizeStylesheetParsing": "Quando definido como false, o arquivo inteiro é analisado para determinar se a posição atual é válida para expandir as abreviações Emmet. Quando definido como true, somente o conteúdo em torno da posição atual em arquivos css / scss / less é analisado."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/extension-editing/package.i18n.json b/i18n/ptb/extensions/extension-editing/package.i18n.json
index f7701436c08..5be926c7d74 100644
--- a/i18n/ptb/extensions/extension-editing/package.i18n.json
+++ b/i18n/ptb/extensions/extension-editing/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Edição de Arquivo de Pacote"
+	"displayName": "Edição de Arquivo de Pacote",
+	"description": "Fornece IntelliSense para os pontos de extensão de código do VS Code e capacidade de linting em arquivos package.json."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/fsharp/package.i18n.json b/i18n/ptb/extensions/fsharp/package.i18n.json
index a6752d374cf..3d6dee1adb0 100644
--- a/i18n/ptb/extensions/fsharp/package.i18n.json
+++ b/i18n/ptb/extensions/fsharp/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem F#"
+	"displayName": "Noções Básicas Sobre a Linguagem F#",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos F#."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/git/out/commands.i18n.json b/i18n/ptb/extensions/git/out/commands.i18n.json
index c27be95a183..64a2c5576d9 100644
--- a/i18n/ptb/extensions/git/out/commands.i18n.json
+++ b/i18n/ptb/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "OK",
 	"push with tags success": "Envio de rótulos finalizado com sucesso.",
 	"pick remote": "Pegue um  remoto para publicar o ramo '{0}':",
-	"sync is unpredictable": "Esta ação vai fazer push e pull nos commits de e para '{0}'.",
+	"sync is unpredictable": "Esta ação vai empurrar e puxar commits de e para '{0}/{1}'.",
 	"never again": "OK, Não Mostrar Novamente",
 	"no remotes to publish": "Seu repositório não possui remotos configurados para publicação.",
 	"no changes stash": "Não há nenhuma mudança para esconder.",
diff --git a/i18n/ptb/extensions/git/package.i18n.json b/i18n/ptb/extensions/git/package.i18n.json
index d293df15a4e..6ab84324adb 100644
--- a/i18n/ptb/extensions/git/package.i18n.json
+++ b/i18n/ptb/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Controla se deve mostrar uma ação Abrir Arquivo em linha na visualização de alterações do Git.",
 	"config.inputValidation": "Controla quando exibir validação do campo de mensagem do commit.",
 	"config.detectSubmodules": "Controla se deve detectar automaticamente os sub-módulos do git.",
+	"config.detectSubmodulesLimit": "Controla o limite de sub-módulos git detectados.",
 	"colors.modified": "Cor para recursos modificados.",
 	"colors.deleted": "Cor para recursos excluídos.",
 	"colors.untracked": "Cor para recursos não controlados.",
diff --git a/i18n/ptb/extensions/go/package.i18n.json b/i18n/ptb/extensions/go/package.i18n.json
index 3425e376a6d..203f97d1603 100644
--- a/i18n/ptb/extensions/go/package.i18n.json
+++ b/i18n/ptb/extensions/go/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Go"
+	"displayName": "Noções Básicas Sobre a Linguagem Go",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Go."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/groovy/package.i18n.json b/i18n/ptb/extensions/groovy/package.i18n.json
index 875bfb0802e..abdb1ff0880 100644
--- a/i18n/ptb/extensions/groovy/package.i18n.json
+++ b/i18n/ptb/extensions/groovy/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Groovy"
+	"displayName": "Noções Básicas Sobre a Linguagem Groovy",
+	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Groovy."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/handlebars/package.i18n.json b/i18n/ptb/extensions/handlebars/package.i18n.json
index 7fa3a76c709..2eb0ec888d5 100644
--- a/i18n/ptb/extensions/handlebars/package.i18n.json
+++ b/i18n/ptb/extensions/handlebars/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Handlebars"
+	"displayName": "Noções Básicas Sobre a Linguagem Handlebars",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Handlebars."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/hlsl/package.i18n.json b/i18n/ptb/extensions/hlsl/package.i18n.json
index 4e272ff2dd7..f00e509b8c7 100644
--- a/i18n/ptb/extensions/hlsl/package.i18n.json
+++ b/i18n/ptb/extensions/hlsl/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem HLSL"
+	"displayName": "Noções Básicas Sobre a Linguagem HLSL",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos HLSL."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..6e9a973c172
--- /dev/null
+++ b/i18n/ptb/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "Servidor de Linguagem HTML",
+	"folding.start": "Início da Região Expansível",
+	"folding.end": "Fim da Região Expansível"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html-language-features/package.i18n.json b/i18n/ptb/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..a434dbe0f11
--- /dev/null
+++ b/i18n/ptb/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Recursos da Linguagem HTML",
+	"description": "Fornece suporte de linguagem rico para arquivos HTML, Razor e Handlebar.",
+	"html.format.enable.desc": "Ativar/desativar o formatador HTML padrão",
+	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
+	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
+	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
+	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
+	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
+	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
+	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
+	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Agrupar atributos.",
+	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
+	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
+	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
+	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
+	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
+	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
+	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
+	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
+	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
+	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
+	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/html/package.i18n.json b/i18n/ptb/extensions/html/package.i18n.json
index 2ca6fef99c5..53d3b893dda 100644
--- a/i18n/ptb/extensions/html/package.i18n.json
+++ b/i18n/ptb/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Recursos da Linguagem HTML",
-	"description": "Fornece suporte de linguagem rico para arquivos HTML, Razor e Handlebar.",
-	"html.format.enable.desc": "Ativar/desativar o formatador HTML padrão",
-	"html.format.wrapLineLength.desc": "Quantidade máxima de caracteres por linha (0 = desativar).",
-	"html.format.unformatted.desc": "Lista de tags, separados por vírgula, que não deveria ser reformatada. o padrão é 'nulo' para todas as tags listadas em https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Lista de tags, separada por vírgula, onde o conteúdo não deve ser reformatado. o padrão é 'nulo' para a tag 'pré'.",
-	"html.format.indentInnerHtml.desc": "Indentar secões <head>e <body>.",
-	"html.format.preserveNewLines.desc": "Se quebras de linha existentes antes de elementos deveriam ser preservadas. Só funciona antes de elementos, não dentro de rótulos ou para texto.",
-	"html.format.maxPreserveNewLines.desc": "Número máximo de quebras de linha a serem preservadas em um bloco. Use 'null' para ilimitado.",
-	"html.format.indentHandlebars.desc": "Formatar e indentar {{#foo}} e {{/ foo}}.",
-	"html.format.endWithNewline.desc": "Finalizar com uma nova linha.",
-	"html.format.extraLiners.desc": "Lista de rótulos, separados por vírgulas, que deveriam ter uma quebra de linha extra antes deles. 'null' admite o padrão \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Agrupar atributos.",
-	"html.format.wrapAttributes.auto": "Agrupar atributos somente quando o tamanho da linha é excedido.",
-	"html.format.wrapAttributes.force": "Agrupar cada atributo exceto o primeiro.",
-	"html.format.wrapAttributes.forcealign": "Agrupar cada atributo, exceto o primeiro e manter alinhado.",
-	"html.format.wrapAttributes.forcemultiline": "Agrupar cada atributo.",
-	"html.suggest.angular1.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos e propriedades do Angular V1.",
-	"html.suggest.ionic.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores Ionic.",
-	"html.suggest.html5.desc": "Configura se o suporte da linguagem HTML interna sugere rótulos, propriedades e valores HTML5.",
-	"html.trace.server.desc": "Rastrear a comunicação entre o VS Code e o servidor de linguagem HTML.",
-	"html.validate.scripts": "Configura se o suporte da linguagem HTML interna valida scripts embutidos.",
-	"html.validate.styles": "Configura se o suporte da linguagem HTML interna valida estilos embutidos.",
-	"html.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas.",
-	"html.autoClosingTags": "Ativar/desativar o fechamento automático de tags HTML."
+	"displayName": "Noções Básicas da Linguagem HTML",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e trechos em arquivos HTML."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/ini/package.i18n.json b/i18n/ptb/extensions/ini/package.i18n.json
index d3c9a58f2d7..f7e7bd037dd 100644
--- a/i18n/ptb/extensions/ini/package.i18n.json
+++ b/i18n/ptb/extensions/ini/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Ini"
+	"displayName": "Noções Básicas Sobre a Linguagem Ini",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ini."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/java/package.i18n.json b/i18n/ptb/extensions/java/package.i18n.json
index 446ed1b1df3..207e95a5b2f 100644
--- a/i18n/ptb/extensions/java/package.i18n.json
+++ b/i18n/ptb/extensions/java/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Java"
+	"displayName": "Noções Básicas Sobre a Linguagem Java",
+	"description": "Fornece trechos de código, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Java."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/javascript/package.i18n.json b/i18n/ptb/extensions/javascript/package.i18n.json
index 455ec8a3376..582a7ee0bac 100644
--- a/i18n/ptb/extensions/javascript/package.i18n.json
+++ b/i18n/ptb/extensions/javascript/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem JavaScript"
+	"displayName": "Noções Básicas Sobre a Linguagem JavaScript",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos JavaScript."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..3db289491e4
--- /dev/null
+++ b/i18n/ptb/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "Servidor de linguagem JSON"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json-language-features/package.i18n.json b/i18n/ptb/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..5be341b6196
--- /dev/null
+++ b/i18n/ptb/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Recursos da Linguagem JSON",
+	"description": "Fornece suporte de linguagem rico para arquivos JSON.",
+	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
+	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
+	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
+	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
+	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
+	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
+	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
+	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
+	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/json/package.i18n.json b/i18n/ptb/extensions/json/package.i18n.json
index 2888e93dfe4..4f2081eef5f 100644
--- a/i18n/ptb/extensions/json/package.i18n.json
+++ b/i18n/ptb/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Recursos da Linguagem JSON",
-	"description": "Fornece suporte de linguagem rico para arquivos JSON.",
-	"json.schemas.desc": "Esquemas associadas a arquivos de JSON no projeto atual",
-	"json.schemas.url.desc": "Um URL para um esquema ou um caminho relativo a um esquema no diretório atual",
-	"json.schemas.fileMatch.desc": "Uma matriz de padrões de arquivos para correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.fileMatch.item.desc": "Um padrão de arquivos que pode conter '*' para fazer a correspondência ao resolver arquivos JSON para esquemas.",
-	"json.schemas.schema.desc": "A definição de esquema para o URL dado. O esquema precisa ser fornecido apenas para evitar acessos ao URL do esquema.",
-	"json.format.enable.desc": "Habilitar/desabilitar o formatador JSON padrão (requer reinicialização)",
-	"json.tracing.desc": "Loga a comunicação entre o VS Code e o servidor de linguagem JSON.",
-	"json.colorDecorators.enable.desc": "Habilita ou desabilita os decoradores de cor",
-	"json.colorDecorators.enable.deprecationMessage": "A configuração 'json.colorDecorators.enable' foi descontinuada em favor de 'editor.colorDecorators'.",
-	"json.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas."
+	"displayName": "Noções Básicas da Linguagem JSON",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos JSON."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/less/package.i18n.json b/i18n/ptb/extensions/less/package.i18n.json
index 498dbc3c941..f83a843880a 100644
--- a/i18n/ptb/extensions/less/package.i18n.json
+++ b/i18n/ptb/extensions/less/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Less"
+	"displayName": "Noções Básicas Sobre a Linguagem Less",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Less."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/log/package.i18n.json b/i18n/ptb/extensions/log/package.i18n.json
index 257db2e6372..0f7313e5de8 100644
--- a/i18n/ptb/extensions/log/package.i18n.json
+++ b/i18n/ptb/extensions/log/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Log"
+	"displayName": "Log",
+	"description": "Fornece realce de sintaxe para arquivos com extensão .log."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/lua/package.i18n.json b/i18n/ptb/extensions/lua/package.i18n.json
index c1a61a7ed26..a85199917e7 100644
--- a/i18n/ptb/extensions/lua/package.i18n.json
+++ b/i18n/ptb/extensions/lua/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Lua"
+	"displayName": "Noções Básicas Sobre a Linguagem Lua",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Lua."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/make/package.i18n.json b/i18n/ptb/extensions/make/package.i18n.json
index 9302615da23..52ddd461b8d 100644
--- a/i18n/ptb/extensions/make/package.i18n.json
+++ b/i18n/ptb/extensions/make/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Make"
+	"displayName": "Noções Básicas Sobre a Linguagem Make",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Make."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-basics/package.i18n.json b/i18n/ptb/extensions/markdown-basics/package.i18n.json
index 35229bd6699..4295e53ce24 100644
--- a/i18n/ptb/extensions/markdown-basics/package.i18n.json
+++ b/i18n/ptb/extensions/markdown-basics/package.i18n.json
@@ -5,5 +5,7 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	]
+	],
+	"displayName": "Noções Básicas Sobre a Linguagem Markdown",
+	"description": "Fornece trechos de código e destaque de sintaxe para Markdown."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..b72e8b907d6
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "Não foi possível carregar o 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..c84ba98d829
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Pré-visualização] {0}",
+	"previewTitle": "Pré-visualização {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..3d1337eab3e
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Parte do conteúdo foi desativada neste documento",
+	"preview.securityMessage.title": "Conteúdo potencialmente inseguro foi desativado na visualização de remarcação. Altere a configuração de segurança de visualização do Markdown para permitir conteúdo inseguro ou habilitar scripts",
+	"preview.securityMessage.label": "Conteúdo do Aviso de Segurança Desativado"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json b/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..ead307bcb9d
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Estrito",
+	"strict.description": "Somente carregar conteúdo seguro",
+	"insecureLocalContent.title": "Permitir conteúdo local inseguro",
+	"insecureLocalContent.description": "Permitir carregar conteúdo por http servida por localhost",
+	"insecureContent.title": "Permitir conteúdo inseguro",
+	"insecureContent.description": "Permitir o carregamento de conteúdo via http",
+	"disable.title": "Desabilitar",
+	"disable.description": "Permitir a execução de conteúdo e scripts. Não recomendado",
+	"moreInfo.title": "Mais informações",
+	"enableSecurityWarning.title": "Habilitar a visualização de avisos de segurança neste espaço de trabalho",
+	"disableSecurityWarning.title": "Desabilitar a visualização de avisos de segurança neste espaço de trabalho",
+	"toggleSecurityWarning.description": "Não afeta o nível de segurança do conteúdo",
+	"preview.showPreviewSecuritySelector.title": "Selecione as configurações de segurança para pré-visualização de Markdown nesta área de trabalho."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/markdown-language-features/package.i18n.json b/i18n/ptb/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..2a40b868546
--- /dev/null
+++ b/i18n/ptb/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Recursos da Linguagem Markdown",
+	"description": "Fornece suporte à linguagem rica para Markdown.",
+	"markdown.preview.breaks.desc": "Configura como quebras de linha são processadas na visualização de markdown. Configurando como 'true' cria um <br> para cada nova linha.",
+	"markdown.preview.linkify": "Habilitar ou desabilitar a conversão de texto URL para links na visualização markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Duplo clique na pré-visualização markdown para alternar para o editor.",
+	"markdown.preview.fontFamily.desc": "Controla a família de fonte usada na pré-visualização de markdown.",
+	"markdown.preview.fontSize.desc": "Controla o tamanho da fonte em pixels usado na pré-visualização de markdown.",
+	"markdown.preview.lineHeight.desc": "Controla a altura de linha usada na pré-visualização de markdown. Este número é relativo ao tamanho de fonte.",
+	"markdown.preview.markEditorSelection.desc": "Marca a seleção atual do editor na pré-visualização de markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Quando uma pré-visualização de markdown é rolada, atualiza a exibição do editor.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Quando um editor de markdown é rolado, atualiza a exibição da pré-visualização.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Descontinuada] Rola a pré-visualização Markdown para mostrar a linha atualmente selecionada no editor.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Esta configuração foi substituída por 'markdown.preview.scrollPreviewWithEditor' e já não tem qualquer efeito.",
+	"markdown.preview.title": "Abrir a visualização",
+	"markdown.previewFrontMatter.dec": "Configura como o frontispicio YAML frente questão devem ser processado na pré-visualização de markdown. 'hide' remove o frontispicio. Caso contrário, o frontispicio é tratado como conteúdo de markdown.",
+	"markdown.previewSide.title": "Abre pré-visualização ao lado",
+	"markdown.showLockedPreviewToSide.title": "Abrir pré-visualização travada ao lado",
+	"markdown.showSource.title": "Exibir Código-Fonte",
+	"markdown.styles.dec": "Uma lista de URLs ou caminhos locais para folhas de estilo CSS para usar na pré-visualização do markdown. Caminhos relativos são interpretados em relação à pasta aberta no explorer. Se não houver nenhuma pasta aberta, eles são interpretados em relação ao local do arquivo markdown. Todos os ' \\' precisam ser escritos como ' \\ \\ '.",
+	"markdown.showPreviewSecuritySelector.title": "Alterar configurações de segurança da pré-visualização",
+	"markdown.trace.desc": "Habilitar log de depuração para a extensão do markdown.",
+	"markdown.preview.refresh.title": "Atualizar pré-visualização",
+	"markdown.preview.toggleLock.title": "Alternar Bloqueio de Visualização"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/merge-conflict/package.i18n.json b/i18n/ptb/extensions/merge-conflict/package.i18n.json
index 1aa2e946156..7c3c0804258 100644
--- a/i18n/ptb/extensions/merge-conflict/package.i18n.json
+++ b/i18n/ptb/extensions/merge-conflict/package.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"displayName": "Mesclar conflitos",
+	"description": "Realce e comandos para mesclagem de conflitos inline.",
 	"command.category": "Conflito de Mesclagem",
 	"command.accept.all-current": "Aceitar Todos os Atuais",
 	"command.accept.all-incoming": "Aceitar todas entradas",
diff --git a/i18n/ptb/extensions/objective-c/package.i18n.json b/i18n/ptb/extensions/objective-c/package.i18n.json
index 6c21271685a..be2418c54c4 100644
--- a/i18n/ptb/extensions/objective-c/package.i18n.json
+++ b/i18n/ptb/extensions/objective-c/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Objective-C"
+	"displayName": "Noções Básicas Sobre a Linguagem Objective-C",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Objective-C."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/perl/package.i18n.json b/i18n/ptb/extensions/perl/package.i18n.json
index c45067607b6..5b15ff68e47 100644
--- a/i18n/ptb/extensions/perl/package.i18n.json
+++ b/i18n/ptb/extensions/perl/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Perl"
+	"displayName": "Noções Básicas Sobre a Linguagem Perl",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Perl."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..bfb1b796def
--- /dev/null
+++ b/i18n/ptb/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Você permite {0} (definido como uma configuração do espaço de trabalho) a ser executado para lint de arquivos PHP?",
+	"php.yes": "Permitir",
+	"php.no": "Não permitir",
+	"wrongExecutable": "Não é possível validar {0} pois não é um executável php válido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
+	"noExecutable": "Não é possível validar porque nenhum executável PHP está definido. Use a configuração 'php.validate.executablePath' para configurar o executável do PHP.",
+	"unknownReason": "Falha ao executar o php usando o caminho: {0}. O motivo é desconhecido."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php-language-features/package.i18n.json b/i18n/ptb/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..7779248205c
--- /dev/null
+++ b/i18n/ptb/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
+	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
+	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
+	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)",
+	"displayName": "Recursos da linguagem PHP",
+	"description": "Fornece suporte de linguagem rica para arquivos PHP."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/php/package.i18n.json b/i18n/ptb/extensions/php/package.i18n.json
index 171cc8de307..5ebf52a77aa 100644
--- a/i18n/ptb/extensions/php/package.i18n.json
+++ b/i18n/ptb/extensions/php/package.i18n.json
@@ -6,12 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Configura se as sugestões intrínsecas da linguagem PHP estão habilitadas. O suporte sugere globais e variáveis do PHP.",
-	"configuration.validate.enable": "Habilita/desabilita a validação interna do PHP.",
-	"configuration.validate.executablePath": "Aponta para o executável do PHP.",
-	"configuration.validate.run": "Se o linter é executado ao salvar ou ao digitar.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Desabilita a validação de executável do PHP (definida como configuração do espaço de trabalho)",
-	"displayName": "Recursos da linguagem PHP"
+	"displayName": "Noções básicas de linguagem PHP",
+	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes para arquivos PHP."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/powershell/package.i18n.json b/i18n/ptb/extensions/powershell/package.i18n.json
index 8d1fc47c67e..c8d4a44ac0b 100644
--- a/i18n/ptb/extensions/powershell/package.i18n.json
+++ b/i18n/ptb/extensions/powershell/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Powershell"
+	"displayName": "Noções Básicas Sobre a Linguagem Powershell",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Powershell."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/pug/package.i18n.json b/i18n/ptb/extensions/pug/package.i18n.json
index 9898328e3cb..a4a9f443d88 100644
--- a/i18n/ptb/extensions/pug/package.i18n.json
+++ b/i18n/ptb/extensions/pug/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Pug"
+	"displayName": "Noções Básicas Sobre a Linguagem Pug",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Pug."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/python/package.i18n.json b/i18n/ptb/extensions/python/package.i18n.json
index 6f1ce258965..ee8ff1f709e 100644
--- a/i18n/ptb/extensions/python/package.i18n.json
+++ b/i18n/ptb/extensions/python/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Python"
+	"displayName": "Noções Básicas Sobre a Linguagem Python",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Python."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/r/package.i18n.json b/i18n/ptb/extensions/r/package.i18n.json
index b8dd971968a..d6beac66e30 100644
--- a/i18n/ptb/extensions/r/package.i18n.json
+++ b/i18n/ptb/extensions/r/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem R"
+	"displayName": "Noções Básicas Sobre a Linguagem R",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos R."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/razor/package.i18n.json b/i18n/ptb/extensions/razor/package.i18n.json
index e852ddd68a9..c79997f74c3 100644
--- a/i18n/ptb/extensions/razor/package.i18n.json
+++ b/i18n/ptb/extensions/razor/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Razor"
+	"displayName": "Noções Básicas Sobre a Linguagem Razor",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos Razor."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/ruby/package.i18n.json b/i18n/ptb/extensions/ruby/package.i18n.json
index 96c639a55b4..11ef2cb215a 100644
--- a/i18n/ptb/extensions/ruby/package.i18n.json
+++ b/i18n/ptb/extensions/ruby/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Ruby"
+	"displayName": "Noções Básicas Sobre a Linguagem Ruby",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Ruby."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/rust/package.i18n.json b/i18n/ptb/extensions/rust/package.i18n.json
index 423ab816de0..7812f5b58c1 100644
--- a/i18n/ptb/extensions/rust/package.i18n.json
+++ b/i18n/ptb/extensions/rust/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Rust"
+	"displayName": "Noções Básicas Sobre a Linguagem Rust",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Rust."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/scss/package.i18n.json b/i18n/ptb/extensions/scss/package.i18n.json
index 2007a85cbe3..1f732d38a0a 100644
--- a/i18n/ptb/extensions/scss/package.i18n.json
+++ b/i18n/ptb/extensions/scss/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem SCSS"
+	"displayName": "Noções Básicas Sobre a Linguagem SCSS",
+	"description": "Fornece realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos SCSS."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/shaderlab/package.i18n.json b/i18n/ptb/extensions/shaderlab/package.i18n.json
index f7ded2dce77..6138101920b 100644
--- a/i18n/ptb/extensions/shaderlab/package.i18n.json
+++ b/i18n/ptb/extensions/shaderlab/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Shaderlab"
+	"displayName": "Noções Básicas Sobre a Linguagem Shaderlab",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos Shaderlab."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/shellscript/package.i18n.json b/i18n/ptb/extensions/shellscript/package.i18n.json
index d8764c3903c..f52f15ed9de 100644
--- a/i18n/ptb/extensions/shellscript/package.i18n.json
+++ b/i18n/ptb/extensions/shellscript/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Shell Script"
+	"displayName": "Noções Básicas Sobre a Linguagem Shell Script",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes em arquivos de Script de Shell."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/sql/package.i18n.json b/i18n/ptb/extensions/sql/package.i18n.json
index bb7822cba12..95abedb5aac 100644
--- a/i18n/ptb/extensions/sql/package.i18n.json
+++ b/i18n/ptb/extensions/sql/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem SQL"
+	"displayName": "Noções Básicas Sobre a Linguagem SQL",
+	"description": "Fornece realce de sintaxe e correspondência de colchetes nos arquivos SQL."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/swift/package.i18n.json b/i18n/ptb/extensions/swift/package.i18n.json
index 7ca859e9a6e..aa1efe8c491 100644
--- a/i18n/ptb/extensions/swift/package.i18n.json
+++ b/i18n/ptb/extensions/swift/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Swift"
+	"displayName": "Noções Básicas Sobre a Linguagem Swift",
+	"description": "Fornece trechos de código, realce de sintaxe e correspondência de colchetes em arquivos Swift."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-basics/package.i18n.json b/i18n/ptb/extensions/typescript-basics/package.i18n.json
index 0a1d2df7587..24615fd096d 100644
--- a/i18n/ptb/extensions/typescript-basics/package.i18n.json
+++ b/i18n/ptb/extensions/typescript-basics/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas da Linguagem TypeScript"
+	"displayName": "Noções Básicas da Linguagem TypeScript",
+	"description": "Fornece trechos, realce de sintaxe, correspondência de colchetes e oclusão de código em arquivos TypeScript."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..43bfcb4644a
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript",
+	"typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado",
+	"typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript",
+	"typescript.noTypeScriptProjectConfig": "O arquivo não é parte do projeto TypeScript. Clique [aqui]({0}) para mais informações.",
+	"typescript.noJavaScriptProjectConfig": "O arquivo não é parte do projeto JavaScript. Clique [aqui]({0}) para mais informações.",
+	"typescript.configureTsconfigQuickPick": "Configurar tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "Configurar jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..07ef27a5bcf
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Selecione uma ação de código para aplicar",
+	"acquiringTypingsLabel": "Adquirindo digitações...",
+	"acquiringTypingsDetail": "Adquirindo definições de digitações para o Intellisense.",
+	"autoImportLabel": "Importação automática de {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..eafca22f53d
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Habilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
+	"ts-nocheck": "Desabilita verificação semântica em um arquivo JavaScript. Deve estar no topo de um arquivo.",
+	"ts-ignore": "Suprime erros de @ts-check na próxima linha de um arquivo."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..c0ccafb6005
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 implementação",
+	"manyImplementationLabel": "{0} implementações",
+	"implementationsErrorLabel": "Não foi possível determinar implementações"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..0f22e0563e3
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "Comentário JSDoc"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..a0dd22d5e1e
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Organizar as importações"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..96d00a06bb5
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Reparar tudo no arquivo)"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..fd899d96208
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 referência",
+	"manyReferenceLabel": "{0} referências",
+	"referenceErrorLabel": "Não foi possível determinar as referências"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..083f9cdd4a2
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "compilar - {0}",
+	"buildAndWatchTscLabel": "monitorar - {0}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..18d31ac5959
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "O caminho {0} não aponta para uma instalação de tsserver válida. Voltando para a versão do TypeScript empacotada.",
+	"serverCouldNotBeStarted": "Servidor de linguagem TypeScript não pôde ser iniciado. Mensagem de erro é: {0}",
+	"typescript.openTsServerLog.notSupported": "Logging de TS Server requer TS TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "Logging de TS Server está desligado. Por favor configure 'typescript.tsserver.log' e reinicie o  TS Server para habilitar o log",
+	"typescript.openTsServerLog.enableAndReloadOption": "Habilitar logging e reniciar TS server",
+	"typescript.openTsServerLog.noLogFile": "O TS Server não iniciou o logging.",
+	"openTsServerLog.openFileFailedFailed": "Não foi possível abrir o arquivo de log do TS Server",
+	"serverDiedAfterStart": "O serviço de linguagem TypeScript morreu 5 vezes depois que começou. O serviço não será reiniciado.",
+	"serverDiedReportIssue": "Reportar Problema",
+	"serverDied": "O serviço TypeScript morreu inesperadamente 5 vezes nos últimos 5 minutos."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..c723b32adb6
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "versão inválida"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..6cf4fd3d7e5
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas com muitos arquivos, como: {0}",
+	"hintExclude.generic": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha.",
+	"large.label": "Configurar exclusões",
+	"hintExclude.tooltip": "Para habilitar os recursos de linguagem JavaScript/TypeScipt em todo o projeto, excluir pastas grandes com arquivos em que você não trabalha."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..26560f00bfe
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Buscando dados para melhor IntelliSense do TypeScript",
+	"typesInstallerInitializationFailed.title": "Não foi possível instalar os arquivos de tipagem para recursos da linguagem JavaScript. Por favor, certifique-se que o NPM está instalado ou configure 'typescript.npm' em suas configurações de usuário. Clique [aqui]({0}) para mais informações.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Não mostrar novamente"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..8f3cd072f30
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Use a versão do VS Code",
+	"useWorkspaceVersionOption": "Use a versão de área de trabalho",
+	"learnMore": "Saiba Mais",
+	"selectTsVersion": "Selecione a versão do TypeScript usada para os recursos de linguagem JavaScript e TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..ba136d68e8b
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Não foi possível carregar a versão do TypeScript neste caminho",
+	"noBundledServerFound": "Tsserver do VS Code foi eliminado por outro aplicativo como uma ferramenta de detecção de vírus com um comportamento inadequado. Por favor reinstale o VS Code."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/typescript-language-features/package.i18n.json b/i18n/ptb/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..97dd0af87e4
--- /dev/null
+++ b/i18n/ptb/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,64 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Recursos da Linguagem TypeScript e JavaScript",
+	"description": "Fornece suporte à linguagem rica pra JavaScript e TypeScript.",
+	"typescript.reloadProjects.title": "Recarregar Projeto",
+	"javascript.reloadProjects.title": "Recarregar Projeto",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Funções completas com a assinatura do parâmetro.",
+	"typescript.tsdk.desc": "Especifica o caminho da pasta que contém os arquivos tsserver e lib*.d.ts para usar.",
+	"typescript.disableAutomaticTypeAcquisition": "Desabilita a aquisição automática de tipo. Requer TypeScript > = 2.0.6.",
+	"typescript.tsserver.log": "Habilita o log do servidor TS para um arquivo. Este log pode ser usado para diagnosticar problemas do servidor de TS. O log pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
+	"typescript.tsserver.pluginPaths": "Caminhos adicionais para descobrir os plugins do serviço de linguagem TypeScript. Requer TypeScript > = 2.3.0.",
+	"typescript.tsserver.pluginPaths.item": "Pode ser um caminho absoluto ou relativo. Caminho relativo será resolvido a partir da pasta da área de trabalho.",
+	"typescript.tsserver.trace": "Habilita o rastreamento de mensagens enviadas para o servidor de TS. Este rastreamento pode ser usado para diagnosticar problemas do servidor de TS. O rastreamento pode conter caminhos de arquivo, código-fonte e outras informações potencialmente confidenciais do seu projeto.",
+	"typescript.validate.enable": "Habilita/Desabilita a validação TypeScript.",
+	"typescript.format.enable": "Habilita/Desabilita o formatador padrão TypeScript.",
+	"javascript.format.enable": "Habilita/Desabilita o formatador padrão JavaScript.",
+	"format.insertSpaceAfterCommaDelimiter": "Define o tratamento de espaços após um delimitador vírgula.",
+	"format.insertSpaceAfterConstructor": "Define a manipulação de espaços após a palavra-chave do construtor. Requer TypeScript > = 2.3.0.",
+	"format.insertSpaceAfterSemicolonInForStatements": "Define o tratamento de espaços após um ponto e vírgula para um comando.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Define o tratamento de espaços após um operador binário.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Define o tratamento de espaços após palavras-chave em um comando de controle de fluxo.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Define o tratamento de espaços após uma palavra-chave de função para funções anônimas.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Define a manipulação de espaços antes de parênteses do argumento de função. Requer TypeScript > = 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "Define a manipulação de espaços após abrir e antes de fechar parênteses não vazios.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "Define a manipulação de espaços após abrir e antes de fechar colchetes não vazios.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de cadeias de caracteres de modelos. Requer TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Define a manipulação de espaços após abrir e antes de fechar chaves de expressões JSX. Requer TypeScript >= 2.0.6.",
+	"format.insertSpaceAfterTypeAssertion": "Define a manipulação de espaços após asserções de tipo em TypeScript. Requer TypeScript >= 2,4.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Define-se uma chave de abertura é colocada em uma nova linha para funções ou não.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Define-se uma chave de abertura é colocada em uma nova linha para blocos de controle ou não.",
+	"javascript.validate.enable": "Habilitar/Desabilitar validação JavaScript.",
+	"typescript.goToProjectConfig.title": "Ir para a Configuração do Projeto",
+	"javascript.goToProjectConfig.title": "Ir para a Configuração do Projeto",
+	"javascript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos JavaScript.",
+	"typescript.referencesCodeLens.enabled": "Habilitar/desabilitar referências CodeLens em arquivos TypeScript. Requer TypeScript > = 2.0.6.",
+	"typescript.implementationsCodeLens.enabled": "Habilitar/desabilitar implementações CodeLens. Requer TypeScript > = 2.0.6.",
+	"typescript.openTsServerLog.title": "Abrir arquivo de log do servidor TS",
+	"typescript.restartTsServer": "Reiniciar o servidor TS",
+	"typescript.selectTypeScriptVersion.title": "Selecionar a versão do JavaScript",
+	"typescript.reportStyleChecksAsWarnings": "Reportar verificações de estilo como avisos",
+	"jsDocCompletion.enabled": "Habilitar/Desabilitar comentários JSDoc automáticos.",
+	"javascript.implicitProjectConfig.checkJs": "Habilitar/desabilitar verificação semântica de arquivos JavaScript. Os arquivos existentes  jsconfig.json ou tsconfig.json substituem essa configuração. Requer TypeScript > = 2.3.1.",
+	"typescript.npm": "Especifica o caminho para o executável do NPM usado para Aquisição de Tipo Automático. Requer TypeScript > = 2.3.4.",
+	"typescript.check.npmIsInstalled": "Verificar se o NPM está instalado para aquisição automática de tipo.",
+	"javascript.nameSuggestions": "Habilitar/desabilitar incluindo nomes exclusivos do arquivo nas listas de sugestão de JavaScript.",
+	"typescript.tsc.autoDetect": "Controla a auto deteção das tarefas de tsc. 'off' desativa esse recurso. 'build' só cria tarefas de compilação de execução única. 'watch' cria apenas tarefas de compilação e monitoramento. 'on' cria ambas as tarefas de compilar e monitoramento. Padrão é 'on'.",
+	"typescript.problemMatchers.tsc.label": "Problemas TypeScript",
+	"typescript.problemMatchers.tscWatch.label": "Problemas TypeScript (modo observação)",
+	"typescript.quickSuggestionsForPaths": "Ativar/desativar sugestões rápidas quando estiver digitando um caminho de importação.",
+	"typescript.locale": "Define a localidade usada para relatar erros TypeScript. Requer TypeScript > = 2.6.0. Padrão 'null' usa a localidade do VS Code para erros TypeScript.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Ativar/desativar 'experimentalDecorators' para arquivos JavaScript que não fazem parte de um projeto. Os arquivos existentes de jsconfig.json ou tsconfig.json substituem essa configuração. Requer TypeScript >= 2.3.1.",
+	"typescript.autoImportSuggestions.enabled": "Ativar/desativar sugestões de importação automática. Requer TypeScript >= 2.6.1",
+	"typescript.experimental.syntaxFolding": "Habilita/Desabilita a sintaxe dos marcadores de pastas ativas.",
+	"taskDefinition.tsconfig.description": "O arquivo tsconfig que define a compilação do TS.",
+	"javascript.suggestionActions.enabled": "Ativar/desativar o diagnóstico de sugestões para arquivos JavaScript no editor. Requer TypeScript > = 2.8",
+	"typescript.suggestionActions.enabled": "Ativar/desativar o diagnóstico de sugestões para arquivos TypeScript no editor. Requer TypeScript  > = 2.8."
+}
\ No newline at end of file
diff --git a/i18n/ptb/extensions/vb/package.i18n.json b/i18n/ptb/extensions/vb/package.i18n.json
index 4ce55e93689..eaf6b99fa56 100644
--- a/i18n/ptb/extensions/vb/package.i18n.json
+++ b/i18n/ptb/extensions/vb/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem Visual Basic"
+	"displayName": "Noções Básicas Sobre a Linguagem Visual Basic",
+	"description": "Fornece trechos, destaque de sintaxe, correspondência de colchetes e oclusão em arquivos do Visual Basic."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/xml/package.i18n.json b/i18n/ptb/extensions/xml/package.i18n.json
index c021fd6f6b1..a5b08901983 100644
--- a/i18n/ptb/extensions/xml/package.i18n.json
+++ b/i18n/ptb/extensions/xml/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem XML"
+	"displayName": "Noções Básicas Sobre a Linguagem XML",
+	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos XML."
 }
\ No newline at end of file
diff --git a/i18n/ptb/extensions/yaml/package.i18n.json b/i18n/ptb/extensions/yaml/package.i18n.json
index 8b586bfe33c..4a6a3b45e48 100644
--- a/i18n/ptb/extensions/yaml/package.i18n.json
+++ b/i18n/ptb/extensions/yaml/package.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Noções Básicas Sobre a Linguagem YAML"
+	"displayName": "Noções Básicas Sobre a Linguagem YAML",
+	"description": "Fornece realce de sintaxe e suporte a correspondência de colchetes em arquivos YAML."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/base/node/processes.i18n.json b/i18n/ptb/src/vs/base/node/processes.i18n.json
index 19c9978965a..35229bd6699 100644
--- a/i18n/ptb/src/vs/base/node/processes.i18n.json
+++ b/i18n/ptb/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Não é possível executar um comando shell em uma unidade UNC."
+	]
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 6a08afe545f..ff2a8afaccd 100644
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -8,14 +8,15 @@
 	],
 	"previewOnGitHub": "Pré-visualizar no GitHub",
 	"loadingData": "Carregando dados...",
+	"rateLimited": "Limite de consulta do GitHub excedido. Por favor, espere.",
 	"similarIssues": "Problemas semelhantes",
 	"open": "Abrir",
 	"closed": "Fechado",
-	"noResults": "Nenhum resultado encontrado",
+	"noSimilarIssues": "Nenhum problema semelhante encontrado",
 	"settingsSearchIssue": "Problema na Pesquisa de Configurações",
 	"bugReporter": "Relatório de Bug",
-	"performanceIssue": "Problema de Performance",
 	"featureRequest": "Solicitação de Recurso",
+	"performanceIssue": "Problema de Performance",
 	"stepsToReproduce": "Etapas para Reproduzir",
 	"bugDescription": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
 	"performanceIssueDesciption": "Nós suportamos Markdown no padrão GitHub. Você poderá editar o seu problema e adicionar capturas de tela quando nós o pré-visualizarmos no GitHub. ",
diff --git a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index cfbca1eb679..779dbc700cc 100644
--- a/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,12 @@
 	],
 	"completeInEnglish": "Por favor, preencha o formulário em inglês.",
 	"issueTypeLabel": "Isso é um",
+	"issueSourceLabel": "Arquivo na",
+	"vscode": "Visual Studio Code",
+	"extension": "Uma extensão",
+	"disableExtensionsLabelText": "Tente reproduzir o problema depois de {0}. Se o problema só se reproduz quando as extensões são ativas, provavelmente é um problema com uma extensão.",
+	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
+	"chooseExtension": "Extensão",
 	"issueTitleLabel": "Título",
 	"issueTitleRequired": "Por favor, digite um título.",
 	"titleLengthValidation": "O título é muito longo.",
@@ -18,9 +24,6 @@
 	"extensions": "Minhas extensões",
 	"searchedExtensions": "Extensões Pesquisadas",
 	"settingsSearchDetails": "Detalhes da Pesquisa de Configurações",
-	"yes": "Sim",
-	"no": "Não",
-	"disableExtensions": "desabilitando todas as extensões e recarregando a janela",
 	"details": "Por favor informe detalhes.",
 	"loadingData": "Carregando dados..."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..8f468bf0efc
--- /dev/null
+++ b/i18n/ptb/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cpu": "% DE CPU",
+	"memory": "Memória (MB)",
+	"pid": "PID",
+	"name": "Nome",
+	"killProcess": "Matar processo",
+	"forceKillProcess": "Matar processo a força"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json b/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
index 413a18b3d90..0d8ffc448c9 100644
--- a/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-main/logUploader.i18n.json
@@ -9,6 +9,7 @@
 	"invalidEndpoint": "Destino para envio do log é inválido.",
 	"beginUploading": "Enviando...",
 	"didUploadLogs": "Envio bem-sucedido! ID do arquivo de Log: {0}",
+	"logUploadPromptHeader": "Você está prestes a fazer o envio de seus logs de sessão para um ponto de extremidade seguro da Microsoft e que apenas membros da equipe Microsoft e do time VS Code podem acessar.",
 	"logUploadPromptBody": "Logs de sessão podem conter informações pessoais como caminhos completos ou conteúdos de arquivos. Por favor revise e elimine seus arquivos de log de sessão aqui: '{0}'",
 	"logUploadPromptBodyDetails": "Ao continuar você confirma que você revisou e eliminou seus arquivos de log de sessão e que você concorda que a Microsoft use eles para depurar o VS Code.",
 	"logUploadPromptAcceptInstructions": "Por favor execute o code com '--upload-logs={0}' para proceder com o upload",
diff --git a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json b/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
index eef1af7a303..68f544d5457 100644
--- a/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-main/menus.i18n.json
@@ -93,6 +93,7 @@
 	"miOpenView": "&&Abrir Visualização...",
 	"miToggleFullScreen": "Alternar &&Tela Inteira",
 	"miToggleZenMode": "Alternar modo Zen",
+	"miToggleCenteredLayout": "Alternar para Layout Centralizado",
 	"miToggleMenuBar": "Alternar &&Barra de Menus",
 	"miSplitEditor": "Dividir &&editor",
 	"miToggleEditorLayout": "Alternar &&Layout do Grupo de Editor",
@@ -160,6 +161,7 @@
 	"mMergeAllWindows": "Mesclar todas as janelas",
 	"miToggleDevTools": "&&Alternar Ferramentas do Desenvolvedor",
 	"miAccessibilityOptions": "&&Opções de Acessibilidade",
+	"miOpenProcessExplorerer": "Abrir o &&Process Explorer",
 	"miReportIssue": "Reportar &&Problema",
 	"miWelcome": "&&Bem-vindo",
 	"miInteractivePlayground": "Playground &&Interativo",
diff --git a/i18n/ptb/src/vs/code/electron-main/windows.i18n.json b/i18n/ptb/src/vs/code/electron-main/windows.i18n.json
index a6234f91276..25a098f0535 100644
--- a/i18n/ptb/src/vs/code/electron-main/windows.i18n.json
+++ b/i18n/ptb/src/vs/code/electron-main/windows.i18n.json
@@ -8,7 +8,7 @@
 	],
 	"ok": "OK",
 	"pathNotExistTitle": "O caminho não existe",
-	"pathNotExistDetail": "O caminho '{0}' não parece mais existir no disco.",
+	"pathNotExistDetail": "Aparentemente o caminho {0} não existe mais no disco.",
 	"reopen": "&&Reabrir",
 	"wait": "&&Continuar Aguardando",
 	"close": "&&Fechar",
diff --git a/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
index de20d2cf5b9..fd79f520ec4 100644
--- a/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/ptb/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Fechar",
-	"header": "Diferença {0} de {1}: original {2}, {3} linhas, modificado {4}, {5} linhas",
 	"blankLine": "branco",
 	"equalLine": "original {0}, modificados {1}: {2}",
 	"insertLine": "+ modificado {0}: {1}",
diff --git a/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
index d31266adb34..0b3fe531920 100644
--- a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -46,6 +46,7 @@
 	"multiCursorModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e para 'Command' no macOS.",
 	"multiCursorModifier.alt": "Mapeia para 'Alt' em Windows e Linux e para 'Option' em macOS.",
 	"multiCursorModifier": "O modificador a ser usado para adicionar vários cursores com o mouse. `ctrlCmd` mapeia para 'Control' no Windows e Linux e para 'Command' no macOS. Os gestos do mouse Ir para definição e Abrir Link irão adaptar-se de forma que eles não entrem em conflito com o modificador multicursor.",
+	"multiCursorMergeOverlapping": "Mesclar vários cursores quando eles estão sobrepostos.",
 	"quickSuggestions.strings": "Habilitar sugestões rápidas dentro de strings.",
 	"quickSuggestions.comments": "Habilitar sugestões rápidas dentro de comentários.",
 	"quickSuggestions.other": "Habilitar sugestões rápidas fora de strings e comentários.",
@@ -88,6 +89,9 @@
 	"renderLineHighlight": "Controla como o editor deve renderizar a linha atual, as possibilidades são 'none', 'gutter', 'line' e 'all'.",
 	"codeLens": "Controla se o editor exibirá a lente de códigos.",
 	"folding": "Controla se o editor tem codigo colapsível hablitado",
+	"foldingStrategyAuto": "Se disponível, use uma estratégia de dobramento específica de idioma, caso contrário, recua para a estratégia baseada na indentação.",
+	"foldingStrategyIndentation": "Sempre use a estratégia de dobragem baseada no indentação ",
+	"foldingStrategy": "Controla a maneira como os intervalos de dobra são calculados. As opções 'auto' usam uma estratégia de dobra específica de idioma, se disponível. 'indentação' força o uso da estratégia de dobragem baseada na indentação.",
 	"showFoldingControls": "Controla se os controles de desdobramento na divisão são ocultas automaticamente.",
 	"matchBrackets": "Realça colchetes correspondente quando um deles estiver selecionado.",
 	"glyphMargin": "Controla se o editor deve renderizar a margem vertical de ícones. A margem vertical de ícones é usada primordialmente na depuração",
@@ -105,5 +109,7 @@
 	"selectionClipboard": "Controla se a área primária de transferência Linux deve ser suportada.",
 	"sideBySide": "Controla se o editor de diff mostra as diff lado a lado ou inline.",
 	"ignoreTrimWhitespace": "Controla se o editor de diff mostra alterações nos espaços iniciais ou finais como diferenças",
+	"largeFileSize": "Controles de limite de tamanho do arquivo em bytes além do qual são aplicadas as regras de otimização especial",
+	"largeFileLineCount": "Limite de tamanho de arquivo de controles em termos de número de linhas, além do qual são aplicadas as regras de otimização especial",
 	"renderIndicators": "Controla se o editor de diff mostra indicadores +/- para alterações adicionadas/removidas"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 2b9a537a3bb..d7f075f4fc0 100644
--- a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -16,6 +16,7 @@
 	"editorIndentGuides": "Cor das guias de indentação do editor.",
 	"editorLineNumbers": "Cor dos números de linha do editor.",
 	"editorActiveLineNumber": "Cor dos números de linhas do editor",
+	"deprecatedEditorActiveLineNumber": "Identificação foi descontinuado. Use 'editorLineNumber.activeForeground'  em vez disso.",
 	"editorRuler": "Cor das réguas do editor.",
 	"editorCodeLensForeground": "Cor do primeiro plano das lentes de código do editor",
 	"editorBracketMatchBackground": "Cor de fundo atrás do colchetes correspondentes",
@@ -28,7 +29,9 @@
 	"warningBorder": "Cor da borda das linhas onduladas de aviso no editor.",
 	"infoForeground": "Cor do primeiro plano das linhas de informação no editor.",
 	"infoBorder": "Cor da borda das linhas de informação no editor.",
-	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para intervalos de destaques.",
+	"hintForeground": "Cor de primeiro plano de linhas onduladas de dica no editor.",
+	"hintBorder": "Cor da borda de linhas onduladas de dica no editor.",
+	"overviewRulerRangeHighlight": "Visão geral da cor do marcador da régua para destaques do intervalo. A cor não deve ser opaca para não esconder decorações subjacentes.",
 	"overviewRuleError": "Visão geral da cor do marcador da régua para erros.",
 	"overviewRuleWarning": "Visão geral da cor do marcador da régua para avisos.",
 	"overviewRuleInfo": "Visão geral da cor do marcador da régua para informações."
diff --git a/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..11ddcaff63f
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Mostrar correções ({0})",
+	"quickFix": "Mostrar correções"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 84ea506500f..8d9a0536028 100644
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Ir para o Próximo Problema (Erro, Aviso, Informação)",
-	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)",
-	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
-	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
-	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
-	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
+	"markerAction.previous.label": "Ir para o Problema Anterior (Erro, Aviso, Informação)"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..e76001982d3
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Ferramenta de marcação de edição apresentando error na cor ",
+	"editorMarkerNavigationWarning": "Ferramenta de marcação de edição apresentando adventência na cor",
+	"editorMarkerNavigationInfo": "Cor de informação da ferramenta de navegação do marcador do editor.",
+	"editorMarkerNavigationBackground": "Cor de fundo da ferramenta de marcação de navegação do editor."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..8b1d4736ce9
--- /dev/null
+++ b/i18n/ptb/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Domingo",
+	"Monday": "Segunda-feira",
+	"Tuesday": "Terça-feira",
+	"Wednesday": "Quarta-feira",
+	"Thursday": "Quinta-feira",
+	"Friday": "Sexta-feira",
+	"Saturday": "Sábado",
+	"SundayShort": "Dom",
+	"MondayShort": "Seg",
+	"TuesdayShort": "Ter",
+	"WednesdayShort": "Qua",
+	"ThursdayShort": "Qui",
+	"FridayShort": "Sex",
+	"SaturdayShort": "Sáb",
+	"January": "Janeiro",
+	"February": "Fevereiro",
+	"March": "Março",
+	"April": "Abril",
+	"May": "Maio",
+	"June": "Junho",
+	"July": "Julho",
+	"August": "Agosto",
+	"September": "Setembro",
+	"October": "Outubro",
+	"November": "Novembro",
+	"December": "Dezembro",
+	"JanuaryShort": "Jan",
+	"FebruaryShort": "Fev",
+	"MarchShort": "Mar",
+	"AprilShort": "Abr",
+	"MayShort": "Mai",
+	"JuneShort": "Jun",
+	"JulyShort": "Jul",
+	"AugustShort": "Ago",
+	"SeptemberShort": "Set",
+	"OctoberShort": "Out",
+	"NovemberShort": "Nov",
+	"DecemberShort": "Dez"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 46ba9518381..1c858bde51c 100644
--- a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Cor de fundo de um símbolo durante o acesso de escrita, como ao escrever uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.",
 	"wordHighlightBorder": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.",
 	"wordHighlightStrongBorder": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.",
-	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos.",
-	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para gravação de destaques de símbolos.",
+	"overviewRulerWordHighlightForeground": "Visão geral da cor do marcador da régua para destaques de símbolos. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"overviewRulerWordHighlightStrongForeground": "Visão geral da cor do marcador da régua para destaques de símbolos de acesso de escrita. A cor não deve ser opaca para não esconder decorações subjacentes.",
 	"wordHighlight.next.label": "Ir para o próximo símbolo em destaque",
 	"wordHighlight.previous.label": "Ir para o símbolo de destaque anterior"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..f3c382a82fa
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "... 1 arquivo adicional não está mostrado",
+	"moreFiles": "... {0} arquivos adicionais não estão mostrados"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..4a277edc564
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
index 9e468f9401d..768ee3289ce 100644
--- a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
@@ -29,9 +29,7 @@
 	"performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.",
 	"prof-startup": "Rodar o CPU profiler durante a inicialização",
 	"disableExtensions": "Desabilita todas as extensões instaladas.",
-	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
-	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
-	"disableGPU": "Desabilita aceleração de hardware da GPU.",
+	"disableGPU": "Desabilita aceleração de hardware via GPU.",
 	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
 	"maxMemory": "Tamanho máximo de memória para uma janela (em Mbytes).",
 	"usage": "Uso",
diff --git a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 3ceced97733..6bd9ed493bf 100644
--- a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Erro ao instalar dependências. {0}",
 	"MarketPlaceDisabled": "Loja não está habilitada.",
 	"removeError": "Erro ao remover a extensão: {0}. por favor, Saia e Inicie o VS Code antes de tentar novamente.",
-	"Not Market place extension": "Somente Extensões da Loja podem ser reinstaladas",
+	"Not a Marketplace extension": "Somente Extensões da Loja podem ser reinstaladas",
 	"notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.",
 	"malicious extension": "Não foi possível instalar a extensão, pois foi relatada como problemática.",
 	"notFoundCompatibleDependency": "Não foi possível instalar porque a extensão dependente '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.",
 	"quitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
 	"exitCode": "Não foi possível instalar a extensão. Por favor, saia e reinicie o VS Code antes de reinstalar.",
 	"uninstallDependeciesConfirmation": "Gostaria de desinstalar '{0}' somente, ou suas dependências também?",
-	"uninstallOnly": "Apenas",
-	"uninstallAll": "Todos",
+	"uninstallOnly": "Somente Extensão",
+	"uninstallAll": "Desinstalar Tudo",
 	"uninstallConfirmation": "Tem certeza que deseja desinstalar '{0}'?",
 	"ok": "OK",
 	"singleDependentError": "Não foi possível desinstalar a extensão '{0}'. A extensão '{1}' depende dela.",
diff --git a/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json
index 01ad5432236..ba2aa8d0b24 100644
--- a/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/ptb/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Não foi possível analisar o valor de 'engines.vscode' {0}. Por favor, utilize, por exemplo: ^ 0.10.0, ^ 1.2.3, ^ 0.11.0, ^ 0.10.x, etc.",
 	"versionSpecificity1": "Versão especificada em 'engines.vscode' ({0}) não é específica o suficiente. Para versões do vscode anteriores a 1.0.0, por favor defina no mínimo a versão principal e secundária desejada. Por exemplo, ^ 0.10.0, 0.10.x, 0.11.0, etc.",
 	"versionSpecificity2": "Versão especificada em 'engines.vscode' ({0}) não é específica o suficiente. Para as versões do vscode posteriores a 1.0.0, por favor defina no mínimo a versão principal do desejado. Por exemplo, ^ 1.10.0, 1.10.x 1. XX, 2.x.x, etc.",
 	"versionMismatch": "Extensão não é compatível com Code {0}. A extensão requer: {1}."
diff --git a/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index 941e39f27a1..a3c2b5abd84 100644
--- a/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/ptb/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "Sua instalação de {0} parece estar corrompida. Favor reinstalar.",
 	"integrity.moreInformation": "Mais informações",
-	"integrity.dontShowAgain": "Não mostrar novamente",
-	"integrity.prompt": "Sua instalação de {0} parece estar corrompida. Favor reinstalar."
+	"integrity.dontShowAgain": "Não mostrar novamente"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json b/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
index 0d4902c10e2..e21fa3376d2 100644
--- a/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "O modificador deve ser usado para adicionar um item nas listas e árvores para uma multi-seleção com o mouse (por exemplo, no explorador, editores abertos e exibição scm). 'ctrlCmd' mapeia para 'Control' no Windows e Linux e 'Command' no macOS. Os gestos do mouse 'Aberto ao lado' - se suportado - irá adaptar-se de tal forma que eles não entrem em conflito com o modificador de várias seleções.",
 	"openMode.singleClick": "Abre os itens em um único clique do mouse.",
 	"openMode.doubleClick": "Abre os itens com duplo clique do mouse. ",
-	"openModeModifier": "Controla como abrir itens em árvores e listas usando o mouse (se suportado). Definido como 'singleClick' para abrir itens com um único clique do mouse e 'doubleClick' para abrir somente através do duplo clique do mouse. Para os pais com filhos em árvores, essa configuração controla se um único clique expande o pai ou um clique duplo. Note que algumas árvores e listas podem optar por ignorar essa configuração, se não for aplicável. "
+	"openModeModifier": "Controla como abrir itens em árvores e listas usando o mouse (se suportado). Definido como 'singleClick' para abrir itens com um único clique do mouse e 'doubleClick' para abrir somente através do duplo clique do mouse. Para os pais com filhos em árvores, essa configuração controla se um único clique expande o pai ou um clique duplo. Note que algumas árvores e listas podem optar por ignorar essa configuração, se não for aplicável. ",
+	"horizontalScrolling setting": "Controla se as árvores suportam a rolagem horizontal na área de trabalho."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json b/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..1b82ec1834e
--- /dev/null
+++ b/i18n/ptb/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Erro",
+	"sev.warning": "Aviso",
+	"sev.info": "Informações"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
index 0103ae9995b..a33d1357414 100644
--- a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Cor de fundo de régua de visuaização atual em conflito de mesclagem em linha.",
 	"overviewRulerIncomingContentForeground": "Cor de fundo de régua de visuaização de entrada em conflito de mesclagem em linha.",
 	"overviewRulerCommonContentForeground": "Ancestral comum da cor da régua de visão geral para conflitos de mesclagem inline.",
-	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para buscas correspondentes.",
-	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para a seleção de destaques"
+	"overviewRulerFindMatchForeground": "Visão geral da cor do marcador da régua para correspondências de localização. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"overviewRulerSelectionHighlightForeground": "Visão geral da cor do marcador da régua para destaques de seleção. A cor não deve ser opaca para não esconder decorações subjacentes."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..b25f4fe2939
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`",
+	"showViewlet": "Mostrar {0}",
+	"view": "Exibir"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 94adc8bdb1b..dfe343c9d2b 100644
--- a/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/ptb/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Contribui visualizações ao editor",
 	"views.explorer": "Visualização do explorador",
 	"views.debug": "Visualizar Depurador",
-	"locationId.invalid": "'{0}' não é um local válido de visualização",
 	"duplicateView1": "Não é possível registrar vários modos de exibição com a mesma id '{0}' no local '{1}'",
 	"duplicateView2": "Uma exibição com id '{0}' já está registrada no local '{1}'"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
index ffe76f5613e..f318947e97c 100644
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadMessageService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"extensionSource": "{0} (Extensão)",
 	"defaultSource": "Extensão",
 	"manageExtension": "Gerenciar Extensão",
 	"cancel": "Cancelar",
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 4498984aac3..35229bd6699 100644
--- a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "editor webview"
+	]
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..d53bcb288c2
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (Extensão)"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
index 4a8523b9b47..3991d555141 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
@@ -19,12 +19,14 @@
 	"close": "Fechar",
 	"closeOthers": "Fechar Outros",
 	"closeRight": "Fechar à direita",
+	"closeAllSaved": "Fechar Salvos",
 	"closeAll": "Fechar todos",
 	"keepOpen": "Manter aberto",
 	"toggleInlineView": "Alternar para exibição embutida",
 	"showOpenedEditors": "Mostrar editores abertos",
 	"keepEditor": "Manter editor",
 	"closeEditorsInGroup": "Fechar todos editores no grupo",
+	"closeSavedEditors": "Fechar Editores Salvos em Grupo",
 	"closeOtherEditors": "Fechar outros editores",
 	"closeRightEditors": "Fechar editores à direita"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 3d0849e2d3d..8f7c2c32373 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Focalizar próximo grupo",
 	"openToSide": "Aberto para o lado",
 	"closeEditor": "Fechar editor",
+	"closeOneEditor": "Fechar",
 	"revertAndCloseActiveEditor": "Reverter e fechar editor",
 	"closeEditorsToTheLeft": "Fechar editores à esquerda ",
 	"closeAllEditors": "Fechar todos editores",
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index ec0d2b3b02a..086dcb9f4da 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "Se você não estiver usando um leitor de tela, por favor altere a configuração `editor.accessibilitySupport` para \"desligado\".",
 	"disableTabMode": "Desativar o modo de acessibilidade",
 	"gotoLine": "Ir para linha",
-	"indentation": "Indentação",
 	"selectEncoding": "Selecionar a codificação",
 	"selectEOL": "Selecionar a sequência de fim de linha",
 	"selectLanguageMode": "Selecionar modo de idioma",
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index bfe39400384..d65e8370bed 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0}MB",
 	"sizeGB": "{0}GB",
 	"sizeTB": "{0}TB",
-	"largeImageError": "O tamanho do arquivo da imagem é muito grande (>1MB) para exibir no editor. ",
 	"resourceOpenExternalButton": "Abrir imagem usando um programa externo?",
-	"nativeBinaryError": "O arquivo não pode ser exibido no editor porque é binário, muito grande ou usa uma codificação de texto sem suporte.",
 	"zoom.action.fit.label": "Toda a imagem",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index af4bb7c1e23..4b815cd265a 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Fechar",
 	"araLabelEditorActions": "Ações de editor"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
index ef35b7db33c..970ea3ec097 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsActions.i18n.json
@@ -6,9 +6,11 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"clearNotification": "Limpar Notificação",
 	"clearNotifications": "Limpar Todas as Notificações",
 	"hideNotificationsCenter": "Ocultar Notificações",
 	"expandNotification": "Expandir Notificação",
 	"collapseNotification": "Recolher Notificação",
-	"configureNotification": "Configurar Notificação"
+	"configureNotification": "Configurar Notificação",
+	"copyNotification": "Copiar Texto"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index b2e58614a30..0f4a30c299f 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Nenhuma nova notificação",
 	"notifications": "Notificações",
+	"notificationsToolbar": "Ações da Central de Notificações",
 	"notificationsList": "Lista de Notificações"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
index 9c950e41e29..c73d363c135 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/notifications/notificationsStatus.i18n.json
@@ -6,5 +6,9 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"hideNotifications": "Ocultar Notificações"
+	"hideNotifications": "Ocultar Notificações",
+	"zeroNotifications": "Sem Notificações",
+	"noNotifications": "Sem Novas Notificações",
+	"oneNotification": "1 Nova Notificação",
+	"notifications": "{0} Novas Notificações"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..bcdf56e4849
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "OK"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json b/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json
index bf6f25565e7..d3bee3ce826 100644
--- a/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/viewlet.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"compositePart.hideSideBarLabel": "Ocultar a Barra Lateral",
 	"collapse": "Recolher tudo"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
index 69ab398eeb1..74295c8a145 100644
--- a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json
@@ -18,6 +18,7 @@
 	"zoomReset": "Reinicializar Zoom",
 	"appPerf": "Desempenho de inicialização",
 	"reloadWindow": "Recarregar Janela",
+	"reloadWindowWithExntesionsDisabled": "Recarregar Janela Com Extensões Desabilitadas",
 	"switchWindowPlaceHolder": "Selecionar uma janela para onde alternar",
 	"current": "Janela Atual",
 	"close": "Fechar Janela",
@@ -48,5 +49,6 @@
 	"moveWindowTabToNewWindow": "Mover a guia da janela para a nova janela",
 	"mergeAllWindowTabs": "Mesclar todas as janelas",
 	"toggleWindowTabsBar": "Alternar a Barra de Guias da Janela",
-	"about": "Sobre {0}"
+	"about": "Sobre {0}",
+	"inspect context keys": "Inspecionar Chaves de Contexto"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
index 38924568114..15dd21d37a3 100644
--- a/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,13 @@
 	"windowConfigurationTitle": "Janela",
 	"window.openFilesInNewWindow.on": "Arquivos serão abertos em uma nova janela",
 	"window.openFilesInNewWindow.off": "Arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou com a última janela ativa.",
-	"window.openFilesInNewWindow.default": "Os arquivos serão abertos na janela com a pasta de arquivos aberta ou a última janela ativa, a menos que seja aberto através do dock ou do finder (somente macOS)",
-	"openFilesInNewWindow": "Controla se os arquivos devem ser abertos em uma nova janela\n- padrão: os arquivos serão abertos em uma nova janela com a pasta de arquivos aberta ou na última janela ativa, a menos que seja aberta através do dock ou do finder (apenas macOS)\n- ligado: os arquivos serão abertos em uma nova janela\n- desligado: os arquivos serão abertos em uma janela com a pasta de arquivos aberta ou a última janela ativa\nNote que ainda podem haver casos em que esta configuração será ignorada (por exemplo, quando estiver usando as opções de linha de comando -new-window ou -reuse-window).",
+	"window.openFilesInNewWindow.defaultMac": "Arquivos serão abertos na janela com a pasta dos arquivos aberta ou a última janela ativa, a menos que tenha sido aberta pelo Dock ou pelo Finder",
+	"window.openFilesInNewWindow.default": "Arquivos serão abertos em uma nova janela, a menos que escolhidos  dentro do aplicativo (por exemplo, através do menu de arquivo)",
 	"window.openFoldersInNewWindow.on": "As pastas serão abertas em uma nova janela",
 	"window.openFoldersInNewWindow.off": "As pastas substituirão a última janela ativa",
 	"window.openFoldersInNewWindow.default": "As pastas serão abertas em uma nova janela, a menos que uma pasta seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)",
 	"openFoldersInNewWindow": "Controla se as pastas devem ser abertas em uma nova janela ou substituir a última janela ativa\n- padrão: as pastas serão abertas em uma nova janela, a menos que seja selecionada dentro do aplicativo (por exemplo, através do menu Arquivo)\n- ligado: as pastas serão abertas em uma nova janela\n- desligado: as pastas substituirão a última janela ativa\nNote que ainda podem haver casos em que esta configuração será ignorada (por exemplo, quando estiver usando as opções de linha de comando -new-window ou -reuse-window).",
+	"window.openWithoutArgumentsInNewWindow.on": "Abrir uma nova janela vazia",
 	"window.reopenFolders.all": "Reabrir todas as janelas.",
 	"window.reopenFolders.folders": "Reabrir todas as pastas. Espaços de trabalho vazios não serão restaurados.",
 	"window.reopenFolders.one": "Reabrir a última janela ativa.",
@@ -58,7 +59,6 @@
 	"restoreWindows": "Controla como as janelas serão reabertas após uma reinicialização. Selecione 'nenhum' para sempre iniciar com uma área de trabalho vazia, 'um' para reabrir a última janela que você trabalhou, 'pastas' para reabrir todas as janelas que tinham pastas abertas ou 'todos' para reabrir todas as janelas da sua última sessão.",
 	"restoreFullscreen": "Controla se uma janela deve ser restaurada em modo de tela cheia se ela foi finalizada em modo de tela cheia.",
 	"zoomLevel": "Ajusta o nível de zoom da janela. O tamanho original é 0 e cada aumento (por exemplo, 1) ou redução (por exemplo, -1) representa um zoom 20% maior ou menor. Você também pode digitar decimais para ajustar o nível de zoom com uma granularidade mais fina.",
-	"title": "Controla o título de janela baseado no editor ativo. Variáveis são substituídas com base no contexto: \n${activeEditorShort}: o nome do arquivo (por exemplo, MyFile txt)\n${activeEditorMedium}: o caminho do arquivo relativo à pasta da área de trabalho (por exemplo, myFolder/myFile.txt) \n${activeEditorLong}: o caminho completo do arquivo (por exemplo, /Users/Development/myProject/myFolder/myFile.txt) \n${folderName}: nome da pasta de trabalho em que o arquivo está contido (por exemplo, myFolder) \n${folderPath}: caminho do arquivo da pasta de trabalho em que o arquivo está contido (por exemplo, /Users/Development/myFolder) {\n$(rootName}: nome do espaço de trabalho (por exemplo, myFolder ou myWorkspace)\n${rootPath}: caminho do espaço de trabalho (por exemplo, /Users/Development/myWorkspace) \n${appName}: por exemplo, VS Code\n${dirty}: um indicador se o editor ativo foi modificado\n${separator}: um separador condicional (\"-\") que é mostrado apenas quando cercado por variáveis com valores",
 	"window.newWindowDimensions.default": "Abrir novas janelas no centro da tela.",
 	"window.newWindowDimensions.inherit": "Abrir novas janelas com a mesma dimensão da última janela ativa.",
 	"window.newWindowDimensions.maximized": "Abrir novas janelas maximizadas.",
@@ -76,6 +76,7 @@
 	"window.nativeTabs": "Habilita as abas da janela do macOS Sierra. Note que as alterações exigem um reinício completo e que as abas nativas desabilitarão um estilo de barra de título customizado, se configurado.",
 	"zenModeConfigurationTitle": "Modo Zen",
 	"zenMode.fullScreen": "Controla se a ativação do modo Zen também coloca o espaço de trabalho em modo de tela cheia.",
+	"zenMode.centerLayout": "Controla se ativar o Modo Zen também centraliza o layout.",
 	"zenMode.hideTabs": "Controla se a ativação do modo Zen também oculta as abas do espaço de trabalho.",
 	"zenMode.hideStatusBar": "Controla se a ativação do modo Zen também oculta a barra de status no rodapé do espaço de trabalho.",
 	"zenMode.hideActivityBar": "Controla se a ativação do modo Zen também oculta a barra de atividades à esquerda do espaço de trabalho.",
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index fae5e7689d0..4aab0d24a42 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,10 +6,13 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Editar o Ponto de Parada...",
 	"functionBreakpointsNotSupported": "Pontos de parada de função não são suportados por este tipo de depuração",
 	"functionBreakpointPlaceholder": "Função de parada",
 	"functionBreakPointInputAriaLabel": "Digitar Ponto de Parada de Função",
+	"breakpointDisabledHover": "Ponto de interrupção desativado",
+	"breakpointUnverifieddHover": "Ponto de Parada não Verificado",
+	"functionBreakpointUnsupported": "Função de ponto de parada não é suportado por este tipo de debug",
 	"breakpointDirtydHover": "Ponto de parada não verificado. O arquivo foi modificado, por favor reinicie a sessão de depuração.",
-	"conditionalBreakpointUnsupported": "Pontos de parada condicionais não são suportados por esse tipo de depurador"
+	"conditionalBreakpointUnsupported": "Pontos de parada condicionais não são suportados por esse tipo de depurador",
+	"hitBreakpointUnsupported": "Pontos de parada condicionais não são suportados por este tipo de debug"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 734a4f0737e..7bffbd36c2c 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Reiniciar o Frame",
 	"removeBreakpoint": "Remover Ponto de Parada",
 	"removeAllBreakpoints": "Remover Todos os Pontos de Parada",
-	"enableBreakpoint": "Habilitar ponto de Parada",
-	"disableBreakpoint": "Desativar Ponto de Parada",
 	"enableAllBreakpoints": "Habilitar Todos os Pontos de Parada",
 	"disableAllBreakpoints": "Desabilitar Todos Pontos de Parada",
 	"activateBreakpoints": "Ativar Pontos de Parada",
 	"deactivateBreakpoints": "Desativar Pontos de Parada",
 	"reapplyAllBreakpoints": "Reaplicar Todos os Pontos de Parada",
 	"addFunctionBreakpoint": "Adicionar Ponto de Parada de Função",
-	"addConditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
-	"editConditionalBreakpoint": "Editar o Ponto de Parada...",
 	"setValue": "Definir Valor",
 	"addWatchExpression": "Adicionar Expressão",
 	"editWatchExpression": "Editar expressão",
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
index fc9ccfbe315..8d9d177e084 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugCommands.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"noFolderDebugConfig": "Primeiro abra uma pasta para fazer uma configuração de depuração avançada.",
+	"columnBreakpoint": "Coluna de ponto de parada",
 	"debug": "Depurar",
 	"addColumnBreakpoint": "Adicionar Ponto de Interrupção de Coluna"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
index 291cad9feea..ae25f330896 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugContentProvider.i18n.json
@@ -6,5 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"unable": "Não é possível resolver o recurso sem uma sessão de depuração"
+	"unable": "Não é possível resolver o recurso sem uma sessão de depuração",
+	"canNotResolveSource": "Não foi possível resolver o recurso {0}, não há resposta da extensão do debug."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..0e03569a94f
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Parar quando contagem de ocorrências condição for alcançada. 'Enter' para aceitar, 'esc' para cancelar.",
+	"breakpointWidgetExpressionPlaceholder": "Parar quando a expressão for avaliada como true. 'Enter' para aceitar, 'esc' para cancelar.",
+	"expression": "Expressão",
+	"hitCount": "Contagem de ocorrências"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index e6cb3550cab..1a2d0c2dbfa 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -26,5 +26,6 @@
 	"always": "Sempre mostrar depurar na barra de status",
 	"onFirstSessionStart": "Mostrar depurar na barra de status somente após a depuração ser iniciada pela primeira vez",
 	"showInStatusBar": "Controla quando a barra de status de depuração deve ser visível",
+	"openDebug": "Controla se a visualização de depuração deve ser aberta no início da sessão de depuração.",
 	"launch": "Configuração global do lançamento do depurador. Deve ser usado como uma alternativa para o arquivo 'launch.json' que é compartilhado entre os espaços de trabalho"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 6d03421bc47..7d73da69fcf 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Por favor, use nomes únicos de configuração.",
 	"app.launch.json.compound.folder": "Nome da pasta em que o composto se encontra.",
 	"app.launch.json.compounds.configurations": "Nomes das configurações que serão iniciadas como parte deste composto.",
-	"debugNoType": "'type' do adaptador de depuração não pode ser omitido e deve ser do tipo 'string'.",
 	"selectDebug": "Selecione o ambiente",
 	"DebugConfig.failed": "Não é possível criar o arquivo 'launch.json' dentro da pasta '.vscode' ({0}).",
 	"workspace": "espaço de trabalho",
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index 60374cdddc8..3e8dc5d2303 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -18,5 +18,7 @@
 	"enableBreakpoints": "Habilitar o ponto de interrupção na coluna {0}",
 	"enableBreakpointOnLine": "Habilitar o ponto de interrupção de linha",
 	"addBreakpoint": "Adicionar ponto de interrupção",
+	"addConditionalBreakpoint": "Adicionar Ponto de Parada Condicional...",
+	"cancel": "Cancelar",
 	"addConfiguration": "Adicionar Configuração..."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index 54e30c2ab6b..1551a564cda 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -14,9 +14,11 @@
 	"breakpointRemoved": "Ponto de interrupção removido, linha {0}, arquivo {1}",
 	"compoundMustHaveConfigurations": "Composição deve ter o atributo \"configurations\" definido para iniciar várias configurações.",
 	"noConfigurationNameInWorkspace": "Não foi possível encontrar a configuração de inicialização '{0}' na área de trabalho.",
+	"multipleConfigurationNamesInWorkspace": "Existem múltiplas configurações de lançamento '{0}' na área de trabalho. Use o nome da pasta para qualificar a configuração.",
 	"noFolderWithName": "Não é possível encontrar a pasta com nome '{0}' para configuração '{1}' no composto '{2}'.",
 	"configMissing": "Configuração '{0}' não tem 'launch.json'.",
 	"launchJsonDoesNotExist": "'launch.json' não existe.",
+	"debugRequestNotSupported": "Atributo '{0}' tem um valor sem suporte '{1}' na configuração de debug escolhida.",
 	"debugRequesMissing": "Atributo '{0}' está faltando para a configuração de depuração escolhida.",
 	"debugTypeNotSupported": "Tipo de depuração configurado '{0}' não é suportado.",
 	"debugTypeMissing": "Falta a propriedade 'type' para a configuração de lançamento escolhida.",
@@ -27,6 +29,5 @@
 	"showErrors": "Mostrar erros",
 	"noFolderWorkspaceDebugError": "O arquivo ativo não pode ser depurado. Certifique-se de que ele está salvo no disco e que tem uma extensão de depuração instalada para esse tipo de arquivo.",
 	"cancel": "Cancelar",
-	"DebugTaskNotFound": "Não foi possível encontrar o preLaunchTask '{0}'.",
-	"taskNotTracked": "Tarefa de pré-lançamento ${0} não pode ser rastreada."
+	"taskNotTracked": "A tarefa '{0}' não pode ser rastreada."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
index 02bb00f9f6c..549e00ee363 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copyValue": "Copiar valor",
+	"copyAsExpression": "Copiar como Expressão",
 	"copy": "Copiar",
 	"copyAll": "Copiar todos",
 	"copyStackTrace": "Copiar Pilha de Chamadas"
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index c6a227f6440..3b712f1be09 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Mais Informações",
-	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
-	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração.",
-	"stoppingDebugAdapter": "{0}. Parando o adaptador de depuração.",
 	"debugAdapterCrash": "Processo do adaptador de depuração foi finalizado inesperadamente"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 68f9e1f25bf..18e436b0f51 100644
--- a/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "Executável do adaptador de depuração '{0}' não existe.",
 	"debugAdapterCannotDetermineExecutable": "Não é possível determinar o executável para o adaptador de depuração '{0}'.",
-	"launch.config.comment1": "Use o IntelliSense para aprender sobre possíveis atributos.",
-	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
-	"launch.config.comment3": "Para obter mais informações, visite: {0}",
-	"debugType": "Tipo de configuração.",
-	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
-	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
-	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
-	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
-	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
-	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
-	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
-	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
-	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
-	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
+	"unableToLaunchDebugAdapter": "Não é possível executar o adaptador de depuração de '{0}'.",
+	"unableToLaunchDebugAdapterNoArgs": "Não é possível executar o adaptador de depuração."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..ddf29b94374
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,23 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment2": "Passe o mouse para ver as descrições dos atributos existentes.",
+	"launch.config.comment3": "Para obter mais informações, visite: {0}",
+	"debugType": "Tipo de configuração.",
+	"debugTypeNotRecognised": "O tipo de depuração não é reconhecido. Certifique-se de que você tem uma extensão de depuração correspondente instalada e que ela está habilitada.",
+	"node2NotSupported": "\"node2\" não é mais suportado, use \"node\" ao invés e defina o atributo \"protocol\" para \"inspector\".",
+	"debugName": "Nome da configuração; aparece no menu drop-down da configuração de lançamento. ",
+	"debugRequest": "Requer o tipo de configuração. Pode ser \"launch\" ou \"attach\".",
+	"debugServer": "Somente para o desenvolvimento de extensão de depuração: se uma porta é especificada, o VS Code tenta se conectar a um adaptador de depuração executando em modo de servidor",
+	"debugPrelaunchTask": "Tarefa para ser executada antes de começar a sessão de depuração.",
+	"debugPostDebugTask": "Tarefa para ser executada após término da sessão de debug.",
+	"debugWindowsConfiguration": "Atributos de configuração de lançamento específicos do Windows.",
+	"debugOSXConfiguration": "Atributos de configuração de lançamento específicos do OS X.",
+	"debugLinuxConfiguration": "Atributos de configuração de lançamento específicos do Linux.",
+	"deprecatedVariables": "'env.', 'config.' e 'command.' foram descontinuados, use ' env:', ' config:' e ' command:' em vez disso."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..0043a4db9f3
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "Console VS Code",
+	"mac.terminal.script.failed": "Script '{0}' falhou com código de saída {1}",
+	"mac.terminal.type.not.supported": "'{0}' não suportado",
+	"press.any.key": "Pressione qualquer tecla para continuar...",
+	"linux.term.failed": "'{0}' falhou com código de saída {1}"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index ed84158ab3a..86302d2d217 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -6,12 +6,15 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"download": "Baixar manualmente",
 	"installAction": "Instalar",
 	"installing": "Instalando",
+	"failedToInstall": "Falha ao instalar '{0}'.",
 	"uninstallAction": "Desinstalar",
 	"Uninstalling": "Desinstalando",
 	"updateAction": "Atualizar",
 	"updateTo": "Atualizar para {0}",
+	"failedToUpdate": "Falha ao atualizar '{0}'.",
 	"ManageExtensionAction.uninstallingTooltip": "Desinstalando",
 	"enableForWorkspaceAction": "Habilitar (Espaço de Trabalho)",
 	"enableGloballyAction": "Habilitar",
@@ -54,8 +57,11 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Configurar as Extensões Recomendadas (Pasta do Espaço de Trabalho)",
 	"malicious tooltip": "Esta extensão foi relatada como problemática.",
 	"malicious": "Malicioso",
+	"disabled": "Desativado",
+	"disabled globally": "Desativado",
 	"disableAll": "Desabilitar Todas as Extensões Instaladas",
 	"disableAllWorkspace": "Desabilitar Todas as Extensões Instaladas para este Espaço de Trabalho",
+	"enableAll": "Ativar Todas as Extensões",
 	"openExtensionsFolder": "Abrir a Pasta de Extensões",
 	"installVSIX": "Instalar do VSIX...",
 	"installFromVSIX": "Instalar a partir do VSIX",
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..f6209cf359d
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,57 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Nome da extensão",
+	"extension id": "Identificador da extensão",
+	"preview": "Visualizar",
+	"builtin": "Intrínseco",
+	"publisher": "Nome do editor",
+	"install count": "Quantidade de Instalações",
+	"rating": "Avaliação",
+	"license": "Licença",
+	"details": "Detalhes",
+	"contributions": "Contribuições",
+	"changelog": "Registro de Alterações",
+	"dependencies": "Dependências",
+	"noReadme": "README não disponível.",
+	"noChangelog": "Registro de Alterações não disponível.",
+	"noContributions": "Sem Contribuições",
+	"noDependencies": "Sem Dependências",
+	"settings": "Configurações ({0})",
+	"setting name": "Nome",
+	"description": "Descrição",
+	"default": "Valor padrão",
+	"debuggers": "Depuradores ({0})",
+	"debugger name": "Nome",
+	"debugger type": "Tipo",
+	"views": "Visualizações ({0})",
+	"view id": "ID",
+	"view name": "Nome",
+	"view location": "Onde",
+	"localizations": "Localizações ({0})",
+	"localizations language id": "Id do Idioma",
+	"colorThemes": "Temas de cores ({0})",
+	"iconThemes": "Temas de ícones ({0})",
+	"colors": "Cores ({0})",
+	"colorId": "Id",
+	"defaultDark": "Padrão Escuro",
+	"defaultLight": "Padrão Claro",
+	"defaultHC": "Padrão de Alto Contraste",
+	"JSON Validation": "Validação JSON ({0})",
+	"schema": "Esquema",
+	"commands": "Comandos ({0})",
+	"command name": "Nome",
+	"keyboard shortcuts": "Atalhos de Teclado",
+	"menuContexts": "Contextos de Menu",
+	"languages": "Linguagens ({0})",
+	"language id": "ID",
+	"language name": "Nome",
+	"file extensions": "Extensões de Arquivo",
+	"grammar": "Gramática",
+	"snippets": "Trechos"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 9afc0966221..e88b86ca28f 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -8,13 +8,15 @@
 	],
 	"neverShowAgain": "Não mostrar novamente",
 	"searchMarketplace": "Pesquisar na Loja",
+	"showLanguagePackExtensions": "A loja possui extensões que podem ajudar na localização do VS Code para o local '{0}'",
+	"dynamicWorkspaceRecommendation": "Esta extensão pode interessá-lo porque é popular entre os usuários do repositório {0}.",
 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
 	"reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.",
 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
-	"showRecommendations": "Mostrar Recomendações",
 	"install": "Instalar",
+	"showRecommendations": "Mostrar Recomendações",
 	"showLanguageExtensions": "A Loja tem extensões que podem ajudar com arquivos '.{0}'",
 	"workspaceRecommended": "Este espaço de trabalho possui recomendações de extensão.",
 	"installAll": "Instalar Tudo",
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index d9fc84f40b8..af3364f4bd8 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Desabilitar outros mapeamentos de teclado ({0}) para evitar conflitos entre as combinações de teclas?",
 	"yes": "Sim",
-	"no": "Não",
-	"betterMergeDisabled": "A extensão Better Merge agora é intrínseca, a extensão instalada foi desabilitada e pode ser desinstalada.",
-	"uninstall": "Desinstalar"
+	"no": "Não"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 4f398630432..5d4dd840e84 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "Recomendado",
 	"otherRecommendedExtensions": "Outras recomendações",
 	"workspaceRecommendedExtensions": "Recomendações do Espaço de Trabalho",
-	"builtInExtensions": "Incorporado",
+	"builtInExtensions": "Funcionalidades",
+	"builtInThemesExtensions": "Temas",
 	"searchExtensions": "Pesquisar Extensões na Loja",
 	"sort by installs": "Ordenar por: Quantidade de Instalações",
 	"sort by rating": "Ordenar por: Avaliação",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 209ded70473..bb320e7128c 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,16 +27,13 @@
 	"confirmMoveTrashMessageMultiple": "Você tem certeza que deseja excluir os seguintes {0} arquivos?",
 	"confirmMoveTrashMessageFolder": "Tem certeza de que deseja excluir '{0}' e seu conteúdo?",
 	"confirmMoveTrashMessageFile": "Tem certeza de que deseja excluir '{0}'?",
-	"undoBin": "Você pode restaurar da lixeira.",
-	"undoTrash": "Você pode restaurar a partir do lixo.",
 	"doNotAskAgain": "Não me pergunte novamente",
 	"confirmDeleteMessageMultiple": "Você tem certeza que deseja excluir permanentemente os seguintes {0} arquivos?",
 	"confirmDeleteMessageFolder": "Tem certeza de que deseja excluir permanentemente '{0}' e seu conteúdo?",
 	"confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?",
 	"irreversible": "Esta ação é irreversível!",
-	"cancel": "Cancelar",
-	"permDelete": "Excluir permanentemente",
-	"importFiles": "Importar Arquivos",
+	"deletePermanentlyButtonLabel": "&&Excluir Permanentemente",
+	"retryButtonLabel": "&&Tentar Novamente",
 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
 	"replaceButtonLabel": "&&Substituir",
 	"fileDeleted": "Arquivo para colar foi excluído ou movido no meio-tempo",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index bfb3cdc41bf..d918ced097a 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Digite o Nome do arquivo. Pressione Enter para confirmar ou Escape para cancelar.",
-	"constructedPath": "Criar {0} em **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Explorador de Arquivos",
 	"dropFolders": "Você deseja adicionar as pastas ao espaço de trabalho?",
 	"dropFolder": "Você quer adicionar a pasta no espaço de trabalho?",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
index e38036e8255..e4ceea553e3 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"openEditors": "Abrir Editores",
+	"openEditors": "Editores Abertos",
 	"openEditosrSection": "Abrir Seção de Editores",
 	"dirtyCounter": "{0} não salvos"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..2f618f306d5
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Visualização Html"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..478273f97f8
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Entrada inválida do editor."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..1bdb832ea43
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Desenvolvedor"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..c9dceaeb492
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"refreshWebviewLabel": "Recarregar Webviews"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index a43dc690778..32575a778b5 100644
--- a/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Gostaria de alternar o idioma da interface do usuário do VS Code para {0} e reiniciar?",
+	"yes": "Sim",
+	"no": "Não",
+	"neverAgain": "Não mostrar novamente",
 	"JsonSchema.locale": "O idioma da interface do usuário a ser usada.",
 	"vscode.extension.contributes.localizations": "Contribui localizações ao editor",
 	"vscode.extension.contributes.localizations.languageId": "Id do idioma em que as strings de exibição estão traduzidas.",
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..ed26614c2ca
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Copiar",
+	"copyMessage": "Copiar Mensagem"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..8323facb36a
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Total {0} Problemas"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..4af5054b913
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Problemas",
+	"tooltip.1": "1 problema neste arquivo",
+	"tooltip.N": "{0} problemas neste arquivo"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..4c8c7d44a47
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Exibir",
+	"problems.view.toggle.label": "Esconder/exibir Problemas (Erros, Avisos, Infos)",
+	"problems.view.focus.label": "Focar Problemas (Erros, Avisos, Infos)",
+	"problems.panel.configuration.title": "Visualização de Problemas",
+	"problems.panel.configuration.autoreveal": "Controla se a visaulização de problemas evela os arquivos automaticamente ao abri-los",
+	"markers.panel.title.problems": "Problemas",
+	"markers.panel.aria.label.problems.tree": "Problemas agrupados por arquivos",
+	"markers.panel.no.problems.build": "Nenhum problema foi detectado na área de trabalho até agora.",
+	"markers.panel.action.filter": "Problemas de Filtro",
+	"markers.panel.filter.ariaLabel": "Problemas de Filtro",
+	"markers.panel.filter.errors": "erros",
+	"markers.panel.filter.warnings": "avisos",
+	"markers.panel.filter.infos": "informações",
+	"markers.panel.single.error.label": "1 Erro",
+	"markers.panel.multiple.errors.label": "{0} Erros",
+	"markers.panel.single.warning.label": "1 Aviso",
+	"markers.panel.multiple.warnings.label": "{0} Avisos",
+	"markers.panel.single.info.label": "1 Informação",
+	"markers.panel.multiple.infos.label": "{0} Informações",
+	"markers.panel.single.unknown.label": "1 Desconhecido",
+	"markers.panel.multiple.unknowns.label": "{0} Desconhecidos",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} com {1} problemas",
+	"errors.warnings.show.label": "Mostrar Erros e Avisos"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index c8466a5d8cf..71d77d2ad9b 100644
--- a/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Alternar Saída",
 	"clearOutput": "Limpar saída",
 	"toggleOutputScrollLock": "Alternar Scroll Lock de Saída",
-	"switchToOutput.label": "Mudar para Saída"
+	"switchToOutput.label": "Mudar para Saída",
+	"openInLogViewer": "Abrir Arquivo de Log"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index e1415c136bc..9b707612469 100644
--- a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Saída",
 	"logViewer": "Visualizador do Log",
 	"viewCategory": "Exibir",
-	"clearOutput.label": "Limpar saída"
+	"clearOutput.label": "Limpar saída",
+	"openActiveLogOutputFile": "Exibir: Abrir Arquivo de Saída de Log Ativo"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 7db752c5c98..b2078df07b5 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Atalhos de Teclado",
 	"SearchKeybindings.AriaLabel": "Pesquisar keybindings",
 	"SearchKeybindings.Placeholder": "Pesquisar keybindings",
 	"sortByPrecedene": "Ordenar por precedência",
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index 3bdbd7e75ff..adf9b0ba020 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Abrir Configurações Padrão Raw",
+	"openSettings": "Abrir configurações",
 	"openGlobalSettings": "Abra as Configurações de Usuário",
 	"openGlobalKeybindings": "Abrir Atalhos de Teclado",
 	"openGlobalKeybindingsFile": "Abrir Arquivo de Atalhos de Teclado",
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 1c1c058a5fd..6036183487d 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Configurações Padrão",
 	"SearchSettingsWidget.AriaLabel": "Configurações de Pesquisa",
 	"SearchSettingsWidget.Placeholder": "Configurações de Pesquisa",
 	"noSettingsFound": "Nenhum resultado",
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 5ca42fabfaf..d9d0d18805d 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Mostrar Extensão \"{0}\"",
 	"editTtile": "Editar",
 	"replaceDefaultValue": "Substituir nas Configurações",
-	"copyDefaultValue": "Copiar para Configurações",
-	"unsupportedPHPExecutablePathSetting": "Essa configuração deve ser uma Configuração de Usuário. Para configurar o PHP para o espaço de trabalho, abra um arquivo PHP e clique em 'Caminho do PHP' na barra de status.",
-	"unsupportedWorkspaceSetting": "Essa configuração deve ser uma Configuração de Usuário.",
-	"unsupportedWorkbenchSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente.",
-	"unsupportedWorkbenchSettingDevMode": "Essa configuração não pode ser aplicada agora. Ela será aplicada se você definir o seu escopo como 'recurso' durante o registo, ou quando você abrir esta pasta diretamente."
+	"copyDefaultValue": "Copiar para Configurações"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index a7ff00a96e8..dfb6a734a7b 100644
--- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -9,7 +9,8 @@
 	"scm providers": "Provedores de Controle de Código Fonte",
 	"hideRepository": "Ocultar",
 	"installAdditionalSCMProviders": "Instalar provedores de SCM adicionais...",
-	"no open repo": "Não existem provedores controle de código fonte ativos.",
+	"no open repo": "Não existem provedores de controle de código fonte ativos.",
 	"source control": "Controle de código-fonte",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Ocultar"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index 31c522acb51..ba5b86d8773 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Mostrar a Busca Anterior Excluindo Padrões",
 	"nextSearchTerm": "Mostrar o Próximo Termo de Pesquisa",
 	"previousSearchTerm": "Mostrar Termo de Pesquisa Anterior",
-	"showSearchViewlet": "Mostrar Busca",
 	"findInFiles": "Localizar nos Arquivos",
 	"replaceInFiles": "Substituir nos Arquivos",
 	"RefreshAction.label": "Atualizar",
diff --git a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
index 5f837d2145a..b3ae6818505 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/browser/searchView.i18n.json
@@ -30,6 +30,7 @@
 	"removeAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1} com '{2}'?",
 	"replaceAll.occurrences.files.confirmation.message": "Substituir {0} ocorrências nos arquivos {1}?",
 	"treeAriaLabel": "Resultados da Pesquisa",
+	"searchPathNotFoundError": "Caminho de pesquisa não encontrado: {0}",
 	"searchMaxResultsWarning": "O conjunto de resultados contém apenas um subconjunto de todas as correspondências. Seja mais específico na sua pesquisa para diminuir o número de resultados.",
 	"searchCanceled": "Pesquisa foi cancelada antes de qualquer resultado ser encontrado - ",
 	"noResultsIncludesExcludes": "Nenhum resultado encontrado em '{0}' excluindo '{1}' - ",
diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 485dee67981..56d88e0a648 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Pesquisar",
+	"copyMatchLabel": "Copiar",
+	"copyPathLabel": "Copiar Caminho",
+	"copyAllLabel": "Copiar todos",
 	"findInFolder": "Procurar na pasta...",
 	"findInWorkspace": "Procurar no Espaço de Trabalho...",
 	"showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...",
 	"name": "Pesquisar",
-	"search": "Pesquisar",
 	"showSearchViewl": "Mostrar Busca",
 	"view": "Exibir",
 	"findInFiles": "Localizar nos Arquivos",
@@ -24,5 +27,6 @@
 	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
 	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
-	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive."
+	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive.",
+	"search.globalFindClipboard": "Controla se a visualização de busca deve ler ou modificar a área de transferência de busca compartilhada no macOS"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 0dca83c74ee..79f168bdecb 100644
--- a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Nos ajude a melhorar o nosso apoio para {0}",
 	"takeShortSurvey": "Responda a uma pesquisa curta",
 	"remindLater": "Lembrar mais tarde",
-	"neverAgain": "Não mostrar novamente",
-	"helpUs": "Nos ajude a melhorar o nosso apoio para {0}"
+	"neverAgain": "Não mostrar novamente"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 40d20b6cd54..0e5b3cbd493 100644
--- a/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Você deseja responder a uma pequena pesquisa?",
 	"takeSurvey": "Responder a pesquisa",
 	"remindLater": "Lembrar mais tarde",
-	"neverAgain": "Não mostrar novamente",
-	"surveyQuestion": "Você deseja responder a uma pequena pesquisa?"
+	"neverAgain": "Não mostrar novamente"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 36d63910548..7cef3aef4bd 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,8 @@
 	"JsonSchema.tasks.group.none": "Atribui a tarefa para nenhum grupo",
 	"JsonSchema.tasks.group": "Define a que grupo de execução desta tarefa pertence. Suporta \"build\" para adicioná-lo ao grupo de compilação e \"test\" para adicioná-lo ao grupo de teste.",
 	"JsonSchema.tasks.type": "Define quando a tarefa é executada como um processo ou como um comando dentro do shell.",
+	"JsonSchema.command": "O comando a ser executado. Pode ser um programa externo ou um comando shell.",
+	"JsonSchema.tasks.args": "Argumentos passados para o comando quando esta tarefa é invocada.",
 	"JsonSchema.tasks.label": "O rótulo da tarefa na interface do usuário.",
 	"JsonSchema.version": "O número da versão do config.",
 	"JsonSchema.tasks.identifier": "Um identificador definido pelo usuário para fazer referência a tarefa em launch.json ou uma cláusula dependsOn.",
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 98ac71f39a9..c3c8aff5499 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Tarefas",
 	"ConfigureTaskRunnerAction.label": "Configurar a tarefa",
+	"totalErrors": "{0} Erros",
+	"totalWarnings": "{0} Avisos",
+	"totalInfos": "{0} Informações",
 	"problems": "Problemas",
 	"building": "Compilando...",
-	"manyMarkers": "99+",
+	"manyProblems": "10K+",
 	"runningTasks": "Mostrar tarefas em execução",
 	"tasks": "Tarefas",
 	"TaskSystem.noHotSwap": "Alterar o mecanismo de execução da tarefa com uma tarefa ativa executando exige que a janela seja recarregada",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Selecione quais tipos de erros e avisos da saída da tarefa você deseja verificar",
 	"customizeParseErrors": "A configuração da tarefa atual tem erros. Por favor, corrija os erros primeiro antes de personalizar uma tarefa.",
 	"moreThanOneBuildTask": "Há muitas tarefas de compilação definidas em tasks.json. Executando a primeira.\n",
-	"TaskSystem.activeSame.background": "A tarefa '{0}' já está ativa e executando em segundo plano. Para finalizá-la use 'Finalizar Tarefa' no menu Tarefas.",
-	"TaskSystem.activeSame.noBackground": "A tarefa '{0}' já está ativa. Para finalizá-la use 'Finalizar Tarefa' no menu Tarefas.",
+	"terminateTask": "Finalizar Tarefa",
+	"restartTask": "Reiniciar Tarefa",
 	"TaskSystem.active": "Já existe uma tarefa sendo executada. Finalize-a antes de executar outra tarefa.",
 	"TaskSystem.restartFailed": "Falha ao finalizar e reiniciar a tarefa {0}",
 	"TaskService.noConfiguration": "Erro: A deteção de tarefa {0} não contribuiu para uma tarefa para a seguinte configuração: {1} a tarefa será ignorada.\n",
diff --git a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 910bec85134..2b141ba44a3 100644
--- a/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -17,7 +17,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Erro: a configuração de tarefa '{0}' não possui a propriedade obrigatória '{1}'. A configuração de tarefa será ignorada.",
 	"ConfigurationParser.notCustom": "Erro: tarefas não está declarada como uma tarefa personalizada. A configuração será ignorada.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Erro: uma tarefa deve fornecer uma propriedade de rótulo. A tarefa será ignorada.\n{0}\n",
-	"taskConfiguration.shellArgs": "Aviso: a tarefa '{0}' é um comando shell e um dos seus argumentos pode ter espaços sem escape. Para garantir a citação da linha de comando correta por favor mesclar args ao comando.",
 	"taskConfiguration.noCommandOrDependsOn": "Erro: a tarefa '{0}' não especifica nem um comando nem uma propriedade dependsOn. A tarefa será ignorada. Sua definição é: \n{1}",
 	"taskConfiguration.noCommand": "Erro: a tarefa '{0}' não define um comando. A tarefa será ignorada. Sua definição é: {1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Tarefa versão 2.0.0 não oferece suporte a tarefas globais específicas do sistema operacional. Converta-as em uma tarefa com um comando específico do sistema operacional. Tarefas afetadas:\n{0}"
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..eb2f070aafe
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "A cor de fundo do terminal, isso permite colorir o terminal com uma cor diferente do painel.",
+	"terminal.foreground": "A cor de primeiro plano do terminal.",
+	"terminal.ansiColor": "'{0}' cor ANSI no terminal."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
index a0dc8f3fbc0..ccb060cdd99 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
@@ -35,6 +35,7 @@
 	"terminal.integrated.env.linux": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Linux",
 	"terminal.integrated.env.windows": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Windows",
 	"terminal.integrated.showExitAlert": "Mostrar alerta 'O processo terminal foi encerrado com código de saída' quando o código de saída é diferente de zero.",
+	"terminal.integrated.experimentalRestore": "Se deseja restaurar sessões de terminal para a área de trabalho automaticamente quando executa o VS Code. Essa é uma configuração experimental; Ele pode ser falho e pode mudar no futuro.",
 	"terminalCategory": "Terminal",
 	"viewCategory": "Exibir"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 2e5bc67362f..5844af8cc38 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -22,6 +22,7 @@
 	"workbench.action.terminal.newInActiveWorkspace": "Criar Novo Terminal Integrado (No Espaço de Trabalho Ativo)",
 	"workbench.action.terminal.split": "Dividir Terminal",
 	"workbench.action.terminal.focusPreviousPane": "Focar Painel Anterior",
+	"workbench.action.terminal.focusNextPane": "Foco próximo painel",
 	"workbench.action.terminal.resizePaneLeft": "Redimensionar Painel à Esquerda",
 	"workbench.action.terminal.resizePaneRight": "Redimensionar Painel à Direita",
 	"workbench.action.terminal.resizePaneUp": "Redimensionar Painel Superior",
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 725f78f2307..dbdfa88d94b 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Copiar",
+	"split": "Dividir",
 	"paste": "Colar",
 	"selectAll": "Selecionar Tudo",
-	"clear": "Limpar",
-	"split": "Dividir"
+	"clear": "Limpar"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index de16a43b9aa..c77824faf3b 100644
--- a/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Esta área de trabalho contém configurações que só podem ser definidas nas configurações do usuário. ({0}). Clique [aqui]({1}) para mais informações.",
 	"openWorkspaceSettings": "Abrir as configurações do espaço de trabalho",
-	"dontShowAgain": "Não mostrar novamente",
-	"unsupportedWorkspaceSettings": "Esta área de trabalho contém configurações que só podem ser definidas nas configurações do usuário. ({0}). Clique [aqui]({1}) para mais informações."
+	"dontShowAgain": "Não mostrar novamente"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..4290f9be0ba
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Notas da Versão: {0}",
+	"unassigned": "Não atribuído"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 5847a090e0c..0f2f852e685 100644
--- a/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Mais tarde",
-	"unassigned": "Não atribuído",
 	"releaseNotes": "Notas da Versão",
 	"showReleaseNotes": "Mostrar Notas da Versão",
 	"read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "Nova atualização de {0} disponível.",
 	"noUpdatesAvailable": "Não há nenhuma atualização disponível no momento.",
 	"ok": "OK",
-	"download now": "Baixar agora",
 	"thereIsUpdateAvailable": "Há uma atualização disponível.",
+	"download now": "Baixar agora",
+	"later": "Mais tarde",
 	"installUpdate": "Instalar Atualização",
-	"updateAvailable": "Há uma atualização disponível: {0} {1}",
 	"updateInstalling": "{0} {1} está sendo instalado no plano de fundo, nós te avisaremos quando estiver pronto.",
 	"updateNow": "Atualizar Agora",
-	"updateAvailableAfterRestart": "{0} será atualizado após reiniciar.",
 	"commandPalette": "Paleta de comandos...",
 	"settings": "Configurações",
 	"keyboardShortcuts": "Atalhos de Teclado",
diff --git a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..0169a443115
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "editor webview",
+	"developer": "Desenvolvedor"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..3533d84f530
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Abrir Ferramentas de Desenvolvedor do Webview",
+	"refreshWebviewLabel": "Recarregar Webviews"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..960ae0c5c98
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.readMore": "Ler Mais"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 0e1241ddfa4..39c7626f423 100644
--- a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Ferramentas e linguagens",
 	"welcomePage.installExtensionPacksDescription": "Instalar o suporte para {0} e {1}",
 	"welcomePage.moreExtensions": "mais",
-	"welcomePage.installKeymapDescription": "Instalar atalhos de teclado",
-	"welcomePage.installKeymapExtension": "Instalar os atalhos de teclado de {0} e {1}",
 	"welcomePage.others": "outros",
 	"welcomePage.colorTheme": "Tema de cores",
 	"welcomePage.colorThemeDescription": "Fazer o editor e seu código parecer do jeito que você gosta",
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
index 988b848fc4e..68215b632ce 100644
--- a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationEditingService.i18n.json
@@ -16,6 +16,11 @@
 	"errorInvalidWorkspaceTarget": "Não é possível gravar as configurações do espaço de trabalho porque {0} não oferece suporte para o escopo de espaço de trabalho em um espaço de trabalho de múltiplas pastas.",
 	"errorInvalidFolderTarget": "Não é possível gravar as configurações da pasta porque nenhum recurso é fornecido.",
 	"errorNoWorkspaceOpened": "Não é possível gravar {0} porque nenhum espaço de trabalho está aberto. Por favor, abra um espaço de trabalho primeiro e tente novamente.",
+	"errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração de tarefas. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
+	"errorInvalidLaunchConfiguration": "Não é possível escrever no arquivo de configuração de lançamento. Por favor, abra o arquivo para corrigir erros/avisos e tente novamente.",
+	"errorInvalidConfiguration": "Não é possível escrever nas configurações do usuário. Por favor, abra as configurações do usuário para corrigir erros/avisos e tente novamente.",
+	"errorInvalidConfigurationWorkspace": "Não é possível escrever nas configurações do espaço de trabalho. Por favor, abra as configurações do espaço de trabalho para corrigir erros/avisos no arquivo e tente novamente.",
+	"errorInvalidConfigurationFolder": "Não é possível escrever nas configurações de pasta. Por favor, abra as configurações da pasta '{0}' para corrigir erros/avisos e tente novamente.",
 	"userTarget": "Configurações de Usuário",
 	"workspaceTarget": "Configurações de Espaço de Trabalho",
 	"folderTarget": "Configurações de pasta"
diff --git a/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..54475988a3a
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "Essa configuração não pode ser aplicada agora. Será aplicada quando você abrir esta pasta diretamente."
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..7fbcc0a8081
--- /dev/null
+++ b/i18n/ptb/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Sim",
+	"cancelButton": "Cancelar"
+}
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
index f12b0743598..4dbdaaac4b5 100644
--- a/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/extensions/common/extensionsRegistry.i18n.json
@@ -30,5 +30,6 @@
 	"vscode.extension.badges.description": "Descrição do emblema.",
 	"vscode.extension.extensionDependencies": "Dependências para outras extensões. O identificador de uma extensão sempre é ${publisher}. ${nome}. Por exemplo: vscode.csharp.",
 	"vscode.extension.scripts.prepublish": "Script a ser executado antes do pacote ser publicado como uma extensão VS Code.",
+	"vscode.extension.scripts.uninstall": "Desinstala o hook para a extensão do VS Code. O script que é executado quando a extensão é completamente desinstalada do VS Code e é quando o VS Code é reiniciado (desligar e iniciar) depois que a extensão for desinstalada. Somente scripts Node são suportados.",
 	"vscode.extension.icon": "O caminho para um ícone de 128x128 pixels."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 34d4e413217..f274e33cf84 100644
--- a/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "Host de extensão foi encerrado inesperadamente.",
 	"extensionHostProcess.unresponsiveCrash": "Host de extensão encerrado porque não foi responsivo.",
-	"devTools": "Ferramentas do Desenvolvedor",
 	"restart": "Reinicie o Host de extensão",
 	"overwritingExtension": "Sobrescrevendo extensão {0} por {1}.",
 	"extensionUnderDevelopment": "Carregando extensão de desenvolvimento em {0}",
diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 45f49e07241..f77f09d67b9 100644
--- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,22 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "O Microsoft .NET Framework 4.5 é necessário. Por favor siga o link para instalá-lo.",
 	"installNet": "Baixar o .NET Framework 4.5",
 	"neverShowAgain": "Não mostrar novamente",
-	"netVersionError": "O Microsoft .NET Framework 4.5 é necessário. Por favor siga o link para instalá-lo.",
 	"learnMore": "Instruções",
-	"enospcError": "{0} está ficando sem tratamento de arquivos. Por favor, siga o link de instruções para resolver esse problema.",
+	"fileInvalidPath": "Recurso de arquivo inválido ({0})",
+	"fileIsDirectoryError": "Arquivo é um diretório",
+	"fileNotModifiedError": "Arquivo não modificado desde",
+	"fileTooLargeError": "Arquivo muito grande para abrir",
+	"fileNotFoundError": "Arquivo não encontrado ({0})",
+	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
+	"filePermission": "Permissão negada ao escrever no arquivo ({0})",
+	"fileExists": "Arquivo a ser criado já existe ({0})",
+	"fileModifiedError": "Arquivo Modificado Desde",
+	"fileReadOnlyError": "Arquivo é Somente Leitura",
+	"fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino.",
+	"unableToMoveCopyError": "Não é possível mover/copiar. Arquivo poderia substituir a pasta em que está contida.",
 	"binFailed": "Falha ao mover '{0}' para a lixeira",
 	"trashFailed": "Falha em mover '{0}' para a lixeira"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index a3887e88897..ea2af2d0060 100644
--- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Arquivo não encontrado ({0})",
 	"fileIsDirectoryError": "Arquivo é um diretório",
 	"fileNotModifiedError": "Arquivo não modificado desde",
 	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto"
diff --git a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
index 37fbb011a3d..29bfbb0d040 100644
--- a/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Recurso de arquivo inválido ({0})",
 	"fileIsDirectoryError": "Arquivo é um diretório",
 	"fileNotModifiedError": "Arquivo não modificado desde",
-	"fileTooLargeForHeapError": "O tamanho do arquivo excede o limite de memória da janela. Por favor, tente executar o codigo -max-memory=NOVOVALOR",
 	"fileTooLargeError": "Arquivo muito grande para abrir",
 	"fileNotFoundError": "Arquivo não encontrado ({0})",
 	"fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto",
diff --git a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..10f4afca07b 100644
--- a/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Cancelar"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
index 7913d843913..a1c9ed8158f 100644
--- a/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
+++ b/i18n/ptb/src/vs/workbench/services/themes/common/colorThemeSchema.i18n.json
@@ -9,6 +9,7 @@
 	"schema.token.settings": "Cores e estilos para o token.",
 	"schema.token.foreground": "Cor do primeiro plano para o token.",
 	"schema.token.background.warning": "Atualmente as cores de fundo do token não são suportadas.",
+	"schema.token.fontStyle": "Estilo da fonte da regra: 'itálico', 'negrito', 'sublinhado' ou uma combinação. Cadeia de caracteres vazia desfaz configurações herdadas.",
 	"schema.token.fontStyle.none": "Nenhum (limpar estilo herdado)",
 	"schema.properties.name": "Descrição da regra.",
 	"schema.properties.scope": "Seletor de escopo que bate com esta regra.",
diff --git a/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..01ee817cdcd
--- /dev/null
+++ b/i18n/rus/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "Языковой сервер CSS",
+	"folding.start": "Начало сворачиваемого региона",
+	"folding.end": "Окончание сворачиваемого региона"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css-language-features/package.i18n.json b/i18n/rus/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..13b750e8b52
--- /dev/null
+++ b/i18n/rus/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Возможности языка CSS",
+	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
+	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
+	"css.validate.desc": "Включает или отключает все проверки",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
+	"less.validate.desc": "Включает или отключает все проверки",
+	"scss.title": "SCSS (SASS)",
+	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
+	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
+	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
+	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
+	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
+	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
+	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
+	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
+	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
+	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
+	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
+	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
+	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
+	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
+	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
+	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
+	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
+	"scss.validate.desc": "Включает или отключает все проверки",
+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
+	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
+	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/css/package.i18n.json b/i18n/rus/extensions/css/package.i18n.json
index a4d164c6122..f94884afe4a 100644
--- a/i18n/rus/extensions/css/package.i18n.json
+++ b/i18n/rus/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Возможности языка CSS",
-	"description": "Предоставляет широкую поддержку языка для файлов CSS, LESS и SCSS.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"css.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"css.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"css.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"css.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"css.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"css.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"css.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"css.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"css.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"css.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"css.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"css.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером CSS.",
-	"css.validate.title": "Управляет проверкой CSS и серьезностью проблем.",
-	"css.validate.desc": "Включает или отключает все проверки",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"less.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"less.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"less.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"less.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"less.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"less.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"less.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"less.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"less.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"less.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"less.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"less.validate.title": "Управляет проверкой LESS и уровнями серьезности проблем. ",
-	"less.validate.desc": "Включает или отключает все проверки",
-	"scss.title": "SCSS (SASS)",
-	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
-	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
-	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
-	"scss.lint.duplicateProperties.desc": "Не использовать дублирующиеся определения стилей",
-	"scss.lint.emptyRules.desc": "Не использовать пустые наборы правил",
-	"scss.lint.float.desc": "Старайтесь не использовать \"float\". Из-за элементов \"float\" работа кода CSS может легко нарушиться, если изменить один из аспектов разметки.",
-	"scss.lint.fontFaceProperties.desc": "Правило @font-face должно определять свойства src и font-family",
-	"scss.lint.hexColorLength.desc": "Цвета в шестнадцатеричном формате должны содержать три или шесть шестнадцатеричных чисел",
-	"scss.lint.idSelector.desc": "Селекторы не должны содержать идентификаторов, потому что эти правила слишком тесно связаны с HTML.",
-	"scss.lint.ieHack.desc": "Полезные советы для Internet Explorer требуются только при поддержке Internet Explorer 7 и более ранних версий",
-	"scss.lint.important.desc": "Старайтесь не использовать !important, так как это признак того, что весь код CSS стал неуправляемым и его надо переработать.",
-	"scss.lint.importStatement.desc": "Операторы импорта не загружаются параллельно",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Свойство проигнорировано из-за значения свойства display. Например, при \"display: inline\" свойства width, height, margin-top, margin-bottom и float не работают",
-	"scss.lint.universalSelector.desc": "Универсальный селектор (*) работает медленно",
-	"scss.lint.unknownProperties.desc": "Неизвестное свойство.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Неизвестное свойство поставщика.",
-	"scss.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
-	"scss.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
-	"scss.validate.title": "Управляет проверкой SCSS и уровнями серьезности проблем.",
-	"scss.validate.desc": "Включает или отключает все проверки",
-	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"css.colorDecorators.enable.deprecationMessage": "Параметр \"css.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"scss.colorDecorators.enable.deprecationMessage": "Параметр \"scss.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". ",
-	"less.colorDecorators.enable.deprecationMessage": "Параметр \"less.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\". "
+	"displayName": "Основы языка CSS",
+	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах CSS, LESS и SCSS."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/emmet/package.i18n.json b/i18n/rus/extensions/emmet/package.i18n.json
index b9e88e5f37b..c6570b949da 100644
--- a/i18n/rus/extensions/emmet/package.i18n.json
+++ b/i18n/rus/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Путь к папке, содержащей профили Emmet и фрагменты кода.",
 	"emmetShowExpandedAbbreviation": "Отображает развернутые сокращения Emmet в виде предложений.\nПараметр \"inMarkupAndStylesheetFilesOnly\" применяется к html, haml, jade, slim, xml, xsl, css, scss, sass, less и stylus .\nПараметр \"always\" применяется ко всем частям файла независимо от разметки и стилей.",
 	"emmetShowAbbreviationSuggestions": "Отображает возможные сокращения Emmet в виде предложений. Не применяется в таблицах стилей или если параметр emmet.showExpandedAbbreviation имеет значение \"never\".",
-	"emmetIncludeLanguages": "Включает сокращения Emmet в языках, которые не поддерживаются по умолчанию. Здесь можно указать связь между не поддерживаемым и поддерживаемым языками.\nПример: {\"vue-html\": \"html\", \"javascript\": \"javascriptreact\"}",
 	"emmetVariables": "Переменные, которые будут использоваться во фрагментах Emmet",
 	"emmetTriggerExpansionOnTab": "Если этот параметр установлен, сокращения Emmet разворачиваются при нажатии клавиши TAB.",
 	"emmetPreferences": "Настройки, которые используются для изменения поведения некоторых действий и сопоставителей Emmet.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"webkit\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс  \"webkit\" никогда не подставлялся, установите в качестве этого параметра пустое значение.",
 	"emmetPreferencesCssMozProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"moz\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"moz\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
 	"emmetPreferencesCssOProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"o\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"o\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
-	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. "
+	"emmetPreferencesCssMsProperties": "Разделенный запятыми список свойств CSS, которые получают префикс разработчика \"ms\" при использовании в сокращениях Emmet, которые начинаются с \"-\". Чтобы префикс \"ms\" никогда не подставлялся, установите в качестве этого параметра пустое значение. ",
+	"emmetPreferencesCssFuzzySearchMinScore": "Минимальное количество очков для нечеткого соответствия сокращения (от 0 до 1). При указании более низких значений возможно увеличение числа ложных срабатываний, при указании более высоких значений - уменьшение числа возможных соответствий."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/commands.i18n.json b/i18n/rus/extensions/git/out/commands.i18n.json
index ef93bfa4e37..c7863b7c963 100644
--- a/i18n/rus/extensions/git/out/commands.i18n.json
+++ b/i18n/rus/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "ОК",
 	"push with tags success": "Файлы с тегами успешно отправлены.",
 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
-	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
+	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}/{1}\" и извлекает их из этого расположения.",
 	"never again": "ОК, больше не показывать",
 	"no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.",
 	"no changes stash": "Отсутствуют изменения, которые необходимо спрятать.",
diff --git a/i18n/rus/extensions/git/package.i18n.json b/i18n/rus/extensions/git/package.i18n.json
index 9b69c39a76d..f033330e3d5 100644
--- a/i18n/rus/extensions/git/package.i18n.json
+++ b/i18n/rus/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Определяет, должно ли отображаться интерактивное действие \"Открыть файл\" в представлении \"Изменения Git\".",
 	"config.inputValidation": "Определяет, следует ли проверять введенные данные в сообщении фиксации.",
 	"config.detectSubmodules": "Определяет, следует ли автоматически определять подмодули Git.",
+	"config.detectSubmodulesLimit": "Управляет ограничением на количество обнаруженных подмодулей Git.",
 	"colors.modified": "Цвет измененных ресурсов.",
 	"colors.deleted": "Цвет удаленных ресурсов.",
 	"colors.untracked": "Цвет неотслеживаемых ресурсов.",
diff --git a/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..113482bb267
--- /dev/null
+++ b/i18n/rus/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "Языковой сервер HTML",
+	"folding.start": "Начало сворачиваемого региона",
+	"folding.end": "Окончание сворачиваемого региона"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html-language-features/package.i18n.json b/i18n/rus/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..ffedf2c26a3
--- /dev/null
+++ b/i18n/rus/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Возможности языка HTML",
+	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
+	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
+	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
+	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
+	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
+	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
+	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
+	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
+	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
+	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
+	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
+	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
+	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
+	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
+	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
+	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
+	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
+	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
+	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
+	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
+	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
+	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/html/package.i18n.json b/i18n/rus/extensions/html/package.i18n.json
index 97846bbda84..42837cfec9d 100644
--- a/i18n/rus/extensions/html/package.i18n.json
+++ b/i18n/rus/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Возможности языка HTML",
-	"description": "Предоставляет широкую поддержку языка для файлов HTML, Razor и Handlebar.",
-	"html.format.enable.desc": "Включить/отключить модуль форматирования HTML по умолчанию",
-	"html.format.wrapLineLength.desc": "Максимальное число символов на строку (0 — отключить).",
-	"html.format.unformatted.desc": "Список тегов, которые не следует повторно форматировать, с разделителями-запятыми. Значение \"NULL\" по умолчанию означает все теги, перечисленные на странице https://www.w3.org/TR/html5/dom.html#phrasing-content.",
-	"html.format.contentUnformatted.desc": "Разделенный запятыми список тегов, в которых формат содержимого не должен изменяться. Значение null задается по умолчанию для тега pre.",
-	"html.format.indentInnerHtml.desc": "Отступ в разделах <head> и <body>.",
-	"html.format.preserveNewLines.desc": "Следует ли сохранять разрывы строк перед элементами. Работает только перед элементами, а не внутри тегов или для текста.",
-	"html.format.maxPreserveNewLines.desc": "Максимальное число разрывов строк для сохранения в блоке. Чтобы указать неограниченное число строк, используйте \"null\".",
-	"html.format.indentHandlebars.desc": "Формат и отступ {{#foo}} и {{/foo}}.",
-	"html.format.endWithNewline.desc": "Завершение символом новой строки.",
-	"html.format.extraLiners.desc": "Список тегов с разделителями-запятыми и дополнительными новыми строками между ними. Значение \"null\" по умолчанию ставится для \"head, body, /html\".",
-	"html.format.wrapAttributes.desc": "Перенос атрибутов.",
-	"html.format.wrapAttributes.auto": "Перенос атрибутов только при превышении длины строки.",
-	"html.format.wrapAttributes.force": "Перенос всех атрибутов, кроме первого.",
-	"html.format.wrapAttributes.forcealign": "Перенос всех атрибутов, кроме первого, и сохранение выравнивания.",
-	"html.format.wrapAttributes.forcemultiline": "Перенос всех атрибутов.",
-	"html.suggest.angular1.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги и свойства Angular 1.",
-	"html.suggest.ionic.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения Ionic.",
-	"html.suggest.html5.desc": "Определяет, будет ли встроенная поддержка языка HTML предлагать теги, свойства и значения HTML5.",
-	"html.trace.server.desc": "Отслеживает обмен данными между VS Code и языковым сервером HTML. ",
-	"html.validate.scripts": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные сценарии.",
-	"html.validate.styles": "Определяет, будет ли встроенная поддержка языка HTML проверять внедренные стили.",
-	"html.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
-	"html.autoClosingTags": "Включить или отключить автоматическое закрытие тегов HTML. "
+	"displayName": "Основы языка HTML",
+	"description": "Обеспечивает подсветку синтаксиса, выделение парных скобок и сниппеты в HTML-файлах."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..ae46a81e4e9
--- /dev/null
+++ b/i18n/rus/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "Языковой сервер JSON"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json-language-features/package.i18n.json b/i18n/rus/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..c12c7e1110d
--- /dev/null
+++ b/i18n/rus/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Возможности языка JSON",
+	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
+	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
+	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
+	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
+	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
+	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
+	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
+	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
+	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета",
+	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\"."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/json/package.i18n.json b/i18n/rus/extensions/json/package.i18n.json
index 5b4b6d24cfd..85f61bdfc1a 100644
--- a/i18n/rus/extensions/json/package.i18n.json
+++ b/i18n/rus/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "Возможности языка JSON",
-	"description": "Предоставляет широкую поддержку языка для файлов JSON.",
-	"json.schemas.desc": "Связь схем с JSON-файлами в текущем проекте",
-	"json.schemas.url.desc": "URL-адрес схемы или относительный путь к ней в текущем каталоге",
-	"json.schemas.fileMatch.desc": "Массив шаблонов файлов, с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.fileMatch.item.desc": "Шаблон файла, который может содержать \"*\" и с которым выполняется сравнение, при разрешении JSON-файлов в схемах.",
-	"json.schemas.schema.desc": "Определение схемы для указанного URL-адреса. Схему необходимо указать только для того, чтобы не обращаться по URL-адресу схемы.",
-	"json.format.enable.desc": "Включение или отключение модуля форматирования JSON по умолчанию (требуется перезагрузка)",
-	"json.tracing.desc": "Отслеживает связь между VS Code и языковым сервером JSON.",
-	"json.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
-	"json.colorDecorators.enable.deprecationMessage": "Параметр \"json.colorDecorators.enable\" устарел. Теперь вместо него используется параметр \"editor.colorDecorators\".",
-	"json.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса."
+	"displayName": "Основы языка JSON",
+	"description": "Обеспечивает подсветку синтаксиса и выделение парных скобок в файлах JSON."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..b4a71726277
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "Не удалось загрузить 'markdown.styles': {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..5788adc61fe
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Предварительный просмотр] {0}",
+	"previewTitle": "Открыть {0} для предварительного просмотра"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..01fb924a326
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Некоторое содержимое в этом документе было отключено",
+	"preview.securityMessage.title": "В предварительном просмотре Markdown было отключено потенциально опасное или ненадежное содержимое. Чтобы разрешить ненадежное содержимое или включить сценарии, измените параметры безопасности предварительного просмотра Markdown.",
+	"preview.securityMessage.label": "Предупреждение безопасности об отключении содержимого"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/out/security.i18n.json b/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..d51d2ea286d
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,22 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Строгий",
+	"strict.description": "Загружать только безопасное содержимое",
+	"insecureLocalContent.title": "Разрешить небезопасное локальное содержимое",
+	"insecureLocalContent.description": "Включить загрузку содержимого через HTTP из localhost",
+	"insecureContent.title": "Разрешить небезопасное содержимое",
+	"insecureContent.description": "Включить загрузку содержимого через HTTP",
+	"disable.title": "Отключить",
+	"disable.description": "Разрешить все содержимое и выполнение сценариев. Не рекомендуется",
+	"moreInfo.title": "Дополнительные сведения",
+	"enableSecurityWarning.title": "Включить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
+	"disableSecurityWarning.title": "Отключить предварительный просмотр предупреждений системы безопасности в этой рабочей области",
+	"toggleSecurityWarning.description": "Не влияет на уровень безопасности содержимого",
+	"preview.showPreviewSecuritySelector.title": "Установите параметры безопасности для предварительного просмотра Markdown в этой рабочей области"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/markdown-language-features/package.i18n.json b/i18n/rus/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..0c205858212
--- /dev/null
+++ b/i18n/rus/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Возможности языка Markdown",
+	"description": "Предоставляет широкую поддержку языка для Markdown.",
+	"markdown.preview.breaks.desc": "Определяет, как переносы строк отображаются в области предварительного просмотра файла Markdown. Если установить этот параметр в значение 'true', <br>будут создаваться для каждой новой строки.",
+	"markdown.preview.linkify": "Включить или отключить преобразование текста в URL для предварительного просмотра Markdown.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Двойной щелчок в области предварительного просмотра Markdown в редакторе.",
+	"markdown.preview.fontFamily.desc": "Определяет семейство шрифтов, используемое в области предварительного просмотра файла Markdown.",
+	"markdown.preview.fontSize.desc": "Определяет размер шрифта (в пикселях), используемый в области предварительного просмотра файла Markdown.",
+	"markdown.preview.lineHeight.desc": "Определяет высоту строки, используемую в области предварительного просмотра файла Markdown. Это значение задается относительно размера шрифта.",
+	"markdown.preview.markEditorSelection.desc": "Выделение выбранного в текущем редакторе в предпросмотре Markdown.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Обновить представление редактора при прокрутке предварительного просмотра Markdown.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Обновить представление предварительного просмотра при прокрутке редактора Markdown.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Устаревшая функция] Прокрутка предварительного просмотра Markdown до выбранной строки в редакторе.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Этот параметр был заменен на 'markdown.preview.scrollPreviewWithEditor' и больше не используется.",
+	"markdown.preview.title": "Открыть область предварительного просмотра",
+	"markdown.previewFrontMatter.dec": "Определяет обработку титульных листов YAML в области предварительного просмотра файла Markdown. Значение \"скрыть\" удаляет титульные листы. В противном случае титульные листы обрабатываются как содержимое файла Markdown.",
+	"markdown.previewSide.title": "Открыть область предварительного просмотра сбоку",
+	"markdown.showLockedPreviewToSide.title": "Открыть заблокированную область предварительного просмотра сбоку",
+	"markdown.showSource.title": "Показать источник",
+	"markdown.styles.dec": "Список URL-адресов или локальных путей к таблицам стилей CSS, используемых из области предварительного просмотра файла Markdown. Относительные пути интерпретируются относительно папки, открытой в проводнике. Если папка не открыта, они интерпретируются относительно расположения файла Markdown. Все символы '\\' должны записываться в виде '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Изменить параметры безопасности для предварительного просмотра",
+	"markdown.trace.desc": "Включить ведение журнала отладки для расширения Markdown.",
+	"markdown.preview.refresh.title": "Обновить область предварительного просмотра",
+	"markdown.preview.toggleLock.title": "Включить/отключить блокировку области предварительного просмотра"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..5696440e52e
--- /dev/null
+++ b/i18n/rus/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "Разрешить выполнять {0} (определяется как параметр рабочей области) для обработки PHP-файлов через lint?",
+	"php.yes": "Разрешить",
+	"php.no": "Запретить",
+	"wrongExecutable": "Не удается проверить, так как {0} не является допустимым исполняемым PHP-файлом. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
+	"noExecutable": "Не удается проверить, так как не задан исполняемый PHP-файл. Используйте параметр php.validate.executablePath, чтобы настроить исполняемый PHP-файл.",
+	"unknownReason": "Не удалось запустить PHP-файл, используя путь {0}. Причина неизвестна."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php-language-features/package.i18n.json b/i18n/rus/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..b0eb11ff036
--- /dev/null
+++ b/i18n/rus/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
+	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
+	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
+	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)",
+	"displayName": "Функции языка PHP",
+	"description": "Предоставляет широкую поддержку возможностей языка для файлов PHP."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/php/package.i18n.json b/i18n/rus/extensions/php/package.i18n.json
index c35bde05b3a..f980f6e45a4 100644
--- a/i18n/rus/extensions/php/package.i18n.json
+++ b/i18n/rus/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Указывает, включены ли встроенные языковые предложения для PHP. Поддержка предлагает глобальные значения и переменные PHP.",
-	"configuration.validate.enable": "Включение или отключение встроенной проверки PHP.",
-	"configuration.validate.executablePath": "Указывает на исполняемый файл PHP.",
-	"configuration.validate.run": "Запускается ли анализатор кода при сохранении или при печати.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "Запретить исполняемый файл проверки PHP (определяется как параметр рабочей области)",
-	"displayName": "Функции языка PHP",
-	"description": "Предоставляет IntelliSense, функции жанров и основные функции языка для файлов PHP."
+	"description": "Предоставляет подсветку синтаксиса и выделение парных скобок в файлах PHP."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json b/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..c2ebfd19241
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.",
+	"typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла",
+	"typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.",
+	"typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript. Дополнительные сведения см. [здесь]({0}).",
+	"typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript. Дополнительные сведения см. [здесь]({0}).",
+	"typescript.configureTsconfigQuickPick": "Настроить tsconfig.json",
+	"typescript.configureJsconfigQuickPick": "Настроить jsconfig.json"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..3df8eafb051
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Выберите применяемое действие кода",
+	"acquiringTypingsLabel": "Получение typings...",
+	"acquiringTypingsDetail": "Получение определений typings для IntelliSense.",
+	"autoImportLabel": "Автоматический импорт из {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..3add3405e17
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Включает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
+	"ts-nocheck": "Отключает семантическую проверку в JavaScript файле. Необходимо расположить в самом начале файла.",
+	"ts-ignore": "Отключает вывод ошибок @ts-check для следующей строки файла."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..8f5e9d5ec4f
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 реализация",
+	"manyImplementationLabel": "Реализации {0}",
+	"implementationsErrorLabel": "Не удалось определить реализации."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..b4cad43043f
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "Комментарий JSDoc"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..1787a125fae
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "Организация импортов"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..72b696f9b0a
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Исправить все в файле)"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..63583231cd7
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 ссылка",
+	"manyReferenceLabel": "Ссылок: {0}",
+	"referenceErrorLabel": "Не удалось определить ссылки."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..a641634e077
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "сборка – {0}",
+	"buildAndWatchTscLabel": "отслеживание – {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..0a42c8c6746
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "Путь {0} не указывает на допустимый файл программы установки tsserver. Выполняется откат до пакетной версии TypeScript.",
+	"serverCouldNotBeStarted": "Не удалось запустить языковой сервер TypeScript. Сообщение об ошибке: \"{0}\".",
+	"typescript.openTsServerLog.notSupported": "Для ведения журнала сервера TS требуется TS 2.2.2+",
+	"typescript.openTsServerLog.loggingNotEnabled": "Вход в TS Server отключен. Задайте \"typescript.tsserver.log\" и перезагрузите VS Code, чтобы включить ведение журнала",
+	"typescript.openTsServerLog.enableAndReloadOption": "Войдите и перезагрузите TS server",
+	"typescript.openTsServerLog.noLogFile": "Сервер TS не начал ведение журнала.",
+	"openTsServerLog.openFileFailedFailed": "Не удалось открыть файл журнала сервера TS",
+	"serverDiedAfterStart": "Языковая служба TypeScript пять раз завершила работу сразу после запуска. Служба не будет перезапущена.",
+	"serverDiedReportIssue": "Сообщить об ошибке",
+	"serverDied": "Языковая служба TypeScript пять раз непредвиденно завершила работу за последние пять минут."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..54d1199165b
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
+	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
+	"large.label": "Настройка исключений",
+	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..f5ffd76a57b
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Получение данных для повышения эффективности IntelliSense TypeScript",
+	"typesInstallerInitializationFailed.title": "Не удалось установить файлы типизации для языка JavaScript. Убедитесь, что NPM установлен или укажите путь к файлу 'typescript.npm' в параметрах среды пользователя. Дополнительные сведения см. [здесь]({0}).",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Больше не показывать"
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..f475eb8cead
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "Использовать версию VS Code",
+	"useWorkspaceVersionOption": "Использовать версию рабочей области",
+	"learnMore": "Дополнительные сведения",
+	"selectTsVersion": "Выберите версию TypeScript, используемую для языковых функций JavaScript и TypeScript."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..5de17783d56
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Не удалось загрузить версию TypeScript по этому пути",
+	"noBundledServerFound": "Файл tsserver VSCode был удален другим приложением, например, в результате ошибочного срабатывания средства обнаружения вирусов. Переустановите VSCode."
+}
\ No newline at end of file
diff --git a/i18n/rus/extensions/typescript-language-features/package.i18n.json b/i18n/rus/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..52fae6d2583
--- /dev/null
+++ b/i18n/rus/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,58 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Возможности языков TypeScript и JavaScript",
+	"description": "Предоставляет широкую поддержку языка для JavaScript и TypeScript.",
+	"typescript.reloadProjects.title": "Перезагрузить проект",
+	"javascript.reloadProjects.title": "Перезагрузить проект",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Дополните функции сигнатурами их параметров.",
+	"typescript.tsdk.desc": "Указывает путь к папке, содержащей файлы tsserver и lib*.d.ts, которые необходимо использовать.",
+	"typescript.disableAutomaticTypeAcquisition": "Отключает автоматическое получение типов. Требуется TypeScript 2.0.6 и более поздней версии.",
+	"typescript.tsserver.log": "Включает ведение журнала для сервера TS. Этот журнал можно использовать для диагностики проблем сервера TS. В журнале могут содержаться пути к файлам, исходный код и другие сведения из вашего проекта, в том числе носящие конфиденциальный характер.",
+	"typescript.tsserver.trace": "Включает трассировку сообщений, отправляемых на сервер TS. Эту трассировку можно использовать для диагностики проблем сервера TS. Трассировка может содержать пути к файлам, исходный код и другие сведения из вашего проекта, в том числе конфиденциальные данные.",
+	"typescript.validate.enable": "Включение или отключение проверки TypeScript.",
+	"typescript.format.enable": "Включение или отключение модуля форматирования TypeScript по умолчанию.",
+	"javascript.format.enable": "Включение или отключение модуля форматирования JavaScript по умолчанию.",
+	"format.insertSpaceAfterCommaDelimiter": "Определяет метод обработки пробелов после разделителя-запятой.",
+	"format.insertSpaceAfterConstructor": "Определяет метод обработки пробелов после ключевого слова constructor. Требуется TypeScript 2.3.0 или более поздней версии.",
+	"format.insertSpaceAfterSemicolonInForStatements": " Определяет метод обработки пробелов после точки с запятой в операторе for.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Определяет метод обработки пробелов после двоичного оператора.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Определяет метод обработки пробелов после ключевых слов в операторе управления потоком выполнения.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Определяет метод обработки пробелов после ключевого слова function у анонимных функций.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Определяет метод обработки пробелов перед скобками аргумента функции. Требует TypeScript >= 2.1.5.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок в строке шаблона. Требуется TypeScript 2.0.6 или более поздней версии.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "Определяет метод обработки пробелов после открытия и до закрытия скобок выражения JSX. Требуется TypeScript 2.0.6 или более поздней версии.",
+	"format.insertSpaceAfterTypeAssertion": "Определяет метод обработки пробелов после утверждений типа в TypeScript. Требуется TypeScript 2.4 или более поздней версии.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Определяет, ставится ли открывающая фигурная скобка с новой строки в функциях.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Определяет, ставится ли открывающая фигурная скобка с новой строки в блоках управления.",
+	"javascript.validate.enable": "Включение или отключение проверки JavaScript.",
+	"typescript.goToProjectConfig.title": "Перейти к конфигурации проекта",
+	"javascript.goToProjectConfig.title": "Перейти к конфигурации проекта",
+	"javascript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов JavaScript.",
+	"typescript.referencesCodeLens.enabled": "Включить/отключить ссылки CodeLens для файлов TypeScript. Требуется TypeScript версии 2.0.6 или более поздней версии.",
+	"typescript.implementationsCodeLens.enabled": "Включить или отключить CodeLens для реализаций. Требуется TypeScript >= 2.2.0.",
+	"typescript.openTsServerLog.title": "Открыть журнал сервера TS",
+	"typescript.restartTsServer": "Перезапустить сервер TS",
+	"typescript.selectTypeScriptVersion.title": "Выберите версию TypeScript.",
+	"typescript.reportStyleChecksAsWarnings": "Отображать ошибки при проверке стиля в виде предупреждений",
+	"jsDocCompletion.enabled": "Включить или отключить JSDoc коментарии",
+	"javascript.implicitProjectConfig.checkJs": "Включает/отключает семантическую проверку файлов JavaScript. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
+	"typescript.npm": "Указывает путь к исполняемому файлу NPM, используемому для автоматического получения типа. Требуется TypeScript версии 2.3.4 или более поздней версии.",
+	"typescript.check.npmIsInstalled": "Проверяет, установлен ли NPM для автоматического получения типов.",
+	"javascript.nameSuggestions": "Включить/отключить использование уникальных имен из файла в списках предложений JavaScript.",
+	"typescript.tsc.autoDetect": "Управляет автоматическим обнаружением задач tsc. При указании значения 'off' эта функция отключается. При указании значения 'build' создаются задачи компиляции для однократного запуска. При указании значения 'watch' создаются только задачи компиляции и наблюдения. При указании значения 'on' создаются как задачи сборки, так и задачи наблюдения. По умолчанию используется значение 'on'.",
+	"typescript.problemMatchers.tsc.label": "Проблемы TypeScript",
+	"typescript.problemMatchers.tscWatch.label": "Проблемы TypeScript (режим наблюдения)",
+	"typescript.quickSuggestionsForPaths": "Включить/отключить краткие предложения при вводе пути импорта.",
+	"typescript.locale": "Устанавливает языковой стандарт, используемый для сообщений об ошибках TypeScript. Требуется TypeScript 2.6.0 или более поздней версии. Значение по умолчанию — 'null'. При указании значения null для сообщений об ошибках TypeScript используется языковой стандарт VS Code.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Включает/отключает параметр 'experimentalDecorators' для файлов JavaScript, которые не являются частью проекта. Этот параметр может переопределяться в файле jsconfig.json или tsconfig.json. Требуется TypeScript 2.3.1 или более поздней версии.",
+	"typescript.autoImportSuggestions.enabled": "Включить/отключить предложения автоматического импорта. Требуется TypeScript 2.6.1 или более поздней версии",
+	"typescript.experimental.syntaxFolding": "Включает/отключает маркеры свертывания с учетом синтаксиса.",
+	"taskDefinition.tsconfig.description": "Файл tsconfig, который определяет сборку TS."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/base/node/processes.i18n.json b/i18n/rus/src/vs/base/node/processes.i18n.json
index 56d7d224726..35229bd6699 100644
--- a/i18n/rus/src/vs/base/node/processes.i18n.json
+++ b/i18n/rus/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "Невозможно выполнить команду оболочки на диске UNC."
+	]
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 2c957229e71..12574bacd03 100644
--- a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -11,11 +11,10 @@
 	"similarIssues": "Похожие проблемы",
 	"open": "Открыть",
 	"closed": "Закрыто",
-	"noResults": "Результаты не найдены",
 	"settingsSearchIssue": "Проблема с параметрами поиска",
 	"bugReporter": "Отчет об ошибках",
-	"performanceIssue": "Проблема с производительностью",
 	"featureRequest": "Запрос функции",
+	"performanceIssue": "Проблема с производительностью",
 	"stepsToReproduce": "Действия для воспроизведения проблемы",
 	"bugDescription": "Опишите действия для точного воспроизведения проблемы. Включите фактические и ожидаемые результаты. Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
 	"performanceIssueDesciption": "Когда возникла эта проблема с производительностью? Происходит ли она при запуске или после указанной серии действий? Поддерживается разметка Markdown в стиле GitHub. Вы можете отредактировать текст проблемы и добавить снимки экрана при просмотре проблемы в GitHub.",
diff --git a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 6954a9f7442..bda3982524f 100644
--- a/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/rus/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "Заполните форму на английском языке.",
 	"issueTypeLabel": "Это",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "отключение всех расширений и перезагрузка окна",
+	"chooseExtension": "Расширение",
 	"issueTitleLabel": "Название",
 	"issueTitleRequired": "Введите название.",
 	"titleLengthValidation": "Название слишком длинное.",
@@ -18,13 +21,6 @@
 	"extensions": "Мои расширения",
 	"searchedExtensions": "Расширения, для которых выполнялся поиск",
 	"settingsSearchDetails": "Сведения о параметрах поиска",
-	"tryDisablingExtensions": "Сохраняется ли проблема после отключения расширений?",
-	"yes": "Да",
-	"no": "Нет",
-	"disableExtensionsLabelText": "Попробуйте воспроизвести проблему после {0}.",
-	"disableExtensions": "отключение всех расширений и перезагрузка окна",
-	"showRunningExtensionsLabelText": "Если вы подозреваете, что проблема связана с расширениями, сообщите о проблеме с расширением с помощью {0}.",
-	"showRunningExtensions": "просмотр всех запущенных расширений",
 	"details": "Укажите сведения.",
 	"loadingData": "Загрузка данных..."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..a3507419036
--- /dev/null
+++ b/i18n/rus/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Имя"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json
index a40d32e1219..dfe5ffc5276 100644
--- a/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/rus/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Закрыть",
-	"header": "Различие {0} из {1}; исходная версия: {2}, строки: {3}, измененная версия: {4}, строки: {5}",
 	"blankLine": "пустой",
 	"equalLine": "Исходная версия: {0}, измененная версия: {1}: {2}",
 	"insertLine": "+ измененная версия: {0}: {1}",
diff --git a/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
index 4e38fa1d925..1acfd70b90b 100644
--- a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "Цвет границ волнистой линии для выделения предупреждений в редакторе.",
 	"infoForeground": "Цвет волнистой линии для выделения информационных сообщений в редакторе.",
 	"infoBorder": "Цвет границ волнистой линии для выделения информационных сообщений в редакторе. ",
-	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов.",
+	"hintForeground": "Цвет волнистой линии для выделения подсказок в редакторе.",
+	"hintBorder": "Цвет границ волнистой линии для выделения подсказок в редакторе. ",
+	"overviewRulerRangeHighlight": "Цвет метки линейки в окне просмотра для выделений диапазонов. Цвет должен быть прозрачным, чтобы не перекрывать основные знаки отличия.",
 	"overviewRuleError": "Цвет метки линейки в окне просмотра для ошибок.",
 	"overviewRuleWarning": "Цвет метки линейки в окне просмотра для предупреждений.",
 	"overviewRuleInfo": "Цвет метки линейки в окне просмотра для информационных сообщений."
diff --git a/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..8fa3a1ad468
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Показать исправления ({0})",
+	"quickFix": "Показать исправления",
+	"organizeImports.label": "Организация импортов"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 3bb2176af07..952cf41b7f5 100644
--- a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Перейти к Следующей Проблеме (Ошибке, Предупреждению, Информации)",
-	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)",
-	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
-	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
+	"markerAction.previous.label": "Перейти к Предыдущей Проблеме (Ошибке, Предупреждению, Информации)"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..696263e5f65
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.",
+	"editorMarkerNavigationBackground": "Фон мини-приложения навигации по меткам редактора."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..5831d974e53
--- /dev/null
+++ b/i18n/rus/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Воскресенье",
+	"Monday": "Понедельник",
+	"Tuesday": "Вторник",
+	"Wednesday": "Среда",
+	"Thursday": "Четверг",
+	"Friday": "Пятница",
+	"Saturday": "Суббота",
+	"SundayShort": "Вс",
+	"MondayShort": "Пн",
+	"TuesdayShort": "Вт",
+	"WednesdayShort": "Ср",
+	"ThursdayShort": "Чт",
+	"FridayShort": "Пт",
+	"SaturdayShort": "Сб",
+	"January": "Январь",
+	"February": "Февраль",
+	"March": "Март",
+	"April": "Апрель",
+	"May": "Май",
+	"June": "Июнь",
+	"July": "Июль",
+	"August": "Август",
+	"September": "Сентябрь",
+	"October": "Октябрь",
+	"November": "Ноябрь",
+	"December": "Декабрь",
+	"JanuaryShort": "Янв",
+	"FebruaryShort": "Фев",
+	"MarchShort": "Мар",
+	"AprilShort": "Апр",
+	"MayShort": "Май",
+	"JuneShort": "Июн",
+	"JulyShort": "Июл",
+	"AugustShort": "Авг",
+	"SeptemberShort": "Сен",
+	"OctoberShort": "Окт",
+	"NovemberShort": "Ноя",
+	"DecemberShort": "Дек"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index 1d513afb117..5b31b385ffd 100644
--- a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Фон символа при доступе для записи, например при записи переменной. Цвет должен быть прозрачным чтобы не перекрывать основных знаков отличия.",
 	"wordHighlightBorder": "Цвет границы символа при доступе на чтение, например, при считывании переменной.",
 	"wordHighlightStrongBorder": "Цвет границы символа при доступе на запись, например, при записи переменной. ",
-	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.",
-	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ",
+	"overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделения символов. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
+	"overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделения символов с доступом на запись. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
 	"wordHighlight.next.label": "Перейти к следующему выделению символов",
 	"wordHighlight.previous.label": "Перейти к предыдущему выделению символов"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..cd5317488f4
--- /dev/null
+++ b/i18n/rus/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 дополнительный файл не показан",
+	"moreFiles": "...не показано дополнительных файлов: {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..a9e4b3696ae
--- /dev/null
+++ b/i18n/rus/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "Отмена"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
index 60e5e887ae4..d214cf140db 100644
--- a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "Запустите с включенной командой \"Developer: Startup Performance\".",
 	"prof-startup": "Запустить профилировщик ЦП при запуске",
 	"disableExtensions": "Отключить все установленные расширения.",
-	"inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.",
-	"inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ",
 	"disableGPU": "Отключить аппаратное ускорение GPU.",
 	"uploadLogs": "Отправляет журналы из текущего сеанса в защищенную конечную точку.",
 	"maxMemory": "Максимальный размер памяти для окна (в МБ).",
diff --git a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 2d37e3e2376..61b52ee878a 100644
--- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,15 +14,15 @@
 	"errorInstallingDependencies": "Ошибка при установке зависимостей. {0}",
 	"MarketPlaceDisabled": "Marketplace не включен",
 	"removeError": "Ошибка при удалении расширения: {0}. Закройте и снова откройте VS Code, затем повторите попытку.",
-	"Not Market place extension": "Повторно устанавливать можно только расширения из Marketplace",
+	"Not a Marketplace extension": "Можно переустановить только расширения из Marketplace",
 	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
 	"malicious extension": "Не удается установить расширение, так как оно помечено как проблемное.",
 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
 	"quitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
 	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
-	"uninstallOnly": "Только",
-	"uninstallAll": "Все",
+	"uninstallOnly": "Только расширение",
+	"uninstallAll": "Удалить все",
 	"uninstallConfirmation": "Вы действительно хотите удалить \"{0}\"?",
 	"ok": "ОК",
 	"singleDependentError": "Не удается удалить расширение \"{0}\". От него зависит расширение \"{1}\".",
diff --git a/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json
index a7a3fc36a7d..6fc7fb30591 100644
--- a/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/rus/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "Не удалось проанализировать значение engines.vscode {0}. Используйте, например, ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x и т. д.",
 	"versionSpecificity1": "Версия, указанная в engines.vscode ({0}), недостаточно конкретная. Для версий vscode до 1.0.0 укажите по крайней мере основной и дополнительный номер версии. Например, 0.10.0, 0.10.x, 0.11.0 и т. д.",
 	"versionSpecificity2": "Версия, указанная в engines.vscode ({0}), недостаточно конкретная. Для версий vscode после 1.0.0 укажите по крайней мере основной номер версии. Например, 1.10.0, 1.10.x, 1.x.x, 2.x.x и т. д.",
 	"versionMismatch": "Расширение несовместимо с кодом \"{0}\". Расширению требуется: {1}."
diff --git a/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index ccf4c0564b8..954eb473437 100644
--- a/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/rus/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "Похоже, ваша установка {0} повреждена. Повторите установку.",
 	"integrity.moreInformation": "Дополнительные сведения",
-	"integrity.dontShowAgain": "Больше не показывать",
-	"integrity.prompt": "Похоже, ваша установка {0} повреждена. Повторите установку."
+	"integrity.dontShowAgain": "Больше не показывать"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/list/browser/listService.i18n.json b/i18n/rus/src/vs/platform/list/browser/listService.i18n.json
index a5965b1f141..b9fbce4eef3 100644
--- a/i18n/rus/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/rus/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Модификатор, который будет использоваться для добавления элементов в деревьях и списках в элемент множественного выбора с помощью мыши (например, в проводнике, в открытых редакторах и в представлении scm). \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в macOS. Жесты мыши  \"Открыть сбоку\" (если они поддерживаются), будут изменены таким образом, чтобы они не конфликтовали с модификатором элемента множественного выбора.",
 	"openMode.singleClick": "Открывает элемент одним щелчком мыши.",
 	"openMode.doubleClick": "Открывает элемент двойным щелчком мыши.",
-	"openModeModifier": "Управляет тем, как открывать элементы в деревьях и списках с помощью мыши (если поддерживается). Укажите значение \"singleClick\", чтобы открывать элементы одним щелчком мыши, и \"doubleClick\", чтобы открывать их только двойным щелчком мыши. Для родительских элементов с дочерними элементами в деревьях этот параметр управляет тем, будет ли родительский элемент разворачиваться по одинарному или по двойному щелчку мыши. Обратите внимание, что этот параметр может игнорироваться в некоторых деревьях и списках, если он не применяется к ним. "
+	"openModeModifier": "Управляет тем, как открывать элементы в деревьях и списках с помощью мыши (если поддерживается). Укажите значение \"singleClick\", чтобы открывать элементы одним щелчком мыши, и \"doubleClick\", чтобы открывать их только двойным щелчком мыши. Для родительских элементов с дочерними элементами в деревьях этот параметр управляет тем, будет ли родительский элемент разворачиваться по одинарному или по двойному щелчку мыши. Обратите внимание, что этот параметр может игнорироваться в некоторых деревьях и списках, если он не применяется к ним. ",
+	"horizontalScrolling setting": "Определяет, поддерживают ли древа горизонтальную прокрутку в рабочей области."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/markers/common/markers.i18n.json b/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..eaeabe67095
--- /dev/null
+++ b/i18n/rus/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Ошибка",
+	"sev.warning": "Предупреждение",
+	"sev.info": "Сведения"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
index 7e411db1da2..681bcf8d8ed 100644
--- a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.",
 	"overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.",
 	"overviewRulerCommonContentForeground": "Цвет переднего плана для обзорной линейки для общего предка во внутренних конфликтах слияния. ",
-	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска.",
-	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения."
+	"overviewRulerFindMatchForeground": "Цвет метки линейки в окне просмотра для результатов поиска. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия.",
+	"overviewRulerSelectionHighlightForeground": "Цвет метки линейки в окне просмотра для выделения. Цвет не должен был прозрачным, чтобы не перекрывать основные знаки отличия."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..5a602cb684a
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string",
+	"showViewlet": "Показать {0}",
+	"view": "Просмотр"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 99c3d895cf3..ea28349cd88 100644
--- a/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/rus/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Добавляет представления в редактор",
 	"views.explorer": "Представление проводника",
 	"views.debug": "Представление отладки",
-	"locationId.invalid": "\"{0}\" не является допустимым расположением представления",
 	"duplicateView1": "Не удается зарегистрировать несколько представлений с одинаковым идентификатором '{0}' в расположении '{1}'",
 	"duplicateView2": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 37bcdaf055d..4e0cc0deeb3 100644
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Форматирование при сохранении прервано через {0} мс",
+	"timeout.onWillSave": "Событие onWillSaveTextDocument-event прервано по истечении 1750 мс",
 	"saveParticipants": "Сохранение участников..."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 79967c51d9e..35229bd6699 100644
--- a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "Редактор веб-представления"
+	]
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..06bdf111ede
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (расширение)"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index 67fe147e873..99aca234c7b 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Фокус на следующую группу",
 	"openToSide": "Открыть сбоку",
 	"closeEditor": "Закрыть редактор",
+	"closeOneEditor": "Закрыть",
 	"revertAndCloseActiveEditor": "Отменить изменения и закрыть редактор",
 	"closeEditorsToTheLeft": "Закрыть редакторы слева",
 	"closeAllEditors": "Закрыть все редакторы",
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index 0b2da1baa17..f9f5adc30ce 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,7 +17,6 @@
 	"screenReaderDetectedExtra": "Если вы не используете средство чтения с экрана, измените значение параметра \"editor.accessibilitySupport\" на \"off\".",
 	"disableTabMode": "Отключить режим специальных возможностей",
 	"gotoLine": "Перейти к строке",
-	"indentation": "Отступ",
 	"selectEncoding": "Выберите кодировку",
 	"selectEOL": "Выберите последовательность конца строки",
 	"selectLanguageMode": "Выберите языковой режим",
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 096f82a9a51..1bf380ec2e5 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0} МБ",
 	"sizeGB": "{0} ГБ",
 	"sizeTB": "{0} ТБ",
-	"largeImageError": "Изображение имеет слишком большой размер для отображения в редакторе (более 1 МБ). ",
 	"resourceOpenExternalButton": "Открыть изображение с помощью внешней программы?",
-	"nativeBinaryError": "Файл не будет отображен в редакторе, так как он двоичный, очень большой или использует неподдерживаемую кодировку текста.",
 	"zoom.action.fit.label": "Все изображение",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 1a90a14ced0..9d49f9d5c3c 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Закрыть",
 	"araLabelEditorActions": "Действия редактора"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index a5d906fdd98..d6c896929e7 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Новые уведомления отсутствуют",
 	"notifications": "Уведомления",
 	"notificationsToolbar": "Действия центра уведомлений",
 	"notificationsList": "Список уведомлений"
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..c7537efab64
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "ОК"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
index cf76b9c9591..12656d83a09 100644
--- a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Окно",
 	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
 	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-	"window.openFilesInNewWindow.default": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).",
-	"openFilesInNewWindow": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
+	"window.openFilesInNewWindow.defaultMac": "Файлы будут открыты в новом окне с открытой папкой файлов или в последнем активном окне, если они не были открыты с помощью панели Dock или поиска",
+	"window.openFilesInNewWindow.default": "Файлы будут открыты в новом окне, если они не были выбраны в приложении (например, из меню \"Файл\")",
+	"openFilesInNewWindowMac": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска.\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
+	"openFilesInNewWindow": "Определяет, будут ли файлы открываться в новом окне.\n- default: файлы будут открываться в новом окне, если они не выбраны в приложении (например, из меню \"Файл\").\n- on: файлы будут открываться в новом окне.\n- off: файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
 	"window.openFoldersInNewWindow.on": "Папки будут открываться в новом окне.",
 	"window.openFoldersInNewWindow.off": "Папки будут заменять последнее активное окно.",
 	"window.openFoldersInNewWindow.default": "Папки будут открываться в новом окне, если папка не выбрана в приложении (например, в меню \"Файл\").",
 	"openFoldersInNewWindow": "Определяет, будут ли папки открываться в новом окне или заменять последнее активное окно.\n- default: папки будут открываться в новом окне, если папка не выбрана из приложения (например, из меню \"Файл\").\n- on: папки будут открываться в новом окне.\n- off: папки будут заменять последнее активное окно.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
+	"window.openWithoutArgumentsInNewWindow.on": "Открыть новое пустое окно",
+	"window.openWithoutArgumentsInNewWindow.off": "Перенести фокус на последний активный запущенный экземпляр",
+	"openWithoutArgumentsInNewWindow": "Определяет, следует ли открыть второй активный экземпляр без аргументов или перевести выделение на последний запущенный экземпляр.\n- on: открыть новое пустое окно.\n- off: перевести выделение на последний запущенный экземпляр.\nОбратите внимание, что возможны случаи, когда этот параметр игнорируется (например, при использовании параметра командной строки -new-window или -reuse-window).",
 	"window.reopenFolders.all": "Повторно открыть все окна.",
 	"window.reopenFolders.folders": "Повторно откройте все папки. Пустые рабочие области не будут восстановлены.",
 	"window.reopenFolders.one": "Повторно открыть последнее активное окно.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Управляет повторным открытием окон после перезапуска. Выберите 'none', чтобы всегда начинать с пустой рабочей области; 'one', чтобы открыть последнее окно, с которым вы работали; 'folders', чтобы открыть все окна с открытыми папками, и 'all', чтобы открыть все окна последнего сеанса.",
 	"restoreFullscreen": "Определяет, должно ли окно восстанавливаться в полноэкранном режиме, если оно было закрыто в полноэкранном режиме.",
 	"zoomLevel": "Настройте масштаб окна. Исходный размер равен 0. Увеличение или уменьшение значения на 1 означает увеличение или уменьшение окна на 20 %. Чтобы более точно задать масштаб, можно также ввести десятичное число.",
-	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями ",
+	"title": "Определяет заголовок окна в зависимости от активного редактора. Подстановка переменных выполняется на основе контекста:\n${activeEditorShort}: имя файла (например, myFile.txt)\n${activeEditorMedium}: путь к файлу относительно папки рабочей области (например, myFolder/myFile.txt)\n${activeEditorLong}: полный путь к файлу (например, /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: имя папки рабочей области, в которой находится файл (например, myFolder)\n${folderPath}: путь к папке рабочей области, в которой находится файл (например, /Users/Development/myFolder)\n${rootName}: имя рабочей области (например, myFolder или myWorkspace)\n${rootPath}: путь к папке рабочей области (например, /Users/Development/myWorkspace)\n${appName}: например, VS Code\n${dirty}: индикатор изменения файла в активном редакторе\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями или статическим текстом",
 	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
 	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
 	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "Если включено, будет выполняться автоматический переход к высококонтрастной теме, если в Windows используется тема высокой контрастности, или к темной теме при выходе из темы высокой контрастности Windows.",
 	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
 	"window.nativeTabs": "Включает вкладки окна macOS Sierra. Обратите внимание, что для применения этих изменений потребуется полная перезагрузка, и что для всех внутренних вкладок будет отключен пользовательский стиль заголовка, если он был настроен.",
+	"window.smoothScrollingWorkaround": "Включите это обходное решение, если после восстановления свернутого окна кода VS Code прокрутка не выполняется плавно. Это обходное решение для проблемы (https://github.com/Microsoft/vscode/issues/13612), при которой возникают задержки прокрутки на устройствах с сенсорными панелями высокой точности, такими как устройства Surface от Майкрософт. Включение этого обходного решения может привести к небольшому дрожанию элементов окна во время восстановления, но не имеет других негативных последствий.",
 	"zenModeConfigurationTitle": "Режим Zen",
 	"zenMode.fullScreen": "Определяет, будет ли переключение в режим Zen переключать рабочее пространство в полноэкранный режим.",
 	"zenMode.centerLayout": "Определяет, будет ли также выполняться выравнивание по центру при включении режима Zen.",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 3a211dd7bc4..24e8426f8cc 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Изменить точку останова…",
+	"breakpoint": "Точка останова",
 	"functionBreakpointsNotSupported": "Точки останова функций не поддерживаются в этом типе отладки",
 	"functionBreakpointPlaceholder": "Функция, в которой производится останов",
 	"functionBreakPointInputAriaLabel": "Введите точку останова в функции",
@@ -14,6 +14,7 @@
 	"breakpointUnverifieddHover": "Непроверенная точка останова",
 	"functionBreakpointUnsupported": "Точки останова функций не поддерживаются в этом типе отладки",
 	"breakpointDirtydHover": "Непроверенная точка останова. Файл был изменен, перезапустите сеанс отладки.",
+	"logBreakpointUnsupported": "Точки журнала не поддерживаются для этого типа отладки",
 	"conditionalBreakpointUnsupported": "Условные точки останова не поддерживаются этим типом отладки",
 	"hitBreakpointUnsupported": "Останавливаться на условных точках останова, которые не поддерживаются этим типом отладки"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index db465cf62cd..69f67e96d48 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Перезапустить кадр",
 	"removeBreakpoint": "Удалить точку останова",
 	"removeAllBreakpoints": "Удалить все точки останова",
-	"enableBreakpoint": "Включить точку останова",
-	"disableBreakpoint": "Выключить точку останова",
 	"enableAllBreakpoints": "Включить все точки останова",
 	"disableAllBreakpoints": "Отключить все точки останова",
 	"activateBreakpoints": "Активировать точки останова",
 	"deactivateBreakpoints": "Отключить точки останова",
 	"reapplyAllBreakpoints": "Повторно применить все точки останова",
 	"addFunctionBreakpoint": "Добавить точку останова в функции",
-	"addConditionalBreakpoint": "Добавить условную точку останова…",
-	"editConditionalBreakpoint": "Изменить точку останова…",
 	"setValue": "Задать значение",
 	"addWatchExpression": "Добавить выражение",
 	"editWatchExpression": "Изменить выражение",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index 83f5638058a..63b8dbd0104 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Отладка: переключить точку останова",
 	"conditionalBreakpointEditorAction": "Отладка: добавить условную точку останова…",
+	"logPointEditorAction": "Отладка: Добавить точку журнала...",
 	"runToCursor": "Выполнить до курсора",
 	"debugEvaluate": "Отладка: вычисление",
 	"debugAddToWatch": "Отладка: добавить контрольное значение",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..9324196d9e7
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "Прервать при определенном количестве обращений. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
+	"breakpointWidgetExpressionPlaceholder": "Прервать выполнение, если выражение равно true. Нажмите клавишу ВВОД, чтобы принять, или ESC для отмены.",
+	"expression": "Выражение",
+	"hitCount": "Количество обращений",
+	"logMessage": "Сообщение журнала"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index 718232647ac..cce426f1e59 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Используйте уникальное имя конфигурации.",
 	"app.launch.json.compound.folder": "Имя папки, в которой расположен составной объект.",
 	"app.launch.json.compounds.configurations": "Имена конфигураций, которые будут запущены как часть этого составного объекта.",
-	"debugNoType": "Параметр type адаптера отладки не может быть опущен и должен иметь тип string.",
 	"selectDebug": "Выбор среды",
 	"DebugConfig.failed": "Не удается создать файл launch.json в папке .vscode ({0}).",
 	"workspace": "рабочая область",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index b73933c327a..c00bc52781c 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"breakpoint": "Точка останова",
 	"removeBreakpoints": "Удалить точки останова",
 	"removeBreakpointOnColumn": "Удалить точку останова из столбца {0}",
 	"removeLineBreakpoint": "Удалить точку останова из строки",
@@ -18,5 +19,8 @@
 	"enableBreakpoints": "Включить точку останова в столбце {0}",
 	"enableBreakpointOnLine": "Включить точку останова в строке",
 	"addBreakpoint": "Добавить точку останова",
+	"addConditionalBreakpoint": "Добавить условную точку останова…",
+	"addLogPoint": "Добавить точку журнала...",
+	"cancel": "Отмена",
 	"addConfiguration": "Добавить конфигурацию..."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index fb28b2912a1..23eb63e486d 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Показывать ошибки",
 	"noFolderWorkspaceDebugError": "Нельзя выполнить отладку активного файла. Убедитесь, что файл сохранен на диске и установлено расширение отладки для этого типа файла.",
 	"cancel": "Отмена",
-	"DebugTaskNotFound": "Не удалось найти задачу preLaunchTask \"{0}\".",
-	"taskNotTracked": "Не удается отследить задачу предварительного запуска '{0}'."
+	"DebugTaskNotFound": "Не удалось найти задачу \"{0}\".",
+	"taskNotTracked": "Не удается отследить задачу \"{0}\"."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 8fa346a7b25..b28b6560832 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Подробнее",
-	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
-	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки.",
-	"stoppingDebugAdapter": "{0}. Адаптер отладки останавливается.",
 	"debugAdapterCrash": "Процесс адаптера отладки неожиданно завершился"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index 352c6d32543..4d4a7ed83f0 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "Исполняемый файл адаптера отладки \"{0}\" не существует.",
 	"debugAdapterCannotDetermineExecutable": "Невозможно определить исполняемый файл для адаптера отладки \"{0}\".",
-	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
-	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
-	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
-	"debugType": "Тип конфигурации.",
-	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
-	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
-	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
-	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
-	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
-	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
-	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
-	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
-	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
+	"unableToLaunchDebugAdapter": "Не удается запустить адаптер отладки из \"{0}\".",
+	"unableToLaunchDebugAdapterNoArgs": "Не удается запустить адаптер отладки."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..3ac477e5e53
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,24 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Используйте IntelliSense, чтобы узнать о возможных атрибутах.",
+	"launch.config.comment2": "Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.",
+	"launch.config.comment3": "Для получения дополнительной информации посетите: {0}",
+	"debugType": "Тип конфигурации.",
+	"debugTypeNotRecognised": "Не удается распознать тип отладки. Убедитесь, что соответствующее расширение отладки установлено и включено.",
+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\".",
+	"debugName": "Имя конфигурации; отображается в раскрывающемся меню конфигурации запуска.",
+	"debugRequest": "Запросите тип конфигурации. Возможные типы: \"запуск\" и \"подключение\".",
+	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
+	"debugPrelaunchTask": "Задача, выполняемая перед началом сеанса отладки.",
+	"debugPostDebugTask": "Задача, которая будет запущена после завершения сеанса отладки.",
+	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
+	"debugOSXConfiguration": "Атрибуты конфигурации запуска для OS X.",
+	"debugLinuxConfiguration": "Атрибуты конфигурации запуска для Linux.",
+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\"."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..1402209c14c
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "Консоль VS Code",
+	"mac.terminal.script.failed": "Сбой скрипта \"{0}\" с кодом выхода {1}",
+	"mac.terminal.type.not.supported": "\"{0}\" не поддерживается",
+	"press.any.key": "Для продолжения нажмите любую клавишу...",
+	"linux.term.failed": "Сбой \"{0}\" с кодом выхода {1}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index af8481a7c6b..bd475832dcf 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Настроить рекомендуемые расширения (папка рабочей области)",
 	"malicious tooltip": "Это расширение помечено как проблемное.",
 	"malicious": "Вредоносный",
+	"disabled": "Отключено",
+	"disabled globally": "Отключено",
+	"disabled workspace": "Отключено для этой рабочей области",
 	"disableAll": "Отключить все установленные расширения",
 	"disableAllWorkspace": "Отключить все установленные расширения для этой рабочей области",
 	"enableAll": "Включить все расширения",
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..9dfffd351b8
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Имя расширения",
+	"extension id": "Идентификатор расширений",
+	"preview": "Предварительный просмотр",
+	"builtin": "Встроенное",
+	"publisher": "Имя издателя",
+	"install count": "Число установок",
+	"rating": "Оценка",
+	"repository": "Репозиторий",
+	"license": "Лицензия",
+	"details": "Подробности",
+	"contributions": "Вклады",
+	"changelog": "Журнал изменений",
+	"dependencies": "Зависимости",
+	"noReadme": "Файл сведений недоступен.",
+	"noChangelog": "Журнал изменений недоступен.",
+	"noContributions": "Нет публикаций",
+	"noDependencies": "Нет зависимостей",
+	"settings": "Параметры ({0})",
+	"setting name": "Имя",
+	"description": "Описание",
+	"default": "По умолчанию",
+	"debuggers": "Отладчики ({0})",
+	"debugger name": "Имя",
+	"debugger type": "Тип",
+	"views": "Представления ({0})",
+	"view id": "Идентификатор",
+	"view name": "Имя",
+	"view location": "Где",
+	"localizations": "Локализации ({0})",
+	"localizations language id": "Идентификатор языка",
+	"colorThemes": "Цветовые темы ({0})",
+	"iconThemes": "Темы значков ({0})",
+	"colors": "Цвета ({0})",
+	"colorId": "Идентификатор",
+	"defaultDark": "Темная по умолчанию",
+	"defaultLight": "Светлая по умолчанию",
+	"defaultHC": "С высоким контрастом по умолчанию",
+	"JSON Validation": "Проверка JSON ({0})",
+	"fileMatch": "Сопоставление файла",
+	"schema": "Схема",
+	"commands": "Команды ({0})",
+	"command name": "Имя",
+	"keyboard shortcuts": "Сочетания клавиш",
+	"menuContexts": "Контексты меню",
+	"languages": "Языки ({0})",
+	"language id": "Идентификатор",
+	"language name": "Имя",
+	"file extensions": "Расширения файлов",
+	"grammar": "Грамматика",
+	"snippets": "Фрагменты"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 885c2235791..fdfbc72c290 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
 	"reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.",
 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
-	"showRecommendations": "Показать рекомендации",
 	"install": "Установить",
+	"showRecommendations": "Показать рекомендации",
 	"showLanguageExtensions": "В Marketplace есть расширения для работы с файлами '.{0}'",
 	"workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям.",
 	"installAll": "Установить все",
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index 3604f1b2e8d..dbb0453fcc6 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Отключить другие раскладки клавиатуры ({0}), чтобы избежать конфликта между настраиваемыми сочетаниями клавиш?",
 	"yes": "Да",
-	"no": "Нет",
-	"betterMergeDisabled": "В текущую версию встроено средство слияния с лучшей функциональностью. Установленное расширение было отключено и не может быть удалено.",
-	"uninstall": "Удаление"
+	"no": "Нет"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index a5a34da17d1..8bb1f5d04bf 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "Рекомендуемое",
 	"otherRecommendedExtensions": "Другие рекомендации",
 	"workspaceRecommendedExtensions": "Рекомендации рабочей области",
-	"builtInExtensions": "Встроенный",
+	"builtInExtensions": "Функции",
+	"builtInThemesExtensions": "Темы",
 	"searchExtensions": "Поиск расширений в Marketplace",
 	"sort by installs": "Сортировать по: числу установок",
 	"sort by rating": "Сортировать по: рейтинг",
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index 6be9e343706..e5c218fb1d5 100644
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -34,9 +34,10 @@
 	"confirmDeleteMessageFolder": "Вы действительно хотите удалить папку \"{0}\" и ее содержимое без возможности восстановления?",
 	"confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?",
 	"irreversible": "Это действие необратимо.",
-	"cancel": "Отмена",
-	"permDelete": "Удалить навсегда",
-	"importFiles": "Импорт файлов",
+	"binFailed": "Не удалось выполнить удаление в корзину. Вы хотите выполнить удаление навсегда?",
+	"trashFailed": "Не удалось выполнить удаление в корзину. Вы действительно хотите выполнить удаление навсегда?",
+	"deletePermanentlyButtonLabel": "&&Удалить навсегда",
+	"retryButtonLabel": "&&Повторить",
 	"confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?",
 	"replaceButtonLabel": "Заменить",
 	"fileIsAncestor": "Файл для вставки является предком папки назначения",
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 7864917b59e..124b190523e 100644
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "Режим языка по умолчанию, который назначается новым файлам.",
 	"editorConfigurationTitle": "Редактор",
 	"formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.",
+	"formatOnSaveTimeout": "Время ожидания форматирования при сохранении. Указывает ограничение времени в миллисекундах для команд форматирования при сохранении. Команды, выполнение которых превышает указанное время ожидания, будут отменены.",
 	"explorerConfigurationTitle": "Проводник",
 	"openEditorsVisible": "Число редакторов, отображаемых на панели \"Открытые редакторы\".",
 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index 4d9d86ce6f1..37cc4f97cc6 100644
--- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Введите имя файла. Нажмите клавишу ВВОД, чтобы подтвердить введенные данные, или ESCAPE для отмены.",
-	"constructedPath": "Создать {0} в **{1}**",
 	"filesExplorerViewerAriaLabel": "{0}, Проводник",
 	"dropFolders": "Вы хотите действительно добавить папки в эту рабочую область?",
 	"dropFolder": "Вы хотите действительно добавить папку в эту рабочую область?",
 	"addFolders": "&&Добавить папки",
 	"addFolder": "&&Добавить папку",
+	"confirmRootsMove": "Вы действительно хотите изменить порядок нескольких корневых папок в рабочей области?",
 	"confirmMultiMove": "Вы действительно хотите переместить следующие файлы ({0})?",
+	"confirmRootMove": "Вы действительно хотите изменить порядок корневой папки \"{0}\" в рабочей области?",
 	"confirmMove": "Вы действительно хотите переместить '{0}'?",
 	"doNotAskAgain": "Больше не спрашивать",
 	"moveButtonLabel": "&&Переместить",
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..36cadcfcce5
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Предварительный просмотр HTML"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a80ebf7aef9
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Недопустимые входные данные для редактора."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..e4db582c42e
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Разработчик"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..18d62a09459
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
+	"refreshWebviewLabel": "Перезагрузить веб-представления"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index 430f371b699..a63d4097358 100644
--- a/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,6 +6,10 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "Вы хотели бы изменить язык пользовательского интерфейса VS Code на {0} и перезапустить VS Code?",
+	"yes": "Да",
+	"no": "Нет",
+	"neverAgain": "Больше не показывать",
 	"JsonSchema.locale": "Язык пользовательского интерфейса.",
 	"vscode.extension.contributes.localizations": "Добавляет локализации в редактор",
 	"vscode.extension.contributes.localizations.languageId": "Идентификатор языка, на который будут переведены отображаемые строки.",
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..8bfb35ec63c
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Копировать",
+	"copyMessage": "Копировать сообщение"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..44eeaa06f3b
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Всего проблем: {0}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..e99ea342272
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Проблемы",
+	"tooltip.1": "Проблем в этом файле: 1",
+	"tooltip.N": "Проблем в этом файле: {0}",
+	"markers.showOnFile": "Показывать ошибки и предупреждения для файлов и папки."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..e7a5379738c
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Просмотр",
+	"problems.view.toggle.label": "Включить или отключить сообщения о проблемах (ошибки, предупреждения, информационные сообщения)",
+	"problems.view.focus.label": "Перевести фокус на сообщения о проблемах (ошибки, предупреждения, информационные сообщения) ",
+	"problems.panel.configuration.title": "Представление \"Проблемы\"",
+	"problems.panel.configuration.autoreveal": "Определяет, следует ли представлению \"Проблемы\" отображать файлы при их открытии",
+	"markers.panel.title.problems": "Проблемы",
+	"markers.panel.aria.label.problems.tree": "Проблемы, сгруппированные по файлам",
+	"markers.panel.no.problems.build": "В рабочей области проблемы пока не обнаружены.",
+	"markers.panel.action.filter": "Фильтр проблем",
+	"markers.panel.filter.ariaLabel": "Фильтр проблем",
+	"markers.panel.filter.errors": "ошибки",
+	"markers.panel.filter.warnings": "предупреждения",
+	"markers.panel.filter.infos": "сообщения",
+	"markers.panel.single.error.label": "1 ошибка",
+	"markers.panel.multiple.errors.label": "Ошибок: {0}",
+	"markers.panel.single.warning.label": "1 предупреждение",
+	"markers.panel.multiple.warnings.label": "Предупреждения: {0}",
+	"markers.panel.single.info.label": "1 сообщение",
+	"markers.panel.multiple.infos.label": "Сообщения: {0}",
+	"markers.panel.single.unknown.label": "1 неизвестный",
+	"markers.panel.multiple.unknowns.label": "Неизвестные: {0}",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} с проблемами ({1})",
+	"problems.tree.aria.label.marker.relatedInformation": "У этой проблемы есть ссылки на несколько расположений ({0}).",
+	"problems.tree.aria.label.error.marker": "Ошибка выдана {0}: {1}, строка {2}, символ {3}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Ошибка: {0}, строка {1}, символ {2}.{3}",
+	"problems.tree.aria.label.warning.marker": "Предупреждение выдано {0}: {1}, строка {2}, символ {3}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Предупреждение: {0}, строка {1}, символ {2}.{3} ",
+	"problems.tree.aria.label.info.marker": "Информационное сообщение выдано {0}: {1}, строка {2}, символ {3}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Информационное сообщение: {0}, строка {1}, символ {2}.{3} ",
+	"problems.tree.aria.label.marker": "Проблема выдана {0}: {1}, строка {2}, символ {3}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Проблема: {0}, строка {1}, символ {2}.{3} ",
+	"problems.tree.aria.label.relatedinfo.message": "{0}, строка {1}, символ {2} в {3}",
+	"errors.warnings.show.label": "Показать ошибки и предупреждения"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 9cba91c70e4..67574542705 100644
--- a/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Переключить выходные данные",
 	"clearOutput": "Очистить выходные данные",
 	"toggleOutputScrollLock": "Включить/отключить SCROLL LOCK для вывода",
-	"switchToOutput.label": "Переключиться на выходные данные"
+	"switchToOutput.label": "Переключиться на выходные данные",
+	"openInLogViewer": "Открыть файл журнала"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index e357345cb24..66e8e86a36d 100644
--- a/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Вывод",
 	"logViewer": "Средство просмотра журналов",
 	"viewCategory": "Просмотр",
-	"clearOutput.label": "Очистить выходные данные"
+	"clearOutput.label": "Очистить выходные данные",
+	"openActiveLogOutputFile": "Просмотр: открыть активный выходной файл журнала"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 1199d8b1427..b1ff2f3c4a2 100644
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Сочетания клавиш",
+	"showDefaultKeybindings": "Показать сочетания клавиш по умолчанию",
+	"showUserKeybindings": "Показать пользовательские сочетания клавиш",
 	"SearchKeybindings.AriaLabel": "Поиск настраиваемых сочетаний клавиш",
 	"SearchKeybindings.Placeholder": "Поиск настраиваемых сочетаний клавиш",
 	"sortByPrecedene": "Сортировать по приоритету",
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index b6e5dd2331c..301f65925ac 100644
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Открыть исходные параметры по умолчанию",
+	"openSettings": "Открыть параметры",
 	"openGlobalSettings": "Открыть пользовательские параметры",
 	"openGlobalKeybindings": "Открыть сочетания клавиш",
 	"openGlobalKeybindingsFile": "Открыть файл сочетаний клавиш",
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index d1d27d53dda..b589e13bf13 100644
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Параметры по умолчанию",
 	"SearchSettingsWidget.AriaLabel": "Параметры поиска",
 	"SearchSettingsWidget.Placeholder": "Параметры поиска",
 	"noSettingsFound": "Нет результатов",
diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 1a2779a2e10..b457921fc6f 100644
--- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "Показать расширение «{0}»",
 	"editTtile": "Изменить",
 	"replaceDefaultValue": "Заменить в параметрах",
-	"copyDefaultValue": "Копировать в параметры",
-	"unsupportedPHPExecutablePathSetting": "Этот параметр должен быть параметром пользователя. Чтобы настроить в рабочей области PHP, откройте PHP-файл и щелкните \"Путь PHP\" в строке состояния.",
-	"unsupportedWorkspaceSetting": "Этот параметр должен быть параметром пользователя.",
-	"unsupportedWorkbenchSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую.",
-	"unsupportedWorkbenchSettingDevMode": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы определите область параметра как 'resource' при регистрации или когда вы откроете эту папку напрямую."
+	"copyDefaultValue": "Копировать в параметры"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 53719eca157..6b3cd3ed9a8 100644
--- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "Установить дополнительных поставщиков SCM...",
 	"no open repo": "Отсутствуют активные поставщики систем управления версиями.",
 	"source control": "Система управления версиями",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Скрыть"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index a43c7553d81..769a0432529 100644
--- a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Показать предыдущий шаблон исключения из поиска",
 	"nextSearchTerm": "Показать следующее условие поиска",
 	"previousSearchTerm": "Показать предыдущее условие поиска",
-	"showSearchViewlet": "Показать средство поиска",
 	"findInFiles": "Найти в файлах",
 	"replaceInFiles": "Заменить в файлах",
 	"RefreshAction.label": "Обновить",
diff --git a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index f4733a91f5a..75cbba61a06 100644
--- a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Поиск",
+	"copyMatchLabel": "Копировать",
+	"copyPathLabel": "Скопировать путь",
+	"copyAllLabel": "Копировать все",
 	"findInFolder": "Найти в папке...",
 	"findInWorkspace": "Найти в рабочей области...",
 	"showTriggerActions": "Перейти к символу в рабочей области...",
 	"name": "Поиск",
-	"search": "Поиск",
 	"showSearchViewl": "Показать средство поиска",
 	"view": "Просмотр",
 	"findInFiles": "Найти в файлах",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Настройте для включения результатов поиска глобальных символов в файлы по запросу для Quick Open.",
 	"search.followSymlinks": "Определяет, нужно ли следовать символическим ссылкам при поиске.",
 	"search.smartCase": "Выполняет поиск без учета регистра, если шаблон состоит только из букв нижнего регистра; в противном случае выполняет поиск с учетом регистра",
-	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS",
-	"search.location": "Предварительная версия: управляет тем, будет ли панель поиска отображаться в виде представления в боковой колонке или в виде панели в области панели для освобождения пространства по горизонтали. В следующем выпуске горизонтальное расположение поиска в панели будет улучшено, и этот параметр больше не будет находиться в предварительной версии."
+	"search.globalFindClipboard": "Определяет, должно ли представление поиска считывать или изменять общий буфер обмена поиска в macOS"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 7fdf8781d53..794340391f4 100644
--- a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "Помогите нам улучшить поддержку {0}",
 	"takeShortSurvey": "Пройдите краткий опрос",
 	"remindLater": "Напомнить мне позже",
-	"neverAgain": "Больше не показывать",
-	"helpUs": "Помогите нам улучшить поддержку {0}"
+	"neverAgain": "Больше не показывать"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index e4287fa366a..ac0dc50d4a0 100644
--- a/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Вас не затруднит пройти краткий опрос?",
 	"takeSurvey": "Пройти опрос",
 	"remindLater": "Напомнить мне позже",
-	"neverAgain": "Больше не показывать",
-	"surveyQuestion": "Вас не затруднит пройти краткий опрос?"
+	"neverAgain": "Больше не показывать"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index ccc1b54893d..9e1a9301226 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Шаблон проблем либо имя добавленного или предопределенного шаблона проблем. Его можно опустить, если указано базовое значение.",
 	"ProblemMatcherSchema.base": "Имя используемого базового сопоставителя проблем.",
 	"ProblemMatcherSchema.owner": "Владелец проблемы в Code. Можно опустить, если указан элемент base. Если владелец опущен, а элемент base не указан, значение по умолчанию — \"внешний\".",
+	"ProblemMatcherSchema.source": "Строка, описывающая источник диагностических сведений, в удобном формате, например, \"typescript\" или \"super lint\".",
 	"ProblemMatcherSchema.severity": "Серьезность по умолчанию для выявленных проблем. Используется, если в шаблоне не определена группа сопоставления для серьезности.",
 	"ProblemMatcherSchema.applyTo": "Определяет, относится ли проблема, о которой сообщается для текстового документа, только к открытым, только к закрытым или ко всем документам.",
 	"ProblemMatcherSchema.fileLocation": "Определяет способ интерпретации имен файлов, указываемых в шаблоне проблемы.",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 60e666cad4c..f9fa20a44cf 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "Отменяет связь задачи со всеми группами",
 	"JsonSchema.tasks.group": "Определяет, к какой группе выполнения принадлежит эта задача. Поддерживаемые значения: \"build\" для добавления задачи к группе сборки и \"test\" для добавления задачи к группе тестирования.",
 	"JsonSchema.tasks.type": "Определяет, выполняется ли задача в виде процесса или в виде команды оболочки.",
+	"JsonSchema.command.quotedString.value": "Фактическое значение команды",
+	"JsonSchema.tasks.quoting.escape": "Экранирует символы с помощью escape-символа оболочки (например, \"`\" в PowerShell и\"\\\" в bash).",
+	"JsonSchema.tasks.quoting.strong": "Заключает аргумент в кавычки с использованием символа двойной кавычки (например, \" в PowerShell и bash).",
+	"JsonSchema.tasks.quoting.weak": "Заключает аргумент в кавычки с использованием символа одинарной кавычки (например, ' в PowerShell и bash).",
+	"JsonSchema.command.quotesString.quote": "Указывает, как значение команды должно быть заключено в кавычки.",
+	"JsonSchema.command": "Выполняемая команда. Это может быть внешняя программа или команда оболочки.",
+	"JsonSchema.args.quotedString.value": "Фактическое значение аргумента.",
+	"JsonSchema.args.quotesString.quote": "Указывает, как значение аргумента должно быть заключено в кавычки.",
+	"JsonSchema.tasks.args": "Аргументы, передаваемые в команду при вызове этой задачи.",
 	"JsonSchema.tasks.label": "Метка пользовательского интерфейса задачи",
 	"JsonSchema.version": "Номер версии конфигурации.",
 	"JsonSchema.tasks.identifier": "Пользовательский идентификатор задачи в файле launch.json или в предложении dependsOn.",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 8cccd04ba00..874c52d41c7 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Задачи",
 	"ConfigureTaskRunnerAction.label": "Настроить задачу",
+	"totalErrors": "Ошибок: {0}",
+	"totalWarnings": "Предупреждения: {0}",
+	"totalInfos": "Сообщения: {0}",
 	"problems": "Проблемы",
 	"building": "Сборка...",
-	"manyMarkers": "99+",
+	"manyProblems": "Более 10 тысяч",
 	"runningTasks": "Показать выполняемые задачи",
 	"tasks": "Задачи",
 	"TaskSystem.noHotSwap": "Чтобы изменить подсистему выполнения задач, в которой запущена активная задача, необходимо перезагрузить окно",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Выберите, на какие ошибки и предупреждения следует проверять выходные данные задачи",
 	"customizeParseErrors": "В конфигурации текущей задачи есть ошибки. Исправьте ошибки перед изменением задачи.",
 	"moreThanOneBuildTask": "В файле tasks.json определено несколько задач сборки. Выполняется первая задача.\n",
-	"TaskSystem.activeSame.background": "Задача '{0}' уже активна и находится в фоновом режиме. Чтобы завершить задачу, выберите \"Завершить задачу\" в меню \"Задачи\".",
-	"TaskSystem.activeSame.noBackground": "Задача '{0}' уже активна. Чтобы завершить задачу, выберите \"Завершить задачу\" из меню \"Задачи\".",
+	"terminateTask": "Завершить задачу",
+	"restartTask": "Перезапустить задачу",
 	"TaskSystem.active": "Уже выполняется задача. Завершите ее, прежде чем выполнять другую задачу.",
 	"TaskSystem.restartFailed": "Не удалось завершить и перезапустить задачу {0}",
 	"TaskService.noConfiguration": "Ошибка: в определении задачи {0} не выявлена задача для следующей конфигурации:\n{1}\nЗадача будет проигнорирована.\n",
diff --git a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 13433636ffe..b7b348484d2 100644
--- a/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Предупреждение: options.cwd должен иметь тип string. Игнорируется значение {0}\n",
+	"ConfigurationParser.inValidArg": "Ошибка: аргумент команды должен представлять строку или строку в кавычках. Указанное значение:\n{0}",
 	"ConfigurationParser.noargs": "Ошибка: аргументы команды должны представлять собой массив строк. Указанное значение:\n{0}",
 	"ConfigurationParser.noShell": "Предупреждение: конфигурация оболочки поддерживается только при выполнении задач в терминале.",
 	"ConfigurationParser.noName": "Ошибка: сопоставитель проблем в области объявления должен иметь имя:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Ошибка: в конфигурации задачи '{0}' отсутствует необходимое свойство '{1}'. Конфигурация задачи будет проигнорирована.",
 	"ConfigurationParser.notCustom": "Ошибка: задачи не объявлены в качестве пользовательской задачи. Конфигурация будет проигнорирована.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Ошибка: в задаче должно быть указано свойство метки. Задача будет проигнорирована.\n{0}\n",
-	"taskConfiguration.shellArgs": "Предупреждение: задача \"{0}\" является командой оболочки, и один из ее аргументов содержит пробелы без escape-последовательности. Чтобы обеспечить правильную расстановку кавычек в командной строке, объедините аргументы в команде.",
 	"taskConfiguration.noCommandOrDependsOn": "Ошибка: в задаче \"{0}\" не указаны ни команда, ни свойство dependsOn. Задача будет проигнорирована. Определение задачи:\n{1}",
 	"taskConfiguration.noCommand": "Ошибка: задача \"{0}\" не определяет команду. Задача будет игнорироваться. Ее определение:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "Версия задач 2.0.0 не поддерживает глобальные задачи для конкретных ОС. Преобразуйте их в задачи с помощью команд для конкретных ОС.\nЗатронутые задачи: {0}"
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..aca12bf1061
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "Цвет фона терминала. С его помощью можно указать цвет терминала, отличный от цвета панели.",
+	"terminal.foreground": "Цвет переднего плана терминала.",
+	"terminalCursor.foreground": "Цвет переднего плана курсора терминала.",
+	"terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.",
+	"terminal.selectionBackground": "Цвет фона выделения терминала.",
+	"terminal.border": "Цвет границы, которая отделяет области в терминале. По умолчанию используется panel.border.",
+	"terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 17bf9786dc4..e484fadb360 100644
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,7 @@
 	"workbench.action.terminal.hideFindWidget": "Скрыть мини-приложение поиска",
 	"nextTerminalFindTerm": "Показать следующий найденный термин",
 	"previousTerminalFindTerm": "Показать предыдущий найденный термин",
-	"quickOpenTerm": "Переключить активный терминал"
+	"quickOpenTerm": "Переключить активный терминал",
+	"workbench.action.terminal.selectToPreviousCommand": "Выбрать предыдущую команду",
+	"workbench.action.terminal.selectToNextCommand": "Выбрать следующую команду"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index 21822900dfd..e8a4956658f 100644
--- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Копировать",
+	"split": "Разделить",
 	"paste": "Вставить",
 	"selectAll": "Выбрать все",
-	"clear": "Очистить",
-	"split": "Разделить"
+	"clear": "Очистить"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index a9d5c44acd5..005e94e4f73 100644
--- a/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Эта рабочая область содержит параметры, которые можно задать только в параметрах пользователя. ({0}) Дополнительные сведения см. [здесь]({1}).",
 	"openWorkspaceSettings": "Открыть параметры рабочей области",
-	"dontShowAgain": "Больше не показывать",
-	"unsupportedWorkspaceSettings": "Эта рабочая область содержит параметры, которые можно задать только в параметрах пользователя. ({0}) Дополнительные сведения см. [здесь]({1})."
+	"dontShowAgain": "Больше не показывать"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..52d5c03cd56
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Заметки о выпуске: {0}",
+	"unassigned": "не присвоено"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index d80a8d53e52..c0275a6fc93 100644
--- a/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Позже",
-	"unassigned": "не присвоено",
 	"releaseNotes": "Заметки о выпуске",
 	"showReleaseNotes": "Показать заметки о выпуске",
 	"read the release notes": "Вас приветствует {0} v{1}! Вы хотите прочитать заметки о выпуске?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "Доступно новое обновление {0}.",
 	"noUpdatesAvailable": "Доступные обновления отсутствуют.",
 	"ok": "ОК",
-	"download now": "Скачать сейчас",
 	"thereIsUpdateAvailable": "Доступно обновление.",
+	"download now": "Скачать сейчас",
+	"later": "Позже",
 	"installUpdate": "Установить обновление",
-	"updateAvailable": "Доступно обновление: {0} {1}",
 	"updateInstalling": "{0} {1} устанавливается в фоновом режиме, мы сообщим вам о завершении.",
 	"updateNow": "Обновить сейчас",
-	"updateAvailableAfterRestart": "{0} будет обновлен после перезапуска.",
 	"commandPalette": "Палитра команд...",
 	"settings": "Параметры",
 	"keyboardShortcuts": "Сочетания клавиш",
diff --git a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..dfb29cabd85
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "Редактор веб-представления",
+	"developer": "Разработчик"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..18d62a09459
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Открыть инструменты разработчика веб-представлений",
+	"refreshWebviewLabel": "Перезагрузить веб-представления"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..1f214477976
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Помогите улучшить VS Code, разрешив корпорации Майкрософт сбор данных об использовании. Прочтите наше [заявление о конфиденциальности]({0}) и узнайте, как [явно отказаться от него]({1}).",
+	"telemetryOptOut.optInNotice": "Помогите улучшить VS Code, разрешив корпорации Майкрософт сбор данных об использовании. Прочтите наше [заявление о конфиденциальности]({0}) и узнайте, как [его принять]({1}). ",
+	"telemetryOptOut.readMore": "Подробнее"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index 98a88920d3f..fd358ddceed 100644
--- a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Средства и языки",
 	"welcomePage.installExtensionPacksDescription": "Установить поддержку для {0} и {1}",
 	"welcomePage.moreExtensions": "Еще",
-	"welcomePage.installKeymapDescription": "Установка сочетаний клавиш",
-	"welcomePage.installKeymapExtension": "Настроить сочетания клавиш для {0} и {1}",
 	"welcomePage.others": "Другие",
 	"welcomePage.colorTheme": "Цветовая тема",
 	"welcomePage.colorThemeDescription": "Настройте редактор и код удобным образом.",
diff --git a/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..c171e724326
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "Сейчас применить этот параметр нельзя. Он будет применен, когда вы откроете эту папку напрямую."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..360b3b18b2b
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Да",
+	"cancelButton": "Отмена"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 91121ed66f9..f7305a5fe40 100644
--- a/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "Хост-процесс для расширений неожиданно завершил работу.",
 	"extensionHostProcess.unresponsiveCrash": "Работа хост-процесса для расширений была завершена, так как он перестал отвечать на запросы.",
-	"devTools": "Средства разработчика",
 	"restart": "Перезапустить хост-процесс для расширений",
 	"overwritingExtension": "Идет перезапись расширения {0} на {1}.",
 	"extensionUnderDevelopment": "Идет загрузка расширения разработки в {0}.",
diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index bd6cb49d41e..1e6d5f9b9b9 100644
--- a/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
 	"installNet": "Скачать .NET Framework 4.5",
 	"neverShowAgain": "Больше не показывать",
-	"netVersionError": "Требуется платформа Microsoft .NET Framework 4.5. Нажмите ссылку, чтобы установить ее.",
+	"enospcError": "{0} не удалось проследить изменения файлов в этой большой рабочей области. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
 	"learnMore": "Инструкции",
-	"enospcError": "В {0} закончились дескрипторы файлов. Для решения проблемы воспользуйтесь ссылкой на инструкции.",
+	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
+	"fileIsDirectoryError": "Файл является каталогом",
+	"fileNotModifiedError": "undefined",
+	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
+	"fileNotFoundError": "Файл не найден ({0})",
+	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
+	"filePermission": "Отсутствует разрешение на запись в файл ({0})",
+	"fileExists": "Создаваемый файл уже существует ({0})",
+	"fileModifiedError": "Файл изменен с",
+	"fileReadOnlyError": "Файл доступен только для чтения",
+	"fileMoveConflict": "Невозможно переместить или скопировать файл, так как он уже существует в папке назначения.",
+	"unableToMoveCopyError": "Невозможно переместить или скопировать файл, так как он заменил бы папку, в которой содержится.",
 	"binFailed": "Не удалось переместить \"{0}\" в корзину",
 	"trashFailed": "Не удалось переместить \"{0}\" в корзину."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index b754ce1af13..ca3f9e887a1 100644
--- a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Файл не найден ({0})",
 	"fileIsDirectoryError": "Файл является каталогом",
 	"fileNotModifiedError": "undefined",
 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый."
diff --git a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
index 041ccc58fa5..10de0847f46 100644
--- a/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Недопустимый ресурс файла ({0})",
 	"fileIsDirectoryError": "Файл является каталогом",
 	"fileNotModifiedError": "undefined",
-	"fileTooLargeForHeapError": "Размер файла превышает объем памяти окна, попробуйте выполнить код с параметром --max-memory=новый_объем_памяти",
 	"fileTooLargeError": "Не удается открыть файл, так как он имеет слишком большой размер",
 	"fileNotFoundError": "Файл не найден ({0})",
 	"fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый.",
diff --git a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..ba82447f37b 100644
--- a/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "Отмена"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 4ac6ac13d25..a51daf45d2b 100644
--- a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -11,5 +11,6 @@
 	"vscode.extension.contributes.grammars.scopeName": "Имя области TextMate, используемое в файле tmLanguage.",
 	"vscode.extension.contributes.grammars.path": "Путь к файлу tmLanguage. Путь указывается относительно папки расширения и обычно начинается с \"./syntaxes/\".",
 	"vscode.extension.contributes.grammars.embeddedLanguages": "Сопоставление имени области и идентификатора языка, если грамматика содержит внедренные языки.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Сопоставление имени области с типами маркеров.",
 	"vscode.extension.contributes.grammars.injectTo": "Список имен языковых областей, в которые вставляется эта грамматика."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index 5b8cb3c808b..40ffdebf725 100644
--- a/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/rus/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}",
 	"invalid.injectTo": "Недопустимое значение в \"contributes.{0}.injectTo\". Должен быть задан массив имен языковых областей. Указанное значение: {1}",
 	"invalid.embeddedLanguages": "Недопустимое значение в \"contributes.{0}.embeddedLanguages\". Оно должно быть сопоставлением объекта между именем области и языком. Указанное значение: {1}.",
+	"invalid.tokenTypes": "Недопустимое значение в \"contributes.{0}.tokenTypes\". Необходимо указать сопоставление объекта между именем объекта и типом маркера. Указанное значение: {1}.",
 	"invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.",
 	"no-tm-grammar": "Нет грамматики TM, зарегистрированной для этого языка."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json b/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
new file mode 100644
index 00000000000..5d438afc47c
--- /dev/null
+++ b/i18n/trk/extensions/css-language-features/client/out/cssMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cssserver.name": "CSS Dil Sunucusu",
+	"folding.start": "Katlama Bölgesi Başlangıcı",
+	"folding.end": "Katlama Bölgesi Sonu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css-language-features/package.i18n.json b/i18n/trk/extensions/css-language-features/package.i18n.json
new file mode 100644
index 00000000000..5a93ed1e786
--- /dev/null
+++ b/i18n/trk/extensions/css-language-features/package.i18n.json
@@ -0,0 +1,81 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "CSS Dili Özellikleri",
+	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
+	"css.title": "CSS",
+	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"css.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
+	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
+	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"less.title": "LESS",
+	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"less.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
+	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"scss.title": "SCSS (Sass)",
+	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
+	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
+	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
+	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
+	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
+	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
+	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
+	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
+	"scss.lint.idSelector.desc": " ID'ler HTML'e çok sıkı bağlı olduğundan, seçiciler ID içermemelidir. ",
+	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
+	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
+	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
+	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
+	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
+	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
+	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
+	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
+	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
+	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
+	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
+	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
+	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
+	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/css/package.i18n.json b/i18n/trk/extensions/css/package.i18n.json
index 16d27b93d73..66b4b1f0603 100644
--- a/i18n/trk/extensions/css/package.i18n.json
+++ b/i18n/trk/extensions/css/package.i18n.json
@@ -6,76 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "CSS Dili Özellikleri",
-	"description": "CSS, LESS, SCSS dosyaları için zengin dil desteği sağlar.",
-	"css.title": "CSS",
-	"css.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"css.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"css.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"css.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"css.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"css.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"css.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"css.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"css.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"css.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"css.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"css.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"css.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"css.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"css.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"css.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"css.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"css.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"css.trace.server.desc": "VS Code ve CSS dil sunucusu arasındaki iletişimi izler.",
-	"css.validate.title": "CSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"css.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.title": "LESS",
-	"less.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"less.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"less.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"less.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"less.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"less.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"less.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"less.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"less.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"less.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"less.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"less.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"less.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"less.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"less.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"less.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"less.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"less.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"less.validate.title": "LESS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"less.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"scss.title": "SCSS (Sass)",
-	"scss.lint.argumentsInColorFunction.desc": "Geçersiz sayıda parametre",
-	"scss.lint.boxModel.desc": "Doldurma veya kenarlık kullanırken genişlik veya yükseklik kullanmayın",
-	"scss.lint.compatibleVendorPrefixes.desc": "Satıcıya özgü bir ön ek kullanırken satıcıya özgü diğer tüm özellikleri de dahil ettiğinizden emin olun",
-	"scss.lint.duplicateProperties.desc": "Yinelenen stil tanımları kullanmayın",
-	"scss.lint.emptyRules.desc": "Boş kural kümeleri kullanmayın",
-	"scss.lint.float.desc": "'float' kullanmaktan kaçının. Float'lar, düzenin herhangi bir unsuru değiştiğinde kolayca bozulan kırılgan CSS ile sonuçlanır.",
-	"scss.lint.fontFaceProperties.desc": "@font-face kuralı 'src' ve 'font-family' özelliklerini tanımlamalıdır",
-	"scss.lint.hexColorLength.desc": "Onaltılık renkler üç veya altı onaltılık sayıdan oluşmalıdır",
-	"scss.lint.idSelector.desc": "Bu kurallar HTML'ye çok sıkı bağlı olduğundan seçiciler kimlikleri içermemelidir.",
-	"scss.lint.ieHack.desc": "IE izinsiz girişleri yalnızca IE7 ve daha eski sürümler desteklenirken gereklidir",
-	"scss.lint.important.desc": "!important kullanmaktan kaçının. Tüm CSS'nin belirginlik düzeyi üzerindeki denetimin kaybedildiğinin ve yeniden düzenlenmesi gerektiğinin bir belirtisidir.",
-	"scss.lint.importStatement.desc": "İçe aktarma deyimleri paralel olarak yüklenmez",
-	"scss.lint.propertyIgnoredDueToDisplay.desc": "Özellik gösterim nedeniyle yoksayıldı. Örn. 'display: inline' ile width, height, margin-top, margin-bottom ve float özelliklerinin hiçbir etkisi olmaz",
-	"scss.lint.universalSelector.desc": "Evrensel seçici (*) yavaş olarak bilinir",
-	"scss.lint.unknownProperties.desc": "Bilinmeyen özellik.",
-	"scss.lint.unknownVendorSpecificProperties.desc": "Bilinmeyen satıcıya özel özellik.",
-	"scss.lint.vendorPrefix.desc": "Satıcıya özgü bir ön ek kullanırken standart özelliği de dahil edin",
-	"scss.lint.zeroUnits.desc": "Sıfır için birim gerekmez",
-	"scss.validate.title": "SCSS doğrulamasını ve sorunların önem derecelerini denetler.",
-	"scss.validate.desc": "Tüm doğrulamaları etkinleştirir veya devre dışı bırakır",
-	"less.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"scss.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"css.colorDecorators.enable.deprecationMessage": "`css.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"scss.colorDecorators.enable.deprecationMessage": "`scss.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"less.colorDecorators.enable.deprecationMessage": "`less.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+	"displayName": "CSS Dil Temelleri",
+	"description": "CSS, LESS ve SCSS dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/emmet/package.i18n.json b/i18n/trk/extensions/emmet/package.i18n.json
index f11753f3076..e3403b912e2 100644
--- a/i18n/trk/extensions/emmet/package.i18n.json
+++ b/i18n/trk/extensions/emmet/package.i18n.json
@@ -35,7 +35,6 @@
 	"emmetExtensionsPath": "Emmet profileri ve parçacıklarını içeren bir klasör yolu.'",
 	"emmetShowExpandedAbbreviation": "Genişletilmiş Emmet kısaltmalarını öneriler olarak gösterir.\n\"inMarkupAndStylesheetFilesOnly\" seçeneği\" html, haml, jade, xml, xsl, css, scss, sass, less ve stylus'a uygulanır.\n\"always\" seçeneği işaretleme/css'den bağımsız olarak dosyanın tüm bölümlerine uygulanır.",
 	"emmetShowAbbreviationSuggestions": "Olası Emmet kısaltmalarını öneriler olarak gösterir. Stil dosyalarında veya emmet.showExpandedAbbreviation, \"never\" olarak ayarlandığında uygulanamaz.",
-	"emmetIncludeLanguages": "Varsayılan olarak desteklenmeyen dillerde Emmet kısaltmalarını etkinleştirin. Burada dil ile desteklenen emmet destekli dil arasında eşleme ekleyin.",
 	"emmetVariables": "Emmet parçacıklarında kullanılacak değişkenler",
 	"emmetTriggerExpansionOnTab": "Etkinleştirildiğinde, Emmet kısaltmaları TAB tuşuna basıldığında genişletilir.",
 	"emmetPreferences": "Emmet'in bazı eylemleri ve çözümleyicilerinin davranışını değiştirmek için kullanılacak tercihler.",
@@ -59,5 +58,6 @@
 	"emmetPreferencesCssWebkitProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'webkit' önekini alacak virgülle ayrılmış CSS özellikleri. 'webkit' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
 	"emmetPreferencesCssMozProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'moz' önekini alacak virgülle ayrılmış CSS özellikleri. 'moz' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
 	"emmetPreferencesCssOProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'o' önekini alacak virgülle ayrılmış CSS özellikleri. 'o' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
-	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın."
+	"emmetPreferencesCssMsProperties": "`-` ile başlayan Emmet kısaltmasında kullanıldığında 'ms' önekini alacak virgülle ayrılmış CSS özellikleri. 'ms' önekinden her zaman kaçınmak için boş bir dize olarak ayarlayın.",
+	"emmetPreferencesCssFuzzySearchMinScore": "Bulanık eşleştirilmiş kısaltmaların elde etmesi gereken minimum puan (0'dan 1'e kadar). Düşük değerler birçok yanlış pozitif eşleşme oluşturabilir, daha yüksek değerler olası eşleşmeleri azaltabilir."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/git/out/commands.i18n.json b/i18n/trk/extensions/git/out/commands.i18n.json
index 9ab82c662af..2883a4dafdf 100644
--- a/i18n/trk/extensions/git/out/commands.i18n.json
+++ b/i18n/trk/extensions/git/out/commands.i18n.json
@@ -75,7 +75,7 @@
 	"ok": "Tamam",
 	"push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.",
 	"pick remote": "'{0}' dalının yayınlanacağı bir uzak uçbirim seçin:",
-	"sync is unpredictable": "Bu eylem, '{0}' esas projesine commitleri gönderecek ve alacaktır.",
+	"sync is unpredictable": "Bu eylem, '{0}/{1}' deposuna commitleri gönderecek ve alacaktır.",
 	"never again": "Tamam, Tekrar Gösterme",
 	"no remotes to publish": "Deponuzda yayınlamanın yapılacağı hiçbir uzak uçbirim yapılandırılmamış.",
 	"no changes stash": "Geçici olarak saklanacak bir değişiklik yok.",
diff --git a/i18n/trk/extensions/git/package.i18n.json b/i18n/trk/extensions/git/package.i18n.json
index b96aca8151e..c440a7230c6 100644
--- a/i18n/trk/extensions/git/package.i18n.json
+++ b/i18n/trk/extensions/git/package.i18n.json
@@ -77,6 +77,7 @@
 	"config.showInlineOpenFileAction": "Git değişiklikleri görünümünde satır içi Dosyayı Aç eyleminin gösterilip gösterilmeyeceğini denetler.",
 	"config.inputValidation": "Commit mesajı doğrulamasının ne zaman gösterileceğini kontrol eder.",
 	"config.detectSubmodules": "Git alt modüllerin otomatik olarak tespit edilip edilmeyeceğini denetler.",
+	"config.detectSubmodulesLimit": "Algılanan git alt modüllerinin limitini denetler.",
 	"colors.modified": "Değiştirilen kaynakların rengi.",
 	"colors.deleted": "Silinen kaynakların rengi.",
 	"colors.untracked": "İzlenmeyen kaynakların rengi.",
diff --git a/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json b/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
new file mode 100644
index 00000000000..cd480d42123
--- /dev/null
+++ b/i18n/trk/extensions/html-language-features/client/out/htmlMain.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"htmlserver.name": "HTML Dil Sunucusu",
+	"folding.start": "Katlama Bölgesi Başlangıcı",
+	"folding.end": "Katlama Bölgesi Sonu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html-language-features/package.i18n.json b/i18n/trk/extensions/html-language-features/package.i18n.json
new file mode 100644
index 00000000000..00e0da3830a
--- /dev/null
+++ b/i18n/trk/extensions/html-language-features/package.i18n.json
@@ -0,0 +1,33 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "HTML Dili Özellikleri",
+	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
+	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
+	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
+	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
+	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
+	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
+	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
+	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
+	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
+	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
+	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
+	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
+	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
+	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
+	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
+	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
+	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
+	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
+	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
+	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
+	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
+	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
+	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/html/package.i18n.json b/i18n/trk/extensions/html/package.i18n.json
index 6cae077d9f9..7b449502bb0 100644
--- a/i18n/trk/extensions/html/package.i18n.json
+++ b/i18n/trk/extensions/html/package.i18n.json
@@ -6,29 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "HTML Dili Özellikleri",
-	"description": "HTML, Razor ve Handlebar dosyaları için zengin dil desteği sağlar.",
-	"html.format.enable.desc": "Varsayılan HTML biçimlendiricisini etkinleştirin/devre dışı bırakın",
-	"html.format.wrapLineLength.desc": "Satır başına en fazla karakter miktarı (0 = devre dışı bırak)",
-	"html.format.unformatted.desc": "Yeniden biçimlendirilmeyecek virgülle ayrılmış etiketler listesi. 'null' değeri, https://www.w3.org/TR/html5/dom.html#phrasing-content adresinde listelenen tüm etiketleri varsayılan olarak belirler.",
-	"html.format.contentUnformatted.desc": "İçeriğin yeniden biçimlendirilmeyeceği virgülle ayrılmış etiketler listesi. 'null' değeri, 'pre' etiketini varsayılan olarak belirler.",
-	"html.format.indentInnerHtml.desc": "<head> ve <body> bölümlerini girintile.",
-	"html.format.preserveNewLines.desc": "Ögelerden önceki mevcut satır sonlarının korunup korunmayacağı. Yalnızca ögelerden önce çalışır, etiketler içinde veya metinde çalışmaz.",
-	"html.format.maxPreserveNewLines.desc": "Bir öbekte korunacak maksimum satır sonu sayısı. Sınırsız için 'null' değerini kullanın.",
-	"html.format.indentHandlebars.desc": "{{#foo}} ve {{/foo}}'yu biçimlendir ve girintile.",
-	"html.format.endWithNewline.desc": "Boş bir satırla bitir.",
-	"html.format.extraLiners.desc": "Kendilerinden önce ek bir boş satır bulunması gereken virgülle ayrılmış etiketler listesi. 'null' değeri, \"head, body, /html\" değerini varsayılan olarak belirler.",
-	"html.format.wrapAttributes.desc": "Öznitelikleri sarmala.",
-	"html.format.wrapAttributes.auto": "Öznitelikleri sadece satır uzunluğu aşıldığında sarmala.",
-	"html.format.wrapAttributes.force": "İlki hariç tüm öznitelikleri sarmala.",
-	"html.format.wrapAttributes.forcealign": "İlki hariç tüm öznitelikleri sarmala ve hizada tut.",
-	"html.format.wrapAttributes.forcemultiline": "Tüm öznitelikleri sarmala.",
-	"html.suggest.angular1.desc": "Yerleşik HTML dili desteğinin Angular V1 etiketlerini ve özelliklerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.ionic.desc": "Yerleşik HTML dili desteğinin Ionic etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.suggest.html5.desc": "Yerleşik HTML dili desteğinin HTML5 etiketlerini, özelliklerini ve değerlerini önerip önermeyeceğini yapılandırır.",
-	"html.trace.server.desc": "VS Code ve HTML dil sunucusu arasındaki iletişimi izler.",
-	"html.validate.scripts": "Yerleşik HTML dili desteğinin HTML5 gömülü betikleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.validate.styles": "Yerleşik HTML dili desteğinin HTML5 gömülü stilleri doğrulayıp doğrulamayacağını yapılandırır.",
-	"html.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
-	"html.autoClosingTags": "HTML etiketlerinin otomatik kapatılmasını etkinleştirin/devre dışı bırakın"
+	"displayName": "HTML Dil Temelleri",
+	"description": "HTML dosyaları için söz dizimi vurgulama, ayraç eşleştirme ve kod parçacıkları sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json b/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
new file mode 100644
index 00000000000..34990f71588
--- /dev/null
+++ b/i18n/trk/extensions/json-language-features/client/out/jsonMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"jsonserver.name": "JSON Dil Sunucusu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json-language-features/package.i18n.json b/i18n/trk/extensions/json-language-features/package.i18n.json
new file mode 100644
index 00000000000..94799976a72
--- /dev/null
+++ b/i18n/trk/extensions/json-language-features/package.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "JSON Dili Özellikleri",
+	"description": "JSON dosyaları için zengin dil desteği sağlar.",
+	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
+	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
+	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
+	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
+	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
+	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
+	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
+	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
+	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/json/package.i18n.json b/i18n/trk/extensions/json/package.i18n.json
index 9f3d0ff8c56..edd35777010 100644
--- a/i18n/trk/extensions/json/package.i18n.json
+++ b/i18n/trk/extensions/json/package.i18n.json
@@ -6,16 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"displayName": "JSON Dili Özellikleri",
-	"description": "JSON dosyaları için zengin dil desteği sağlar.",
-	"json.schemas.desc": "Şemaları geçerli projedeki JSON dosyalarıyla ilişkilendir",
-	"json.schemas.url.desc": "Bir şemanın URL'si veya geçerli dizindeki bir şemanın göreli yolu",
-	"json.schemas.fileMatch.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için kullanılacak bir dosya düzenleri dizisi.",
-	"json.schemas.fileMatch.item.desc": "JSON dosyaları şemalara çözümlenirken eşleşme için '*' içerebilen bir dosya düzeni.",
-	"json.schemas.schema.desc": "Verilen URL için şema tanımı. Şema, yalnızca şema URL'sine erişimi önlemek için sağlanmalıdır.",
-	"json.format.enable.desc": "Varsayılan JSON biçimlendiricisini etkinleştirin/devre dışı bırakın (yeniden başlatma gerektirir)",
-	"json.tracing.desc": "VS Code ve JSON dil sunucusu arasındaki iletişimi izler.",
-	"json.colorDecorators.enable.desc": "Renk dekoratörlerini etkinleştirir veya devre dışı bırakır",
-	"json.colorDecorators.enable.deprecationMessage": "`json.colorDecorators.enable` ayarı, `editor.colorDecorators` yüzünden kullanım dışıdır.",
-	"json.experimental.syntaxFolding": "Sözdizimi duyarlı katlama işaretçilerini etkinleştirin/devre dışı bırakın."
+	"displayName": "JSON Dil Temelleri",
+	"description": "JSON dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json b/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
new file mode 100644
index 00000000000..44f66398a79
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/commands/onPreviewStyleLoadError.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"onPreviewStyleLoadError": "'markdown.styles' yüklenemedi: {0}"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
new file mode 100644
index 00000000000..3a5b0eca0e2
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/features/preview.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"lockedPreviewTitle": "[Önizleme] {0}",
+	"previewTitle": "{0} Önizlemesi"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json b/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
new file mode 100644
index 00000000000..76db8cd58cf
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/features/previewContentProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"preview.securityMessage.text": "Bu belgedeki bazı içerikler devre dışı bırakıldı",
+	"preview.securityMessage.title": "Markdown önizlemesinde potansiyel olarak tehlikeli veya güvenli olmayan içerik devre dışı bırakıldı. Güvenli olmayan içeriğe izin vermek veya betikleri etkinleştirmek için Markdown önizleme güvenlik ayarını değiştirin",
+	"preview.securityMessage.label": "İçerik Devre Dışı Güvenlik Uyarısı"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/out/security.i18n.json b/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
new file mode 100644
index 00000000000..df9d9eb7615
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/out/security.i18n.json
@@ -0,0 +1,20 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"strict.title": "Katı",
+	"strict.description": "Sadece güvenli içeriği yükle",
+	"insecureContent.title": "Güvenli olmayan içeriğe izin ver",
+	"insecureContent.description": "Http üzerinden içerik yüklemeyi etkinleştir",
+	"disable.title": "Devre Dışı Bırak",
+	"disable.description": "Tüm içeriğe ve betik yürütmeye izin ver. Tavsiye edilmez",
+	"moreInfo.title": "Daha Fazla Bilgi",
+	"enableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını etkinleştir",
+	"disableSecurityWarning.title": "Bu çalışma alanında önizleme güvenlik uyarılarını devre dışı bırak",
+	"toggleSecurityWarning.description": "İçerik güvenlik seviyesini etkilemez",
+	"preview.showPreviewSecuritySelector.title": "Bu çalışma alanında Markdown önizlemeleri için güvenlik ayarlarını seçin"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/markdown-language-features/package.i18n.json b/i18n/trk/extensions/markdown-language-features/package.i18n.json
new file mode 100644
index 00000000000..c7a539dac45
--- /dev/null
+++ b/i18n/trk/extensions/markdown-language-features/package.i18n.json
@@ -0,0 +1,32 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "Markdown Dili Özellikleri",
+	"description": "Markdown için zengin dil desteği sağlar.",
+	"markdown.preview.breaks.desc": "Markdown önizlemesinde satır sonlarının nasıl gösterileceğini ayarlar. 'true' olarak ayarlamak, her yeni satırda bir <br> oluşturur.",
+	"markdown.preview.linkify": "Markdown önizlemesinde URL benzeri metinlerin bağlantıya çevrilmesini etkinleştir veya devre dışı bırak.",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "Düzenleyiciye geçiş yapmak için Markdown önizlemesine çift tıklayın.",
+	"markdown.preview.fontFamily.desc": "Markdown önizlemesinde kullanılan yazı tipi ailesini denetler.",
+	"markdown.preview.fontSize.desc": "Markdown önizlemesinde kullanılan yazı tipi boyutunu piksel olarak denetler.",
+	"markdown.preview.lineHeight.desc": "Markdown önizlemesinde kullanılan satır yüksekliğini denetler. Bu sayı yazı tipi boyutuna görecelidir.",
+	"markdown.preview.markEditorSelection.desc": "Markdown önizlemesinde geçerli düzenleyici seçimini işaretle.",
+	"markdown.preview.scrollEditorWithPreview.desc": "Markdown önizlemesi kaydırıldığında, düzenleyicinin görünümünü güncelle.",
+	"markdown.preview.scrollPreviewWithEditor.desc": "Markdown düzenleyicisi kaydırıldığında, önizlemenin görünümünü güncelle.",
+	"markdown.preview.scrollPreviewWithEditorSelection.desc": "[Kullanım Dışı] Düzenleyicide seçili satırın görünmesi için Markdown önizlemesini kaydırır.",
+	"markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage": "Bu ayar 'markdown.preview.scrollPreviewWithEditor' ile değiştirildi ve artık hiçbir etkisi bulunmamaktadır.",
+	"markdown.preview.title": "Önizlemeyi Aç",
+	"markdown.previewFrontMatter.dec": "YAML ön maddesinin Markdown önizlemesinde nasıl gösterilmesi gerektiğini ayarlar. 'hide' ön maddeyi kaldırır. Diğer türlü; ön madde, Markdown içeriği olarak sayılır.",
+	"markdown.previewSide.title": "Önizlemeyi Yana Aç",
+	"markdown.showLockedPreviewToSide.title": "Kilitlenmiş Önizlemeyi Yana Aç",
+	"markdown.showSource.title": "Kaynağı Göster",
+	"markdown.styles.dec": "Markdown önizlemesinde kullanılmak üzere CSS stil dosyalarını işaret eden bir URL'ler veya yerel yollar listesi. Göreli yollar, gezginde açılan klasöre göreli olarak yorumlanır.",
+	"markdown.showPreviewSecuritySelector.title": "Önizleme Güvenlik Ayarlarını Değiştir",
+	"markdown.trace.desc": "Markdown eklentisi için hata ayıklama günlüğünü etkinleştir.",
+	"markdown.preview.refresh.title": "Önizlemeyi Yenile",
+	"markdown.preview.toggleLock.title": "Önizleme Kilitlemeyi Aç/Kapat"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json b/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
new file mode 100644
index 00000000000..d882c2764da
--- /dev/null
+++ b/i18n/trk/extensions/php-language-features/out/features/validationProvider.i18n.json
@@ -0,0 +1,15 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"php.useExecutablePath": "{0} (çalışma alanı ayarı olarak tanımlı) yürütülebilir dosyasına PHP dosyalarını doğrulama izni veriyor musunuz?",
+	"php.yes": "İzin Ver",
+	"php.no": "İzin Verme",
+	"wrongExecutable": "{0} geçerli bir php yürütülebilir dosyası olmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
+	"noExecutable": "Hiçbir PHP yürütülebilir dosyası ayarlanmadığı için doğrulanamıyor. PHP yürütülebilir dosyasını yapılandırmak için 'php.validate.executablePath' ayarını kullanın.",
+	"unknownReason": "{0} yolu kullanılarak php çalıştırılamadı. Sebep bilinmiyor."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php-language-features/package.i18n.json b/i18n/trk/extensions/php-language-features/package.i18n.json
new file mode 100644
index 00000000000..9ee5b59f86c
--- /dev/null
+++ b/i18n/trk/extensions/php-language-features/package.i18n.json
@@ -0,0 +1,18 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
+	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
+	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
+	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
+	"configuration.title": "PHP",
+	"commands.categroy.php": "PHP",
+	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
+	"displayName": "PHP Dil Özellikleri",
+	"description": "PHP dosyaları için zengin dil desteği sağlar."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/php/package.i18n.json b/i18n/trk/extensions/php/package.i18n.json
index dbcdfc169f6..20718b8a0e7 100644
--- a/i18n/trk/extensions/php/package.i18n.json
+++ b/i18n/trk/extensions/php/package.i18n.json
@@ -6,13 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"configuration.suggest.basic": "Yerleşik PHP dili önerilerinin etkinleştirilip etkinleştirilmediğini yapılandırır. Destek, PHP globalleri ve değişkenleri önerir.",
-	"configuration.validate.enable": "Yerleşik PHP doğrulamasını etkinleştir/devre dışı bırak.",
-	"configuration.validate.executablePath": "PHP çalıştırılabilir dosyasına işaret eder.",
-	"configuration.validate.run": "Doğrulayıcının kayıt esnasında mı tuşlama esnasında mı çalışacağı.",
-	"configuration.title": "PHP",
-	"commands.categroy.php": "PHP",
-	"command.untrustValidationExecutable": "PHP doğrulama yürütülebilir dosyasına izin verme (çalışma alanı ayarı olarak tanımlanır)",
-	"displayName": "PHP Dil Özellikleri",
-	"description": "PHP dosyaları için gelişmiş kod tamamlama(IntelliSense), doğrulama ve dil temelleri sağlar."
+	"description": "PHP dosyaları için söz dizimi vurgulama ve ayraç eşleştirme sağlar."
 }
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json b/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json
new file mode 100644
index 00000000000..8893bf346b3
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/commands.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın",
+	"typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü",
+	"typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi",
+	"typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
+	"typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin parçası değil. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
+	"typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır",
+	"typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
new file mode 100644
index 00000000000..73c28f59b2d
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/completionItemProvider.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"selectCodeAction": "Uygulanacak kod eylemini seçin",
+	"acquiringTypingsLabel": "Tuşlamalar alınıyor...",
+	"acquiringTypingsDetail": "IntelliSense için tuşlama tanımları alınıyor...",
+	"autoImportLabel": "{0} kaynağından otomatik içe aktar"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
new file mode 100644
index 00000000000..9125b191bf7
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/directiveCommentCompletionProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ts-check": "Bir JavaScript dosyasının anlamsal kontrolünü etkinleştirir. Bir dosyanın en üstünde olmalıdır.",
+	"ts-nocheck": "Bir JavaScript dosyasının anlamsal kontrolünü devre dışı bırakır. Bir dosyanın en üstünde olmalıdır.",
+	"ts-ignore": "Bir dosyanın sonraki satırında @ts-check hatalarını bastırır."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..3561a581bac
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/implementationsCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneImplementationLabel": "1 uygulama",
+	"manyImplementationLabel": "{0} uygulama",
+	"implementationsErrorLabel": "Uygulamalar belirlenemedi"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..d6c29560283
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"typescript.jsDocCompletionItem.documentation": "JSDoc yorumu"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json
new file mode 100644
index 00000000000..4f692e9af12
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/organizeImports.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oraganizeImportsAction.title": "İçe Aktarımları Düzenle"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
new file mode 100644
index 00000000000..323d1a99391
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/quickFixProvider.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"fixAllInFileLabel": "{0} (Dosyadaki tümünü düzelt)"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
new file mode 100644
index 00000000000..48ebde68477
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/referencesCodeLensProvider.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"oneReferenceLabel": "1 başvuru",
+	"manyReferenceLabel": "{0} başvuru",
+	"referenceErrorLabel": "Başvurular belirlenemedi"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json
new file mode 100644
index 00000000000..e69846fe634
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/features/taskProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"buildTscLabel": "derleme - {0}",
+	"buildAndWatchTscLabel": "izleme - {0}"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json b/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
new file mode 100644
index 00000000000..d378e70d327
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/typescriptServiceClient.i18n.json
@@ -0,0 +1,19 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"noServerFound": "{0} yolu geçerli bir tsserver kurulumuna işaret etmiyor. Paketlenmiş TypeScript sürümüne geri dönülüyor.",
+	"serverCouldNotBeStarted": "TypeScript dil sunucusu başlatılamadı. Hata mesajı: {0}",
+	"typescript.openTsServerLog.notSupported": "TS Sunucu günlüğü için TS 2.2.2+ gerekiyor",
+	"typescript.openTsServerLog.loggingNotEnabled": "TS Sunucu günlüğü kapalı. Lütfen `typescript.tsserver.log` ögesini ayarlayın ve günlüğe yazmayı etkinleştirmek için TS sunucusunu yeniden başlatın",
+	"typescript.openTsServerLog.enableAndReloadOption": "Günlüğe yazmayı etkinleştir ve TS sunucusunu yeniden başlat",
+	"typescript.openTsServerLog.noLogFile": "TS sunucu günlüğe yazmaya başlamadı.",
+	"openTsServerLog.openFileFailedFailed": "TS Sunucu günlük dosyası açılamadı",
+	"serverDiedAfterStart": "TypeScript dil hizmeti, başladıktan hemen sonra 5 kez kapandı. Hizmet yeniden başlatılmayacaktır.",
+	"serverDiedReportIssue": "Sorun Bildir",
+	"serverDied": "TypeScript dil hizmeti, son 5 dakikada 5 kez beklenmedik şekilde kapandı."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json
new file mode 100644
index 00000000000..4a8a4fba715
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/api.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"invalidVersion": "geçersiz sürüm"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json
new file mode 100644
index 00000000000..8f5ef5415b9
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/logger.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"channelName": "TypeScript"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
new file mode 100644
index 00000000000..61c40dd9a35
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/projectStatus.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"hintExclude": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, şunlar gibi birçok dosyaya sahip klasörleri hariç tutun: {0}",
+	"hintExclude.generic": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun.",
+	"large.label": "Hariç Tutmaları Yapılandır",
+	"hintExclude.tooltip": "Proje çapında JavaScript/TypeScript dil özelliklerini etkinleştirmek için, üzerinde çalışmadığınız kaynak dosyalar içeren büyük klasörleri hariç tutun."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
new file mode 100644
index 00000000000..6f7d1c56095
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/typingsStatus.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"installingPackages": "Daha iyi TypeScript IntelliSense için veri alınıyor",
+	"typesInstallerInitializationFailed.title": "JavaScript dil özellikleri için tuşlama dosyaları yüklenemedi. Lütfen NPM'in yüklenmiş olduğundan emin olun veya kullanıcı ayarlarınızdaki 'typescript.npm' ögesini yapılandırın. Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
+	"typesInstallerInitializationFailed.doNotCheckAgain": "Tekrar Gösterme"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
new file mode 100644
index 00000000000..bbccc6cfbc1
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/versionPicker.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"useVSCodeVersionOption": "VS Code'un Sürümünü Kullan",
+	"useWorkspaceVersionOption": "Çalışma Alanı Sürümünü Kullan",
+	"learnMore": "Daha Fazla Bilgi Edin",
+	"selectTsVersion": "JavaScript ve TypeScript dil özellikleri için kullanılacak TypeScript sürümünü seçin"
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json b/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
new file mode 100644
index 00000000000..86f606ebb3a
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/out/utils/versionProvider.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"couldNotLoadTsVersion": "Bu yolda TypeScript sürümü yüklenemedi",
+	"noBundledServerFound": "VS Code'un tsserver'ı hatalı bir virüs tespit aracı gibi bir uygulama tarafından silindi. Lütfen VS Code'u yeniden yükleyin."
+}
\ No newline at end of file
diff --git a/i18n/trk/extensions/typescript-language-features/package.i18n.json b/i18n/trk/extensions/typescript-language-features/package.i18n.json
new file mode 100644
index 00000000000..452869e59fe
--- /dev/null
+++ b/i18n/trk/extensions/typescript-language-features/package.i18n.json
@@ -0,0 +1,58 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"displayName": "TypeScript ve JavaScript Dili Özellikleri",
+	"description": "JavaScript ve TypeScript için zengin dil desteği sağlar.",
+	"typescript.reloadProjects.title": "Projeyi Yeniden Yükle",
+	"javascript.reloadProjects.title": "Projeyi Yeniden Yükle",
+	"configuration.typescript": "TypeScript",
+	"typescript.useCodeSnippetsOnMethodSuggest.dec": "İşlevleri parametre imzalarıyla tamamlayın.",
+	"typescript.tsdk.desc": "Kullanılacak tsserver ve lib*.d.ts dosyalarını içeren klasör yolunu belirtir.",
+	"typescript.disableAutomaticTypeAcquisition": "Otomatik tür kazanımını devre dışı bırakır. TypeScript >= 2.0.6 gerektirir.",
+	"typescript.tsserver.log": "TS sunucusunun bir dosyaya günlük yazmasını etkinleştirir. Bu günlük, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. Günlük dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
+	"typescript.tsserver.trace": "TS sunucusuna gönderilen mesajları izlemeyi etkinleştirir. Bu izleme, TS Sunucu sorunlarını teşhis etmek için kullanılabilir. İzleme; dosya yollarını, kaynak kodunu ve projenizdeki diğer muhtemel hassas bilgileri içerebilir.",
+	"typescript.validate.enable": "TypeScript doğrulamasını etkinleştir veya devre dışı bırak.",
+	"typescript.format.enable": "Varsayılan TypeScript biçimlendiricisini etkinleştirin/devre dışı bırakın.",
+	"javascript.format.enable": "Varsayılan JavaScript biçimlendiricisini etkinleştir veya devre dışı bırak.",
+	"format.insertSpaceAfterCommaDelimiter": "Virgül sınırlayıcısından sonra boşluk eklenmesini tanımlar.",
+	"format.insertSpaceAfterConstructor": "Oluşturucu anahtar kelimesinden sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.3.0 gerektirir.",
+	"format.insertSpaceAfterSemicolonInForStatements": "Bir ifade için noktalı virgülden sonra boşluk eklenmesini tanımlar.",
+	"format.insertSpaceBeforeAndAfterBinaryOperators": "Bir ikili operatöründen sonra boşluk eklenmesini tanımlar.",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "Bir kontrol akışı ifadesi için anahtar kelimelerden sonra boşluk eklenmesini tanımlar.",
+	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "Anonim fonksiyonlar için \"function\" anahtar kelimesinden sonra boşluk eklenmesini tanımlar.",
+	"format.insertSpaceBeforeFunctionParenthesis": "Fonksiyon argüman parantezlerinden önce boşluk eklenmesini tanımlar. TypeScript >= 2.1.5 gerektirir.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": "Şablon dizesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
+	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "JSX ifadesi ayraçları açıldıktan sonra ve kapatılmadan önce boşluk eklenmesini tanımlar. TypeScript >= 2.0.6 gerektirir.",
+	"format.insertSpaceAfterTypeAssertion": "TypeScript'te tür iddialarından sonra boşluk eklenip eklenmeyeceğini tanımlar. TypeScript >= 2.4 gerektirir.",
+	"format.placeOpenBraceOnNewLineForFunctions": "Fonksiyonlarda bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
+	"format.placeOpenBraceOnNewLineForControlBlocks": "Kontrol bloklarında bir açılış ayracının yeni satıra koyulup koyulmayacağını tanımlar.",
+	"javascript.validate.enable": "JavaScript doğrulamasını etkinleştir veya devre dışı bırak.",
+	"typescript.goToProjectConfig.title": "Proje Yapılandırmasına Git",
+	"javascript.goToProjectConfig.title": "Proje Yapılandırmasına Git",
+	"javascript.referencesCodeLens.enabled": "JavaScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak.",
+	"typescript.referencesCodeLens.enabled": "TypeScript dosyalarında başvuru kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.0.6 gerektirir.",
+	"typescript.implementationsCodeLens.enabled": "Uygulama kod objektifini etkinleştir veya devre dışı bırak. TypeScript >= 2.2.0 gerektirir.",
+	"typescript.openTsServerLog.title": "TS Sunucu günlüğünü aç",
+	"typescript.restartTsServer": "TS sunucusunu yeniden başlat",
+	"typescript.selectTypeScriptVersion.title": "TypeScript Sürümünü Seç",
+	"typescript.reportStyleChecksAsWarnings": "Stil kontrollerini uyarı olarak bildir",
+	"jsDocCompletion.enabled": "Otomatik JSDoc yorumlarını etkinleştir veya devre dışı bırak.",
+	"javascript.implicitProjectConfig.checkJs": "JavaScript dosyalarının anlamsal kontrolünü etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
+	"typescript.npm": "Otomatik Tür Kazanımı için kullanılacak NPM yürütülebilir dosyasının yolunu belirtir. TypeScript >= 2.3.4 gerektirir.",
+	"typescript.check.npmIsInstalled": "Otomatik Tür Kazanımı için NPM'in yüklü olup olmadığını kontrol et.",
+	"javascript.nameSuggestions": "JavaScript öneri listelerindeki dosyadan benzersiz adları eklemeyi etkinleştir veya devre dışı bırak.",
+	"typescript.tsc.autoDetect": "tsc görevlerinin otomatik algılanmasını denetler. 'off' bu özelliği devre dışı bırakır. 'build' sadece bir kez çalışan derleme görevleri oluşturur. 'watch' sadece derleme ve izleme görevleri oluşturur. 'on' derleme ve izleme görevlerinin her ikisini de oluşturur. Varsayılan 'on'dur. ",
+	"typescript.problemMatchers.tsc.label": "TypeScript sorunları",
+	"typescript.problemMatchers.tscWatch.label": "TypeScript sorunları (izleme modu)",
+	"typescript.quickSuggestionsForPaths": "Bir içe aktarım yolu girerken hızlı önerileri etkinleştir/devre dışı bırak.",
+	"typescript.locale": "TypeScript hatalarını bildirirken kullanılarak dili(bölgeyi) ayarlar. TypeScript >= 2.6.0 gerektirir. 'null' varsayılanı, TypeScript hataları için VS Code'un dil(bölge) ayarlarını kullanır.",
+	"javascript.implicitProjectConfig.experimentalDecorators": "Bir projenin parçası olmayan JavaScript dosyaları için deneysel dekoratörler ('experimentalDecorators') özelliğini etkinleştir veya devre dışı bırak. Mevcut jsconfig.json veya tsconfig.json dosyaları bu ayarı geçersiz kılar. TypeScript >= 2.3.1 gerektirir.",
+	"typescript.autoImportSuggestions.enabled": "Otomatik içe aktarım önerilerini etkinleştir/devre dışı bırak. TypeScript >= 2.6.1 gerektirir.",
+	"typescript.experimental.syntaxFolding": "Sözdimine duyarlı katlama işaretleyicilerini etkinleştirin/devre dışı bırakın.",
+	"taskDefinition.tsconfig.description": "TS derlemesini tanımlayan tsconfig dosyası."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/base/node/processes.i18n.json b/i18n/trk/src/vs/base/node/processes.i18n.json
index 0debe2b0adb..35229bd6699 100644
--- a/i18n/trk/src/vs/base/node/processes.i18n.json
+++ b/i18n/trk/src/vs/base/node/processes.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"TaskRunner.UNC": "UNC sürücüsünde kabuk komutu yürütülemez."
+	]
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
index 9a43ba50fdf..bfc5cc5845c 100644
--- a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
+++ b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterMain.i18n.json
@@ -11,11 +11,10 @@
 	"similarIssues": "Benzer sorunlar",
 	"open": "Aç",
 	"closed": "Kapalı",
-	"noResults": "Sonuç bulunamadı",
 	"settingsSearchIssue": "Ayar Arama Sorunu",
 	"bugReporter": "Hata Raporu",
-	"performanceIssue": "Performans Sorunu",
 	"featureRequest": "Özellik İsteği",
+	"performanceIssue": "Performans Sorunu",
 	"stepsToReproduce": "Yeniden oluşturma adımları",
 	"bugDescription": "Sorunu güvenilir şekilde yeniden oluşturmak için gerekli adımları paylaşın. Lütfen gerçekleşen ve beklenen sonuçları ekleyin. GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
 	"performanceIssueDesciption": "Bu performans sorunu ne zaman oluştu? Başlangıçta mı yoksa belirli eylemlerden sonra mı oluşuyor? GitHub-tarzı Markdown'ı destekliyoruz. GitHub'da önizleme yaptığımızda sorununuzu düzenleyebilecek ve ekran görüntüleri ekleyebileceksiniz.",
diff --git a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
index 0045409477d..48797829bb8 100644
--- a/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
+++ b/i18n/trk/src/vs/code/electron-browser/issue/issueReporterPage.i18n.json
@@ -8,6 +8,9 @@
 	],
 	"completeInEnglish": "Lütfen formu İngilizce olarak doldurunuz.",
 	"issueTypeLabel": "Bu bir",
+	"vscode": "Visual Studio Code",
+	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
+	"chooseExtension": "Eklenti",
 	"issueTitleLabel": "Başlık",
 	"issueTitleRequired": "Lütfen bir başlık girin.",
 	"titleLengthValidation": "Başlık çok uzun.",
@@ -18,13 +21,6 @@
 	"extensions": "Eklentilerim",
 	"searchedExtensions": "Aranan Eklentiler",
 	"settingsSearchDetails": "Ayar Arama Detayları",
-	"tryDisablingExtensions": "Eklentiler devre dışı bırakıldığında sorun yeniden oluşturulabiliyor mu?",
-	"yes": "Evet",
-	"no": "Hayır",
-	"disableExtensionsLabelText": "Sorunu {0} sonrasında yeniden oluşturmaya çalışın.",
-	"disableExtensions": "tüm eklentileri devre dışı bırakıp pencereyi yeniden yükleyin",
-	"showRunningExtensionsLabelText": "Bunun bir eklenti sorunu olduğundan şüpheleniyorsanız, eklentideki sorunu bildirmek için {0}.",
-	"showRunningExtensions": "çalışan tüm eklentileri göster",
 	"details": "Lütfen detayları giriniz.",
 	"loadingData": "Veri yükleniyor..."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json b/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
new file mode 100644
index 00000000000..d79aea5296a
--- /dev/null
+++ b/i18n/trk/src/vs/code/electron-browser/processExplorer/processExplorerMain.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Adı"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json b/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json
index d8b434e3625..fb4e78feb3a 100644
--- a/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json
+++ b/i18n/trk/src/vs/editor/browser/widget/diffReview.i18n.json
@@ -7,7 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"label.close": "Kapat",
-	"header": "Farklılık {0}/{1}: orijinal {2}, {3} satırları, değiştirilen {4}, {5} satırları",
 	"blankLine": "boş",
 	"equalLine": "orijinal {0}, değiştirilen {1}: {2}",
 	"insertLine": "+ değiştirilen {0}: {1}",
diff --git a/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json b/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/editor/common/commonCodeEditor.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
index b57bfc02dd1..93a32fa6ed1 100644
--- a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -28,7 +28,9 @@
 	"warningBorder": "Düzenleyicideki uyarı karalamalarının kenarlık rengi.",
 	"infoForeground": "Düzenleyicideki bilgilendirme karalamalarının ön plan rengi.",
 	"infoBorder": "Düzenleyicideki bilgilendirme karalamalarının kenarlık rengi.",
-	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi.",
+	"hintForeground": "Düzenleyicideki ipucu karalamalarının ön plan rengi.",
+	"hintBorder": "Düzenleyicideki ipucu karalamalarının kenarlık rengi.",
+	"overviewRulerRangeHighlight": "Aralık vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
 	"overviewRuleError": "Hatalar için genel bakış cetvelinin işaretleyici rengi.",
 	"overviewRuleWarning": "Uyarılar için genel bakış cetvelinin işaretleyici rengi.",
 	"overviewRuleInfo": "Bilgilendirmeler için genel bakış cetvelinin işaretleyici rengi."
diff --git a/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json b/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
new file mode 100644
index 00000000000..26213ddb84d
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/codeAction/codeActionCommands.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"quickFixWithKb": "Düzeltmeleri Göster ({0})",
+	"quickFix": "Düzeltmeleri Göster",
+	"organizeImports.label": "İçe Aktarımları Düzenle"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
index 937537fbe28..06ac02ab7ec 100644
--- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -6,11 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"title.wo_source": "({0}/{1})",
 	"markerAction.next.label": "Sonraki Soruna Git (Hata, Uyarı, Bilgi)",
-	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)",
-	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
-	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
-	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
-	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
+	"markerAction.previous.label": "Önceki Soruna Git (Hata, Uyarı, Bilgi)"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json b/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
new file mode 100644
index 00000000000..c3b60a4637d
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoErrorWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"title.wo_source": "({0}/{1})",
+	"editorMarkerNavigationError": "Düzenleyicinin işaretçi gezinti aracının hata rengi.",
+	"editorMarkerNavigationWarning": "Düzenleyicinin işaretçi gezinti aracının uyarı rengi.",
+	"editorMarkerNavigationInfo": "Düzenleyicinin işaretçi gezinti aracının bilgilendirme rengi.",
+	"editorMarkerNavigationBackground": "Düzenleyicinin işaretçi gezinti aracının arka planı."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json b/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/message/messageController.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json b/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
new file mode 100644
index 00000000000..635fee26cd5
--- /dev/null
+++ b/i18n/trk/src/vs/editor/contrib/snippet/snippetVariables.i18n.json
@@ -0,0 +1,47 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"Sunday": "Pazar",
+	"Monday": "Pazartesi",
+	"Tuesday": "Salı",
+	"Wednesday": "Çarşamba",
+	"Thursday": "Perşembe",
+	"Friday": "Cuma",
+	"Saturday": "Cumartesi",
+	"SundayShort": "Paz",
+	"MondayShort": "Pzt",
+	"TuesdayShort": "Sal",
+	"WednesdayShort": "Çar",
+	"ThursdayShort": "Per",
+	"FridayShort": "Cum",
+	"SaturdayShort": "Cmt",
+	"January": "Ocak",
+	"February": "Şubat",
+	"March": "Mart",
+	"April": "Nisan",
+	"May": "Mayıs",
+	"June": "Haziran",
+	"July": "Temmuz",
+	"August": "Ağustos",
+	"September": "Eylül",
+	"October": "Ekim",
+	"November": "Kasım",
+	"December": "Aralık",
+	"JanuaryShort": "Oca",
+	"FebruaryShort": "Şub",
+	"MarchShort": "Mar",
+	"AprilShort": "Nis",
+	"MayShort": "May",
+	"JuneShort": "Haz",
+	"JulyShort": "Tem",
+	"AugustShort": "Ağu",
+	"SeptemberShort": "Eyl",
+	"OctoberShort": "Eki",
+	"NovemberShort": "Kas",
+	"DecemberShort": "Ara"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
index e4f61af229f..5d14aeee198 100644
--- a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -10,8 +10,8 @@
 	"wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
 	"wordHighlightBorder": "Bir değişken okunurken ki gibi, bir sembolün okuma-erişimi sırasındaki kenarlık rengi.",
 	"wordHighlightStrongBorder": "Bir değişkene yazılırken ki gibi, bir sembolün yazma erişimi sırasındaki kenarlık rengi.",
-	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi.",
+	"overviewRulerWordHighlightForeground": "Sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
+	"overviewRulerWordHighlightStrongForeground": "Yazma erişimli sembol vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk mat olmamalıdır.",
 	"wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git",
 	"wordHighlight.previous.label": "Önceki Sembol Vurgusuna Git"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json b/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
new file mode 100644
index 00000000000..0bc4bb5dea3
--- /dev/null
+++ b/i18n/trk/src/vs/platform/dialogs/common/dialogs.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"moreFile": "...1 ek dosya gösterilmiyor",
+	"moreFiles": "...{0} ek dosya gösterilmiyor"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json b/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
new file mode 100644
index 00000000000..40e62eb8c37
--- /dev/null
+++ b/i18n/trk/src/vs/platform/dialogs/node/dialogService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"cancel": "İptal"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json
index de45d35b28e..66361e3eb27 100644
--- a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json
@@ -29,8 +29,6 @@
 	"performance": "'Geliştirici: Başlangıç Performansı' komutu etkinleştirilmiş olarak başlat.",
 	"prof-startup": "Başlangıç sırasında CPU profil oluşturucusunu çalıştır",
 	"disableExtensions": "Yüklü tüm eklentileri devre dışı bırak.",
-	"inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
-	"inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.",
 	"disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.",
 	"uploadLogs": "Geçerli oturumdaki günlükleri güvenli bir uçbirime yükler.",
 	"maxMemory": "Bir pencere için maksimum bellek miktarı (Mbyte olarak).",
diff --git a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
index 9f87cfce521..06d66b62a1e 100644
--- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -14,7 +14,7 @@
 	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
 	"MarketPlaceDisabled": "Market etkin değil",
 	"removeError": "Eklenti kaldırılırken hata oluştu: {0}. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.",
-	"Not Market place extension": "Sadece Market Eklentileri yeniden yüklenebilir",
+	"Not a Marketplace extension": "Sadece Market Eklentileri yeniden yüklenebilir",
 	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
 	"malicious extension": "Eklenti sorunlu olarak bildirildiği için yüklenemiyor.",
 	"notFoundCompatibleDependency": "Yükleme başarısız oldu çünkü, bağımlılığı bulunan '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.",
@@ -22,7 +22,7 @@
 	"exitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
 	"uninstallDependeciesConfirmation": "Yalnızca '{0}' eklentisini mi yoksa bağımlılıklarını da kaldırmak ister misiniz?",
 	"uninstallOnly": "Sadece Eklenti",
-	"uninstallAll": "Tümü",
+	"uninstallAll": "Tümünü Kaldır",
 	"uninstallConfirmation": "'{0}' eklentisini kaldırmak istediğinizden emin misiniz?",
 	"ok": "Tamam",
 	"singleDependentError": "'{0}' eklentisi kaldırılamıyor. '{1}' eklentisi buna bağlı.",
diff --git a/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json b/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json
index cbe0edea7ae..6060ac3a06c 100644
--- a/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json
+++ b/i18n/trk/src/vs/platform/extensions/node/extensionValidator.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"versionSyntax": "`engines.vscode` değeri {0} ayrıştırılamadı. Lütfen örnekte verilenlere benzer ifadeler kullanın: ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x, vb.",
 	"versionSpecificity1": "`engines.vscode`da belirtilen sürüm ({0}) yeterince belirli değil. vscode 1.0.0'dan önceki sürümler için, lütfen istenecek minimum majör ve minör sürüm numarasını tanımlayın. Örneğin: ^0.10.0, 0.10.x, 0.11.0, vb.",
 	"versionSpecificity2": "`engines.vscode`da belirtilen sürüm ({0}) yeterince belirli değil. vscode 1.0.0'dan sonraki sürümler için, lütfen istenecek minimum majör sürüm numarasını tanımlayın. Örneğin: ^1.10.0, 1.10.x, 1.x.x, 2.x.x, vb.",
 	"versionMismatch": "Eklenti, Code {0} ile uyumlu değil. Gereken sürüm: {1}."
diff --git a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
index e6399c3a740..6cac235b96e 100644
--- a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
+++ b/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin.",
 	"integrity.moreInformation": "Daha Fazla Bilgi",
-	"integrity.dontShowAgain": "Tekrar Gösterme",
-	"integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin."
+	"integrity.dontShowAgain": "Tekrar Gösterme"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
index 8cc26093046..ad10361dfb6 100644
--- a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
+++ b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json
@@ -12,5 +12,6 @@
 	"multiSelectModifier": "Ağaç veya listelerdeki bir ögenin çoklu seçime fare ile eklenmesinde kullanılacak değiştirici(örneğin gezgin, açık düzenleyiciler ve scm görünümlerinde). `ctrlCmd` Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir. 'Yana Aç' fare hareketleri - destekleniyorsa - birden çok seçim değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.",
 	"openMode.singleClick": "Tek tıklamayla ögeleri aç.",
 	"openMode.doubleClick": "Çift tıklamayla ögeleri aç.",
-	"openModeModifier": "Ağaç ve listelerdeki ögelerin (destekleniyorsa) fare ile nasıl açılacağını denetler. Ögeleri tek tıklamayla açmak için `singleClick`, çift tıklamayla açmak için `doubleClick` olarak ayarlayın. Ağaçlardaki alt ögeler içeren ögeler için bu ayar üst ögenin tek veya çift tıklama tarafından genişletilmesini denetler. Bazı ağaç veya listelerin, bu ayar uygulanamaz ise görmezden gelmeyi seçebileceklerini unutmayın."
+	"openModeModifier": "Ağaç ve listelerdeki ögelerin (destekleniyorsa) fare ile nasıl açılacağını denetler. Ögeleri tek tıklamayla açmak için `singleClick`, çift tıklamayla açmak için `doubleClick` olarak ayarlayın. Ağaçlardaki alt ögeler içeren ögeler için bu ayar üst ögenin tek veya çift tıklama tarafından genişletilmesini denetler. Bazı ağaç veya listelerin, bu ayar uygulanamaz ise görmezden gelmeyi seçebileceklerini unutmayın.",
+	"horizontalScrolling setting": "Çalışma ekranındaki ağaçların yatay kaydırmayı destekleyip desteklemeyeceğini denetler."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/markers/common/markers.i18n.json b/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
new file mode 100644
index 00000000000..bc3e8108119
--- /dev/null
+++ b/i18n/trk/src/vs/platform/markers/common/markers.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"sev.error": "Hata",
+	"sev.warning": "Uyarı",
+	"sev.info": "Bilgi"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
index 1135da6951e..4b0f1b56d92 100644
--- a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -93,6 +93,6 @@
 	"overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında \"mevcut olan\" için genel bakış cetveli ön planı.",
 	"overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.",
 	"overviewRulerCommonContentForeground": "Satır içi birleştirme çakışmalarında ortak ata genel bakış cetveli ön planı.",
-	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi.",
-	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi."
+	"overviewRulerFindMatchForeground": "Bulunan eşler için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır.",
+	"overviewRulerSelectionHighlightForeground": "Seçim vurguları için genel bakış cetvelinin işaretleyici rengi. Altta yer alan süslemeleri gizlememek için renk opak olmamalıdır."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
new file mode 100644
index 00000000000..dd01b6be52a
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/api/browser/viewsContainersExtensionPoint.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır",
+	"showViewlet": "{0}'i Göster",
+	"view": "Görüntüle"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
index 5b6a365ee4b..0369e1260ea 100644
--- a/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
+++ b/i18n/trk/src/vs/workbench/api/browser/viewsExtensionPoint.i18n.json
@@ -15,7 +15,6 @@
 	"vscode.extension.contributes.views": "Görünümleri düzenleyiciye ekler.",
 	"views.explorer": "Gezgin Görünümü",
 	"views.debug": "Hata Ayıklama Görünümü",
-	"locationId.invalid": "`{0}` geçerli bir görünüm konumu değil",
-	"duplicateView1": "`{1}` konumunda aynı `{0}` kimliğine sahip birden çok görünüm kaydedilemiyor",
-	"duplicateView2": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
+	"duplicateView1": "`{1}` konumunda aynı `{0}` id'sine sahip birden çok görünüm kaydedilemiyor",
+	"duplicateView2": "`{0}` id'sine sahip bir görünüm `{1}` konumunda zaten kayıtlı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 77c86b9a0b6..3f98c05062b 100644
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -6,5 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"timeout.formatOnSave": "Kaydederken biçimlendirme {0}ms sonrasında durduruldu",
+	"timeout.onWillSave": "onWillSaveTextDocument olayı 1750ms sonrasında durduruldu",
 	"saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
new file mode 100644
index 00000000000..ee8688cdc85
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadTask.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"task.label": "{0}: {1}"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
index 4c6d2775a03..35229bd6699 100644
--- a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
+++ b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadWebview.i18n.json
@@ -5,6 +5,5 @@
 		"Licensed under the MIT License. See License.txt in the project root for license information.",
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
-	],
-	"webview.editor.label": "web görünümü düzenleyicisi"
+	]
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
new file mode 100644
index 00000000000..b8ebfa4861f
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/api/node/extHostProgress.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"extensionSource": "{0} (Eklenti)"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index d8a7f990546..45dce70f0b9 100644
--- a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -7,5 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok.",
-	"treeView.duplicateElement": "{0} kimliğine sahip bir öge zaten kayıtlı"
+	"treeView.duplicateElement": "{0} id'sine sahip bir öge zaten kayıtlı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
index d0faef6808c..90a1b3244f9 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/editorActions.i18n.json
@@ -17,6 +17,7 @@
 	"focusNextGroup": "Sonraki Gruba Odakla",
 	"openToSide": "Yana Aç",
 	"closeEditor": "Düzenleyiciyi Kapat",
+	"closeOneEditor": "Kapat",
 	"revertAndCloseActiveEditor": "Geri Al ve Düzenleyiciyi Kapat",
 	"closeEditorsToTheLeft": "Düzenleyicinin Solundakileri Kapat",
 	"closeAllEditors": "Tüm Düzenleyicileri Kapat",
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
index d89fb0f61b9..d7d8c7f9437 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json
@@ -17,10 +17,9 @@
 	"screenReaderDetectedExtra": "Bir Ekran Okuyucu kullanmıyorsanız, lütfen `editor.accessibilitySupport` ayarını \"off\" olarak değiştirin",
 	"disableTabMode": "Erişilebilirlik Modunu Devre Dışı Bırak",
 	"gotoLine": "Satıra Git",
-	"indentation": "Girinti",
 	"selectEncoding": "Kodlamayı Seç",
 	"selectEOL": "Satır Sonu Sıralamasını Seç",
-	"selectLanguageMode": "Dil Modunu Seçin",
+	"selectLanguageMode": "Dil Modunu Seç",
 	"fileInfo": "Dosya Bilgisi",
 	"spacesSize": "Boşluk: {0}",
 	"tabSize": "Sekme Boyutu: {0}",
@@ -33,9 +32,9 @@
 	"configureModeSettings": "'{0}' dili tabanlı ayarları yapılandır...",
 	"configureAssociationsExt": "'{0}' için Dosya İlişkilendirmesini Yapılandır...",
 	"autoDetect": "Otomatik Algıla",
-	"pickLanguage": "Dil Modunu Seçin",
+	"pickLanguage": "Dil Modunu Seç",
 	"currentAssociation": "Geçerli İlişkilendirme",
-	"pickLanguageToConfigure": " '{0}' ile İlişkilendirilecek Dil Modunu Seçin",
+	"pickLanguageToConfigure": "'{0}' ile İlişkilendirilecek Dil Modunu Seç",
 	"changeIndentation": "Girintiyi Değiştir",
 	"noWritableCodeEditor": "Aktif kod düzenleyici salt okunur.",
 	"indentView": "görünümü değiştir",
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
index 4e305d89305..9428ff84bf5 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/resourceViewer.i18n.json
@@ -11,9 +11,7 @@
 	"sizeMB": "{0}MB",
 	"sizeGB": "{0}GB",
 	"sizeTB": "{0}TB",
-	"largeImageError": "Resim dosyası boyutu düzenleyicide görüntülemek için çok büyük (>1MB).",
 	"resourceOpenExternalButton": "Harici program kullanarak resmi aç",
-	"nativeBinaryError": "Dosya ikili olduğu, çok büyük olduğu veya desteklenmeyen bir metin kodlaması kullandığı için düzenleyicide görüntülenemiyor.",
 	"zoom.action.fit.label": "Resmin Tamamı",
 	"imgMeta": "{0}x{1} {2}"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
index 166ea0d4a6f..4c89a16f31a 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json
@@ -6,6 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"close": "Kapat",
 	"araLabelEditorActions": "Düzenleyici eylemleri"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
index 320cb9f421d..05ae29fe427 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/notifications/notificationsCenter.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"notificationsEmpty": "Yeni bildirim yok",
 	"notifications": "Bildirimler",
 	"notificationsToolbar": "Bildirim Merkezi Eylemleri",
 	"notificationsList": "Bildirim Listesi"
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
new file mode 100644
index 00000000000..205a210e0cd
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInput.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"ok": "Tamam"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/browser/parts/quickinput/quickInputBox.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/common/views.i18n.json b/i18n/trk/src/vs/workbench/common/views.i18n.json
index 08f2962090b..352d616cb23 100644
--- a/i18n/trk/src/vs/workbench/common/views.i18n.json
+++ b/i18n/trk/src/vs/workbench/common/views.i18n.json
@@ -6,5 +6,5 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"duplicateId": "'{0}' kimliğine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
+	"duplicateId": "'{0}' id'sine sahip bir görünüm '{1}' konumunda zaten kayıtlı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
index c69d16c0b90..f55bdf21090 100644
--- a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json
@@ -45,12 +45,17 @@
 	"windowConfigurationTitle": "Pencere",
 	"window.openFilesInNewWindow.on": "Dosyalar yeni bir pencerede açılacak",
 	"window.openFilesInNewWindow.off": "Dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"window.openFilesInNewWindow.default": "Dosyalar, Dock veya Finder ile açılmadıkça (sadece macOS için) dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
-	"openFilesInNewWindow": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, Dock veya Finder ile açılmadıkça (sadece macOS için) dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\n- on: dosyalar yeni bir pencerede açılacak\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
+	"window.openFilesInNewWindow.defaultMac": "Dosyalar, Dock veya Finder'dan açılmadıkça, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak",
+	"window.openFilesInNewWindow.default": "Dosyalar, uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır",
+	"openFilesInNewWindowMac": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, Dock veya Finder'dan açılmadıkça, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\n- on: dosyalar yeni bir pencerede açılacak\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılacak\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
+	"openFilesInNewWindow": "Dosyaların yeni bir pencerede açılıp açılmayacağını denetler.\n- default: dosyalar, uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır\n- on: dosyalar yeni bir pencerede açılır\n- off: dosyalar, dosyaların klasörünün olduğu pencerede veya son aktif pencerede açılır\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
 	"window.openFoldersInNewWindow.on": "Klasörler yeni bir pencerede açılacak",
 	"window.openFoldersInNewWindow.off": "Klasörler son aktif pencereyi değiştirir",
 	"window.openFoldersInNewWindow.default": "Klasörler, bir klasör uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır",
 	"openFoldersInNewWindow": "Klasörlerin yeni bir pencerede mi açılacağını yoksa son aktif pencereyi mi değiştireceğini denetler.\n- default: klasörler, bir klasör uygulama içinden seçilmedikçe (ör. Dosya menüsünden) yeni bir pencerede açılır\n- on: klasörler yeni bir pencerede açılır\n- off: klasörler son aktif pencereyi değiştirir\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
+	"window.openWithoutArgumentsInNewWindow.on": "Yeni bir pencere aç",
+	"window.openWithoutArgumentsInNewWindow.off": "Son aktif çalışan örneğe odakla",
+	"openWithoutArgumentsInNewWindow": "Yeni bir örnek argümansız olarak başlatılırken boş bir yeni pencerenin açılıp açılmamasını veya son çalışan örneğe odaklanıp odaklanmamasını denetler.\n- on: boş bir yeni pencere aç\n- off: son çalışan örneğe odakla\nBu ayarın halen yok sayılacağı durumlar olabilir (ör. -new-window veya -reuse-window komut satırı seçenekleri kullanılırken).",
 	"window.reopenFolders.all": "Tüm pencereleri yeniden aç.",
 	"window.reopenFolders.folders": "Tüm klasörleri yeniden aç. Boş çalışma alanları geri yüklenmeyecektir.",
 	"window.reopenFolders.one": "Son aktif pencereyi yeniden aç.",
@@ -58,7 +63,7 @@
 	"restoreWindows": "Pencerelerin, bir yeniden başlatma sonrası nasıl yeniden açılacağını denetler. Her zaman boş bir çalışma alanı ile başlamak için 'none', üzerinde çalıştığınız son pencereyi yeniden açmak için 'one', açık klasör bulunduran tüm pencereleri yeniden açmak için 'folders' veya son oturumunuzdaki tüm pencereleri yeniden açmak için 'all' seçeneğini seçin.",
 	"restoreFullscreen": "Bir pencere tam ekran modundayken çıkıldıysa, bu pencerenin tam ekran moduna geri dönüp dönmeyeceğini denetler.",
 	"zoomLevel": "Pencerenin yakınlaştırma düzeyini ayarlayın. Orijinal boyut 0'dır ve üstündeki (ör. 1) veya altındaki (ör. -1) her artırma 20% daha fazla veya az yakınlaştırmayı temsil eder. Yakınlaştırma düzeyini daha ince ayrıntılarla ayarlamak için ondalık değerler de girebilirsiniz.",
-	"title": "Pencere başlığını aktif düzenleyiciye bağlı olarak denetler. Değişkenler, bağlama göre değiştirilir:\n${activeEditorShort}: dosyanın adı (ör. myFile.txt)\n${activeEditorMedium}: çalışma alanı klasörüne göreli dosyanın yolu (ör. myFolder/myFile.txt)\n${activeEditorLong}: dosyanın tam yolu (ör. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: dosyayı içeren çalışma alanı klasörünün adı (ör. myFolder)\n${folderPath}: dosyayı içeren çalışma alanı klasörünün yolu (ör. /Users/Development/myFolder)\n${rootName}: çalışma alanının adı (ör. myFolder veya myWorkspace)\n${rootPath}: çalışma alanının yolu (ör. /Users/Development/myWorkspace)\n${appName}: ör. VS Code\n${dirty}: etkin düzenleyici kaydedilmemiş değişiklikler içeriyorsa, değişiklik göstergesi\n${separator}: şartlı ayırıcı (\" - \") yalnızca değer içeren değişkenlerle çevrili olduğunda gösterilir",
+	"title": "Pencere başlığını aktif düzenleyiciye bağlı olarak denetler. Değişkenler, bağlama göre değiştirilir:\n${activeEditorShort}: dosyanın adı (ör. myFile.txt)\n${activeEditorMedium}: çalışma alanı klasörüne göreli dosyanın yolu (ör. myFolder/myFile.txt)\n${activeEditorLong}: dosyanın tam yolu (ör. /Users/Development/myProject/myFolder/myFile.txt)\n${folderName}: dosyayı içeren çalışma alanı klasörünün adı (ör. myFolder)\n${folderPath}: dosyayı içeren çalışma alanı klasörünün yolu (ör. /Users/Development/myFolder)\n${rootName}: çalışma alanının adı (ör. myFolder veya myWorkspace)\n${rootPath}: çalışma alanının yolu (ör. /Users/Development/myWorkspace)\n${appName}: ör. VS Code\n${dirty}: etkin düzenleyici kaydedilmemiş değişiklikler içeriyorsa, değişiklik göstergesi\n${separator}: şartlı ayırıcı (\" - \") yalnızca değer veya statik metin içeren değişkenlerle çevrili olduğunda gösterilir",
 	"window.newWindowDimensions.default": "Yeni pencereleri ekranın ortasında açın.",
 	"window.newWindowDimensions.inherit": "Yeni pencereleri son aktif pencere ile aynı ölçülerde açın.",
 	"window.newWindowDimensions.maximized": "Yeni pencereleri ekranı kapla modunda açın.",
@@ -74,6 +79,7 @@
 	"autoDetectHighContrast": "Etkinleştirilirse; eğer Windows bir yüksek karşıtlık teması kullanıyorsa, otomatik olarak yüksek karşıtlık temasına geçiş yapılır; ve Windows, yüksek karşıtlık temasını kullanmayı bıraktığında koyu temaya geçiş yapılır.",
 	"titleBarStyle": "Pencere başlık çubuğunun görünümünü ayarlayın. Değişikliklerin uygulanması için tam yeniden başlatma gerekir.",
 	"window.nativeTabs": "macOS Sierra pencere sekmelerini etkinleştirir. Değişikliklerin uygulanması için tam yeniden başlatma gerekeceğini ve yerel sekmelerin, eğer yapılandırılmışsa özel başlık çubuğu stilini devre dışı bıracağını unutmayın.",
+	"window.smoothScrollingWorkaround": "Simge durumuna küçültülmüş bir VS Code penceresini tekrar açtıktan sonra kaydırma artık pürüzsüz değilse bu geçici çözümü etkinleştirin. Bu, Microsoft'un Surface cihazları gibi hassas trackpad'ler içeren cihazlarda yaşanan kaydırma gecikmesi sorunu (https://github.com/Microsoft/vscode/issues/13612) için geçici bir çözümdür.",
 	"zenModeConfigurationTitle": "Zen Modu",
 	"zenMode.fullScreen": "Zen Moduna geçmenin ayrıca çalışma ekranını tam ekran moduna geçirip geçirmeyeceğini denetler.",
 	"zenMode.centerLayout": "Zen Modu'nun aktif edilmesinin düzeni ortalayıp ortalamayacağını denetler.",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
index 7be66e01426..8b50a979878 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/browser/breakpointsView.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"editConditionalBreakpoint": "Kesme Noktasını Düzenle...",
 	"functionBreakpointsNotSupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
 	"functionBreakpointPlaceholder": "Mola verilecek fonksiyon",
 	"functionBreakPointInputAriaLabel": "Fonksiyon kesme noktasını girin",
@@ -14,6 +13,7 @@
 	"breakpointUnverifieddHover": "Doğrulanmamış kesme noktası",
 	"functionBreakpointUnsupported": "Fonksiyon kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
 	"breakpointDirtydHover": "Doğrulanmamış Kesme Noktası Dosya düzenlendi, lütfen hata ayıklama oturumunu yeniden başlatın.",
+	"logBreakpointUnsupported": "Günlük noktaları bu hata ayıklama türü tarafından desteklenmiyor",
 	"conditionalBreakpointUnsupported": "Koşullu kesme noktaları bu hata ayıklama türü tarafından desteklenmiyor",
 	"hitBreakpointUnsupported": "Koşullu kesme noktalarına isabet etme bu hata ayıklama türü tarafından desteklenmiyor"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
index 4058874430b..fe54980e241 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/browser/debugActions.i18n.json
@@ -24,16 +24,12 @@
 	"restartFrame": "Çerçeveyi Yeniden Başlat",
 	"removeBreakpoint": "Kesme Noktasını Kaldır",
 	"removeAllBreakpoints": "Tüm Kesme Noktalarını Kaldır",
-	"enableBreakpoint": "Kesme Noktasını Etkinleştir",
-	"disableBreakpoint": "Kesme Noktasını Devre Dışı Bırak",
 	"enableAllBreakpoints": "Tüm Kesme Noktalarını Etkinleştir",
 	"disableAllBreakpoints": "Tüm Kesme Noktalarını Devre Dışı Bırak",
 	"activateBreakpoints": "Kesme Noktalarını Etkinleştir",
 	"deactivateBreakpoints": "Kesme Noktalarını Devre Dışı Bırak",
 	"reapplyAllBreakpoints": "Tüm Kesme Noktalarını Yeniden Uygula",
 	"addFunctionBreakpoint": "Fonksiyon Kesme Noktası Ekle",
-	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
-	"editConditionalBreakpoint": "Kesme Noktasını Düzenle...",
 	"setValue": "Değeri Ayarla",
 	"addWatchExpression": "İfade Ekle",
 	"editWatchExpression": "İfadeyi Düzenle",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
index b06dcece797..015958ac4d9 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/browser/debugEditorActions.i18n.json
@@ -8,6 +8,7 @@
 	],
 	"toggleBreakpointAction": "Hata Ayıklama: Kesme Noktası Ekle/Kaldır",
 	"conditionalBreakpointEditorAction": "Hata Ayıklama: Koşullu Kesme Noktası Ekle...",
+	"logPointEditorAction": "Hata Ayıklama: Günlük Noktası Ekle...",
 	"runToCursor": "İmlece Kadar Çalıştır",
 	"debugEvaluate": "Hata Ayıklama: Değerlendir",
 	"debugAddToWatch": "Hata Ayıklama: İzlemeye Ekle",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
new file mode 100644
index 00000000000..d8d0b352bf7
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"breakpointWidgetHitCountPlaceholder": "İsabet sayısı koşulu sağlandığında mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
+	"breakpointWidgetExpressionPlaceholder": "İfade değerlendirmesi doğru olduğunda mola ver. Kabul etmek için 'Enter', iptal etmek için 'Esc' tuşuna basın.",
+	"expression": "İfade",
+	"hitCount": "İsabet Sayısı",
+	"logMessage": "Günlük Mesajı"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
index a8cf3c979b7..a208d169e68 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json
@@ -35,7 +35,6 @@
 	"useUniqueNames": "Lütfen benzersiz yapılandırma adları kullanın.",
 	"app.launch.json.compound.folder": "Bileşiğin bulunduğu klasörün adı.",
 	"app.launch.json.compounds.configurations": "Bu bileşiğin parçası olarak başlatılacak yapılandırmaların adları.",
-	"debugNoType": "Hata ayıklama bağdaştırıcısının 'type' ögesi atlanabilir veya 'dize' türünde olmalıdır.",
 	"selectDebug": "Ortam Seçin",
 	"DebugConfig.failed": " '.vscode' klasörü içinde 'launch.json' dosyası oluşturulamıyor ({0}).",
 	"workspace": "çalışma alanı",
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
index d616f9186fd..ad2bc971edf 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.i18n.json
@@ -18,5 +18,8 @@
 	"enableBreakpoints": "{0}. Sütundaki Kesme Noktasını Etkinleştir",
 	"enableBreakpointOnLine": "Satır Kesme Noktasını Etkinleştir",
 	"addBreakpoint": "Kesme Noktası Ekle",
+	"addConditionalBreakpoint": "Koşullu Kesme Noktası Ekle...",
+	"addLogPoint": "Günlük Noktası Ekle...",
+	"cancel": "İptal",
 	"addConfiguration": "Yapılandırma Ekle..."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
index af1679c27ae..3b4248d45e7 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugService.i18n.json
@@ -29,6 +29,6 @@
 	"showErrors": "Hataları Göster",
 	"noFolderWorkspaceDebugError": "Aktif dosyada hata ayıklama yapılamıyor. Lütfen, dosyanın diskte kayıtlı olduğundan ve bu dosya türü için hata ayıklama eklentinizin olduğundan emin olun.",
 	"cancel": "İptal",
-	"DebugTaskNotFound": "'{0}' ön başlatma görevi bulunamadı.",
-	"taskNotTracked": "'{0}' başlatma öncesi görevi izlenemez."
+	"DebugTaskNotFound": "'{0}' görevi bulunamadı.",
+	"taskNotTracked": "'{0}' görevi izlenemez."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
index 4a7eda0e464..9ae9577ae78 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.i18n.json
@@ -7,8 +7,5 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"moreInfo": "Daha Fazla Bilgi",
-	"unableToLaunchDebugAdapter": "'{0}' tarafından hata ayıklama bağdaştırıcısı başlatılamadı.",
-	"unableToLaunchDebugAdapterNoArgs": "Hata ayıklama bağdaştırıcısı başlatılamıyor.",
-	"stoppingDebugAdapter": "{0}. Hata ayıklama bağdaştırıcısı durduruluyor.",
 	"debugAdapterCrash": "Hata ayıklama bağdaştırıcısı beklenmeyen biçimde sonlandırıldı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
index dd429e27225..a61ef28f2c1 100644
--- a/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/debug/node/debugAdapter.i18n.json
@@ -8,18 +8,6 @@
 	],
 	"debugAdapterBinNotFound": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}', mevcut değil.",
 	"debugAdapterCannotDetermineExecutable": "Hata ayıklama bağdaştırıcısı yürütülebilir dosyası '{0}' belirlenemedi.",
-	"launch.config.comment1": "Olası öznitelikler hakkında bilgi edinmek için IntelliSense kullanın.",
-	"launch.config.comment2": "Mevcut özniteliklerin açıklamalarını görmek için fare ile üzerine gelin.",
-	"launch.config.comment3": "Daha fazla bilgi için ziyaret edin: {0}",
-	"debugType": "Yapılandırma türü.",
-	"debugTypeNotRecognised": "Hata ayıklama türü tanınmıyor. Karşılık gelen hata ayıklama uzantısı yüklemiş olduğunuzdan ve etkinleştirildiğinden emin olun.",
-	"node2NotSupported": "\"node2\" artık desteklenmiyor, bunun yerine \"node\" kullanın ve \"protocol\" özniteliğini \"inspector\" olarak ayarlayın.",
-	"debugName": "Yapılandırmanın adı; başlatma yapılandırması açılır kutu menüsünde görünür.",
-	"debugRequest": "Yapılandırmanın istek türü. \"launch\" veya \"attach\" olabilir.",
-	"debugServer": "Sadece eklenti geliştirme hata ayıklaması için: eğer port belirtildiyse; Vs Code, bir hata ayıklama bağdaştırıcısına sunucu modunda bağlanmayı dener",
-	"debugPrelaunchTask": "Hata ayıklama oturumu başlamadan önce çalıştırılacak görev.",
-	"debugWindowsConfiguration": "Windows'a özel başlangıç yapılandırması öznitelikleri.",
-	"debugOSXConfiguration": "OS X'e özel başlangıç yapılandırması öznitelikleri.",
-	"debugLinuxConfiguration": "Linux'a özel başlangıç yapılandırması öznitelikleri.",
-	"deprecatedVariables": "'env.', 'config.' ve 'command.' kullanım dışıdır, bunların yerine 'env:', 'config:' ve 'command:' kulanın."
+	"unableToLaunchDebugAdapter": "'{0}' tarafından hata ayıklama bağdaştırıcısı başlatılamadı.",
+	"unableToLaunchDebugAdapterNoArgs": "Hata ayıklama bağdaştırıcısı başlatılamıyor."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json
new file mode 100644
index 00000000000..7c6fe0bcc31
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/debug/node/debugger.i18n.json
@@ -0,0 +1,23 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"launch.config.comment1": "Olası öznitelikler hakkında bilgi edinmek için IntelliSense kullanın.",
+	"launch.config.comment2": "Mevcut özniteliklerin açıklamalarını görmek için fare ile üzerine gelin.",
+	"launch.config.comment3": "Daha fazla bilgi için ziyaret edin: {0}",
+	"debugType": "Yapılandırma türü.",
+	"debugTypeNotRecognised": "Hata ayıklama türü tanınmıyor. Karşılık gelen hata ayıklama uzantısı yüklemiş olduğunuzdan ve etkinleştirildiğinden emin olun.",
+	"node2NotSupported": "\"node2\" artık desteklenmiyor, bunun yerine \"node\" kullanın ve \"protocol\" özniteliğini \"inspector\" olarak ayarlayın.",
+	"debugName": "Yapılandırmanın adı; başlatma yapılandırması açılır kutu menüsünde görünür.",
+	"debugRequest": "Yapılandırmanın istek türü. \"launch\" veya \"attach\" olabilir.",
+	"debugServer": "Sadece eklenti geliştirme hata ayıklaması için: eğer port belirtildiyse; Vs Code, bir hata ayıklama bağdaştırıcısına sunucu modunda bağlanmayı dener",
+	"debugPrelaunchTask": "Hata ayıklama oturumu başlamadan önce çalıştırılacak görev.",
+	"debugWindowsConfiguration": "Windows'a özel başlangıç yapılandırması öznitelikleri.",
+	"debugOSXConfiguration": "OS X'e özel başlangıç yapılandırması öznitelikleri.",
+	"debugLinuxConfiguration": "Linux'a özel başlangıç yapılandırması öznitelikleri.",
+	"deprecatedVariables": "'env.', 'config.' ve 'command.' kullanım dışıdır, bunların yerine 'env:', 'config:' ve 'command:' kulanın."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json
new file mode 100644
index 00000000000..4fbca0dfa72
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/debug/node/terminals.i18n.json
@@ -0,0 +1,14 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"console.title": "VS Code Konsolu",
+	"mac.terminal.script.failed": "'{0}' betiği, {1} çıkış koduyla başarısız oldu",
+	"mac.terminal.type.not.supported": "'{0}' desteklenmiyor",
+	"press.any.key": "Devam etmek için bir tuşa basın ...",
+	"linux.term.failed": "'{0}', {1} çıkış koduyla başarısız oldu"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
index ed1393cf726..69722eca3ee 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json
@@ -27,7 +27,7 @@
 	"enableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Etkinleştir",
 	"disableAutoUpdate": "Eklentileri Otomatik Olarak Güncelleştirmeyi Devre Dışı Bırak",
 	"updateAll": "Tüm Eklentileri Güncelle",
-	"reloadAction": "Yeniden Yükle",
+	"reloadAction": "Pencereyi Yeniden Yükle",
 	"postUpdateTooltip": "Güncellemek için yeniden yükleyin",
 	"postUpdateMessage": "Güncellenen '{0}' eklentisini etkinleştirmek için bu pencere yeniden yüklensin mi?",
 	"postEnableTooltip": "Etkinleştirmek için yeniden yükleyin",
@@ -58,6 +58,9 @@
 	"configureWorkspaceFolderRecommendedExtensions": "Tavsiye Edilen Eklentileri Yapılandır (Çalışma Alanı Klasörü)",
 	"malicious tooltip": "Bu eklentinin sorunlu olduğu bildirildi.",
 	"malicious": "Kötü amaçlı",
+	"disabled": "Devre Dışı",
+	"disabled globally": "Devre Dışı",
+	"disabled workspace": "Bu Çalışma Alanı için Devre Dışı Bırakılmış",
 	"disableAll": "Yüklü Tüm Eklentileri Devre Dışı Bırak",
 	"disableAllWorkspace": "Bu Çalışma Alanı için Yüklü Tüm Eklentileri Devre Dışı Bırak",
 	"enableAll": "Tüm Eklentileri Etkinleştir",
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
new file mode 100644
index 00000000000..dececc5e110
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.i18n.json
@@ -0,0 +1,59 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"name": "Eklenti adı",
+	"extension id": "Eklenti tanımlayıcısı",
+	"preview": "Önizleme",
+	"builtin": "Yerleşik",
+	"publisher": "Yayıncı adı",
+	"install count": "Yüklenme sayısı",
+	"rating": "Derecelendirme",
+	"repository": "Depo",
+	"license": "Lisans",
+	"details": "Detaylar",
+	"contributions": "Eklemeler",
+	"changelog": "Değişim Günlüğü",
+	"dependencies": "Bağımlılıklar",
+	"noReadme": "README dosyası yok.",
+	"noChangelog": "Değişim günlüğü yok.",
+	"noContributions": "Hiçbir Ekleme Yapmıyor",
+	"noDependencies": "Bağımlılık Yok",
+	"settings": "Ayarlar ({0})",
+	"setting name": "Adı",
+	"description": "Açıklama",
+	"default": "Varsayılan",
+	"debuggers": "Hata Ayıklayıcılar ({0})",
+	"debugger name": "Adı",
+	"debugger type": "Tür",
+	"views": "Görünümler ({0})",
+	"view id": "ID",
+	"view name": "Adı",
+	"view location": "Yeri",
+	"localizations": "Çeviriler ({0})",
+	"localizations language id": "Dil Id'si",
+	"colorThemes": "Renk Temaları ({0})",
+	"iconThemes": "Simge Temaları ({0})",
+	"colors": "Renkler ({0})",
+	"colorId": "Id",
+	"defaultDark": "Koyu Varsayılan",
+	"defaultLight": "Açık Varsayılan",
+	"defaultHC": "Yüksek Karşıtlık Varsayılan",
+	"JSON Validation": "JSON Doğrulama ({0})",
+	"fileMatch": "Dosya Eşleşmesi",
+	"schema": "Şema",
+	"commands": "Komutlar ({0})",
+	"command name": "Adı",
+	"keyboard shortcuts": "Klavye Kısayolları",
+	"menuContexts": "Menü Bağlamları",
+	"languages": "Diller ({0})",
+	"language id": "ID",
+	"language name": "Adı",
+	"file extensions": "Dosya Uzantıları",
+	"grammar": "Gramer",
+	"snippets": "Parçacıklar"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index f497a3c8bb1..61f68f56bb4 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -15,8 +15,8 @@
 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
 	"reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.",
 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
-	"showRecommendations": "Tavsiyeleri Göster",
 	"install": "Yükle",
+	"showRecommendations": "Tavsiyeleri Göster",
 	"showLanguageExtensions": "Markette '.{0}' dosyaları için yardımcı olabilecek eklentiler bulunuyor",
 	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
 	"installAll": "Tümünü Yükle",
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
index f2540380575..30c88b423ce 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.i18n.json
@@ -8,7 +8,5 @@
 	],
 	"disableOtherKeymapsConfirmation": "Tuş bağlamlarında çakışmalardan kaçınmak için diğer tuş haritaları ({0}) devre dışı bırakılsın mı?",
 	"yes": "Evet",
-	"no": "Hayır",
-	"betterMergeDisabled": "\"Better Merge\" artık yerleşik bir eklenti, yüklenen eklendi devre dışı bırakıldı ve kaldırılabilir.",
-	"uninstall": "Kaldır"
+	"no": "Hayır"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
index 89dc18d2bf1..0a617d5d5c3 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.i18n.json
@@ -12,7 +12,8 @@
 	"recommendedExtensions": "Tavsiye Edilen",
 	"otherRecommendedExtensions": "Diğer Tavsiyeler",
 	"workspaceRecommendedExtensions": "Çalışma Alanı Tavsiyeleri",
-	"builtInExtensions": "Yerleşik",
+	"builtInExtensions": "Özellikler",
+	"builtInThemesExtensions": "Temalar",
 	"searchExtensions": "Markette Eklenti Ara",
 	"sort by installs": "Sırala: Yüklenme Sayısına Göre",
 	"sort by rating": "Sırala: Derecelendirmeye Göre",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
index be5917d3287..5867f17bd1f 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json
@@ -27,16 +27,17 @@
 	"confirmMoveTrashMessageMultiple": "Aşağıdaki {0} dosyayı silmek istediğinizden emin misiniz?",
 	"confirmMoveTrashMessageFolder": "'{0}' ve içindekileri silmek istediğinizden emin misiniz?",
 	"confirmMoveTrashMessageFile": "'{0}' öğesini silmek istediğinize emin misiniz?",
-	"undoBin": "Geri dönüşüm kutusundan geri alabilirsiniz.",
-	"undoTrash": "Çöp kutusundan geri alabilirsiniz.",
+	"undoBin": "Geri Dönüşüm Kutusu'ndan geri alabilirsiniz.",
+	"undoTrash": "Çöp Kutusu'ndan geri alabilirsiniz.",
 	"doNotAskAgain": "Bir daha sorma",
 	"confirmDeleteMessageMultiple": "Aşağıdaki {0} dosyayı kalıcı olarak silmek istediğinizden emin misiniz?",
 	"confirmDeleteMessageFolder": "'{0}' öğesini ve içindekileri kalıcı olarak silmek istediğinizden emin misiniz?",
 	"confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?",
 	"irreversible": "Bu eylem geri döndürülemez!",
-	"cancel": "İptal",
-	"permDelete": "Kalıcı Olarak Sil",
-	"importFiles": "Dosya İçe Aktar",
+	"binFailed": "Geri Dönüşüm Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
+	"trashFailed": "Çöp Kutusu'nu kullanarak silme başarısız oldu. Bunun yerine, kalıcı olarak silmek ister misiniz?",
+	"deletePermanentlyButtonLabel": "&&Kalıcı Olarak Sil",
+	"retryButtonLabel": "&&Yeniden Dene",
 	"confirmOverwrite": "Hedef klasörde aynı ada sahip bir dosya veya klasör zaten var. Değiştirmek istiyor musunuz?",
 	"replaceButtonLabel": "&&Değiştir",
 	"fileIsAncestor": "Yapıştırılacak dosya hedef klasörün atalarından biridir",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 16f13358790..b2f872d687b 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -37,6 +37,7 @@
 	"defaultLanguage": "Yeni dosyalara atanan varsayılan dil modu.",
 	"editorConfigurationTitle": "Düzenleyici",
 	"formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.",
+	"formatOnSaveTimeout": "Dosyayı kaydederken biçimlendirme zaman aşımı. formatOnSave komutlarında kullanılacak milisaniye cinsinden zaman limiti. Belirtilen zaman aşımından daha uzun süren komutlar iptal edilecektir.",
 	"explorerConfigurationTitle": "Dosya Gezgini",
 	"openEditorsVisible": "Açık Düzenleyiciler bölmesinde gösterilen düzenleyici sayısı.",
 	"autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index cc968719081..8953d418928 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -7,13 +7,14 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"fileInputAriaLabel": "Dosya adı girin. Onaylamak için Enter'a, iptal etmek için Escape tuşuna basın.",
-	"constructedPath": "**{1}** içinde {0} oluştur",
 	"filesExplorerViewerAriaLabel": "{0}, Dosya Gezgini",
 	"dropFolders": "Klasörleri çalışma alanına eklemek istiyor musunuz?",
 	"dropFolder": "Klasörü çalışma alanına eklemek istiyor musunuz?",
 	"addFolders": "Klasörleri &&Ekle",
 	"addFolder": "Klasörü &&Ekle",
+	"confirmRootsMove": "Çalışma alanınızdaki birden çok kök dizinin sırasını değiştirmek istediğinizden emin misiniz?",
 	"confirmMultiMove": "Aşağıdaki {0} dosyayı taşımak istediğinizden emin misiniz?",
+	"confirmRootMove": "Çalışma alanınızdaki '{0}' kök dizininin sırasını değiştirmek istediğinizden emin misiniz?",
 	"confirmMove": "'{0}' ögesini taşımak istediğinizden emin misiniz?",
 	"doNotAskAgain": "Bir daha sorma",
 	"moveButtonLabel": "&&Taşı",
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
new file mode 100644
index 00000000000..7c90e93cddd
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/html.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.editor.label": "Html Önizlemesi"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
new file mode 100644
index 00000000000..a11acc39795
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"html.voidInput": "Geçersiz düzenleyici girdisi."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..af6d69fa60e
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"developer": "Geliştirici"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..13712f3e4c5
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/html/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
+	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
index eceab3d45e4..ea26bcd9db3 100644
--- a/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/localizations/browser/localizations.contribution.i18n.json
@@ -6,13 +6,17 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"updateLocale": "VS Code'un kullanıcı arayüzü dilini {0} olarak değiştirip yeniden başlatmak ister misiniz?",
+	"yes": "Evet",
+	"no": "Hayır",
+	"neverAgain": "Tekrar Gösterme",
 	"JsonSchema.locale": "Kullanılacak Kullanıcı Arayüzü Dili.",
 	"vscode.extension.contributes.localizations": "Düzenleyiciye yerelleştirmeleri ekler",
-	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin kimliği.",
+	"vscode.extension.contributes.localizations.languageId": "Görüntülenen dizelerin çevrileceği dilin id'si.",
 	"vscode.extension.contributes.localizations.languageName": "Dilin İngilizcedeki adı.",
 	"vscode.extension.contributes.localizations.languageNameLocalized": "Dilin eklenen dildeki adı.",
 	"vscode.extension.contributes.localizations.translations": "Bu dille ilişkili çevirilerin listesi.",
-	"vscode.extension.contributes.localizations.translations.id": "Bu çevirinin ekleneceği VS Code veya Eklenti kimliği. VS Code kimliği her zaman `vscode` şeklindedir ve eklenti ise `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
-	"vscode.extension.contributes.localizations.translations.id.pattern": "Kimlik, VS Code çevirisi için `vscode` olmalı veya eklenti çevirisi için `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
+	"vscode.extension.contributes.localizations.translations.id": "Bu çevirinin ekleneceği VS Code veya Eklenti id'si. VS Code id'si her zaman`vscode` şeklindedir ve eklenti `yayinciAdi.eklentiAdi` formatında olmalıdır.",
+	"vscode.extension.contributes.localizations.translations.id.pattern": "Id, VS Code çevirisi için `vscode` olmalı veya eklenti çevirisi için `yayinciAdi.eklentiAdi` biçiminde olmalıdır.",
 	"vscode.extension.contributes.localizations.translations.path": "Dilin çevirilerini içeren dosyaya göreli yol."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
new file mode 100644
index 00000000000..45570f731d6
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"copyMarker": "Kopyala",
+	"copyMessage": "Mesajı Kopyala"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
new file mode 100644
index 00000000000..a84cf939af0
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markers.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"totalProblems": "Toplam {0} Sorun"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
new file mode 100644
index 00000000000..a2b9d4cb87b
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersFileDecorations.i18n.json
@@ -0,0 +1,13 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"label": "Sorunlar",
+	"tooltip.1": "Bu dosyada 1 sorun var",
+	"tooltip.N": "Bu dosyada {0} sorun var",
+	"markers.showOnFile": "Dosya ve klasörlerde Hata & Uyarıları göster."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanel.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
new file mode 100644
index 00000000000..2835343e395
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/markers/electron-browser/messages.i18n.json
@@ -0,0 +1,43 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"viewCategory": "Görüntüle",
+	"problems.view.toggle.label": "Sorunları Aç/Kapat (Hatalar, Uyarılar, Bilgiler)",
+	"problems.view.focus.label": "Sorunlara Odakla (Hatalar, Uyarılar, Bilgiler)",
+	"problems.panel.configuration.title": "Sorunlar Görünümü",
+	"problems.panel.configuration.autoreveal": "Sorunlar görünümünün; dosyalar açılırken, dosyaları otomatik olarak ortaya çıkarıp çıkarmayacağını denetler.",
+	"markers.panel.title.problems": "Sorunlar",
+	"markers.panel.aria.label.problems.tree": "Dosyalara göre gruplandırılmış sorunlar",
+	"markers.panel.no.problems.build": "Şu ana kadar çalışma alanında herhangi bir sorun tespit edilmedi.",
+	"markers.panel.action.filter": "Sorunları Süz",
+	"markers.panel.filter.ariaLabel": "Sorunları Süz",
+	"markers.panel.filter.errors": "hatalar",
+	"markers.panel.filter.warnings": "uyarılar",
+	"markers.panel.filter.infos": "bilgilendirmeler",
+	"markers.panel.single.error.label": "1 Hata",
+	"markers.panel.multiple.errors.label": "{0} Hata",
+	"markers.panel.single.warning.label": "1 Uyarı",
+	"markers.panel.multiple.warnings.label": "{0} Uyarı",
+	"markers.panel.single.info.label": "1 Bilgilendirme",
+	"markers.panel.multiple.infos.label": "{0} Bilgilendirme",
+	"markers.panel.single.unknown.label": "1 Bilinmeyen",
+	"markers.panel.multiple.unknowns.label": "{0} Bilinmeyen",
+	"markers.panel.at.ln.col.number": "({0}, {1})",
+	"problems.tree.aria.label.resource": "{0} {1} sorun içeriyor",
+	"problems.tree.aria.label.marker.relatedInformation": "Bu sorun {0} konumla ilişkilidir.",
+	"problems.tree.aria.label.error.marker": "{0} tarafından oluşturulan hata: {2}. satırın {3}. karakterinde {1}.{4}",
+	"problems.tree.aria.label.error.marker.nosource": "Hata: {1}. satırın {2}. karakterinde {0}.{3}",
+	"problems.tree.aria.label.warning.marker": "{0} tarafından oluşturulan uyarı: {2}. satırın {3}. karakterinde {1}.{4}",
+	"problems.tree.aria.label.warning.marker.nosource": "Uyarı: {1}. satırın {2}. karakterinde {0}.{3}",
+	"problems.tree.aria.label.info.marker": "{0} tarafından oluşturulan bilgilendirme: {2}. satırın {3}. karakterinde {1}.{4}",
+	"problems.tree.aria.label.info.marker.nosource": "Bilgilendirme: {1}. satırın {2}. karakterinde {0}.{3}",
+	"problems.tree.aria.label.marker": "{0} tarafından oluşturulan sorun: {2}. satırın {3}. karakterinde {1}.{4}",
+	"problems.tree.aria.label.marker.nosource": "Sorun: {1}. satırın {2}. karakterinde {0}.{3}",
+	"problems.tree.aria.label.relatedinfo.message": "{3} dosyasının {1}. satırın {2}. karakterinde {0}",
+	"errors.warnings.show.label": "Hataları ve Uyarıları Göster"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json b/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json
index 4659e728e08..3d310c952c0 100644
--- a/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/output/browser/outputActions.i18n.json
@@ -9,5 +9,6 @@
 	"toggleOutput": "Çıktıyı Aç/Kapat",
 	"clearOutput": "Çıktıyı Temizle",
 	"toggleOutputScrollLock": "Çıktı Kaydırma Kilidini Aç/Kapat",
-	"switchToOutput.label": "Çıktıya Geçiş Yap"
+	"switchToOutput.label": "Çıktıya Geçiş Yap",
+	"openInLogViewer": "Günlük Dosyasını Aç"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index ddb5af6067c..3aa95c60f2d 100644
--- a/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -9,5 +9,6 @@
 	"output": "Çıktı",
 	"logViewer": "Günlük Görüntüleyici",
 	"viewCategory": "Görüntüle",
-	"clearOutput.label": "Çıktıyı Temizle"
+	"clearOutput.label": "Çıktıyı Temizle",
+	"openActiveLogOutputFile": "Görüntüle: Aktif Günlük Dosyasını Aç"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 1cd086b7e38..467358d0b9f 100644
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -6,7 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"keybindingsInputName": "Klavye Kısayolları",
+	"showDefaultKeybindings": "Varsayılan Tuş Bağlarını Göster",
+	"showUserKeybindings": "Kullanıcı Tuş Bağlarını Göster",
 	"SearchKeybindings.AriaLabel": "Tuş bağlarını ara",
 	"SearchKeybindings.Placeholder": "Tuş bağlarını ara",
 	"sortByPrecedene": "Önceliğe Göre Sırala",
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
index be9fd552833..019d3ded95f 100644
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesActions.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"openRawDefaultSettings": "Ham Varsayılan Ayarları Aç",
+	"openSettings": "Ayarları Aç",
 	"openGlobalSettings": "Kullanıcı Ayarlarını Aç",
 	"openGlobalKeybindings": "Klavye Kısayollarını Aç",
 	"openGlobalKeybindingsFile": "Klavye Kısayolları Dosyasını Aç",
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 5205b6b6f58..b660c1e4f87 100644
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -6,7 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"settingsEditorName": "Varsayılan Ayarlar",
 	"SearchSettingsWidget.AriaLabel": "Ayarları ara",
 	"SearchSettingsWidget.Placeholder": "Ayarları Ara",
 	"noSettingsFound": "Sonuç Yok",
diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
index 22428848192..a0bd993aafd 100644
--- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesRenderers.i18n.json
@@ -13,9 +13,5 @@
 	"newExtensionLabel": "\"{0}\" Eklentisini Göster",
 	"editTtile": "Düzenle",
 	"replaceDefaultValue": "Ayarlarda Değiştir",
-	"copyDefaultValue": "Ayarlara Kopyala",
-	"unsupportedPHPExecutablePathSetting": "Bu ayar, bir Kullanıcı Ayarı olmalıdır. PHP'yi çalışma alanı için yapılandırmak için bir PHP dosyasını açın ve durum çubuğundaki 'PHP Yolu'na tıklayın.",
-	"unsupportedWorkspaceSetting": "Bu ayar, bir Kullanıcı Ayarı olmalıdır.",
-	"unsupportedWorkbenchSetting": "Bu ayar şu an uygulanamıyor. Ayar, bu klasörü açtığınızda uygulanacaktır.",
-	"unsupportedWorkbenchSettingDevMode": "Bu ayar şu an uygulanamıyor. Ayar, kaydederken kapsamını 'resource' olarak tanımladığınızda veya bu klasörü direkt olarak açtığınızda uygulanacaktır."
+	"copyDefaultValue": "Ayarlara Kopyala"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 860dab87f7f..d7ca189ea44 100644
--- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -11,5 +11,6 @@
 	"installAdditionalSCMProviders": "Ek SCM Sağlayıcıları Yükle...",
 	"no open repo": "Aktif bir kaynak kontrolü sağlayıcısı yok.",
 	"source control": "Kaynak Kontrolü",
-	"viewletTitle": "{0}: {1}"
+	"viewletTitle": "{0}: {1}",
+	"hideView": "Gizle"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
index d655bbf2c91..79f2510cc1f 100644
--- a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json
@@ -12,7 +12,6 @@
 	"previousSearchExcludePattern": "Önceki Aramada Hariç Tutulan Kalıbı Göster",
 	"nextSearchTerm": "Sonraki Arama Terimini Göster",
 	"previousSearchTerm": "Önceki Arama Terimini Göster",
-	"showSearchViewlet": "Aramayı Göster",
 	"findInFiles": "Dosyalarda Bul",
 	"replaceInFiles": "Dosyalardakileri Değiştir",
 	"RefreshAction.label": "Yenile",
diff --git a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 63b497714c2..5042337767a 100644
--- a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -6,11 +6,14 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"search": "Ara",
+	"copyMatchLabel": "Kopyala",
+	"copyPathLabel": "Yolu Kopyala",
+	"copyAllLabel": "Tümünü Kopyala",
 	"findInFolder": "Klasörde Bul...",
 	"findInWorkspace": "Çalışma Alanında Bul...",
 	"showTriggerActions": "Çalışma Alanında Sembole Git...",
 	"name": "Ara",
-	"search": "Ara",
 	"showSearchViewl": "Aramayı Göster",
 	"view": "Görüntüle",
 	"findInFiles": "Dosyalarda Bul",
@@ -25,6 +28,5 @@
 	"search.quickOpen.includeSymbols": "Dosya sonuçlarındaki bir global sembol aramasının sonuçlarının Hızlı Aç'a dahil edilip edilmeyeceğini yapılandırın.",
 	"search.followSymlinks": "Arama yaparken sembolik linklerin takip edilip edilmeyeceğini denetler.",
 	"search.smartCase": "Örüntü tamamen küçük harflerden oluşuyorsa büyük küçük harf duyarlılığı olmadan arar, diğer durumda ise büyük küçük harf duyarlılığı ile arar",
-	"search.globalFindClipboard": "macOS'de arama görünümünün paylaşılan panoyu okuyup okumamasını veya değiştirip değiştirmemesini denetler",
-	"search.location": "Önizleme: aramanın kenar çubuğunda bir görünüm olarak mı yoksa daha fazla yatay boşluk için panel alanında bir panel olarak mı gösterileceğini denetler. Bir sonraki sürümde paneldeki arama, geliştirilmiş yatay düzene sahip olacak ve bu bir önizleme olmaktan çıkacaktır."
+	"search.globalFindClipboard": "macOS'de arama görünümünün paylaşılan panoyu okuyup okumamasını veya değiştirip değiştirmemesini denetler"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
index 6ad8b1e4112..bcad8d50b1f 100644
--- a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"helpUs": "{0} için hizmetimizi iyileştirmemize yardımcı olun",
 	"takeShortSurvey": "Kısa Ankete Katıl",
 	"remindLater": "Daha Sonra Hatırlat",
-	"neverAgain": "Tekrar Gösterme",
-	"helpUs": "{0} için hizmetimizi iyileştirmemize yardımcı olun"
+	"neverAgain": "Tekrar Gösterme"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
index 8e3a8985829..eea9d76b733 100644
--- a/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.i18n.json
@@ -6,8 +6,8 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"surveyQuestion": "Hızlı bir geri bildirim anketine katılmak ister misiniz?",
 	"takeSurvey": "Ankete Katıl",
 	"remindLater": "Daha Sonra Hatırlat",
-	"neverAgain": "Tekrar Gösterme",
-	"surveyQuestion": "Hızlı bir geri bildirim anketine katılmak ister misiniz?"
+	"neverAgain": "Tekrar Gösterme"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
index 8a3fbfaad65..02224d40eaf 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/common/problemMatcher.i18n.json
@@ -45,6 +45,7 @@
 	"PatternTypeSchema.description": "Bir sorun modeli veya bir katkıda bulunulan veya ön tanımlı sorun modelinin adı. Temel model belirtildiyse atlanabilir.",
 	"ProblemMatcherSchema.base": "Kullanılacak temel sorun eşleştiricisinin adı.",
 	"ProblemMatcherSchema.owner": "Code'un içindeki sorunun sahibi. Temel model belirtildiyse atlanabilir. Atlanırsa ve temel belirtilmemişse 'external' varsayılır.",
+	"ProblemMatcherSchema.source": "Bu tanılama bilgilerinin kaynağını açıklayan insan tarafından okunabilir bir dize, ör. 'typescript' veya 'super lint'.",
 	"ProblemMatcherSchema.severity": "Sorun yakalamanın varsayılan önem derecesi. Model, önem derecesi için bir eşleme grubu tanımlamazsa kullanılır.",
 	"ProblemMatcherSchema.applyTo": "Bir metin belgesinde bildirilen bir sorunun sadece açık, kapalı veya tüm belgelere uygulanıp uygulanmadığını denetler.",
 	"ProblemMatcherSchema.fileLocation": "Bir sorun modelinde bildirilen dosya adlarının nasıl yorumlanacağını tanımlar.",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
index 8edb00a2a6a..2af5738ee5a 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.i18n.json
@@ -28,6 +28,15 @@
 	"JsonSchema.tasks.group.none": "Görevi grupsuz olarak atar",
 	"JsonSchema.tasks.group": "Bu görevin ait olduğu çalıştırma grubunu tanımlar. Derleme grubuna eklemek için \"build\"ı ve test grubuna eklemek için \"test\"i destekler.",
 	"JsonSchema.tasks.type": "Görevin bir işlem olarak veya bir kabukta komut olarak çalıştırılıp çalıştırılmayacağını tanımlar.",
+	"JsonSchema.command.quotedString.value": "Gerçek komut değeri",
+	"JsonSchema.tasks.quoting.escape": "Kaçış karakteri olarak kabuğun kaçış karakterini kullanır (ör. PowerShell için ` ve bash için \\).",
+	"JsonSchema.tasks.quoting.strong": "Argümanı kabuğun güçlü alıntı karakteri ile alıntı haline getirir (ör. PowerShell ve bash için \").",
+	"JsonSchema.tasks.quoting.weak": "Argümanı kabuğun zayıf alıntı karakteri ile alıntı haline getirir (ör. PowerShell ve bash için ').",
+	"JsonSchema.command.quotesString.quote": "Komut değerinin tırnak içine nasıl alınacağı.",
+	"JsonSchema.command": "Çalıştırılacak komut. Harici bir program veya bir kabuk komutu olabilir.",
+	"JsonSchema.args.quotedString.value": "Gerçek argüman değeri",
+	"JsonSchema.args.quotesString.quote": "Gerçek argüman değerinin tırnak içine nasıl alınacağı.",
+	"JsonSchema.tasks.args": "Bu görev çağrıldığında, komuta iletilecek argümanlar.",
 	"JsonSchema.tasks.label": "Görevin kullanıcı arayüzü etiketi",
 	"JsonSchema.version": "Yapılandırmanın sürüm numarası.",
 	"JsonSchema.tasks.identifier": "launch.json veya dependsOn maddesindeki göreve atıfta başvuracak, kullanıcı tanımlı bir tanımlayıcı.",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
index 1d0ce65d0fb..19ebebef075 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/electron-browser/task.contribution.i18n.json
@@ -8,9 +8,12 @@
 	],
 	"tasksCategory": "Görevler",
 	"ConfigureTaskRunnerAction.label": "Görevi Yapılandır",
+	"totalErrors": "{0} Hata",
+	"totalWarnings": "{0} Uyarı",
+	"totalInfos": "{0} Bilgilendirme",
 	"problems": "Sorunlar",
 	"building": "Derleniyor...",
-	"manyMarkers": "99+",
+	"manyProblems": "10b+",
 	"runningTasks": "Çalışan Görevleri Göster",
 	"tasks": "Görevler",
 	"TaskSystem.noHotSwap": "Aktif bir görev çalıştıran görev yürütme motorunu değiştirmek pencereyi yeniden yüklemeyi gerektirir",
@@ -28,8 +31,8 @@
 	"selectProblemMatcher": "Görev çıktısında taranacak hata ve uyarı türlerini seçin",
 	"customizeParseErrors": "Geçerli görev yapılandırmasında hatalar var. Lütfen, bir görevi özelleştirmeden önce ilk olarak hataları düzeltin.",
 	"moreThanOneBuildTask": "tasks.json dosyasında tanımlı çok fazla derleme görevi var. İlk görev çalıştırılıyor.",
-	"TaskSystem.activeSame.background": "'{0}' görevi zaten aktif ve arka plan modunda. Görevi sonlandırmak için Görevler menüsünden 'Görevi Sonlandır...'ı kullanın.",
-	"TaskSystem.activeSame.noBackground": " '{0}' görevi zaten aktif. Görevi sonlandırmak için Görevler menüsünden 'Görevi Sonlandır...'ı kullanın. ",
+	"terminateTask": "Görevi Sonlandır",
+	"restartTask": "Görevi Yeniden Başlat",
 	"TaskSystem.active": "Çalışan bir görev zaten var. Bir başkasını çalıştırmadan önce bu görevi sonlandırın.",
 	"TaskSystem.restartFailed": "{0} görevini sonlandırma ve yeniden başlatma başarısız oldu",
 	"TaskService.noConfiguration": "Hata: {0} görev algılaması aşağıdaki yapılandırma için bir görev eklemesi yapmıyor:\n{1}\nYapılandırma yok sayılacaktır.\n",
diff --git a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json b/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
index 9c3c1e8fd86..22ab290691f 100644
--- a/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/tasks/node/taskConfiguration.i18n.json
@@ -7,6 +7,7 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"ConfigurationParser.invalidCWD": "Uyarı: options.cwd dize türünde olmalıdır. {0} değeri yok sayıldı.\n",
+	"ConfigurationParser.inValidArg": "Hata: komut argümanı bir dize veya tırnak içinde bir dize olmalıdır. Belirtilen değer:\n{0}",
 	"ConfigurationParser.noargs": "Hata: komut argümanları dizelerden oluşan bir dizi olmalıdır. Belirtilen değer:\n{0}",
 	"ConfigurationParser.noShell": "Uyarı: kabuk yapılandırması sadece görevler terminalde çalıştırılırken desteklenir.",
 	"ConfigurationParser.noName": "Hata: Kapsam bildiriminde Sorun Eşleştirici'nin bir adı olmalıdır:\n{0}\n",
@@ -17,7 +18,6 @@
 	"ConfigurationParser.missingRequiredProperty": "Hata: ihtiyaç duyulan '{1}' özelliği, '{0}' görev yapılandırmasında eksik. Görev yapılandırması yok sayılacaktır.",
 	"ConfigurationParser.notCustom": "Hata: 'tasks' bir özel görev olarak tanımlanmamış. Yapılandırma yok sayılacaktır.\n{0}\n",
 	"ConfigurationParser.noTaskName": "Hata: bir görev, bir 'label' özelliği belirtmelidir. Görev yok sayılacaktır.\n{0}\n",
-	"taskConfiguration.shellArgs": "Uyarı: '{0}' görevi bir kabuk komutudur ve argümanlarından biri kaçış karakteri içermeyen boşluklar içeriyor olabilir. Doğru komut satırı alıntısını sağlamak için lütfen argümanları komutlarla birleştirin.",
 	"taskConfiguration.noCommandOrDependsOn": "Hata: '{0}' görevi bir komut veya dependsOn özelliği belirtmiyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
 	"taskConfiguration.noCommand": "Hata: '{0}' görevi bir komut tanımlamıyor. Görev yok sayılacaktır. Görevin tanımı:\n{1}",
 	"TaskParse.noOsSpecificGlobalTasks": "2.0.0 görev sürümü genel işletim sistemi özel görevlerini desteklemiyor. Bunları işletim sistemine özel komut içeren bir göreve çevirin. Etkilenen görevler:\n{0}"
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
new file mode 100644
index 00000000000..9ae8066e173
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/terminal/common/terminalColorRegistry.i18n.json
@@ -0,0 +1,16 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"terminal.background": "Terminalin arka plan rengi; bu, terminalin panelden farklı olarak renklendirilmesini sağlar.",
+	"terminal.foreground": "Terminalin ön plan rengi.",
+	"terminalCursor.foreground": "Terminal imlecinin ön plan rengi.",
+	"terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.",
+	"terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.",
+	"terminal.border": "Terminaldeki bölmeleri ayıran kenarlığın rengi. panel.border bunun için varsayılan olarak kullanılır.",
+	"terminal.ansiColor": "Terminalde '{0}' ANSI rengi."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index fb23f3c189e..33c53ccb7b3 100644
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -51,5 +51,7 @@
 	"workbench.action.terminal.hideFindWidget": "Bulma Aracını Gizle",
 	"nextTerminalFindTerm": "Sonraki Arama Terimini Göster",
 	"previousTerminalFindTerm": "Önceki Arama Terimini Göster",
-	"quickOpenTerm": "Aktif Terminali Değiştir"
+	"quickOpenTerm": "Aktif Terminali Değiştir",
+	"workbench.action.terminal.selectToPreviousCommand": "Önceki Komuta Kadar Seç",
+	"workbench.action.terminal.selectToNextCommand": "Sonraki Komuta Kadar Seç"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
index ad9592dd9e3..f2014fcc12e 100644
--- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.i18n.json
@@ -7,8 +7,8 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"copy": "Kopyala",
+	"split": "Böl",
 	"paste": "Yapıştır",
 	"selectAll": "Tümünü Seç",
-	"clear": "Temizle",
-	"split": "Böl"
+	"clear": "Temizle"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
index ecea8c0b753..4ec7921beb2 100644
--- a/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.i18n.json
@@ -6,7 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"unsupportedWorkspaceSettings": "Bu çalışma alanı sadece Kullanıcı Ayarları'nda ayarlanabilen ayarlar içeriyor. ({0}). Daha fazla bilgi almak için [buraya]({0}) tıklayın.",
 	"openWorkspaceSettings": "Çalışma Alanı Ayarlarını Aç",
-	"dontShowAgain": "Tekrar Gösterme",
-	"unsupportedWorkspaceSettings": "Bu çalışma alanı sadece Kullanıcı Ayarları'nda ayarlanabilen ayarlar içeriyor. ({0}). Daha fazla bilgi almak için [buraya]({0}) tıklayın."
+	"dontShowAgain": "Tekrar Gösterme"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
new file mode 100644
index 00000000000..2cfd79cc9e0
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"releaseNotesInputName": "Sürüm Notları: {0}",
+	"unassigned": "atanmamış"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
index 795a37034f6..f0af3fad62b 100644
--- a/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/update/electron-browser/update.i18n.json
@@ -6,8 +6,6 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
-	"later": "Daha Sonra",
-	"unassigned": "atanmamış",
 	"releaseNotes": "Sürüm Notları",
 	"showReleaseNotes": "Sürüm Notlarını Göster",
 	"read the release notes": "{0} v{1} uygulamasına hoş geldiniz! Sürüm Notları'nı okumak ister misiniz?",
@@ -17,13 +15,12 @@
 	"updateIsReady": "Yeni {0} güncellemesi var.",
 	"noUpdatesAvailable": "Şu anda mevcut herhangi bir güncelleme yok.",
 	"ok": "Tamam",
-	"download now": "Şimdi İndir",
 	"thereIsUpdateAvailable": "Bir güncelleştirme var.",
+	"download now": "Şimdi İndir",
+	"later": "Daha Sonra",
 	"installUpdate": "Güncelleştirmeyi Yükle",
-	"updateAvailable": "Bir güncelleştirme var: {0} {1}",
 	"updateInstalling": "{0} {1} arka planda yükleniyor, bittiğinde bilgi vereceğiz.",
 	"updateNow": "Şimdi Güncelle",
-	"updateAvailableAfterRestart": "{0} yeniden başlatıldıktan sonra güncellenecektir.",
 	"commandPalette": "Komut Paleti...",
 	"settings": "Ayarlar",
 	"keyboardShortcuts": "Klavye Kısayolları",
diff --git a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
new file mode 100644
index 00000000000..402fef291ee
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webview.contribution.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"webview.editor.label": "web görünümü düzenleyicisi",
+	"developer": "Geliştirici"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
new file mode 100644
index 00000000000..13712f3e4c5
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/webview/electron-browser/webviewCommands.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"openToolsLabel": "Web Görünümü Geliştirici Araçlarını Aç",
+	"refreshWebviewLabel": "Web Görünümlerini Yeniden Yükle"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
new file mode 100644
index 00000000000..06a856662b9
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.i18n.json
@@ -0,0 +1,12 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"telemetryOptOut.optOutNotice": "Microsoft'un kullanım verilerini toplamasına izin vererek VS Code'u geliştirin. [Gizlilik beyanımızı]({0}) okuyun ve nasıl [vazgeçebileceğinizi]({1}) öğrenin.",
+	"telemetryOptOut.optInNotice": "Microsoft'un kullanım verilerini toplamasına izin vererek VS Code'u geliştirin. [Gizlilik beyanımızı]({0}) okuyun ve nasıl [etkinleştirebileceğinizi]({1}) öğrenin.",
+	"telemetryOptOut.readMore": "Devamını oku"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
index e8f3a223755..29463e7c351 100644
--- a/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -27,8 +27,6 @@
 	"welcomePage.installExtensionPacks": "Araçlar ve diller",
 	"welcomePage.installExtensionPacksDescription": "{0} ve {1} için destek yükle",
 	"welcomePage.moreExtensions": "fazlası",
-	"welcomePage.installKeymapDescription": "Klavye kısayolları yükle",
-	"welcomePage.installKeymapExtension": "{0} ve {1} için klavye kısayolları yükle",
 	"welcomePage.others": "diğerleri",
 	"welcomePage.colorTheme": "Renk teması",
 	"welcomePage.colorThemeDescription": "Düzenleyici ve kodlarınız sevdiğiniz şekilde görünsün",
diff --git a/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json b/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json
new file mode 100644
index 00000000000..67d3a3db217
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/services/configuration/node/configurationService.i18n.json
@@ -0,0 +1,10 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"unsupportedWindowSetting": "Bu ayar şu an uygulanamıyor. Ayar, bu klasörü açtığınızda uygulanacaktır."
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json b/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
new file mode 100644
index 00000000000..35229bd6699
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.i18n.json
@@ -0,0 +1,9 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	]
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
new file mode 100644
index 00000000000..c9b9ed878f8
--- /dev/null
+++ b/i18n/trk/src/vs/workbench/services/dialogs/electron-browser/dialogService.i18n.json
@@ -0,0 +1,11 @@
+{
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"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."
+	],
+	"yesButton": "&&Evet",
+	"cancelButton": "İptal"
+}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
index 9f88c4ae89e..4bd75567fec 100644
--- a/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/extensions/electron-browser/extensionService.i18n.json
@@ -8,7 +8,6 @@
 	],
 	"extensionHostProcess.crash": "Eklenti sunucusu beklenmeyen biçimde sonlandırıldı.",
 	"extensionHostProcess.unresponsiveCrash": "Eklenti sunucusu yanıt vermediğinden sonlandırıldı.",
-	"devTools": "Geliştirici Araçları",
 	"restart": "Eklenti Sunucusunu Yeniden Başlat",
 	"overwritingExtension": "{0} eklentisinin üzerine {1} yazılıyor.",
 	"extensionUnderDevelopment": "{0} konumundaki geliştirme eklentisi yükleniyor",
diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
index 13fc407f066..cb30de0b079 100644
--- a/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/files/electron-browser/fileService.i18n.json
@@ -6,11 +6,23 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
 	"installNet": ".NET Framework 4.5'i İndir",
 	"neverShowAgain": "Tekrar Gösterme",
-	"netVersionError": "Microsoft .NET Framework 4.5 gerekli. Yüklemek için bağlantıyı izleyin.",
+	"enospcError": "{0}, bu büyük çalışma alanındaki dosya değişikliklerini izleyemiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
 	"learnMore": "Talimatlar",
-	"enospcError": "{0} için dosya işleçleri bitiyor. Bu sorunu çözmek için lütfen yönerge bağlantısını izleyin.",
+	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
+	"fileIsDirectoryError": "Dosya bir dizindir",
+	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
+	"fileTooLargeError": "Dosya, açmak için çok büyük",
+	"fileNotFoundError": "Dosya bulunamadı ({0})",
+	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
+	"filePermission": "Dosya için yazma izni reddedildi ({0})",
+	"fileExists": "Oluşturulacak dosya zaten mevcut ({0})",
+	"fileModifiedError": "Dosya Şu Tarihten Beri Değiştiriliyor",
+	"fileReadOnlyError": "Dosya Salt Okunur",
+	"fileMoveConflict": "Taşıma/kopyalama yapılamadı. Dosya, hedefte zaten mevcut.",
+	"unableToMoveCopyError": "Taşıma/kopyalama yapılamadı. Dosya, içinde bulunduğu klasörü değiştiriyor.",
 	"binFailed": "'{0}' geri dönüşüm kutusuna taşınamadı",
 	"trashFailed": "'{0}' çöpe taşınamadı"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
index 0233ec89011..7f8a2b8ad2c 100644
--- a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json
@@ -6,6 +6,7 @@
 		"--------------------------------------------------------------------------------------------",
 		"Do not edit this file. It is machine generated."
 	],
+	"fileNotFoundError": "Dosya bulunamadı ({0})",
 	"fileIsDirectoryError": "Dosya bir dizindir",
 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor"
diff --git a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
index a9f7d643231..0032045d6c1 100644
--- a/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/files/node/fileService.i18n.json
@@ -9,7 +9,6 @@
 	"fileInvalidPath": "Geçersiz dosya kaynağı ({0})",
 	"fileIsDirectoryError": "Dosya bir dizindir",
 	"fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:",
-	"fileTooLargeForHeapError": "Dosya boyutu pencere bellek sınırını aşıyor, lütfen code --max-memory=YENIBOYUT komutunu çalıştırın",
 	"fileTooLargeError": "Dosya, açmak için çok büyük",
 	"fileNotFoundError": "Dosya bulunamadı ({0})",
 	"fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor",
diff --git a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json b/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
index c5336c074ce..4e6920ae96e 100644
--- a/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/progress/browser/progressService2.i18n.json
@@ -7,5 +7,6 @@
 		"Do not edit this file. It is machine generated."
 	],
 	"progress.subtitle": "{0} - {1}",
-	"progress.title": "{0}: {1}"
+	"progress.title": "{0}: {1}",
+	"cancel": "İptal"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
index 925be843a66..0de6a2517b4 100644
--- a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMGrammars.i18n.json
@@ -10,6 +10,7 @@
 	"vscode.extension.contributes.grammars.language": "Bu söz diziminin ekleneceği dil tanımlayıcısı.",
 	"vscode.extension.contributes.grammars.scopeName": "tmLanguage dosyası tarafından kullanılan Textmate kapsam adı.",
 	"vscode.extension.contributes.grammars.path": "tmLanguage dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './syntaxes/' ile başlar.",
-	"vscode.extension.contributes.grammars.embeddedLanguages": "Bu dil bilgisinin gömülü dilleri içermesi durumundaki bir dil kimliğinin kapsam adı haritası.",
+	"vscode.extension.contributes.grammars.embeddedLanguages": "Bu dil bilgisinin gömülü dilleri içermesi durumundaki bir dil id'sinin kapsam adı haritası.",
+	"vscode.extension.contributes.grammars.tokenTypes": "Kapsam adından anahtar türüne kadar olan bir harita.",
 	"vscode.extension.contributes.grammars.injectTo": "Bu dil bilgisinin yerleştirileceği dil kapsam adları listesi."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
index ecc43c9f3f4..75eba1ee007 100644
--- a/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/textMate/electron-browser/TMSyntax.i18n.json
@@ -11,6 +11,7 @@
 	"invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}",
 	"invalid.injectTo": "`contributes.{0}.injectTo` ögesinde geçersiz değer. Dil kapsam adlarından oluşan bir dizi olmalıdır. Sağlanan değer: {1}",
 	"invalid.embeddedLanguages": "`contributes.{0}.embeddedLanguages` ögesinde geçersiz değer. Kapsam adından dile kadar olan bir nesne haritası olmalıdır. Sağlanan değer: {1}",
+	"invalid.tokenTypes": "`contributes.{0}.tokenTypes` ögesinde geçersiz değer. Kapsam adından anahtar türüne kadar olan bir nesne haritası olmalıdır. Sağlanan değer: {1}",
 	"invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.",
 	"no-tm-grammar": "Bu dil için kayıtlı bir TM Grameri yok."
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json b/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
index df63c933295..7c19d60efde 100644
--- a/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
+++ b/i18n/trk/src/vs/workbench/services/themes/common/fileIconThemeSchema.i18n.json
@@ -8,7 +8,7 @@
 	],
 	"schema.folderExpanded": "Genişletilmiş klasörler için klasör simgesi. Genişletilmiş klasör simgesi isteğe bağlıdır. Ayarlanmazsa, klasör için tanımlanan simge gösterilir.",
 	"schema.folder": "Daraltılmış klasörler için klasör simgesi; eğer folderExpanded ayarlanmamışsa, genişletilen klasörler için de kullanılır.",
-	"schema.file": "Varsayılan dosya simgesi, bir uzantı, dosya adı veya dil kimliği ile eşleşmeyen tüm dosyalar için gösterilir.",
+	"schema.file": "Varsayılan dosya simgesi, bir uzantı, dosya adı veya dil id'si ile eşleşmeyen tüm dosyalar için gösterilir.",
 	"schema.folderNames": "Klasör adlarını simgelerle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen klasör adıdır. Örüntüler veya joker karakterlere izin verilmez. Klasör adı eşleştirme büyük/küçük harfe duyarlı değildir.",
 	"schema.folderName": "İlişkilendirilecek simge tanımı ID'si.",
 	"schema.folderNamesExpanded": "Klasör adlarını genişletilmiş klasör simgeleriyle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen klasör adıdır. Örüntüler veya joker karakterlere izin verilmez. Klasör adı eşleştirme büyük/küçük harfe duyarlı değildir.",
@@ -17,7 +17,7 @@
 	"schema.fileExtension": "İlişkilendirilecek simge tanımı ID'si.",
 	"schema.fileNames": "Dosya adlarını simgelerle ilişkilendirir. Nesne anahtarı, herhangi bir yol parçası içermeyen tam dosya adıdır. Dosya adı noktalar ve olası bir dosya uzantısı içerebilir. Örüntüler veya joker karakterlere izin verilmez. Dosya adı eşleştirme büyük/küçük harfe duyarlı değildir.",
 	"schema.fileName": "İlişkilendirilecek simge tanımı ID'si.",
-	"schema.languageIds": "Dilleri simgelerle ilişkilendirir. Nesne anahtarı, dil ekleme noktasında tanımlanan dil kimliğidir.",
+	"schema.languageIds": "Dilleri simgelerle ilişkilendirir. Nesne anahtarı, dil ekleme noktasında tanımlanan dil id'sidir.",
 	"schema.languageId": "İlişkilendirilecek simge tanımı ID'si.",
 	"schema.fonts": "Simge tanımlarında kullanılacak yazı tipleri.",
 	"schema.id": "Yazı tipinin ID'si.",
@@ -33,7 +33,7 @@
 	"schema.fontCharacter": "Glif yazı tipi kullanırken: Kullanılacak yazı tipindeki karakter.",
 	"schema.fontColor": "Glif yazı tipi kullanırken: Kullanılacak renk.",
 	"schema.fontSize": "Yazı tipi kullanırken: Metin yazı tipi yüzdesine göre yazı tipi boyutu. Ayarlanmazsa, yazı tipi tanımındaki boyut kullanılır.",
-	"schema.fontId": "Yazı tipi kullanırken: Yazı tipinin kimliği. Ayarlanmazsa, ilk yazı tipi tanımı varsayılan olarak kullanılır.",
+	"schema.fontId": "Yazı tipi kullanırken: Yazı tipinin id'si. Ayarlanmazsa, ilk yazı tipi tanımı varsayılan olarak kullanılır.",
 	"schema.light": "Açık renk temalarındaki dosya simgeleri için isteğe bağlı ilişkilendirmeler.",
 	"schema.highContrast": "Yüksek karşıtlık renk temalarındaki dosya simgeleri için isteğe bağlı ilişkilendirmeler.",
 	"schema.hidesExplorerArrows": "Bu tema aktif olduğunda dosya gezgini ok işaretlerinin gizli olup olmayacağını yapılandırır."
diff --git a/package.json b/package.json
index 2339b0f7cbb..5714b70e29c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.22.0",
-  "distro": "6e8c6e1a8dc5df53e357062bee4f14a1843c2249",
+  "version": "1.23.0",
+  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -43,11 +43,11 @@
     "sudo-prompt": "^8.0.0",
     "v8-inspect-profiler": "^0.0.7",
     "vscode-chokidar": "1.6.2",
-    "vscode-debugprotocol": "1.27.0",
+    "vscode-debugprotocol": "1.28.0",
     "vscode-nsfw": "1.0.17",
     "vscode-ripgrep": "^0.8.1",
-    "vscode-textmate": "^3.3.2",
-    "vscode-xterm": "3.3.0-beta8",
+    "vscode-textmate": "^3.3.3",
+    "vscode-xterm": "3.4.0-beta3",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
@@ -102,7 +102,6 @@
     "minimatch": "^2.0.10",
     "mkdirp": "^0.5.0",
     "mocha": "^2.2.5",
-    "mocha-junit-reporter": "^1.17.0",
     "object-assign": "^4.0.1",
     "optimist": "0.3.5",
     "p-all": "^1.0.0",
@@ -113,7 +112,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^5.9.1",
-    "typescript": "2.7.2",
+    "typescript": "2.8.1",
     "typescript-formatter": "7.1.0",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",
@@ -132,6 +131,6 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.1.0",
     "windows-mutex": "^0.2.0",
-    "windows-process-tree": "0.1.6"
+    "windows-process-tree": "0.2.1"
   }
 }
diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
index 8b91b77b671..f0015d389d3 100644
--- a/src/bootstrap-amd.js
+++ b/src/bootstrap-amd.js
@@ -18,8 +18,8 @@ function uriFromPath(_path) {
 }
 
 function readFile(file) {
-	return new Promise(function(resolve, reject) {
-		fs.readFile(file, 'utf8', function(err, data) {
+	return new Promise(function (resolve, reject) {
+		fs.readFile(file, 'utf8', function (err, data) {
 			if (err) {
 				reject(err);
 				return;
@@ -35,7 +35,7 @@ var nlsConfig = rawNlsConfig ? JSON.parse(rawNlsConfig) : { availableLanguages:
 // We have a special location of the nls files. They come from a language pack
 if (nlsConfig._resolvedLanguagePackCoreLocation) {
 	let bundles = Object.create(null);
-	nlsConfig.loadBundle = function(bundle, language, cb) {
+	nlsConfig.loadBundle = function (bundle, language, cb) {
 		let result = bundles[bundle];
 		if (result) {
 			cb(undefined, result);
@@ -47,7 +47,7 @@ if (nlsConfig._resolvedLanguagePackCoreLocation) {
 			bundles[bundle] = json;
 			cb(undefined, json);
 		})
-		.catch(cb);
+			.catch(cb);
 	};
 }
 
@@ -66,10 +66,13 @@ if (nlsConfig.pseudo) {
 	});
 }
 
-exports.bootstrap = function (entrypoint) {
+exports.bootstrap = function (entrypoint, onLoad, onError) {
 	if (!entrypoint) {
 		return;
 	}
 
-	loader([entrypoint], function () { }, function (err) { console.error(err); });
+	onLoad = onLoad || function () { };
+	onError = onError || function (err) { console.error(err); };
+
+	loader([entrypoint], onLoad, onError);
 };
diff --git a/src/main.js b/src/main.js
index 84af1506598..1dcd38660cd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -448,7 +448,6 @@ global.getOpenUrls = function () {
 	return openUrls;
 };
 
-
 // use '<UserData>/CachedData'-directory to store
 // node/v8 cached data.
 let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index ce604fb1bf0..daf41dbc736 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -507,7 +507,7 @@ declare namespace Electron {
 		 * and macOS, icons depend on the application associated with file mime type.
 		 */
 		getFileIcon(path: string, callback: (error: Error, icon: NativeImage) => void): void;
-		getGpuFeatureStatus(): GPUFeatureStatus;
+		getGPUFeatureStatus(): GPUFeatureStatus;
 		getJumpListSettings(): JumpListSettings;
 		/**
 		 * Note: When distributing your packaged app, you have to also ship the locales
diff --git a/src/typings/node-pty.d.ts b/src/typings/node-pty.d.ts
index e09b1eb47e5..e3ee561a60c 100644
--- a/src/typings/node-pty.d.ts
+++ b/src/typings/node-pty.d.ts
@@ -1,27 +1,81 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+/**
+ * Copyright (c) 2017, Daniel Imms (MIT License).
+ */
 
 declare module 'node-pty' {
-	export function fork(file: string, args: string[], options: any): Terminal;
-	export function spawn(file: string, args: string[], options: any): Terminal;
-	export function createTerminal(file: string, args: string[], options: any): Terminal;
+	/**
+	 * Forks a process as a pseudoterminal.
+	 * @param file The file to launch.
+	 * @param args The file's arguments as argv (string[]) or in a pre-escaped CommandLine format
+	 * (string). Note that the CommandLine option is only available on Windows and is expected to be
+	 * escaped properly.
+	 * @param options The options of the terminal.
+	 * @see CommandLineToArgvW https://msdn.microsoft.com/en-us/library/windows/desktop/bb776391(v=vs.85).aspx
+	 * @see Parsing C++ Comamnd-Line Arguments https://msdn.microsoft.com/en-us/library/17w5ykft.aspx
+	 * @see GetCommandLine https://msdn.microsoft.com/en-us/library/windows/desktop/ms683156.aspx
+	 */
+	export function spawn(file: string, args: string[] | string, options: IPtyForkOptions): IPty;
 
-	export interface Terminal {
-		pid: number;
-
-		/**
-		 * The title of the active process.
- 		 */
-		process: string;
-
-		on(event: string, callback: (data: any) => void): void;
-
-		resize(columns: number, rows: number): void;
-
-		write(data: string): void;
-
-		kill(): void;
+	export interface IPtyForkOptions {
+	  name?: string;
+	  cols?: number;
+	  rows?: number;
+	  cwd?: string;
+	  env?: { [key: string]: string };
+	  uid?: number;
+	  gid?: number;
+	  encoding?: string;
 	}
-}
\ No newline at end of file
+
+	/**
+	 * An interface representing a pseudoterminal, on Windows this is emulated via the winpty library.
+	 */
+	export interface IPty {
+	  /**
+	   * The process ID of the outer process.
+	   */
+	  pid: number;
+
+	  /**
+	   * The title of the active process.
+	   */
+	  process: string;
+
+	  /**
+	   * Adds a listener to the data event, fired when data is returned from the pty.
+	   * @param event The name of the event.
+	   * @param listener The callback function.
+	   */
+	  on(event: 'data', listener: (data: string) => void): void;
+
+	  /**
+	   * Adds a listener to the exit event, fired when the pty exits.
+	   * @param event The name of the event.
+	   * @param listener The callback function, exitCode is the exit code of the process and signal is
+	   * the signal that triggered the exit. signal is not supported on Windows.
+	   */
+	  on(event: 'exit', listener: (exitCode: number, signal?: number) => void): void;
+
+	  /**
+	   * Resizes the dimensions of the pty.
+	   * @param columns THe number of columns to use.
+	   * @param rows The number of rows to use.
+	   */
+	  resize(columns: number, rows: number): void;
+
+	  /**
+	   * Writes data to the pty.
+	   * @param data The data to write.
+	   */
+	  write(data: string): void;
+
+	  /**
+	   * Kills the pty.
+	   * @param signal The signal to use, defaults to SIGHUP. If the TIOCSIG/TIOCSIGNAL ioctl is not
+	   * supported then the process will be killed instead. This parameter is not supported on
+	   * Windows.
+	   * @throws Will throw when signal is used on Windows.
+	   */
+	  kill(signal?: string): void;
+	}
+  }
\ No newline at end of file
diff --git a/src/typings/windows-process-tree.d.ts b/src/typings/windows-process-tree.d.ts
index aec2670a5cd..b9db4ea76a8 100644
--- a/src/typings/windows-process-tree.d.ts
+++ b/src/typings/windows-process-tree.d.ts
@@ -4,13 +4,60 @@
  *--------------------------------------------------------------------------------------------*/
 
 declare module 'windows-process-tree' {
-	interface ProcessTreeNode {
-		pid: number,
-		name: string,
-		children: ProcessTreeNode[]
+	export enum ProcessDataFlag {
+		None = 0,
+		Memory = 1,
+		CommandLine = 2
 	}
 
-	function get(rootPid: number, callback: (tree: ProcessTreeNode) => void): void;
+	export interface IProcessInfo {
+		pid: number;
+		ppid: number;
+		name: string;
 
-	export = get;
+		/**
+		 * The working set size of the process, in bytes.
+		 */
+		memory?: number;
+
+		/**
+		 * The string returned is at most 512 chars, strings exceeding this length are truncated.
+		 */
+		commandLine?: string;
+	}
+
+	export interface IProcessCpuInfo extends IProcessInfo {
+		cpu?: number;
+	}
+
+	export interface IProcessTreeNode {
+		pid: number;
+		name: string;
+		memory?: number;
+		commandLine?: string;
+		children: IProcessTreeNode[];
+	}
+
+	/**
+	 * Returns a tree of processes with the rootPid process as the root.
+	 * @param rootPid - The pid of the process that will be the root of the tree.
+	 * @param callback - The callback to use with the returned list of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessTree(rootPid: number, callback: (tree: IProcessTreeNode) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns a list of processes containing the rootPid process and all of its descendants.
+	 * @param rootPid - The pid of the process of interest.
+	 * @param callback - The callback to use with the returned set of processes.
+	 * @param flags - The flags for what process data should be included.
+	 */
+	export function getProcessList(rootPid: number, callback: (processList: IProcessInfo[]) => void, flags?: ProcessDataFlag): void;
+
+	/**
+	 * Returns the list of processes annotated with cpu usage information.
+	 * @param processList - The list of processes.
+	 * @param callback - The callback to use with the returned list of processes.
+	 */
+	export function getProcessCpuUsage(processList: IProcessInfo[], callback: (processListWithCpu: IProcessCpuInfo[]) => void): void;
 }
diff --git a/src/vs/base/browser/builder.css b/src/vs/base/browser/builder.css
index 09e124826a6..e440d5cf994 100644
--- a/src/vs/base/browser/builder.css
+++ b/src/vs/base/browser/builder.css
@@ -5,10 +5,4 @@
 
 .monaco-builder-hidden {
 	display: none !important;
-	visibility: hidden !important;
-}
-
-.monaco-builder-visible {
-	display: inherit;
-	visibility: visible;
-}
+}
\ No newline at end of file
diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts
index 83cbd65af57..b47acecc5ae 100644
--- a/src/vs/base/browser/builder.ts
+++ b/src/vs/base/browser/builder.ts
@@ -43,26 +43,6 @@ export interface QuickBuilder {
 	(builder: Builder): Builder;
 }
 
-/**
- * Create a new builder from the element that is uniquely identified by the given identifier. If the
- *  second parameter "offdom" is set to true, the created elements will only be added to the provided
- *  element when the build() method is called.
- */
-export function withElementById(id: string, offdom?: boolean): Builder {
-	assert.ok(types.isString(id), 'Expected String as parameter');
-
-	let element = document.getElementById(id);
-	if (element) {
-		return new Builder(element, offdom);
-	}
-
-	return null;
-}
-
-export const Build = {
-	withElementById: withElementById
-};
-
 // --- Implementation starts here
 
 let MS_DATA_KEY = '_msDataKey';
@@ -70,16 +50,6 @@ let DATA_BINDING_ID = '__$binding';
 let LISTENER_BINDING_ID = '__$listeners';
 let VISIBILITY_BINDING_ID = '__$visibility';
 
-export class Dimension {
-	public width: number;
-	public height: number;
-
-	constructor(width: number, height: number) {
-		this.width = width;
-		this.height = height;
-	}
-}
-
 function data(element: any): any {
 	if (!element[MS_DATA_KEY]) {
 		element[MS_DATA_KEY] = {};
@@ -1206,39 +1176,18 @@ export class Builder implements IDisposable {
 	/**
 	 *  Gets the size (in pixels) of an element, including the margin.
 	 */
-	public getTotalSize(): Dimension {
+	public getTotalSize(): DOM.Dimension {
 		let totalWidth = DOM.getTotalWidth(this.currentElement);
 		let totalHeight = DOM.getTotalHeight(this.currentElement);
 
-		return new Dimension(totalWidth, totalHeight);
+		return new DOM.Dimension(totalWidth, totalHeight);
 	}
 
 	/**
 	 *  Another variant of getting the inner dimensions of an element.
 	 */
-	public getClientArea(): Dimension {
-
-		// 0.) Try with DOM clientWidth / clientHeight
-		if (this.currentElement !== document.body) {
-			return new Dimension(this.currentElement.clientWidth, this.currentElement.clientHeight);
-		}
-
-		// 1.) Try innerWidth / innerHeight
-		if (window.innerWidth && window.innerHeight) {
-			return new Dimension(window.innerWidth, window.innerHeight);
-		}
-
-		// 2.) Try with document.body.clientWidth / document.body.clientHeigh
-		if (document.body && document.body.clientWidth && document.body.clientWidth) {
-			return new Dimension(document.body.clientWidth, document.body.clientHeight);
-		}
-
-		// 3.) Try with document.documentElement.clientWidth / document.documentElement.clientHeight
-		if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientHeight) {
-			return new Dimension(document.documentElement.clientWidth, document.documentElement.clientHeight);
-		}
-
-		throw new Error('Unable to figure out browser width and height');
+	public getClientArea(): DOM.Dimension {
+		return DOM.getClientArea(this.currentElement);
 	}
 }
 
@@ -1484,7 +1433,3 @@ export const $: QuickBuilder = function (arg?: any): Builder {
 		throw new Error('Bad use of $');
 	}
 };
-
-(<any>$).Dimension = Dimension;
-(<any>$).Builder = Builder;
-(<any>$).Build = Build;
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index 82e5954e301..44d337f3b3a 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -5,18 +5,19 @@
 
 'use strict';
 
-import { $ } from 'vs/base/browser/builder';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { addDisposableListener } from 'vs/base/browser/dom';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
  *  dragover event for 800ms. If the drag is aborted before, the callback will not be triggered.
  */
 export class DelayedDragHandler {
-
+	private toDispose: IDisposable[] = [];
 	private timeout: number;
 
 	constructor(container: HTMLElement, callback: () => void) {
-		$(container).on('dragover', () => {
+		this.toDispose.push(addDisposableListener(container, 'dragover', () => {
 			if (!this.timeout) {
 				this.timeout = setTimeout(() => {
 					callback();
@@ -24,9 +25,13 @@ export class DelayedDragHandler {
 					this.timeout = null;
 				}, 800);
 			}
-		});
+		}));
 
-		$(container).on(['dragleave', 'drop', 'dragend'], () => this.clearDragTimeout());
+		['dragleave', 'drop', 'dragend'].forEach(type => {
+			this.toDispose.push(addDisposableListener(container, type, () => {
+				this.clearDragTimeout();
+			}));
+		});
 	}
 
 	private clearDragTimeout(): void {
@@ -37,6 +42,7 @@ export class DelayedDragHandler {
 	}
 
 	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
 		this.clearDragTimeout();
 	}
 }
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 7a5b9af1249..9aee0d502d6 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -35,7 +35,9 @@ export function isInDOM(node: Node): boolean {
 interface IDomClassList {
 	hasClass(node: HTMLElement, className: string): boolean;
 	addClass(node: HTMLElement, className: string): void;
+	addClasses(node: HTMLElement, ...classNames: string[]): void;
 	removeClass(node: HTMLElement, className: string): void;
+	removeClasses(node: HTMLElement, ...classNames: string[]): void;
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void;
 }
 
@@ -110,6 +112,10 @@ const _manualClassList = new class implements IDomClassList {
 		return this._lastStart !== -1;
 	}
 
+	addClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.addClass(node, name)));
+	}
+
 	addClass(node: HTMLElement, className: string): void {
 		if (!node.className) { // doesn't have it for sure
 			node.className = className;
@@ -130,6 +136,10 @@ const _manualClassList = new class implements IDomClassList {
 		}
 	}
 
+	removeClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.removeClass(node, name)));
+	}
+
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void {
 		this._findClassName(node, className);
 		if (this._lastStart !== -1 && (shouldHaveIt === void 0 || !shouldHaveIt)) {
@@ -146,6 +156,10 @@ const _nativeClassList = new class implements IDomClassList {
 		return className && node.classList && node.classList.contains(className);
 	}
 
+	addClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.addClass(node, name)));
+	}
+
 	addClass(node: HTMLElement, className: string): void {
 		if (className && node.classList) {
 			node.classList.add(className);
@@ -158,6 +172,10 @@ const _nativeClassList = new class implements IDomClassList {
 		}
 	}
 
+	removeClasses(node: HTMLElement, ...classNames: string[]): void {
+		classNames.forEach(nameValue => nameValue.split(' ').forEach(name => this.removeClass(node, name)));
+	}
+
 	toggleClass(node: HTMLElement, className: string, shouldHaveIt?: boolean): void {
 		if (node.classList) {
 			node.classList.toggle(className, shouldHaveIt);
@@ -170,7 +188,9 @@ const _nativeClassList = new class implements IDomClassList {
 const _classList: IDomClassList = browser.isIE ? _manualClassList : _nativeClassList;
 export const hasClass: (node: HTMLElement, className: string) => boolean = _classList.hasClass.bind(_classList);
 export const addClass: (node: HTMLElement, className: string) => void = _classList.addClass.bind(_classList);
+export const addClasses: (node: HTMLElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
 export const removeClass: (node: HTMLElement, className: string) => void = _classList.removeClass.bind(_classList);
+export const removeClasses: (node: HTMLElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
 export const toggleClass: (node: HTMLElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
 
 class DomListener implements IDisposable {
@@ -269,7 +289,7 @@ function doRequestAnimationFrame(callback: (time: number) => void): number {
 			|| emulatedRequestAnimationFrame
 		);
 	}
-	return _animationFrame(callback);
+	return _animationFrame.call(self, callback);
 }
 
 /**
@@ -454,6 +474,31 @@ function getDimension(element: HTMLElement, cssPropertyName: string, jsPropertyN
 	return convertToPixels(element, value);
 }
 
+export function getClientArea(element: HTMLElement): Dimension {
+
+	// Try with DOM clientWidth / clientHeight
+	if (element !== document.body) {
+		return new Dimension(element.clientWidth, element.clientHeight);
+	}
+
+	// Try innerWidth / innerHeight
+	if (window.innerWidth && window.innerHeight) {
+		return new Dimension(window.innerWidth, window.innerHeight);
+	}
+
+	// Try with document.body.clientWidth / document.body.clientHeigh
+	if (document.body && document.body.clientWidth && document.body.clientWidth) {
+		return new Dimension(document.body.clientWidth, document.body.clientHeight);
+	}
+
+	// Try with document.documentElement.clientWidth / document.documentElement.clientHeight
+	if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientHeight) {
+		return new Dimension(document.documentElement.clientWidth, document.documentElement.clientHeight);
+	}
+
+	throw new Error('Unable to figure out browser width and height');
+}
+
 const sizeUtils = {
 
 	getBorderLeftWidth: function (element: HTMLElement): number {
@@ -500,6 +545,16 @@ const sizeUtils = {
 // ----------------------------------------------------------------------------------------
 // Position & Dimension
 
+export class Dimension {
+	public width: number;
+	public height: number;
+
+	constructor(width: number, height: number) {
+		this.width = width;
+		this.height = height;
+	}
+}
+
 export function getTopLeftOffset(element: HTMLElement): { left: number; top: number; } {
 	// Adapted from WinJS.Utilities.getPosition
 	// and added borders to the mix
@@ -535,6 +590,36 @@ export interface IDomNodePagePosition {
 	height: number;
 }
 
+export function size(element: HTMLElement, width: number, height: number): void {
+	if (typeof width === 'number') {
+		element.style.width = `${width}px`;
+	}
+
+	if (typeof height === 'number') {
+		element.style.height = `${height}px`;
+	}
+}
+
+export function position(element: HTMLElement, top: number, right?: number, bottom?: number, left?: number, position: string = 'absolute'): void {
+	if (typeof top === 'number') {
+		element.style.top = `${top}px`;
+	}
+
+	if (typeof right === 'number') {
+		element.style.right = `${right}px`;
+	}
+
+	if (typeof bottom === 'number') {
+		element.style.bottom = `${bottom}px`;
+	}
+
+	if (typeof left === 'number') {
+		element.style.left = `${left}px`;
+	}
+
+	element.style.position = position;
+}
+
 /**
  * Returns the position of a dom node relative to the entire page.
  */
@@ -939,12 +1024,14 @@ export function join(nodes: Node[], separator: Node | string): Node[] {
 export function show(...elements: HTMLElement[]): void {
 	for (let element of elements) {
 		element.style.display = '';
+		element.removeAttribute('aria-hidden');
 	}
 }
 
 export function hide(...elements: HTMLElement[]): void {
 	for (let element of elements) {
 		element.style.display = 'none';
+		element.setAttribute('aria-hidden', 'true');
 	}
 }
 
@@ -995,7 +1082,7 @@ export function domContentLoaded(): TPromise<any> {
 	return new TPromise<any>((c, e) => {
 		const readyState = document.readyState;
 		if (readyState === 'complete' || (document && document.body !== null)) {
-			window.setImmediate(c);
+			platform.setImmediate(c);
 		} else {
 			window.addEventListener('DOMContentLoaded', c, false);
 		}
@@ -1029,7 +1116,7 @@ export function windowOpenNoOpener(url: string): void {
 	} else {
 		let newTab = window.open();
 		if (newTab) {
-			newTab.opener = null;
+			(newTab as any).opener = null;
 			newTab.location.href = url;
 		}
 	}
diff --git a/src/vs/base/browser/event.ts b/src/vs/base/browser/event.ts
index 6cf13a62f44..25b85a6807d 100644
--- a/src/vs/base/browser/event.ts
+++ b/src/vs/base/browser/event.ts
@@ -19,7 +19,6 @@ export interface IDomEvent {
 	(element: EventHandler, type: 'MSGotPointerCapture', useCapture?: boolean): _Event<MSPointerEvent>;
 	(element: EventHandler, type: 'MSInertiaStart', useCapture?: boolean): _Event<MSGestureEvent>;
 	(element: EventHandler, type: 'MSLostPointerCapture', useCapture?: boolean): _Event<MSPointerEvent>;
-	(element: EventHandler, type: 'MSManipulationStateChanged', useCapture?: boolean): _Event<MSManipulationEvent>;
 	(element: EventHandler, type: 'MSPointerCancel', useCapture?: boolean): _Event<MSPointerEvent>;
 	(element: EventHandler, type: 'MSPointerDown', useCapture?: boolean): _Event<MSPointerEvent>;
 	(element: EventHandler, type: 'MSPointerEnter', useCapture?: boolean): _Event<MSPointerEvent>;
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
index 22b92dbb28f..646964e4e33 100644
--- a/src/vs/base/browser/keyboardEvent.ts
+++ b/src/vs/base/browser/keyboardEvent.ts
@@ -9,149 +9,160 @@ import { KeyCode, KeyCodeUtils, KeyMod, SimpleKeybinding } from 'vs/base/common/
 import * as platform from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
 
-let KEY_CODE_MAP: { [keyCode: number]: KeyCode } = {};
+let KEY_CODE_MAP: { [keyCode: number]: KeyCode } = new Array(230);
+let INVERSE_KEY_CODE_MAP: KeyCode[] = new Array(KeyCode.MAX_VALUE);
+
 (function () {
-	KEY_CODE_MAP[3] = KeyCode.PauseBreak; // VK_CANCEL 0x03 Control-break processing
-	KEY_CODE_MAP[8] = KeyCode.Backspace;
-	KEY_CODE_MAP[9] = KeyCode.Tab;
-	KEY_CODE_MAP[13] = KeyCode.Enter;
-	KEY_CODE_MAP[16] = KeyCode.Shift;
-	KEY_CODE_MAP[17] = KeyCode.Ctrl;
-	KEY_CODE_MAP[18] = KeyCode.Alt;
-	KEY_CODE_MAP[19] = KeyCode.PauseBreak;
-	KEY_CODE_MAP[20] = KeyCode.CapsLock;
-	KEY_CODE_MAP[27] = KeyCode.Escape;
-	KEY_CODE_MAP[32] = KeyCode.Space;
-	KEY_CODE_MAP[33] = KeyCode.PageUp;
-	KEY_CODE_MAP[34] = KeyCode.PageDown;
-	KEY_CODE_MAP[35] = KeyCode.End;
-	KEY_CODE_MAP[36] = KeyCode.Home;
-	KEY_CODE_MAP[37] = KeyCode.LeftArrow;
-	KEY_CODE_MAP[38] = KeyCode.UpArrow;
-	KEY_CODE_MAP[39] = KeyCode.RightArrow;
-	KEY_CODE_MAP[40] = KeyCode.DownArrow;
-	KEY_CODE_MAP[45] = KeyCode.Insert;
-	KEY_CODE_MAP[46] = KeyCode.Delete;
+	for (let i = 0; i < INVERSE_KEY_CODE_MAP.length; i++) {
+		INVERSE_KEY_CODE_MAP[i] = -1;
+	}
 
-	KEY_CODE_MAP[48] = KeyCode.KEY_0;
-	KEY_CODE_MAP[49] = KeyCode.KEY_1;
-	KEY_CODE_MAP[50] = KeyCode.KEY_2;
-	KEY_CODE_MAP[51] = KeyCode.KEY_3;
-	KEY_CODE_MAP[52] = KeyCode.KEY_4;
-	KEY_CODE_MAP[53] = KeyCode.KEY_5;
-	KEY_CODE_MAP[54] = KeyCode.KEY_6;
-	KEY_CODE_MAP[55] = KeyCode.KEY_7;
-	KEY_CODE_MAP[56] = KeyCode.KEY_8;
-	KEY_CODE_MAP[57] = KeyCode.KEY_9;
+	function define(code: number, keyCode: KeyCode): void {
+		KEY_CODE_MAP[code] = keyCode;
+		INVERSE_KEY_CODE_MAP[keyCode] = code;
+	}
 
-	KEY_CODE_MAP[65] = KeyCode.KEY_A;
-	KEY_CODE_MAP[66] = KeyCode.KEY_B;
-	KEY_CODE_MAP[67] = KeyCode.KEY_C;
-	KEY_CODE_MAP[68] = KeyCode.KEY_D;
-	KEY_CODE_MAP[69] = KeyCode.KEY_E;
-	KEY_CODE_MAP[70] = KeyCode.KEY_F;
-	KEY_CODE_MAP[71] = KeyCode.KEY_G;
-	KEY_CODE_MAP[72] = KeyCode.KEY_H;
-	KEY_CODE_MAP[73] = KeyCode.KEY_I;
-	KEY_CODE_MAP[74] = KeyCode.KEY_J;
-	KEY_CODE_MAP[75] = KeyCode.KEY_K;
-	KEY_CODE_MAP[76] = KeyCode.KEY_L;
-	KEY_CODE_MAP[77] = KeyCode.KEY_M;
-	KEY_CODE_MAP[78] = KeyCode.KEY_N;
-	KEY_CODE_MAP[79] = KeyCode.KEY_O;
-	KEY_CODE_MAP[80] = KeyCode.KEY_P;
-	KEY_CODE_MAP[81] = KeyCode.KEY_Q;
-	KEY_CODE_MAP[82] = KeyCode.KEY_R;
-	KEY_CODE_MAP[83] = KeyCode.KEY_S;
-	KEY_CODE_MAP[84] = KeyCode.KEY_T;
-	KEY_CODE_MAP[85] = KeyCode.KEY_U;
-	KEY_CODE_MAP[86] = KeyCode.KEY_V;
-	KEY_CODE_MAP[87] = KeyCode.KEY_W;
-	KEY_CODE_MAP[88] = KeyCode.KEY_X;
-	KEY_CODE_MAP[89] = KeyCode.KEY_Y;
-	KEY_CODE_MAP[90] = KeyCode.KEY_Z;
+	define(3, KeyCode.PauseBreak); // VK_CANCEL 0x03 Control-break processing
+	define(8, KeyCode.Backspace);
+	define(9, KeyCode.Tab);
+	define(13, KeyCode.Enter);
+	define(16, KeyCode.Shift);
+	define(17, KeyCode.Ctrl);
+	define(18, KeyCode.Alt);
+	define(19, KeyCode.PauseBreak);
+	define(20, KeyCode.CapsLock);
+	define(27, KeyCode.Escape);
+	define(32, KeyCode.Space);
+	define(33, KeyCode.PageUp);
+	define(34, KeyCode.PageDown);
+	define(35, KeyCode.End);
+	define(36, KeyCode.Home);
+	define(37, KeyCode.LeftArrow);
+	define(38, KeyCode.UpArrow);
+	define(39, KeyCode.RightArrow);
+	define(40, KeyCode.DownArrow);
+	define(45, KeyCode.Insert);
+	define(46, KeyCode.Delete);
 
-	KEY_CODE_MAP[93] = KeyCode.ContextMenu;
+	define(48, KeyCode.KEY_0);
+	define(49, KeyCode.KEY_1);
+	define(50, KeyCode.KEY_2);
+	define(51, KeyCode.KEY_3);
+	define(52, KeyCode.KEY_4);
+	define(53, KeyCode.KEY_5);
+	define(54, KeyCode.KEY_6);
+	define(55, KeyCode.KEY_7);
+	define(56, KeyCode.KEY_8);
+	define(57, KeyCode.KEY_9);
 
-	KEY_CODE_MAP[96] = KeyCode.NUMPAD_0;
-	KEY_CODE_MAP[97] = KeyCode.NUMPAD_1;
-	KEY_CODE_MAP[98] = KeyCode.NUMPAD_2;
-	KEY_CODE_MAP[99] = KeyCode.NUMPAD_3;
-	KEY_CODE_MAP[100] = KeyCode.NUMPAD_4;
-	KEY_CODE_MAP[101] = KeyCode.NUMPAD_5;
-	KEY_CODE_MAP[102] = KeyCode.NUMPAD_6;
-	KEY_CODE_MAP[103] = KeyCode.NUMPAD_7;
-	KEY_CODE_MAP[104] = KeyCode.NUMPAD_8;
-	KEY_CODE_MAP[105] = KeyCode.NUMPAD_9;
-	KEY_CODE_MAP[106] = KeyCode.NUMPAD_MULTIPLY;
-	KEY_CODE_MAP[107] = KeyCode.NUMPAD_ADD;
-	KEY_CODE_MAP[108] = KeyCode.NUMPAD_SEPARATOR;
-	KEY_CODE_MAP[109] = KeyCode.NUMPAD_SUBTRACT;
-	KEY_CODE_MAP[110] = KeyCode.NUMPAD_DECIMAL;
-	KEY_CODE_MAP[111] = KeyCode.NUMPAD_DIVIDE;
+	define(65, KeyCode.KEY_A);
+	define(66, KeyCode.KEY_B);
+	define(67, KeyCode.KEY_C);
+	define(68, KeyCode.KEY_D);
+	define(69, KeyCode.KEY_E);
+	define(70, KeyCode.KEY_F);
+	define(71, KeyCode.KEY_G);
+	define(72, KeyCode.KEY_H);
+	define(73, KeyCode.KEY_I);
+	define(74, KeyCode.KEY_J);
+	define(75, KeyCode.KEY_K);
+	define(76, KeyCode.KEY_L);
+	define(77, KeyCode.KEY_M);
+	define(78, KeyCode.KEY_N);
+	define(79, KeyCode.KEY_O);
+	define(80, KeyCode.KEY_P);
+	define(81, KeyCode.KEY_Q);
+	define(82, KeyCode.KEY_R);
+	define(83, KeyCode.KEY_S);
+	define(84, KeyCode.KEY_T);
+	define(85, KeyCode.KEY_U);
+	define(86, KeyCode.KEY_V);
+	define(87, KeyCode.KEY_W);
+	define(88, KeyCode.KEY_X);
+	define(89, KeyCode.KEY_Y);
+	define(90, KeyCode.KEY_Z);
 
-	KEY_CODE_MAP[112] = KeyCode.F1;
-	KEY_CODE_MAP[113] = KeyCode.F2;
-	KEY_CODE_MAP[114] = KeyCode.F3;
-	KEY_CODE_MAP[115] = KeyCode.F4;
-	KEY_CODE_MAP[116] = KeyCode.F5;
-	KEY_CODE_MAP[117] = KeyCode.F6;
-	KEY_CODE_MAP[118] = KeyCode.F7;
-	KEY_CODE_MAP[119] = KeyCode.F8;
-	KEY_CODE_MAP[120] = KeyCode.F9;
-	KEY_CODE_MAP[121] = KeyCode.F10;
-	KEY_CODE_MAP[122] = KeyCode.F11;
-	KEY_CODE_MAP[123] = KeyCode.F12;
-	KEY_CODE_MAP[124] = KeyCode.F13;
-	KEY_CODE_MAP[125] = KeyCode.F14;
-	KEY_CODE_MAP[126] = KeyCode.F15;
-	KEY_CODE_MAP[127] = KeyCode.F16;
-	KEY_CODE_MAP[128] = KeyCode.F17;
-	KEY_CODE_MAP[129] = KeyCode.F18;
-	KEY_CODE_MAP[130] = KeyCode.F19;
+	define(93, KeyCode.ContextMenu);
 
-	KEY_CODE_MAP[144] = KeyCode.NumLock;
-	KEY_CODE_MAP[145] = KeyCode.ScrollLock;
+	define(96, KeyCode.NUMPAD_0);
+	define(97, KeyCode.NUMPAD_1);
+	define(98, KeyCode.NUMPAD_2);
+	define(99, KeyCode.NUMPAD_3);
+	define(100, KeyCode.NUMPAD_4);
+	define(101, KeyCode.NUMPAD_5);
+	define(102, KeyCode.NUMPAD_6);
+	define(103, KeyCode.NUMPAD_7);
+	define(104, KeyCode.NUMPAD_8);
+	define(105, KeyCode.NUMPAD_9);
+	define(106, KeyCode.NUMPAD_MULTIPLY);
+	define(107, KeyCode.NUMPAD_ADD);
+	define(108, KeyCode.NUMPAD_SEPARATOR);
+	define(109, KeyCode.NUMPAD_SUBTRACT);
+	define(110, KeyCode.NUMPAD_DECIMAL);
+	define(111, KeyCode.NUMPAD_DIVIDE);
 
-	KEY_CODE_MAP[186] = KeyCode.US_SEMICOLON;
-	KEY_CODE_MAP[187] = KeyCode.US_EQUAL;
-	KEY_CODE_MAP[188] = KeyCode.US_COMMA;
-	KEY_CODE_MAP[189] = KeyCode.US_MINUS;
-	KEY_CODE_MAP[190] = KeyCode.US_DOT;
-	KEY_CODE_MAP[191] = KeyCode.US_SLASH;
-	KEY_CODE_MAP[192] = KeyCode.US_BACKTICK;
-	KEY_CODE_MAP[193] = KeyCode.ABNT_C1;
-	KEY_CODE_MAP[194] = KeyCode.ABNT_C2;
-	KEY_CODE_MAP[219] = KeyCode.US_OPEN_SQUARE_BRACKET;
-	KEY_CODE_MAP[220] = KeyCode.US_BACKSLASH;
-	KEY_CODE_MAP[221] = KeyCode.US_CLOSE_SQUARE_BRACKET;
-	KEY_CODE_MAP[222] = KeyCode.US_QUOTE;
-	KEY_CODE_MAP[223] = KeyCode.OEM_8;
+	define(112, KeyCode.F1);
+	define(113, KeyCode.F2);
+	define(114, KeyCode.F3);
+	define(115, KeyCode.F4);
+	define(116, KeyCode.F5);
+	define(117, KeyCode.F6);
+	define(118, KeyCode.F7);
+	define(119, KeyCode.F8);
+	define(120, KeyCode.F9);
+	define(121, KeyCode.F10);
+	define(122, KeyCode.F11);
+	define(123, KeyCode.F12);
+	define(124, KeyCode.F13);
+	define(125, KeyCode.F14);
+	define(126, KeyCode.F15);
+	define(127, KeyCode.F16);
+	define(128, KeyCode.F17);
+	define(129, KeyCode.F18);
+	define(130, KeyCode.F19);
 
-	KEY_CODE_MAP[226] = KeyCode.OEM_102;
+	define(144, KeyCode.NumLock);
+	define(145, KeyCode.ScrollLock);
+
+	define(186, KeyCode.US_SEMICOLON);
+	define(187, KeyCode.US_EQUAL);
+	define(188, KeyCode.US_COMMA);
+	define(189, KeyCode.US_MINUS);
+	define(190, KeyCode.US_DOT);
+	define(191, KeyCode.US_SLASH);
+	define(192, KeyCode.US_BACKTICK);
+	define(193, KeyCode.ABNT_C1);
+	define(194, KeyCode.ABNT_C2);
+	define(219, KeyCode.US_OPEN_SQUARE_BRACKET);
+	define(220, KeyCode.US_BACKSLASH);
+	define(221, KeyCode.US_CLOSE_SQUARE_BRACKET);
+	define(222, KeyCode.US_QUOTE);
+	define(223, KeyCode.OEM_8);
+
+	define(226, KeyCode.OEM_102);
 
 	/**
 	 * https://lists.w3.org/Archives/Public/www-dom/2010JulSep/att-0182/keyCode-spec.html
 	 * If an Input Method Editor is processing key input and the event is keydown, return 229.
 	 */
-	KEY_CODE_MAP[229] = KeyCode.KEY_IN_COMPOSITION;
+	define(229, KeyCode.KEY_IN_COMPOSITION);
 
 	if (browser.isIE) {
-		KEY_CODE_MAP[91] = KeyCode.Meta;
+		define(91, KeyCode.Meta);
 	} else if (browser.isFirefox) {
-		KEY_CODE_MAP[59] = KeyCode.US_SEMICOLON;
-		KEY_CODE_MAP[107] = KeyCode.US_EQUAL;
-		KEY_CODE_MAP[109] = KeyCode.US_MINUS;
+		define(59, KeyCode.US_SEMICOLON);
+		define(107, KeyCode.US_EQUAL);
+		define(109, KeyCode.US_MINUS);
 		if (platform.isMacintosh) {
-			KEY_CODE_MAP[224] = KeyCode.Meta;
+			define(224, KeyCode.Meta);
 		}
 	} else if (browser.isWebKit) {
-		KEY_CODE_MAP[91] = KeyCode.Meta;
+		define(91, KeyCode.Meta);
 		if (platform.isMacintosh) {
 			// the two meta keys in the Mac have different key codes (91 and 93)
-			KEY_CODE_MAP[93] = KeyCode.Meta;
+			define(93, KeyCode.Meta);
 		} else {
-			KEY_CODE_MAP[92] = KeyCode.Meta;
+			define(92, KeyCode.Meta);
 		}
 	}
 })();
@@ -165,6 +176,10 @@ function extractKeyCode(e: KeyboardEvent): KeyCode {
 	return KEY_CODE_MAP[e.keyCode] || KeyCode.Unknown;
 }
 
+export function getCodeForKeyCode(keyCode: KeyCode): number {
+	return INVERSE_KEY_CODE_MAP[keyCode];
+}
+
 export interface IKeyboardEvent {
 	readonly browserEvent: KeyboardEvent;
 	readonly target: HTMLElement;
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index cda6b71cc41..909177a4701 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -6,6 +6,7 @@
 'use strict';
 
 import 'vs/css!./actionbar';
+import * as platform from 'vs/base/common/platform';
 import * as nls from 'vs/nls';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -139,7 +140,7 @@ export class BaseActionItem implements IActionItem {
 			if (this.options && this.options.isMenu) {
 				this.onClick(e);
 			} else {
-				setImmediate(() => this.onClick(e));
+				platform.setImmediate(() => this.onClick(e));
 			}
 		});
 
@@ -386,7 +387,7 @@ export class ActionBar implements IActionRunner {
 	private _onDidRun = new Emitter<IRunEvent>();
 	private _onDidBeforeRun = new Emitter<IRunEvent>();
 
-	constructor(container: HTMLElement | Builder, options: IActionBarOptions = defaultOptions) {
+	constructor(container: HTMLElement, options: IActionBarOptions = defaultOptions) {
 		this.options = options;
 		this._context = options.context;
 		this.toDispose = [];
@@ -496,7 +497,7 @@ export class ActionBar implements IActionRunner {
 
 		this.domNode.appendChild(this.actionsList);
 
-		((container instanceof Builder) ? container.getHTMLElement() : container).appendChild(this.domNode);
+		container.appendChild(this.domNode);
 	}
 
 	public get onDidBlur(): Event<void> {
@@ -553,8 +554,8 @@ export class ActionBar implements IActionRunner {
 		}
 	}
 
-	public getContainer(): Builder {
-		return $(this.domNode);
+	public getContainer(): HTMLElement {
+		return this.domNode;
 	}
 
 	public push(arg: IAction | IAction[], options: IActionOptions = {}): void {
@@ -748,7 +749,7 @@ export class ActionBar implements IActionRunner {
 
 		this.toDispose = lifecycle.dispose(this.toDispose);
 
-		this.getContainer().destroy();
+		$(this.getContainer()).destroy();
 	}
 }
 
diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index a31eec3902b..129009f5088 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -48,9 +48,7 @@ export class Button {
 
 	private focusTracker: DOM.IFocusTracker;
 
-	constructor(container: Builder, options?: IButtonOptions);
-	constructor(container: HTMLElement, options?: IButtonOptions);
-	constructor(container: any, options?: IButtonOptions) {
+	constructor(container: HTMLElement, options?: IButtonOptions) {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOptions, false);
 
@@ -197,9 +195,7 @@ export class ButtonGroup {
 	private _buttons: Button[];
 	private toDispose: IDisposable[];
 
-	constructor(container: Builder, count: number, options?: IButtonOptions);
-	constructor(container: HTMLElement, count: number, options?: IButtonOptions);
-	constructor(container: any, count: number, options?: IButtonOptions) {
+	constructor(container: HTMLElement, count: number, options?: IButtonOptions) {
 		this._buttons = [];
 		this.toDispose = [];
 
@@ -210,9 +206,7 @@ export class ButtonGroup {
 		return this._buttons;
 	}
 
-	private create(container: Builder, count: number, options?: IButtonOptions): void;
-	private create(container: HTMLElement, count: number, options?: IButtonOptions): void;
-	private create(container: any, count: number, options?: IButtonOptions): void {
+	private create(container: HTMLElement, count: number, options?: IButtonOptions): void {
 		for (let index = 0; index < count; index++) {
 			const button = new Button(container, options);
 			this._buttons.push(button);
diff --git a/src/vs/base/browser/ui/contextview/contextview.ts b/src/vs/base/browser/ui/contextview/contextview.ts
index 78ddfdb7361..b5b1c296425 100644
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-
 'use strict';
 
 import 'vs/css!./contextview';
diff --git a/src/vs/base/browser/ui/countBadge/countBadge.ts b/src/vs/base/browser/ui/countBadge/countBadge.ts
index 8ff58693925..6eb64da57bd 100644
--- a/src/vs/base/browser/ui/countBadge/countBadge.ts
+++ b/src/vs/base/browser/ui/countBadge/countBadge.ts
@@ -13,6 +13,7 @@ import { mixin } from 'vs/base/common/objects';
 
 export interface ICountBadgeOptions extends ICountBadgetyles {
 	count?: number;
+	countFormat?: string;
 	titleFormat?: string;
 }
 
@@ -31,6 +32,7 @@ export class CountBadge {
 
 	private element: HTMLElement;
 	private count: number;
+	private countFormat: string;
 	private titleFormat: string;
 
 	private badgeBackground: Color;
@@ -48,6 +50,7 @@ export class CountBadge {
 		this.badgeBorder = this.options.badgeBorder;
 
 		this.element = append(container, $('.monaco-count-badge'));
+		this.countFormat = this.options.countFormat || '{0}';
 		this.titleFormat = this.options.titleFormat || '';
 		this.setCount(this.options.count || 0);
 	}
@@ -57,13 +60,18 @@ export class CountBadge {
 		this.render();
 	}
 
+	setCountFormat(countFormat: string) {
+		this.countFormat = countFormat;
+		this.render();
+	}
+
 	setTitleFormat(titleFormat: string) {
 		this.titleFormat = titleFormat;
 		this.render();
 	}
 
 	private render() {
-		this.element.textContent = '' + this.count;
+		this.element.textContent = format(this.countFormat, this.count);
 		this.element.title = format(this.titleFormat, this.count);
 
 		this.applyStyles();
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index 71aeccbe84c..fd4081e90c7 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -15,7 +15,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IContextViewProvider, IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { IMenuOptions } from 'vs/base/browser/ui/menu/menu';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
-import { EventHelper, EventType } from 'vs/base/browser/dom';
+import { EventHelper, EventType, removeClass, addClass } from 'vs/base/browser/dom';
 import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
 
 export interface ILabelRenderer {
@@ -79,12 +79,12 @@ export class BaseDropdown extends ActionRunner {
 		return this._toDispose;
 	}
 
-	public get element(): Builder {
-		return this.$el;
+	public get element(): HTMLElement {
+		return this.$el.getHTMLElement();
 	}
 
-	public get label(): Builder {
-		return this.$label;
+	public get label(): HTMLElement {
+		return this.$label.getHTMLElement();
 	}
 
 	public set tooltip(tooltip: string) {
@@ -142,7 +142,7 @@ export class Dropdown extends BaseDropdown {
 	public show(): void {
 		super.show();
 
-		this.element.addClass('active');
+		addClass(this.element, 'active');
 
 		this.contextViewProvider.showContextView({
 			getAnchor: () => this.getAnchor(),
@@ -160,11 +160,11 @@ export class Dropdown extends BaseDropdown {
 	}
 
 	protected getAnchor(): HTMLElement | IAnchor {
-		return this.element.getHTMLElement();
+		return this.element;
 	}
 
 	protected onHide(): void {
-		this.element.removeClass('active');
+		removeClass(this.element, 'active');
 	}
 
 	public hide(): void {
@@ -234,16 +234,16 @@ export class DropdownMenu extends BaseDropdown {
 	public show(): void {
 		super.show();
 
-		this.element.addClass('active');
+		addClass(this.element, 'active');
 
 		this._contextMenuProvider.showContextMenu({
-			getAnchor: () => this.element.getHTMLElement(),
+			getAnchor: () => this.element,
 			getActions: () => TPromise.as(this.actions),
 			getActionsContext: () => this.menuOptions ? this.menuOptions.context : null,
 			getActionItem: (action) => this.menuOptions && this.menuOptions.actionItemProvider ? this.menuOptions.actionItemProvider(action) : null,
 			getKeyBinding: (action: IAction) => this.menuOptions && this.menuOptions.getKeyBinding ? this.menuOptions.getKeyBinding(action) : null,
 			getMenuClassName: () => this.menuClassName,
-			onHide: () => this.element.removeClass('active'),
+			onHide: () => removeClass(this.element, 'active'),
 			actionRunner: this.menuOptions ? this.menuOptions.actionRunner : null
 		});
 	}
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index d0931e27a1c..83a76cd7330 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -360,19 +360,22 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 	private toMouseEvent(browserEvent: MouseEvent): IListMouseEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.target);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 
 	private toTouchEvent(browserEvent: TouchEvent): IListTouchEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.target);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 
 	private toGestureEvent(browserEvent: GestureEvent): IListGestureEvent<T> {
 		const index = this.getItemIndexFromEventTarget(browserEvent.initialTarget);
-		const element = index < 0 ? undefined : this.items[index].element;
+		const item = index < 0 ? undefined : this.items[index];
+		const element = item && item.element;
 		return { browserEvent, index, element };
 	}
 
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index f82c5788fe9..a93a19f2be3 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -142,7 +142,7 @@ class Trait<T> implements ISpliceable<boolean>, IDisposable {
 		const end = start + deleteCount;
 		const indexes = [
 			...this.indexes.filter(i => i < start),
-			...elements.reduce((r, hasTrait, i) => hasTrait ? [...r, i + start] : r, []),
+			...elements.map((hasTrait, i) => hasTrait ? i + start : -1).filter(i => i !== -1),
 			...this.indexes.filter(i => i >= end).map(i => i + diff)
 		];
 
@@ -388,7 +388,7 @@ const DefaultMultipleSelectionContoller = {
 	isSelectionRangeChangeEvent
 };
 
-const DefaultOpenController = {
+const DefaultOpenController: IOpenController = {
 	shouldOpen: (event: UIEvent) => {
 		if (event instanceof MouseEvent) {
 			return !isMouseRightClick(event);
@@ -396,7 +396,7 @@ const DefaultOpenController = {
 
 		return true;
 	}
-} as IOpenController;
+};
 
 class MouseController<T> implements IDisposable {
 
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
index b73be1a0f2d..16c9a2a69a7 100644
--- a/src/vs/base/browser/ui/menu/menu.ts
+++ b/src/vs/base/browser/ui/menu/menu.ts
@@ -7,11 +7,11 @@
 
 import 'vs/css!./menu';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { $ } from 'vs/base/browser/builder';
 import { IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, IActionItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { Event } from 'vs/base/common/event';
+import { addClass } from 'vs/base/browser/dom';
 
 export interface IMenuOptions {
 	context?: any;
@@ -26,11 +26,13 @@ export class Menu {
 	private listener: IDisposable;
 
 	constructor(container: HTMLElement, actions: IAction[], options: IMenuOptions = {}) {
-		$(container).addClass('monaco-menu-container');
+		addClass(container, 'monaco-menu-container');
 
-		let $menu = $('.monaco-menu').appendTo(container);
+		let menuContainer = document.createElement('div');
+		addClass(menuContainer, 'monaco-menu');
+		container.appendChild(menuContainer);
 
-		this.actionBar = new ActionBar($menu, {
+		this.actionBar = new ActionBar(menuContainer, {
 			orientation: ActionsOrientation.VERTICAL,
 			actionItemProvider: options.actionItemProvider,
 			context: options.context,
diff --git a/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts b/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
index 250114c9f0b..7fb29670d64 100644
--- a/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
+++ b/src/vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts
@@ -5,7 +5,7 @@
 
 import { escape } from 'vs/base/common/strings';
 
-export function render(text: string): string {
+export function renderOcticons(text: string): string {
 	return escape(text);
 }
 
@@ -18,7 +18,7 @@ export class OcticonLabel {
 	}
 
 	set text(text: string) {
-		this._container.innerHTML = render(text || '');
+		this._container.innerHTML = renderOcticons(text || '');
 	}
 
 }
diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts
index 7a08ea37265..b6a3a856ff7 100644
--- a/src/vs/base/browser/ui/progressbar/progressbar.ts
+++ b/src/vs/base/browser/ui/progressbar/progressbar.ts
@@ -45,9 +45,7 @@ export class ProgressBar {
 	private animationStopToken: ValueCallback;
 	private progressBarBackground: Color;
 
-	constructor(container: Builder, options?: IProgressBarOptions);
-	constructor(container: HTMLElement, options?: IProgressBarOptions);
-	constructor(container: any, options?: IProgressBarOptions) {
+	constructor(container: HTMLElement, options?: IProgressBarOptions) {
 		this.options = options || Object.create(null);
 		mixin(this.options, defaultOpts, false);
 
@@ -59,10 +57,8 @@ export class ProgressBar {
 		this.create(container);
 	}
 
-	private create(container: Builder): void;
-	private create(container: HTMLElement): void;
-	private create(container: any): void {
-		$(container).div({ 'class': css_progress_container }, (builder) => {
+	private create(container: HTMLElement): void {
+		$(container).div({ 'class': css_progress_container }, builder => {
 			this.element = builder.clone();
 
 			builder.div({ 'class': css_progress_bit }).on([DOM.EventType.ANIMATION_START, DOM.EventType.ANIMATION_END, DOM.EventType.ANIMATION_ITERATION], (e: Event) => {
@@ -201,11 +197,20 @@ export class ProgressBar {
 		return this;
 	}
 
-	/**
-	 * Returns the builder this progress bar is building in.
-	 */
-	public getContainer(): Builder {
-		return $(this.element);
+	public getContainer(): HTMLElement {
+		return this.element.getHTMLElement();
+	}
+
+	public show(delay?: number): void {
+		if (typeof delay === 'number') {
+			this.element.showDelayed(delay);
+		} else {
+			this.element.show();
+		}
+	}
+
+	public hide(): void {
+		this.element.hide();
 	}
 
 	public style(styles: IProgressBarStyles): void {
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
index 44701f7b59e..d0a2d30d3e2 100644
--- a/src/vs/base/browser/ui/sash/sash.ts
+++ b/src/vs/base/browser/ui/sash/sash.ts
@@ -7,14 +7,14 @@
 
 import 'vs/css!./sash';
 import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { isIPad } from 'vs/base/browser/browser';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as types from 'vs/base/common/types';
-import * as DOM from 'vs/base/browser/dom';
 import { EventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { Event, Emitter } from 'vs/base/common/event';
+import { getElementsByTagName, EventHelper, EventType as DOMEventType, createStyleSheet, addDisposableListener, Dimension } from 'vs/base/browser/dom';
 
 export interface ISashLayoutProvider { }
 
@@ -63,15 +63,14 @@ export class Sash {
 	private _onDidEnd = new Emitter<void>();
 
 	constructor(container: HTMLElement, layoutProvider: ISashLayoutProvider, options: ISashOptions = {}) {
-
 		this.$e = $('.monaco-sash').appendTo(container);
 
 		if (isMacintosh) {
 			this.$e.addClass('mac');
 		}
 
-		this.$e.on(DOM.EventType.MOUSE_DOWN, (e) => { this.onMouseDown(e as MouseEvent); });
-		this.$e.on(DOM.EventType.DBLCLICK, (e) => this._onDidReset.fire());
+		this.$e.on(DOMEventType.MOUSE_DOWN, (e) => { this.onMouseDown(e as MouseEvent); });
+		this.$e.on(DOMEventType.DBLCLICK, (e) => this._onDidReset.fire());
 		Gesture.addTarget(this.$e.getHTMLElement());
 		this.$e.on(EventType.Start, (e) => { this.onTouchStart(e as GestureEvent); });
 
@@ -127,13 +126,13 @@ export class Sash {
 	}
 
 	private onMouseDown(e: MouseEvent): void {
-		DOM.EventHelper.stop(e, false);
+		EventHelper.stop(e, false);
 
 		if (this.isDisabled) {
 			return;
 		}
 
-		const iframes = $(DOM.getElementsByTagName('iframe'));
+		const iframes = $(getElementsByTagName('iframe'));
 		if (iframes) {
 			iframes.style('pointer-events', 'none'); // disable mouse events on iframes as long as we drag the sash
 		}
@@ -157,7 +156,7 @@ export class Sash {
 		const $window = $(window);
 
 		// fix https://github.com/Microsoft/vscode/issues/21675
-		const globalStyle = DOM.createStyleSheet(this.$e.getHTMLElement());
+		const globalStyle = createStyleSheet(this.$e.getHTMLElement());
 		if (this.orientation === Orientation.HORIZONTAL) {
 			globalStyle.innerHTML = `* { cursor: ${isMacintosh ? 'row-resize' : 'ns-resize'}; }`;
 		} else {
@@ -165,7 +164,7 @@ export class Sash {
 		}
 
 		$window.on('mousemove', (e) => {
-			DOM.EventHelper.stop(e, false);
+			EventHelper.stop(e, false);
 			const mouseMoveEvent = new StandardMouseEvent(e as MouseEvent);
 
 			const event: ISashEvent = {
@@ -178,7 +177,7 @@ export class Sash {
 
 			this._onDidChange.fire(event);
 		}).once('mouseup', (e) => {
-			DOM.EventHelper.stop(e, false);
+			EventHelper.stop(e, false);
 
 			this.$e.getHTMLElement().removeChild(globalStyle);
 
@@ -187,7 +186,7 @@ export class Sash {
 
 			$window.off('mousemove');
 
-			const iframes = $(DOM.getElementsByTagName('iframe'));
+			const iframes = $(getElementsByTagName('iframe'));
 			if (iframes) {
 				iframes.style('pointer-events', 'auto');
 			}
@@ -195,7 +194,7 @@ export class Sash {
 	}
 
 	private onTouchStart(event: GestureEvent): void {
-		DOM.EventHelper.stop(event);
+		EventHelper.stop(event);
 
 		const listeners: IDisposable[] = [];
 
@@ -212,7 +211,7 @@ export class Sash {
 			altKey
 		});
 
-		listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
+		listeners.push(addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
 			if (types.isNumber(event.pageX) && types.isNumber(event.pageY)) {
 				this._onDidChange.fire({
 					startX: startX,
@@ -224,7 +223,7 @@ export class Sash {
 			}
 		}));
 
-		listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
+		listeners.push(addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
 			this._onDidEnd.fire();
 			dispose(listeners);
 		}));
@@ -301,7 +300,6 @@ export class Sash {
  * Triggers onPositionChange event when the position is changed
  */
 export class VSash extends Disposable implements IVerticalSashLayoutProvider {
-
 	private sash: Sash;
 	private ratio: number;
 	private startPosition: number;
@@ -313,6 +311,7 @@ export class VSash extends Disposable implements IVerticalSashLayoutProvider {
 
 	constructor(container: HTMLElement, private minWidth: number) {
 		super();
+
 		this.ratio = 0.5;
 		this.sash = new Sash(container, this);
 
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
index c2434674bfc..5aafe0bd8a0 100644
--- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
+++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -336,16 +336,6 @@ export abstract class AbstractScrollableElement extends Widget {
 				deltaY = 0;
 			}
 
-			if (Platform.isMacintosh) {
-				// Give preference to vertical scrolling
-				if (deltaY && Math.abs(deltaX) < 0.2) {
-					deltaX = 0;
-				}
-				if (Math.abs(deltaY) > Math.abs(deltaX) * 0.5) {
-					deltaX = 0;
-				}
-			}
-
 			const futureScrollPosition = this._scrollable.getFutureScrollPosition();
 
 			let desiredScrollPosition: INewScrollPosition = {};
diff --git a/src/vs/base/browser/ui/selectBox/selectBox.ts b/src/vs/base/browser/ui/selectBox/selectBox.ts
index d6f7ee5079c..28828be39de 100644
--- a/src/vs/base/browser/ui/selectBox/selectBox.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBox.ts
@@ -34,6 +34,10 @@ export interface ISelectBoxDelegate {
 	applyStyles(): void;
 }
 
+export interface ISelectBoxOptions {
+	minBottomMargin?: number;
+}
+
 export interface ISelectBoxStyles extends IListStyles {
 	selectBackground?: Color;
 	selectListBackground?: Color;
@@ -58,7 +62,7 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 	private styles: ISelectBoxStyles;
 	private selectBoxDelegate: ISelectBoxDelegate;
 
-	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles)) {
+	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles = deepClone(defaultStyles), selectBoxOptions?: ISelectBoxOptions) {
 		super();
 
 		this.toDispose = [];
@@ -69,7 +73,7 @@ export class SelectBox extends Widget implements ISelectBoxDelegate {
 		if (isMacintosh) {
 			this.selectBoxDelegate = new SelectBoxNative(options, selected, styles);
 		} else {
-			this.selectBoxDelegate = new SelectBoxList(options, selected, contextViewProvider, styles);
+			this.selectBoxDelegate = new SelectBoxList(options, selected, contextViewProvider, styles, selectBoxOptions);
 		}
 
 		this.toDispose.push(this.selectBoxDelegate);
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index 286bfeb835f..d77c5cfd599 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -17,7 +17,7 @@ import { List } from 'vs/base/browser/ui/list/listWidget';
 import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import { domEvent } from 'vs/base/browser/event';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { ISelectBoxDelegate, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
+import { ISelectBoxDelegate, ISelectBoxOptions, ISelectBoxStyles, ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';
 import { isMacintosh } from 'vs/base/common/platform';
 
 const $ = dom.$;
@@ -74,9 +74,10 @@ class SelectListRenderer implements IRenderer<ISelectOptionItem, ISelectListTemp
 
 export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptionItem> {
 
-	private static SELECT_DROPDOWN_BOTTOM_MARGIN = 10;
+	private static readonly DEFAULT_DROPDOWN_MINIMUM_BOTTOM_MARGIN = 32;
 
 	private _isVisible: boolean;
+	private selectBoxOptions: ISelectBoxOptions;
 	private selectElement: HTMLSelectElement;
 	private options: string[];
 	private selected: number;
@@ -93,10 +94,17 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 	private widthControlElement: HTMLElement;
 	private _currentSelection: number;
 
-	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles) {
+	constructor(options: string[], selected: number, contextViewProvider: IContextViewProvider, styles: ISelectBoxStyles, selectBoxOptions?: ISelectBoxOptions) {
 
 		this.toDispose = [];
 		this._isVisible = false;
+		this.selectBoxOptions = selectBoxOptions || Object.create(null);
+
+		if (typeof this.selectBoxOptions.minBottomMargin !== 'number') {
+			this.selectBoxOptions.minBottomMargin = SelectBoxList.DEFAULT_DROPDOWN_MINIMUM_BOTTOM_MARGIN;
+		} else if (this.selectBoxOptions.minBottomMargin < 0) {
+			this.selectBoxOptions.minBottomMargin = 0;
+		}
 
 		this.selectElement = document.createElement('select');
 		this.selectElement.className = 'monaco-select-box';
@@ -237,6 +245,10 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 
 		if (index >= 0 && index < this.options.length) {
 			this.selected = index;
+		} else if (index > this.options.length - 1) {
+			// Adjust index to end of list
+			// This could make client out of sync with the select
+			this.select(this.options.length - 1);
 		} else if (this.selected < 0) {
 			this.selected = 0;
 		}
@@ -400,9 +412,12 @@ export class SelectBoxList implements ISelectBoxDelegate, IDelegate<ISelectOptio
 		const selectWidth = dom.getTotalWidth(this.selectElement);
 		const selectPosition = dom.getDomNodePagePosition(this.selectElement);
 
-		// Set container height to max from select bottom to margin above status bar
-		const statusBarHeight = dom.getTotalHeight(document.getElementById('workbench.parts.statusbar'));
-		const maxSelectDropDownHeight = (window.innerHeight - selectPosition.top - selectPosition.height - statusBarHeight - SelectBoxList.SELECT_DROPDOWN_BOTTOM_MARGIN);
+		// Set container height to max from select bottom to margin (default/minBottomMargin)
+		let maxSelectDropDownHeight = (window.innerHeight - selectPosition.top - selectPosition.height - this.selectBoxOptions.minBottomMargin);
+
+		if (maxSelectDropDownHeight < 0) {
+			maxSelectDropDownHeight = 0;
+		}
 
 		// SetUp list dimensions and layout - account for container padding
 		if (this.selectList) {
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
index 2f8f0184182..c16bd47e0f3 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxNative.ts
@@ -91,6 +91,10 @@ export class SelectBoxNative implements ISelectBoxDelegate {
 	public select(index: number): void {
 		if (index >= 0 && index < this.options.length) {
 			this.selected = index;
+		} else if (index > this.options.length - 1) {
+			// Adjust index to end of list
+			// This could make client out of sync with the select
+			this.select(this.options.length - 1);
 		} else if (this.selected < 0) {
 			this.selected = 0;
 		}
diff --git a/src/vs/base/browser/ui/splitview/panelview.ts b/src/vs/base/browser/ui/splitview/panelview.ts
index 82e35e5f814..d7079513a78 100644
--- a/src/vs/base/browser/ui/splitview/panelview.ts
+++ b/src/vs/base/browser/ui/splitview/panelview.ts
@@ -239,7 +239,7 @@ class PanelDraggable implements IDisposable {
 	private _onDidDrop = new Emitter<{ from: Panel, to: Panel }>();
 	readonly onDidDrop = this._onDidDrop.event;
 
-	constructor(private panel: Panel, private context: IDndContext) {
+	constructor(private panel: Panel, private dnd: IPanelDndController, private context: IDndContext) {
 		panel.draggableElement.draggable = true;
 		domEvent(panel.draggableElement, 'dragstart')(this.onDragStart, this, this.disposables);
 		domEvent(panel.dropTargetElement, 'dragenter')(this.onDragEnter, this, this.disposables);
@@ -249,6 +249,12 @@ class PanelDraggable implements IDisposable {
 	}
 
 	private onDragStart(e: DragEvent): void {
+		if (!this.dnd.canDrag(this.panel)) {
+			e.preventDefault();
+			e.stopPropagation();
+			return;
+		}
+
 		e.dataTransfer.effectAllowed = 'move';
 
 		const dragImage = append(document.body, $('.monaco-panel-drag-image', {}, this.panel.draggableElement.textContent));
@@ -263,6 +269,10 @@ class PanelDraggable implements IDisposable {
 			return;
 		}
 
+		if (!this.dnd.canDrop(this.context.draggable.panel, this.panel)) {
+			return;
+		}
+
 		this.dragOverCounter++;
 		this.render();
 	}
@@ -272,6 +282,10 @@ class PanelDraggable implements IDisposable {
 			return;
 		}
 
+		if (!this.dnd.canDrop(this.context.draggable.panel, this.panel)) {
+			return;
+		}
+
 		this.dragOverCounter--;
 
 		if (this.dragOverCounter === 0) {
@@ -297,7 +311,7 @@ class PanelDraggable implements IDisposable {
 		this.dragOverCounter = 0;
 		this.render();
 
-		if (this.context.draggable !== this) {
+		if (this.dnd.canDrop(this.context.draggable.panel, this.panel) && this.context.draggable !== this) {
 			this._onDidDrop.fire({ from: this.context.draggable.panel, to: this.panel });
 		}
 
@@ -319,8 +333,24 @@ class PanelDraggable implements IDisposable {
 	}
 }
 
-export class IPanelViewOptions {
-	dnd?: boolean;
+export interface IPanelDndController {
+	canDrag(panel: Panel): boolean;
+	canDrop(panel: Panel, overPanel: Panel): boolean;
+}
+
+export class DefaultPanelDndController implements IPanelDndController {
+
+	canDrag(panel: Panel): boolean {
+		return true;
+	}
+
+	canDrop(panel: Panel, overPanel: Panel): boolean {
+		return true;
+	}
+}
+
+export interface IPanelViewOptions {
+	dnd?: IPanelDndController;
 }
 
 interface IPanelItem {
@@ -330,7 +360,7 @@ interface IPanelItem {
 
 export class PanelView implements IDisposable {
 
-	private dnd: boolean;
+	private dnd: IPanelDndController | null;
 	private dndContext: IDndContext = { draggable: null };
 	private el: HTMLElement;
 	private panelItems: IPanelItem[] = [];
@@ -343,7 +373,7 @@ export class PanelView implements IDisposable {
 	readonly onDidSashChange: Event<void>;
 
 	constructor(container: HTMLElement, options: IPanelViewOptions = {}) {
-		this.dnd = !!options.dnd;
+		this.dnd = options.dnd;
 		this.el = append(container, $('.monaco-panel-view'));
 		this.splitview = new SplitView(this.el);
 		this.onDidSashChange = this.splitview.onDidSashChange;
@@ -358,7 +388,7 @@ export class PanelView implements IDisposable {
 		this.splitview.addView(panel, size, index);
 
 		if (this.dnd) {
-			const draggable = new PanelDraggable(panel, this.dndContext);
+			const draggable = new PanelDraggable(panel, this.dnd, this.dndContext);
 			disposables.push(draggable);
 			draggable.onDidDrop(this._onDidDrop.fire, this._onDidDrop, disposables);
 		}
diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index db1c64ffd53..cecc9f9831e 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -8,7 +8,6 @@
 import 'vs/css!./toolbar';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, ActionsOrientation, IActionItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuProvider, DropdownMenuActionItem } from 'vs/base/browser/ui/dropdown/dropdown';
@@ -45,7 +44,7 @@ export class ToolBar {
 		element.className = 'monaco-toolbar';
 		container.appendChild(element);
 
-		this.actionBar = new ActionBar($(element), {
+		this.actionBar = new ActionBar(element, {
 			orientation: options.orientation,
 			ariaLabel: options.ariaLabel,
 			actionRunner: options.actionRunner,
@@ -94,10 +93,18 @@ export class ToolBar {
 		}
 	}
 
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.actionBar.getContainer();
 	}
 
+	public getItemsWidth(): number {
+		let itemsWidth = 0;
+		for (let i = 0; i < this.actionBar.length(); i++) {
+			itemsWidth += this.actionBar.getWidth(i);
+		}
+		return itemsWidth;
+	}
+
 	public setAriaLabel(label: string): void {
 		this.actionBar.setAriaLabel(label);
 	}
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index bb304be3def..2dad9022f32 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -53,7 +53,7 @@ export function binarySearch<T>(array: T[], key: T, comparator: (op1: T, op2: T)
  * are located before all elements where p(x) is true.
  * @returns the least x for which p(x) is true or array.length if no element fullfills the given function.
  */
-export function findFirst<T>(array: T[], p: (x: T) => boolean): number {
+export function findFirstInSorted<T>(array: T[], p: (x: T) => boolean): number {
 	let low = 0, high = array.length;
 	if (high === 0) {
 		return 0; // no children
@@ -267,7 +267,7 @@ function topStep<T>(array: T[], compare: (a: T, b: T) => number, result: T[], i:
 		const element = array[i];
 		if (compare(element, result[n - 1]) < 0) {
 			result.pop();
-			const j = findFirst(result, e => compare(element, e) < 0);
+			const j = findFirstInSorted(result, e => compare(element, e) < 0);
 			result.splice(j, 0, element);
 		}
 	}
diff --git a/src/vs/base/common/decorators.ts b/src/vs/base/common/decorators.ts
index 33ea5f02dab..719407fe245 100644
--- a/src/vs/base/common/decorators.ts
+++ b/src/vs/base/common/decorators.ts
@@ -62,13 +62,27 @@ export function memoize(target: any, key: string, descriptor: any) {
 	};
 }
 
-export function debounce(delay: number): Function {
+export interface IDebouceReducer<T> {
+	(previousValue: T, ...args: any[]): T;
+}
+
+export function debounce<T>(delay: number, reducer?: IDebouceReducer<T>, initialValueProvider?: () => T): Function {
 	return createDecorator((fn, key) => {
 		const timerKey = `$debounce$${key}`;
+		let result = initialValueProvider ? initialValueProvider() : void 0;
 
 		return function (this: any, ...args: any[]) {
 			clearTimeout(this[timerKey]);
-			this[timerKey] = setTimeout(() => fn.apply(this, args), delay);
+
+			if (reducer) {
+				result = reducer(result, ...args);
+				args = [result];
+			}
+
+			this[timerKey] = setTimeout(() => {
+				fn.apply(this, args);
+				result = initialValueProvider ? initialValueProvider() : void 0;
+			}, delay);
 		};
 	});
 }
\ No newline at end of file
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 53a3ce824a1..060b728bcc6 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -279,7 +279,7 @@ export function debounceEvent<I, O>(event: Event<I>, merger: (last: O, event: I)
 
 	let subscription: IDisposable;
 	let output: O = undefined;
-	let handle: number = undefined;
+	let handle: any = undefined;
 	let numDebouncedCalls = 0;
 
 	const emitter = new Emitter<O>({
@@ -365,6 +365,7 @@ export interface IChainableEvent<T> {
 	map<O>(fn: (i: T) => O): IChainableEvent<O>;
 	forEach(fn: (i: T) => void): IChainableEvent<T>;
 	filter(fn: (e: T) => boolean): IChainableEvent<T>;
+	latch(): IChainableEvent<T>;
 	on(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
 }
 
@@ -398,6 +399,10 @@ class ChainableEvent<T> implements IChainableEvent<T> {
 		return new ChainableEvent(filterEvent(this._event, fn));
 	}
 
+	latch(): IChainableEvent<T> {
+		return new ChainableEvent(latch(this._event));
+	}
+
 	on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) {
 		return this._event(listener, thisArgs, disposables);
 	}
diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 9c7dc2dc68d..b268681d0c3 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -50,7 +50,7 @@ function _matchesPrefix(ignoreCase: boolean, word: string, wordToMatchAgainst: s
 
 	let matches: boolean;
 	if (ignoreCase) {
-		matches = strings.beginsWithIgnoreCase(wordToMatchAgainst, word);
+		matches = strings.startsWithIgnoreCase(wordToMatchAgainst, word);
 	} else {
 		matches = wordToMatchAgainst.indexOf(word) === 0;
 	}
diff --git a/src/vs/base/common/keybindingLabels.ts b/src/vs/base/common/keybindingLabels.ts
index c9a7cec8e18..29916e201d4 100644
--- a/src/vs/base/common/keybindingLabels.ts
+++ b/src/vs/base/common/keybindingLabels.ts
@@ -54,10 +54,10 @@ export const UILabelProvider = new ModifierLabelProvider(
 		separator: '',
 	},
 	{
-		ctrlKey: nls.localize('ctrlKey', "Ctrl"),
-		shiftKey: nls.localize('shiftKey', "Shift"),
-		altKey: nls.localize('altKey', "Alt"),
-		metaKey: nls.localize('windowsKey', "Windows"),
+		ctrlKey: nls.localize({ key: 'ctrlKey', comment: ['This is the short form for the Control key on the keyboard'] }, "Ctrl"),
+		shiftKey: nls.localize({ key: 'shiftKey', comment: ['This is the short form for the Shift key on the keyboard'] }, "Shift"),
+		altKey: nls.localize({ key: 'altKey', comment: ['This is the short form for the Alt key on the keyboard'] }, "Alt"),
+		metaKey: nls.localize({ key: 'windowsKey', comment: ['This is the short form for the Windows key on the keyboard'] }, "Windows"),
 		separator: '+',
 	}
 );
@@ -67,17 +67,17 @@ export const UILabelProvider = new ModifierLabelProvider(
  */
 export const AriaLabelProvider = new ModifierLabelProvider(
 	{
-		ctrlKey: nls.localize('ctrlKey.long', "Control"),
-		shiftKey: nls.localize('shiftKey.long', "Shift"),
-		altKey: nls.localize('altKey.long', "Alt"),
-		metaKey: nls.localize('cmdKey.long', "Command"),
+		ctrlKey: nls.localize({ key: 'ctrlKey.long', comment: ['This is the long form for the Control key on the keyboard'] }, "Control"),
+		shiftKey: nls.localize({ key: 'shiftKey.long', comment: ['This is the long form for the Shift key on the keyboard'] }, "Shift"),
+		altKey: nls.localize({ key: 'altKey.long', comment: ['This is the long form for the Alt key on the keyboard'] }, "Alt"),
+		metaKey: nls.localize({ key: 'cmdKey.long', comment: ['This is the long form for the Command key on the keyboard'] }, "Command"),
 		separator: '+',
 	},
 	{
-		ctrlKey: nls.localize('ctrlKey.long', "Control"),
-		shiftKey: nls.localize('shiftKey.long', "Shift"),
-		altKey: nls.localize('altKey.long', "Alt"),
-		metaKey: nls.localize('windowsKey.long', "Windows"),
+		ctrlKey: nls.localize({ key: 'ctrlKey.long', comment: ['This is the long form for the Control key on the keyboard'] }, "Control"),
+		shiftKey: nls.localize({ key: 'shiftKey.long', comment: ['This is the long form for the Shift key on the keyboard'] }, "Shift"),
+		altKey: nls.localize({ key: 'altKey.long', comment: ['This is the long form for the Alt key on the keyboard'] }, "Alt"),
+		metaKey: nls.localize({ key: 'windowsKey.long', comment: ['This is the long form for the Windows key on the keyboard'] }, "Windows"),
 		separator: '+',
 	}
 );
diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts
index 10e06ed599d..ade3020fcdc 100644
--- a/src/vs/base/common/labels.ts
+++ b/src/vs/base/common/labels.ts
@@ -5,8 +5,8 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-import { nativeSep, normalize, isEqualOrParent, basename as pathsBasename, join } from 'vs/base/common/paths';
-import { endsWith, ltrim, equalsIgnoreCase } from 'vs/base/common/strings';
+import { nativeSep, normalize, basename as pathsBasename, join, sep } from 'vs/base/common/paths';
+import { endsWith, ltrim, equalsIgnoreCase, startsWithIgnoreCase, rtrim, startsWith } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
 import { isLinux, isWindows, isMacintosh } from 'vs/base/common/platform';
 
@@ -100,13 +100,22 @@ export function normalizeDriveLetter(path: string): string {
 	return path;
 }
 
+let normalizedUserHomeCached: { original: string; normalized: string } = Object.create(null);
 export function tildify(path: string, userHome: string): string {
-	if (isWindows || !path) {
-		return path; // unsupported on Windows
+	if (isWindows || !path || !userHome) {
+		return path; // unsupported
 	}
 
-	if (isEqualOrParent(path, userHome, !isLinux /* ignorecase */)) {
-		path = `~${path.substr(userHome.length)}`;
+	// Keep a normalized user home path as cache to prevent accumulated string creation
+	let normalizedUserHome = normalizedUserHomeCached.original === userHome ? normalizedUserHomeCached.normalized : void 0;
+	if (!normalizedUserHome) {
+		normalizedUserHome = `${rtrim(userHome, sep)}${sep}`;
+		normalizedUserHomeCached = { original: userHome, normalized: normalizedUserHome };
+	}
+
+	// Linux: case sensitive, macOS: case insensitive
+	if (isLinux ? startsWith(path, normalizedUserHome) : startsWithIgnoreCase(path, normalizedUserHome)) {
+		path = `~/${path.substr(normalizedUserHome.length)}`;
 	}
 
 	return path;
diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts
index 1cfda2446d3..55e4fa20e9a 100644
--- a/src/vs/base/common/map.ts
+++ b/src/vs/base/common/map.ts
@@ -368,10 +368,12 @@ export class TernarySearchTree<E> {
 
 export class ResourceMap<T> {
 
-	protected map: Map<string, T>;
+	protected readonly map: Map<string, T>;
+	protected readonly ignoreCase?: boolean;
 
-	constructor(private ignoreCase?: boolean) {
+	constructor() {
 		this.map = new Map<string, T>();
+		this.ignoreCase = false; // in the future this should be an uri-comparator
 	}
 
 	public set(resource: URI, value: T): void {
@@ -414,18 +416,10 @@ export class ResourceMap<T> {
 
 		return key;
 	}
-}
-
-export class StrictResourceMap<T> extends ResourceMap<T> {
-
-	constructor() {
-		super();
-	}
 
 	public keys(): URI[] {
-		return keys(this.map).map(key => URI.parse(key));
+		return keys(this.map).map(URI.parse);
 	}
-
 }
 
 // We should fold BoundedMap and LinkedMap. See https://github.com/Microsoft/vscode/issues/28496
@@ -743,6 +737,24 @@ export class LinkedMap<K, V> {
 			this._tail = item;
 		}
 	}
+
+	public toJSON(): [K, V][] {
+		const data: [K, V][] = [];
+
+		this.forEach((value, key) => {
+			data.push([key, value]);
+		});
+
+		return data;
+	}
+
+	public fromJSON(data: [K, V][]): void {
+		this.clear();
+
+		for (const [key, value] of data) {
+			this.set(key, value);
+		}
+	}
 }
 
 export class LRUCache<K, V> extends LinkedMap<K, V> {
diff --git a/src/vs/base/common/paths.ts b/src/vs/base/common/paths.ts
index e0e8f7c05ae..70c4b3ae231 100644
--- a/src/vs/base/common/paths.ts
+++ b/src/vs/base/common/paths.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { isWindows } from 'vs/base/common/platform';
-import { beginsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings';
+import { startsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings';
 import { CharCode } from 'vs/base/common/charCode';
 
 /**
@@ -340,7 +340,7 @@ export function isEqualOrParent(path: string, candidate: string, ignoreCase?: bo
 	}
 
 	if (ignoreCase) {
-		const beginsWith = beginsWithIgnoreCase(path, candidate);
+		const beginsWith = startsWithIgnoreCase(path, candidate);
 		if (!beginsWith) {
 			return false;
 		}
diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts
index 4e98c088bc9..0bb890d29bf 100644
--- a/src/vs/base/common/platform.ts
+++ b/src/vs/base/common/platform.ts
@@ -120,6 +120,20 @@ export const translationsConfigFile = _translationsConfigFile;
 const _globals = (typeof self === 'object' ? self : typeof global === 'object' ? global : {} as any);
 export const globals: any = _globals;
 
+let _setImmediate: (callback: (...args: any[]) => void) => number = null;
+export function setImmediate(callback: (...args: any[]) => void): number {
+	if (_setImmediate === null) {
+		if (globals.setImmediate) {
+			_setImmediate = globals.setImmediate.bind(globals);
+		} else if (typeof process !== 'undefined' && typeof process.nextTick === 'function') {
+			_setImmediate = process.nextTick.bind(process);
+		} else {
+			_setImmediate = globals.setTimeout.bind(globals);
+		}
+	}
+	return _setImmediate(callback);
+}
+
 export const enum OperatingSystem {
 	Windows = 1,
 	Macintosh = 2,
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index bbc5c6ca223..45814e12d24 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -9,12 +9,16 @@ import uri from 'vs/base/common/uri';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 
 export function basenameOrAuthority(resource: uri): string {
-	return paths.basename(resource.fsPath) || resource.authority;
+	return paths.basename(resource.path) || resource.authority;
 }
 
 export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean {
 	if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) {
-		return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase);
+		if (resource.scheme === 'file') {
+			return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase);
+		}
+
+		return paths.isEqualOrParent(resource.path, candidate.path, ignoreCase);
 	}
 
 	return false;
@@ -66,4 +70,4 @@ export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => ur
 	}
 
 	return distinctParents;
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
index f1eef60ca00..deeb3ae1f99 100644
--- a/src/vs/base/common/strings.ts
+++ b/src/vs/base/common/strings.ts
@@ -159,6 +159,10 @@ export function startsWith(haystack: string, needle: string): boolean {
 		return false;
 	}
 
+	if (haystack === needle) {
+		return true;
+	}
+
 	for (let i = 0; i < needle.length; i++) {
 		if (haystack[i] !== needle[i]) {
 			return false;
@@ -427,7 +431,7 @@ function doEqualsIgnoreCase(a: string, b: string, stopAt = a.length): boolean {
 	return true;
 }
 
-export function beginsWithIgnoreCase(str: string, candidate: string): boolean {
+export function startsWithIgnoreCase(str: string, candidate: string): boolean {
 	const candidateLength = candidate.length;
 	if (candidate.length > str.length) {
 		return false;
diff --git a/src/vs/base/common/winjs.polyfill.promise.ts b/src/vs/base/common/winjs.polyfill.promise.ts
index 2b6483ae28b..6ebd06ea511 100644
--- a/src/vs/base/common/winjs.polyfill.promise.ts
+++ b/src/vs/base/common/winjs.polyfill.promise.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Promise as WinJSPromise } from './winjs.base';
+import * as platform from 'vs/base/common/platform';
 
 /**
  * A polyfill for the native promises. The implementation is based on
@@ -53,13 +54,13 @@ export class PolyfillPromise<T = any> implements Promise<T> {
 					if (!initializing) {
 						resolve(value);
 					} else {
-						setImmediate(resolve, value);
+						platform.setImmediate(() => resolve(value));
 					}
 				}, function (err) {
 					if (!initializing) {
 						reject(err);
 					} else {
-						setImmediate(reject, err);
+						platform.setImmediate(() => reject(err));
 					}
 				});
 				initializing = false;
@@ -74,14 +75,14 @@ export class PolyfillPromise<T = any> implements Promise<T> {
 				if (!sync) {
 					onFulfilled(value);
 				} else {
-					setImmediate(onFulfilled, value);
+					platform.setImmediate(() => onFulfilled(value));
 				}
 			},
 			onRejected && function (err) {
 				if (!sync) {
-					onFulfilled(err);
+					onRejected(err);
 				} else {
-					setImmediate(onFulfilled, err);
+					platform.setImmediate(() => onRejected(err));
 				}
 			}
 		));
diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts
index 0099aac4956..dc70fcab127 100644
--- a/src/vs/base/common/worker/simpleWorker.ts
+++ b/src/vs/base/common/worker/simpleWorker.ts
@@ -116,7 +116,7 @@ class SimpleWorkerProtocol {
 		} catch (e) {
 			// nothing
 		}
-		if (!message.vsWorker) {
+		if (!message || !message.vsWorker) {
 			return;
 		}
 		if (this._workerId !== -1 && message.vsWorker !== this._workerId) {
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index a84cec1f952..a600eb25bc3 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -10,12 +10,101 @@ import * as iconv from 'iconv-lite';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { isLinux, isMacintosh } from 'vs/base/common/platform';
 import { exec } from 'child_process';
+import { Readable, Writable, WritableOptions } from 'stream';
 
 export const UTF8 = 'utf8';
 export const UTF8_with_bom = 'utf8bom';
 export const UTF16be = 'utf16be';
 export const UTF16le = 'utf16le';
 
+export interface IDecodeStreamOptions {
+	guessEncoding?: boolean;
+	minBytesRequiredForDetection?: number;
+	overwriteEncoding?(detectedEncoding: string): string;
+}
+
+export function toDecodeStream(readable: Readable, options: IDecodeStreamOptions): Promise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }> {
+
+	if (!options.minBytesRequiredForDetection) {
+		options.minBytesRequiredForDetection = options.guessEncoding ? AUTO_GUESS_BUFFER_MAX_LEN : NO_GUESS_BUFFER_MAX_LEN;
+	}
+
+	if (!options.overwriteEncoding) {
+		options.overwriteEncoding = detected => detected || UTF8;
+	}
+
+	return new Promise<{ detected: IDetectedEncodingResult, stream: NodeJS.ReadableStream }>((resolve, reject) => {
+		readable.pipe(new class extends Writable {
+
+			private _decodeStream: NodeJS.ReadWriteStream;
+			private _decodeStreamConstruction: Thenable<any>;
+			private _buffer: Buffer[] = [];
+			private _bytesBuffered = 0;
+
+			constructor(opts?: WritableOptions) {
+				super(opts);
+				this.once('finish', () => this._finish());
+			}
+
+			_write(chunk: any, encoding: string, callback: Function): void {
+				if (!Buffer.isBuffer(chunk)) {
+					callback(new Error('data must be a buffer'));
+				}
+
+				if (this._decodeStream) {
+					// just a forwarder now
+					this._decodeStream.write(chunk, callback);
+					return;
+				}
+
+				this._buffer.push(chunk);
+				this._bytesBuffered += chunk.length;
+
+				if (this._decodeStreamConstruction) {
+					// waiting for the decoder to be ready
+					this._decodeStreamConstruction.then(_ => callback(), err => callback(err));
+
+				} else if (this._bytesBuffered >= options.minBytesRequiredForDetection) {
+					// buffered enough data, create stream and forward data
+					this._startDecodeStream(callback);
+
+				} else {
+					// only buffering
+					callback();
+				}
+			}
+
+			_startDecodeStream(callback: Function): void {
+
+				this._decodeStreamConstruction = Promise.resolve(detectEncodingFromBuffer({
+					buffer: Buffer.concat(this._buffer), bytesRead: this._bytesBuffered
+				}, options.guessEncoding)).then(detected => {
+					detected.encoding = options.overwriteEncoding(detected.encoding);
+					this._decodeStream = decodeStream(detected.encoding);
+					for (const buffer of this._buffer) {
+						this._decodeStream.write(buffer);
+					}
+					callback();
+					resolve({ detected, stream: this._decodeStream });
+
+				}, err => {
+					callback(err);
+				});
+			}
+
+			_finish(): void {
+				if (this._decodeStream) {
+					// normal finish
+					this._decodeStream.end();
+				} else {
+					// we were still waiting for data...
+					this._startDecodeStream(() => this._decodeStream.end());
+				}
+			}
+		});
+	});
+}
+
 export function bomLength(encoding: string): number {
 	switch (encoding) {
 		case UTF8:
@@ -172,6 +261,89 @@ export function toCanonicalName(enc: string): string {
 	}
 }
 
+const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512; // number of bytes to look at to decide about a file being binary or not
+const NO_GUESS_BUFFER_MAX_LEN = 512; 			// when not auto guessing the encoding, small number of bytes are enough
+const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; 		// with auto guessing we want a lot more content to be read for guessing
+
+export interface IDetectedEncodingResult {
+	encoding: string;
+	seemsBinary: boolean;
+}
+
+export interface DetectEncodingOption {
+	autoGuessEncoding?: boolean;
+}
+
+export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IDetectedEncodingResult;
+export function detectEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult>;
+export function detectEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IDetectedEncodingResult> | IDetectedEncodingResult {
+
+	// Always first check for BOM to find out about encoding
+	let encoding = detectEncodingByBOMFromBuffer(buffer, bytesRead);
+
+	// Detect 0 bytes to see if file is binary or UTF-16 LE/BE
+	// unless we already know that this file has a UTF-16 encoding
+	let seemsBinary = false;
+	if (encoding !== UTF16be && encoding !== UTF16le) {
+		let couldBeUTF16LE = true; // e.g. 0xAA 0x00
+		let couldBeUTF16BE = true; // e.g. 0x00 0xAA
+		let containsZeroByte = false;
+
+		// This is a simplified guess to detect UTF-16 BE or LE by just checking if
+		// the first 512 bytes have the 0-byte at a specific location. For UTF-16 LE
+		// this would be the odd byte index and for UTF-16 BE the even one.
+		// Note: this can produce false positives (a binary file that uses a 2-byte
+		// encoding of the same format as UTF-16) and false negatives (a UTF-16 file
+		// that is using 4 bytes to encode a character).
+		for (let i = 0; i < bytesRead && i < ZERO_BYTE_DETECTION_BUFFER_MAX_LEN; i++) {
+			const isEndian = (i % 2 === 1); // assume 2-byte sequences typical for UTF-16
+			const isZeroByte = (buffer.readInt8(i) === 0);
+
+			if (isZeroByte) {
+				containsZeroByte = true;
+			}
+
+			// UTF-16 LE: expect e.g. 0xAA 0x00
+			if (couldBeUTF16LE && (isEndian && !isZeroByte || !isEndian && isZeroByte)) {
+				couldBeUTF16LE = false;
+			}
+
+			// UTF-16 BE: expect e.g. 0x00 0xAA
+			if (couldBeUTF16BE && (isEndian && isZeroByte || !isEndian && !isZeroByte)) {
+				couldBeUTF16BE = false;
+			}
+
+			// Return if this is neither UTF16-LE nor UTF16-BE and thus treat as binary
+			if (isZeroByte && !couldBeUTF16LE && !couldBeUTF16BE) {
+				break;
+			}
+		}
+
+		// Handle case of 0-byte included
+		if (containsZeroByte) {
+			if (couldBeUTF16LE) {
+				encoding = UTF16le;
+			} else if (couldBeUTF16BE) {
+				encoding = UTF16be;
+			} else {
+				seemsBinary = true;
+			}
+		}
+	}
+
+	// Auto guess encoding if configured
+	if (autoGuessEncoding && !seemsBinary && !encoding) {
+		return guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(encoding => {
+			return {
+				seemsBinary: false,
+				encoding
+			};
+		});
+	}
+
+	return { seemsBinary, encoding };
+}
+
 // https://ss64.com/nt/chcp.html
 const windowsTerminalEncodings = {
 	'437': 'cp437', // United States
diff --git a/src/vs/base/node/mime.ts b/src/vs/base/node/mime.ts
deleted file mode 100644
index 1e38a4e02f3..00000000000
--- a/src/vs/base/node/mime.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as mime from 'vs/base/common/mime';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-import * as stream from 'vs/base/node/stream';
-import * as encoding from 'vs/base/node/encoding';
-
-/**
- * Lots of binary file types exists where the type can be determined by matching the first few bytes against some "magic patterns".
- * E.g. PDF files always start with %PDF- and the rest of the file contains mostly text, but sometimes binary data (for fonts and images).
- * In order to detect these types correctly (and independently from the file's extension), the content base mime type detection must be performed
- * on any file, not only on text files.
- *
- * Here is the original mime type detection in pseudocode:
- *
- * let mimes = [];
- *
- * read file extension
- *
- * if (file extension matches) {
- * 	if (file extension is bogus) {
- * 		// ignore.
- * 		// this covers *.manifest files which can contain arbitrary content, so the extension is of no value.
- * 		// a consequence of this is that the content based mime type becomes the most specific type in the array
- * 	} else {
- * 		mimes.push(associated mime type)	  // first element: most specific
- * 	}
- * }
- *
- * read file contents
- *
- * if (content based match found) {	// this is independent from text or binary
- * 	mimes.push(associated mime type)
- * 	if (a second mime exists for the match) {   // should be rare; text/plain should never be included here
- * 		// e.g. for svg: ['image/svg+xml', 'application/xml']
- * 		mimes.push(second mime)
- * 	}
- * }
- *
- * if (content == text)
- * 	mimes.push('text/plain')   // last element: least specific
- * else
- * 	mimes.push('application/octet-stream')    // last element: least specific
- */
-
-const ZERO_BYTE_DETECTION_BUFFER_MAX_LEN = 512; // number of bytes to look at to decide about a file being binary or not
-
-const NO_GUESS_BUFFER_MAX_LEN = 512; 		// when not auto guessing the encoding, small number of bytes are enough
-const AUTO_GUESS_BUFFER_MAX_LEN = 512 * 8; // with auto guessing we want a lot more content to be read for guessing
-
-export function maxBufferLen(arg1?: DetectMimesOption | boolean): number {
-	let autoGuessEncoding: boolean;
-	if (typeof arg1 === 'boolean') {
-		autoGuessEncoding = arg1;
-	} else {
-		autoGuessEncoding = arg1 && arg1.autoGuessEncoding;
-	}
-
-	return autoGuessEncoding ? AUTO_GUESS_BUFFER_MAX_LEN : NO_GUESS_BUFFER_MAX_LEN;
-}
-
-export interface IMimeAndEncoding {
-	encoding: string;
-	mimes: string[];
-}
-
-export interface DetectMimesOption {
-	autoGuessEncoding?: boolean;
-}
-
-export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: false): IMimeAndEncoding;
-export function detectMimeAndEncodingFromBuffer(readResult: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding>;
-export function detectMimeAndEncodingFromBuffer({ buffer, bytesRead }: stream.ReadResult, autoGuessEncoding?: boolean): TPromise<IMimeAndEncoding> | IMimeAndEncoding {
-	let enc = encoding.detectEncodingByBOMFromBuffer(buffer, bytesRead);
-
-	// Detect 0 bytes to see if file is binary (ignore for UTF 16 though)
-	let isText = true;
-	if (enc !== encoding.UTF16be && enc !== encoding.UTF16le) {
-		for (let i = 0; i < bytesRead && i < ZERO_BYTE_DETECTION_BUFFER_MAX_LEN; i++) {
-			if (buffer.readInt8(i) === 0) {
-				isText = false;
-				break;
-			}
-		}
-	}
-
-	if (autoGuessEncoding && isText && !enc) {
-		return encoding.guessEncodingByBuffer(buffer.slice(0, bytesRead)).then(enc => {
-			return {
-				mimes: isText ? [mime.MIME_TEXT] : [mime.MIME_BINARY],
-				encoding: enc
-			};
-		});
-	}
-
-	return {
-		mimes: isText ? [mime.MIME_TEXT] : [mime.MIME_BINARY],
-		encoding: enc
-	};
-}
\ No newline at end of file
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index 14900a32bff..42e7a5447a6 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -82,12 +82,6 @@ export function readlink(path: string): TPromise<string> {
 	return nfcall<string>(fs.readlink, path);
 }
 
-export function touch(path: string): TPromise<void> {
-	const now = Date.now() / 1000; // the value should be a Unix timestamp in seconds
-
-	return nfcall(fs.utimes, path, now, now);
-}
-
 export function truncate(path: string, len: number): TPromise<void> {
 	return nfcall(fs.truncate, path, len);
 }
diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index 8c351239652..38f414b2ffa 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -153,7 +153,7 @@ export abstract class AbstractProcess<TProgressData> {
 
 	public start(): PPromise<SuccessData, TProgressData> {
 		if (Platform.isWindows && ((this.options && this.options.cwd && TPath.isUNC(this.options.cwd)) || !this.options && !this.options.cwd && TPath.isUNC(process.cwd()))) {
-			return TPromise.wrapError(new Error(nls.localize('TaskRunner.UNC', 'Can\'t execute a shell command on an UNC drive.')));
+			return TPromise.wrapError(new Error(nls.localize('TaskRunner.UNC', 'Can\'t execute a shell command on a UNC drive.')));
 		}
 		return this.useExec().then((useExec) => {
 			let cc: TValueCallback<SuccessData>;
@@ -381,7 +381,7 @@ export interface IQueuedSender {
 // queue is free again to consume messages.
 // On Windows we always wait for the send() method to return before sending the next message
 // to workaround https://github.com/nodejs/node/issues/7657 (IPC can freeze process)
-export function createQueuedSender(childProcess: cp.ChildProcess | NodeJS.Process): IQueuedSender {
+export function createQueuedSender(childProcess: cp.ChildProcess): IQueuedSender {
 	let msgQueue: string[] = [];
 	let useQueue = false;
 
diff --git a/src/vs/base/node/ps-win.ps1 b/src/vs/base/node/ps-win.ps1
deleted file mode 100644
index b98ad7b42c5..00000000000
--- a/src/vs/base/node/ps-win.ps1
+++ /dev/null
@@ -1,183 +0,0 @@
-################################################################################################
-#  Copyright (c) Microsoft Corporation. All rights reserved.
-#  Licensed under the MIT License. See License.txt in the project root for license information.
-################################################################################################
-
-Param(
-    [string]$ProcessName = "code.exe",
-	[int]$MaxSamples = 10
-)
-
-$processLength = "process(".Length
-
-function Get-MachineInfo {
-	$model = (Get-WmiObject -Class Win32_Processor).Name
-	$memory = (Get-WmiObject -Class Win32_PhysicalMemory | Measure-Object -Property Capacity -Sum).Sum / 1MB
-	$wmi_cs = Get-WmiObject -Class Win32_ComputerSystem
-	return @{
-		"type" = "machineInfo"
-		"model" = $model
-		"processors" = $wmi_cs.NumberOfProcessors
-		"logicalProcessors" = $wmi_cs.NumberOfLogicalProcessors
-		"totalMemory" = $memory
-
-	}
-}
-$machineInfo = Get-MachineInfo
-
-function Get-MachineState {
-	$proc = Get-WmiObject Win32_Processor
-	$os = Get-WmiObject win32_OperatingSystem
-	return @{
-		"type" = 'machineState'
-		"cpuLoad" = $proc.LoadPercentage
-		"handles" = (Get-Process | Measure-Object Handles -Sum).Sum
-		"memory" = @{
-			"total" = $os.TotalVisibleMemorySize
-			"free" = $os.FreePhysicalMemory
-			"swapTotal" = $os.TotalVirtualMemorySize
-			"swapFree" = $os.FreeVirtualMemory
-		}
-	}
-}
-$machineState = Get-MachineState
-
-$processId2CpuLoad = @{}
-function Get-PerformanceCounters ($logicalProcessors) {
-	$counterError
-	# In a first round we get the performance counters and the process ids.
-	$counters =  (Get-Counter ("\Process(*)\% Processor Time", "\Process(*)\ID Process") -ErrorAction SilentlyContinue).CounterSamples
-	$processKey2Id = @{}
-	foreach ($counter in $counters) {
-		if ($counter.Status -ne 0) {
-			continue
-		}
-		$path = $counter.path;
-		$segments = $path.Split("\");
-		$kind = $segments[4];
-		$processKey = $segments[3].Substring($processLength, $segments[3].Length - $processLength - 1)
-		if ($kind -eq "id process") {
-			$processKey2Id[$processKey] = [uint32]$counter.CookedValue
-		}
-	}
-	foreach ($counter in $counters) {
-		if ($counter.Status -ne 0) {
-			continue
-		}
-		$path = $counter.path;
-		$segments = $path.Split("\");
-		$kind = $segments[4];
-		$processKey = $segments[3].Substring($processLength, $segments[3].Length - $processLength - 1)
-		if ($kind -eq "% processor time") {
-			$array = New-Object double[] ($MaxSamples + 1)
-			$array[0] = ($counter.CookedValue / $logicalProcessors)
-			$processId = $processKey2Id[$processKey]
-			if ($processId) {
-				$processId2CpuLoad[$processId] = $array
-			}
-		}
-	}
-	# Now lets sample another 10 times but only the processor time
-	$samples = Get-Counter "\Process(*)\% Processor Time" -SampleInterval 1 -MaxSamples $MaxSamples -ErrorAction SilentlyContinue
-	for ($s = 0; $s -lt $samples.Count; $s++) {
-		$counters = $samples[$s].CounterSamples;
-		foreach ($counter in $counters) {
-			if ($counter.Status -ne 0) {
-				continue
-			}
-			$path = $counter.path;
-			$segments = $path.Split("\");
-			$processKey = $segments[3].Substring($processLength, $segments[3].Length - $processLength - 1)
-			$processKey = $processKey2Id[$processKey];
-			if ($processKey) {
-				$processId2CpuLoad[$processKey][$s + 1] = ($counter.CookedValue / $logicalProcessors)
-			}
-		}
-	}
-}
-Get-PerformanceCounters -logicalProcessors $machineInfo.logicalProcessors
-
-$topElements = New-Object PSObject[] $processId2CpuLoad.Keys.Count;
-$index = 0;
-foreach ($key in $processId2CpuLoad.Keys) {
-	$obj = [PSCustomObject]@{
-		ProcessId = $key
-		Load = ($processId2CpuLoad[$key] | Measure-Object -Sum).Sum / ($MaxSamples + 1)
-	}
-	$topElements[$index] = $obj
-	$index++
-}
-$topElements = $topElements | Sort-Object Load -Descending
-
-# Get all code processes
-$codeProcesses = @{}
-foreach ($item in Get-WmiObject Win32_Process -Filter "name = '$ProcessName'") {
-	$codeProcesses[$item.ProcessId] = $item
-}
-foreach ($item in Get-WmiObject Win32_Process -Filter "name = 'codeHelper.exe'") {
-	$codeProcesses[$item.ProcessId] = $item
-}
-$otherProcesses = @{}
-foreach ($item in Get-WmiObject Win32_Process -Filter "name Like '%'") {
-	if (!($codeProcesses.Contains($item.ProcessId))) {
-		$otherProcesses[$item.ProcessId] = $item
-	}
-}
-$modified = $false
-do {
-	$toDelete = @()
-	$modified = $false
-	foreach ($item in $otherProcesses.Values) {
-		if ($codeProcesses.Contains([uint32]$item.ParentProcessId)) {
-			$codeProcesses[$item.ProcessId] = $item;
-			$toDelete += $item
-		}
-	}
-	foreach ($item in $toDelete) {
-		$otherProcesses.Remove([uint32]$item.ProcessId)
-		$modified = $true
-	}
-} while ($modified)
-
-$result = New-Object PSObject[] (2 + [math]::Min(5, $topElements.Count) + $codeProcesses.Count)
-$result[0] = $machineInfo
-$result[1] = $machineState
-$index = 2;
-for($i = 0; $i -lt 5 -and $i -lt $topElements.Count; $i++) {
-	$element = $topElements[$i]
-	$item = $codeProcesses[[uint32]$element.ProcessId]
-	if (!$item) {
-		$item = $otherProcesses[[uint32]$element.ProcessId]
-	}
-	if ($item) {
-		$cpuLoad = $processId2CpuLoad[[uint32]$item.ProcessId] | % { [pscustomobject] $_ }
-		$result[$index] = [pscustomobject]@{
-			"type" = "topProcess"
-			"name"            = $item.Name
-			"processId"       = $item.ProcessId
-			"parentProcessId" = $item.ParentProcessId
-			"commandLine"     = $item.CommandLine
-			"handles"         = $item.HandleCount
-			"cpuLoad"         = $cpuLoad
-			"workingSetSize"  = $item.WorkingSetSize
-		}
-		$index++
-	}
-}
-foreach ($item in $codeProcesses.Values) {
-	# we need to convert this otherwise to JSON with create a value, count object and not an inline array
-	$cpuLoad = $processId2CpuLoad[[uint32]$item.ProcessId] | % { [pscustomobject] $_ }
-	$result[$index] = [pscustomobject]@{
-		"type"            = "processInfo"
-		"name"            = $item.Name
-		"processId"       = $item.ProcessId
-		"parentProcessId" = $item.ParentProcessId
-		"commandLine"     = $item.CommandLine
-		"handles"         = $item.HandleCount
-		"cpuLoad"         = $cpuLoad
-		"workingSetSize"  = $item.WorkingSetSize
-	}
-	$index++
-}
-
-$result | ConvertTo-Json -Depth 99
diff --git a/src/vs/base/node/ps.ts b/src/vs/base/node/ps.ts
index 9935e90db48..c47cbf189a8 100644
--- a/src/vs/base/node/ps.ts
+++ b/src/vs/base/node/ps.ts
@@ -5,10 +5,7 @@
 
 'use strict';
 
-import { spawn, exec } from 'child_process';
-import * as path from 'path';
-import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
+import { exec } from 'child_process';
 
 export interface ProcessItem {
 	name: string;
@@ -121,32 +118,6 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 
 		if (process.platform === 'win32') {
 
-			console.log(nls.localize('collecting', 'Collecting CPU and memory information. This might take a couple of seconds.'));
-
-			interface ProcessInfo {
-				type: 'processInfo';
-				name: string;
-				processId: number;
-				parentProcessId: number;
-				commandLine: string;
-				handles: number;
-				cpuLoad: number[];
-				workingSetSize: number;
-			}
-
-			interface TopProcess {
-				type: 'topProcess';
-				name: string;
-				processId: number;
-				parentProcessId: number;
-				commandLine: string;
-				handles: number;
-				cpuLoad: number[];
-				workingSetSize: number;
-			}
-
-			type Item = ProcessInfo | TopProcess;
-
 			const cleanUNCPrefix = (value: string): string => {
 				if (value.indexOf('\\\\?\\') === 0) {
 					return value.substr(4);
@@ -161,75 +132,45 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
 				}
 			};
 
-			const execMain = path.basename(process.execPath);
-			const script = URI.parse(require.toUrl('vs/base/node/ps-win.ps1')).fsPath;
-			const commandLine = `& {& '${script}' -ProcessName '${execMain}' -MaxSamples 3}`;
-			const cmd = spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', commandLine]);
-
-			let stdout = '';
-			let stderr = '';
-			cmd.stdout.on('data', data => {
-				stdout += data.toString();
-			});
-
-			cmd.stderr.on('data', data => {
-				stderr += data.toString();
-			});
-
-			cmd.on('exit', () => {
-				if (stderr.length > 0) {
-					reject(new Error(stderr));
-					return;
-				}
-				let processItems: Map<number, ProcessItem> = new Map();
-				try {
-					const items: Item[] = JSON.parse(stdout);
-					for (const item of items) {
-						if (item.type === 'processInfo') {
-							let load = 0;
-							if (item.cpuLoad) {
-								for (let value of item.cpuLoad) {
-									load += value;
-								}
-								load = load / item.cpuLoad.length;
-							} else {
-								load = -1;
-							}
-							let commandLine = cleanUNCPrefix(item.commandLine);
-							processItems.set(item.processId, {
+			(import('windows-process-tree')).then(windowsProcessTree => {
+				windowsProcessTree.getProcessList(rootPid, (processList) => {
+					windowsProcessTree.getProcessCpuUsage(processList, (completeProcessList) => {
+						const processItems: Map<number, ProcessItem> = new Map();
+						completeProcessList.forEach(process => {
+							const commandLine = cleanUNCPrefix(process.commandLine);
+							processItems.set(process.pid, {
 								name: findName(commandLine),
 								cmd: commandLine,
-								pid: item.processId,
-								ppid: item.parentProcessId,
-								load: load,
-								mem: item.workingSetSize
+								pid: process.pid,
+								ppid: process.ppid,
+								load: process.cpu,
+								mem: process.memory
 							});
-						}
-					}
-					rootItem = processItems.get(rootPid);
-					if (rootItem) {
-						processItems.forEach(item => {
-							let parent = processItems.get(item.ppid);
-							if (parent) {
-								if (!parent.children) {
-									parent.children = [];
+						});
+
+						rootItem = processItems.get(rootPid);
+						if (rootItem) {
+							processItems.forEach(item => {
+								let parent = processItems.get(item.ppid);
+								if (parent) {
+									if (!parent.children) {
+										parent.children = [];
+									}
+									parent.children.push(item);
 								}
-								parent.children.push(item);
-							}
-						});
-						processItems.forEach(item => {
-							if (item.children) {
-								item.children = item.children.sort((a, b) => a.pid - b.pid);
-							}
-						});
-						resolve(rootItem);
-					} else {
-						reject(new Error(`Root process ${rootPid} not found`));
-					}
-				} catch (error) {
-					console.log(stdout);
-					reject(error);
-				}
+							});
+
+							processItems.forEach(item => {
+								if (item.children) {
+									item.children = item.children.sort((a, b) => a.pid - b.pid);
+								}
+							});
+							resolve(rootItem);
+						} else {
+							reject(new Error(`Root process ${rootPid} not found`));
+						}
+					});
+				}, windowsProcessTree.ProcessDataFlag.CommandLine | windowsProcessTree.ProcessDataFlag.Memory);
 			});
 		} else {	// OS X & Linux
 
diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts
index b3d3a11f3e3..79a067db70e 100644
--- a/src/vs/base/node/request.ts
+++ b/src/vs/base/node/request.ts
@@ -96,7 +96,7 @@ export function request(options: IRequestOptions): TPromise<IRequestContext> {
 						stream = stream.pipe(createGunzip());
 					}
 
-					c({ res, stream });
+					c({ res, stream } as IRequestContext);
 				}
 			});
 
diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
index 9ffea7f4620..7561e28471f 100644
--- a/src/vs/base/node/zip.ts
+++ b/src/vs/base/node/zip.ts
@@ -5,7 +5,7 @@
 
 import * as nls from 'vs/nls';
 import * as path from 'path';
-import { createWriteStream } from 'fs';
+import { createWriteStream, WriteStream } from 'fs';
 import { Readable } from 'stream';
 import { nfcall, ninvoke, SimpleThrottler } from 'vs/base/common/async';
 import { mkdirp, rimraf } from 'vs/base/node/pfs';
@@ -26,10 +26,7 @@ interface IOptions {
 	sourcePathRegex: RegExp;
 }
 
-export enum ExtractErrorType {
-	Undefined,
-	CorruptZip
-}
+export type ExtractErrorType = 'CorruptZip' | 'Incomplete';
 
 export class ExtractError extends Error {
 
@@ -40,7 +37,7 @@ export class ExtractError extends Error {
 		let message = cause.message;
 
 		switch (type) {
-			case ExtractErrorType.CorruptZip: message = `Corrupt ZIP: ${message}`; break;
+			case 'CorruptZip': message = `Corrupt ZIP: ${message}`; break;
 		}
 
 		super(message);
@@ -58,12 +55,14 @@ function modeFromEntry(entry: Entry) {
 }
 
 function toExtractError(err: Error): ExtractError {
-	let type = ExtractErrorType.CorruptZip;
+	if (err instanceof ExtractError) {
+		return err;
+	}
 
-	console.log('WHAT');
+	let type: ExtractErrorType = void 0;
 
 	if (/end of central directory record signature not found/.test(err.message)) {
-		type = ExtractErrorType.CorruptZip;
+		type = 'CorruptZip';
 	}
 
 	return new ExtractError(type, err);
@@ -74,24 +73,43 @@ function extractEntry(stream: Readable, fileName: string, mode: number, targetPa
 	const targetDirName = path.join(targetPath, dirName);
 	const targetFileName = path.join(targetPath, fileName);
 
+	let istream: WriteStream;
 	return mkdirp(targetDirName).then(() => new TPromise((c, e) => {
-		let istream = createWriteStream(targetFileName, { mode });
+		istream = createWriteStream(targetFileName, { mode });
 		istream.once('close', () => c(null));
 		istream.once('error', e);
 		stream.once('error', e);
 		stream.pipe(istream);
+	}, () => {
+		if (istream) {
+			istream.close();
+		}
 	}));
 }
 
 function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): TPromise<void> {
+	let isCanceled = false;
+	let last = TPromise.wrap<any>(null);
+	let extractedEntriesCount = 0;
+
 	return new TPromise((c, e) => {
 		const throttler = new SimpleThrottler();
-		let last = TPromise.as<any>(null);
 
 		zipfile.once('error', e);
-		zipfile.once('close', () => last.then(c, e));
+		zipfile.once('close', () => last.then(() => {
+			if (isCanceled || zipfile.entryCount === extractedEntriesCount) {
+				c(null);
+			} else {
+				e(new ExtractError('Incomplete', new Error(nls.localize('incompleteExtract', "Incomplete. Extracted {0} of {1} entries", extractedEntriesCount, zipfile.entryCount))));
+			}
+		}, e));
 		zipfile.on('entry', (entry: Entry) => {
+			if (isCanceled) {
+				return;
+			}
+
 			if (!options.sourcePathRegex.test(entry.fileName)) {
+				extractedEntriesCount++;
 				return;
 			}
 
@@ -100,15 +118,19 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): TP
 			// directory file names end with '/'
 			if (/\/$/.test(fileName)) {
 				const targetFileName = path.join(targetPath, fileName);
-				last = mkdirp(targetFileName);
+				last = mkdirp(targetFileName).then(() => extractedEntriesCount++);
 				return;
 			}
 
 			const stream = ninvoke(zipfile, zipfile.openReadStream, entry);
 			const mode = modeFromEntry(entry);
 
-			last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options)));
+			last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options).then(() => extractedEntriesCount++)));
 		});
+	}, () => {
+		isCanceled = true;
+		last.cancel();
+		zipfile.close();
 	}).then(null, err => TPromise.wrapError(toExtractError(err)));
 }
 
diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts
index 97f8e5611c4..a3985361b63 100644
--- a/src/vs/base/parts/ipc/common/ipc.ts
+++ b/src/vs/base/parts/ipc/common/ipc.ts
@@ -152,7 +152,7 @@ export class ChannelServer implements IChannelServer, IDisposable {
 					id, data: {
 						message: data.message,
 						name: data.name,
-						stack: data.stack ? data.stack.split('\n') : void 0
+						stack: data.stack ? (data.stack.split ? data.stack.split('\n') : data.stack) : void 0
 					}, type: MessageType.ResponseError
 				});
 			} else {
diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
index 2c7e62ed4e9..53a84d50876 100644
--- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
@@ -12,8 +12,8 @@ import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
 import { IQuickNavigateConfiguration, IAutoFocus, IEntryRunContext, IModel, Mode, IKeyMods } from 'vs/base/parts/quickopen/common/quickOpen';
 import { Filter, Renderer, DataSource, IModelProvider, AccessibilityProvider } from 'vs/base/parts/quickopen/browser/quickOpenViewer';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import { ISelectionEvent, IFocusEvent, ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
+import { Builder, $ } from 'vs/base/browser/builder';
+import { ITree, ContextMenuEvent, IActionProvider, ITreeStyles, ITreeOptions, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
 import { InputBox, MessageType, IInputBoxStyles, IRange } from 'vs/base/browser/ui/inputbox/inputBox';
 import Severity from 'vs/base/common/severity';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
@@ -113,7 +113,7 @@ export class QuickOpenWidget implements IModelProvider {
 	private container: HTMLElement;
 	private treeElement: HTMLElement;
 	private inputElement: HTMLElement;
-	private layoutDimensions: Dimension;
+	private layoutDimensions: DOM.Dimension;
 	private model: IModel<any>;
 	private inputChangingTimeoutHandle: number;
 	private styles: IQuickOpenStyles;
@@ -130,8 +130,8 @@ export class QuickOpenWidget implements IModelProvider {
 		this.model = null;
 	}
 
-	public getElement(): Builder {
-		return $(this.builder);
+	public getElement(): HTMLElement {
+		return $(this.builder).getHTMLElement();
 	}
 
 	public getModel(): IModel<any> {
@@ -143,10 +143,10 @@ export class QuickOpenWidget implements IModelProvider {
 	}
 
 	public create(): HTMLElement {
-		this.builder = $().div((div: Builder) => {
+		this.builder = $().div(div => {
 
 			// Eventing
-			div.on(DOM.EventType.KEY_DOWN, (e) => {
+			div.on(DOM.EventType.KEY_DOWN, e => {
 				const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 				if (keyboardEvent.keyCode === KeyCode.Escape) {
 					DOM.EventHelper.stop(e, true);
@@ -160,10 +160,10 @@ export class QuickOpenWidget implements IModelProvider {
 
 			// Progress Bar
 			this.progressBar = new ProgressBar(div.clone(), { progressBarBackground: this.styles.progressBarBackground });
-			this.progressBar.getContainer().hide();
+			this.progressBar.hide();
 
 			// Input Field
-			div.div({ 'class': 'quick-open-input' }, (inputContainer) => {
+			div.div({ 'class': 'quick-open-input' }, inputContainer => {
 				this.inputContainer = inputContainer;
 				this.inputBox = new InputBox(inputContainer.getHTMLElement(), null, {
 					placeholder: this.options.inputPlaceHolder || '',
@@ -226,7 +226,7 @@ export class QuickOpenWidget implements IModelProvider {
 			// Tree
 			this.treeContainer = div.div({
 				'class': 'quick-open-tree'
-			}, (div: Builder) => {
+			}, div => {
 				const createTree = this.options.treeCreator || ((container, config, opts) => new Tree(container, config, opts));
 
 				this.tree = createTree(div.getHTMLElement(), {
@@ -249,11 +249,11 @@ export class QuickOpenWidget implements IModelProvider {
 				this.treeElement = this.tree.getHTMLElement();
 
 				// Handle Focus and Selection event
-				this.toUnbind.push(this.tree.onDidChangeFocus((event: IFocusEvent) => {
+				this.toUnbind.push(this.tree.onDidChangeFocus(event => {
 					this.elementFocused(event.focus, event);
 				}));
 
-				this.toUnbind.push(this.tree.onDidChangeSelection((event: ISelectionEvent) => {
+				this.toUnbind.push(this.tree.onDidChangeSelection(event => {
 					if (event.selection && event.selection.length > 0) {
 						const mouseEvent: StandardMouseEvent = event.payload && event.payload.originalEvent instanceof StandardMouseEvent ? event.payload.originalEvent : void 0;
 						const shouldOpenInBackground = mouseEvent ? this.shouldOpenInBackground(mouseEvent) : false;
@@ -262,7 +262,7 @@ export class QuickOpenWidget implements IModelProvider {
 					}
 				}));
 			}).
-				on(DOM.EventType.KEY_DOWN, (e) => {
+				on(DOM.EventType.KEY_DOWN, e => {
 					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 
 					// Only handle when in quick navigation mode
@@ -277,7 +277,7 @@ export class QuickOpenWidget implements IModelProvider {
 						this.navigateInTree(keyboardEvent.keyCode);
 					}
 				}).
-				on(DOM.EventType.KEY_UP, (e) => {
+				on(DOM.EventType.KEY_UP, e => {
 					const keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e as KeyboardEvent);
 					const keyCode = keyboardEvent.keyCode;
 
@@ -288,7 +288,7 @@ export class QuickOpenWidget implements IModelProvider {
 
 					// Select element when keys are pressed that signal it
 					const quickNavKeys = this.quickNavigateConfiguration.keybindings;
-					const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some((k) => {
+					const wasTriggerKeyPressed = keyCode === KeyCode.Enter || quickNavKeys.some(k => {
 						const [firstPart, chordPart] = k.getParts();
 						if (chordPart) {
 							return false;
@@ -780,7 +780,7 @@ export class QuickOpenWidget implements IModelProvider {
 		this.treeContainer.style({ height: (this.options.minItemsToShow ? this.options.minItemsToShow * 22 : 0) + 'px' });
 
 		// Clear any running Progress
-		this.progressBar.stop().getContainer().hide();
+		this.progressBar.stop().hide();
 
 		// Clear Focus
 		if (this.tree.isDOMFocused()) {
@@ -921,7 +921,7 @@ export class QuickOpenWidget implements IModelProvider {
 		return this.visible;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.layoutDimensions = dimension;
 
 		// Apply to quick open width (height is dynamic by number of items to show)
diff --git a/src/vs/base/parts/tree/browser/treeImpl.ts b/src/vs/base/parts/tree/browser/treeImpl.ts
index 42df25ee308..7821495d25d 100644
--- a/src/vs/base/parts/tree/browser/treeImpl.ts
+++ b/src/vs/base/parts/tree/browser/treeImpl.ts
@@ -122,8 +122,8 @@ export class Tree implements _.ITree {
 		return this.view.getHTMLElement();
 	}
 
-	public layout(height?: number): void {
-		this.view.layout(height);
+	public layout(height?: number, width?: number): void {
+		this.view.layout(height, width);
 	}
 
 	public domFocus(): void {
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index 024564b7faa..91e59737d7c 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -636,7 +636,7 @@ export class TreeView extends HeightMap {
 		return this.onHiddenScrollTop === null;
 	}
 
-	public layout(height?: number): void {
+	public layout(height?: number, width?: number): void {
 		if (!this.isTreeVisible()) {
 			return;
 		}
@@ -645,7 +645,7 @@ export class TreeView extends HeightMap {
 		this.scrollHeight = this.getContentHeight();
 
 		if (this.horizontalScrolling) {
-			this.viewWidth = DOM.getContentWidth(this.wrapper);
+			this.viewWidth = width || DOM.getContentWidth(this.wrapper);
 		}
 	}
 
@@ -1675,6 +1675,11 @@ export class TreeView extends HeightMap {
 		}
 		this.domNode = null;
 
+		if (this.items) {
+			Object.keys(this.items).forEach(key => this.items[key].removeFromDOM());
+			this.items = null;
+		}
+
 		if (this.context.cache) {
 			this.context.cache.dispose();
 			this.context.cache = null;
diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts
index 3760b3e0885..d46dff04c97 100644
--- a/src/vs/base/test/browser/builder.test.ts
+++ b/src/vs/base/test/browser/builder.test.ts
@@ -5,12 +5,25 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Build, Builder, MultiBuilder, $, bindElement, withElement, setPropertyOnElement, getPropertyFromElement } from 'vs/base/browser/builder';
+import { Builder, MultiBuilder, $, bindElement, withElement, setPropertyOnElement, getPropertyFromElement } from 'vs/base/browser/builder';
 import * as Types from 'vs/base/common/types';
 import * as DomUtils from 'vs/base/browser/dom';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { timeout } from 'vs/base/common/async';
 
+function withElementById(id: string, offdom?: boolean): Builder {
+	let element = document.getElementById(id);
+	if (element) {
+		return new Builder(element, offdom);
+	}
+
+	return null;
+}
+
+const Build = {
+	withElementById: withElementById
+};
+
 let withElementsBySelector = function (selector: string, offdom: boolean = false) {
 	let elements = window.document.querySelectorAll(selector);
 
@@ -623,7 +636,6 @@ suite('Builder', () => {
 		assert(!b.isHidden());
 		b.hide();
 		assert(b.isHidden());
-		assert(!b.hasClass('monaco-builder-visible'));
 		b.show();
 		b.hide();
 		assert(b.hasClass('monaco-builder-hidden'));
diff --git a/src/vs/base/test/browser/progressBar.test.ts b/src/vs/base/test/browser/progressBar.test.ts
index 3d4423ac1ef..00e7b2e487b 100644
--- a/src/vs/base/test/browser/progressBar.test.ts
+++ b/src/vs/base/test/browser/progressBar.test.ts
@@ -6,7 +6,6 @@
 
 import * as assert from 'assert';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
-import { Builder } from 'vs/base/browser/builder';
 
 suite('ProgressBar', () => {
 	let fixture: HTMLElement;
@@ -21,10 +20,7 @@ suite('ProgressBar', () => {
 	});
 
 	test('Progress Bar', function () {
-		const b = new Builder(fixture);
-
-		const bar = new ProgressBar(b);
-		assert(bar.getContainer());
+		const bar = new ProgressBar(fixture);
 		assert(bar.infinite());
 		assert(bar.total(100));
 		assert(bar.worked(50));
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index e05fed736e1..3a8126f0bf2 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -12,25 +12,25 @@ suite('Arrays', () => {
 	test('findFirst', function () {
 		const array = [1, 4, 5, 7, 55, 59, 60, 61, 64, 69];
 
-		let idx = arrays.findFirst(array, e => e >= 0);
+		let idx = arrays.findFirstInSorted(array, e => e >= 0);
 		assert.equal(array[idx], 1);
 
-		idx = arrays.findFirst(array, e => e > 1);
+		idx = arrays.findFirstInSorted(array, e => e > 1);
 		assert.equal(array[idx], 4);
 
-		idx = arrays.findFirst(array, e => e >= 8);
+		idx = arrays.findFirstInSorted(array, e => e >= 8);
 		assert.equal(array[idx], 55);
 
-		idx = arrays.findFirst(array, e => e >= 61);
+		idx = arrays.findFirstInSorted(array, e => e >= 61);
 		assert.equal(array[idx], 61);
 
-		idx = arrays.findFirst(array, e => e >= 69);
+		idx = arrays.findFirstInSorted(array, e => e >= 69);
 		assert.equal(array[idx], 69);
 
-		idx = arrays.findFirst(array, e => e >= 70);
+		idx = arrays.findFirstInSorted(array, e => e >= 70);
 		assert.equal(idx, array.length);
 
-		idx = arrays.findFirst([], e => e >= 0);
+		idx = arrays.findFirstInSorted([], e => e >= 0);
 		assert.equal(array[idx], 1);
 	});
 
@@ -75,7 +75,7 @@ suite('Arrays', () => {
 			for (let i = 1; i < array.length; i++) {
 				let n = array[i];
 				if (last > n) {
-					assert.fail(array.slice(i - 10, i + 10));
+					assert.fail(JSON.stringify(array.slice(i - 10, i + 10)));
 				}
 			}
 		}
diff --git a/src/vs/base/test/common/cache.test.ts b/src/vs/base/test/common/cache.test.ts
index 521c59b3375..c7bab09abd0 100644
--- a/src/vs/base/test/common/cache.test.ts
+++ b/src/vs/base/test/common/cache.test.ts
@@ -16,9 +16,9 @@ suite('Cache', () => {
 		const cache = new Cache(() => TPromise.as(counter++));
 
 		return cache.get()
-			.then(c => assert.equal(c, 0), () => assert.fail())
+			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'))
 			.then(() => cache.get())
-			.then(c => assert.equal(c, 0), () => assert.fail());
+			.then(c => assert.equal(c, 0), () => assert.fail('Unexpected assertion error'));
 	});
 
 	test('simple error', () => {
@@ -26,9 +26,9 @@ suite('Cache', () => {
 		const cache = new Cache(() => TPromise.wrapError(new Error(String(counter++))));
 
 		return cache.get()
-			.then(() => assert.fail(), err => assert.equal(err.message, 0))
+			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0))
 			.then(() => cache.get())
-			.then(() => assert.fail(), err => assert.equal(err.message, 0));
+			.then(() => assert.fail('Unexpected assertion error'), err => assert.equal(err.message, 0));
 	});
 
 	test('should retry cancellations', () => {
diff --git a/src/vs/base/test/common/map.test.ts b/src/vs/base/test/common/map.test.ts
index 11420c395e3..33924f78f72 100644
--- a/src/vs/base/test/common/map.test.ts
+++ b/src/vs/base/test/common/map.test.ts
@@ -200,6 +200,33 @@ suite('Map', () => {
 		assert.deepStrictEqual(cache.values(), values);
 	});
 
+	test('LinkedMap - toJSON / fromJSON', () => {
+		let map = new LinkedMap<string, string>();
+		map.set('ak', 'av');
+		map.set('bk', 'bv');
+		map.set('ck', 'cv');
+
+		const json = map.toJSON();
+		map = new LinkedMap<string, string>();
+		map.fromJSON(json);
+
+		let i = 0;
+		map.forEach((value, key) => {
+			if (i === 0) {
+				assert.equal(key, 'ak');
+				assert.equal(value, 'av');
+			} else if (i === 1) {
+				assert.equal(key, 'bk');
+				assert.equal(value, 'bv');
+			} else if (i === 2) {
+				assert.equal(key, 'ck');
+				assert.equal(value, 'cv');
+			}
+
+			i++;
+		});
+	});
+
 	test('PathIterator', function () {
 		const iter = new PathIterator();
 		iter.reset('file:///usr/bin/file.txt');
@@ -517,32 +544,32 @@ suite('Map', () => {
 		assert.equal(map.get(uncFile), 'true');
 	});
 
-	test('ResourceMap - files (ignorecase)', function () {
-		const map = new ResourceMap<any>(true);
+	// test('ResourceMap - files (ignorecase)', function () {
+	// 	const map = new ResourceMap<any>(true);
 
-		const fileA = URI.parse('file://some/filea');
-		const fileB = URI.parse('some://some/other/fileb');
-		const fileAUpper = URI.parse('file://SOME/FILEA');
+	// 	const fileA = URI.parse('file://some/filea');
+	// 	const fileB = URI.parse('some://some/other/fileb');
+	// 	const fileAUpper = URI.parse('file://SOME/FILEA');
 
-		map.set(fileA, 'true');
-		assert.equal(map.get(fileA), 'true');
+	// 	map.set(fileA, 'true');
+	// 	assert.equal(map.get(fileA), 'true');
 
-		assert.equal(map.get(fileAUpper), 'true');
+	// 	assert.equal(map.get(fileAUpper), 'true');
 
-		assert.ok(!map.get(fileB));
+	// 	assert.ok(!map.get(fileB));
 
-		map.set(fileAUpper, 'false');
-		assert.equal(map.get(fileAUpper), 'false');
+	// 	map.set(fileAUpper, 'false');
+	// 	assert.equal(map.get(fileAUpper), 'false');
 
-		assert.equal(map.get(fileA), 'false');
+	// 	assert.equal(map.get(fileA), 'false');
 
-		const windowsFile = URI.file('c:\\test with %25\\c#code');
-		const uncFile = URI.file('\\\\shäres\\path\\c#\\plugin.json');
+	// 	const windowsFile = URI.file('c:\\test with %25\\c#code');
+	// 	const uncFile = URI.file('\\\\shäres\\path\\c#\\plugin.json');
 
-		map.set(windowsFile, 'true');
-		map.set(uncFile, 'true');
+	// 	map.set(windowsFile, 'true');
+	// 	map.set(uncFile, 'true');
 
-		assert.equal(map.get(windowsFile), 'true');
-		assert.equal(map.get(uncFile), 'true');
-	});
+	// 	assert.equal(map.get(windowsFile), 'true');
+	// 	assert.equal(map.get(uncFile), 'true');
+	// });
 });
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index 4db726aae72..295c3adb50a 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -21,29 +21,29 @@ suite('Strings', () => {
 	});
 
 	test('beginsWithIgnoreCase', function () {
-		assert(strings.beginsWithIgnoreCase('', ''));
-		assert(!strings.beginsWithIgnoreCase('', '1'));
-		assert(strings.beginsWithIgnoreCase('1', ''));
+		assert(strings.startsWithIgnoreCase('', ''));
+		assert(!strings.startsWithIgnoreCase('', '1'));
+		assert(strings.startsWithIgnoreCase('1', ''));
 
-		assert(strings.beginsWithIgnoreCase('a', 'a'));
-		assert(strings.beginsWithIgnoreCase('abc', 'Abc'));
-		assert(strings.beginsWithIgnoreCase('abc', 'ABC'));
-		assert(strings.beginsWithIgnoreCase('Höhenmeter', 'HÖhenmeter'));
-		assert(strings.beginsWithIgnoreCase('ÖL', 'Öl'));
+		assert(strings.startsWithIgnoreCase('a', 'a'));
+		assert(strings.startsWithIgnoreCase('abc', 'Abc'));
+		assert(strings.startsWithIgnoreCase('abc', 'ABC'));
+		assert(strings.startsWithIgnoreCase('Höhenmeter', 'HÖhenmeter'));
+		assert(strings.startsWithIgnoreCase('ÖL', 'Öl'));
 
-		assert(strings.beginsWithIgnoreCase('alles klar', 'a'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'A'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'alles k'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'alles K'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'ALLES K'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'alles klar'));
-		assert(strings.beginsWithIgnoreCase('alles klar', 'ALLES KLAR'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'a'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'A'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'alles k'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'alles K'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'ALLES K'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'alles klar'));
+		assert(strings.startsWithIgnoreCase('alles klar', 'ALLES KLAR'));
 
-		assert(!strings.beginsWithIgnoreCase('alles klar', ' ALLES K'));
-		assert(!strings.beginsWithIgnoreCase('alles klar', 'ALLES K '));
-		assert(!strings.beginsWithIgnoreCase('alles klar', 'öALLES K '));
-		assert(!strings.beginsWithIgnoreCase('alles klar', ' '));
-		assert(!strings.beginsWithIgnoreCase('alles klar', 'ö'));
+		assert(!strings.startsWithIgnoreCase('alles klar', ' ALLES K'));
+		assert(!strings.startsWithIgnoreCase('alles klar', 'ALLES K '));
+		assert(!strings.startsWithIgnoreCase('alles klar', 'öALLES K '));
+		assert(!strings.startsWithIgnoreCase('alles klar', ' '));
+		assert(!strings.startsWithIgnoreCase('alles klar', 'ö'));
 	});
 
 	test('compareIgnoreCase', function () {
diff --git a/src/vs/base/test/node/encoding/encoding.test.ts b/src/vs/base/test/node/encoding/encoding.test.ts
index d5fc48bf381..252ee281e37 100644
--- a/src/vs/base/test/node/encoding/encoding.test.ts
+++ b/src/vs/base/test/node/encoding/encoding.test.ts
@@ -6,8 +6,10 @@
 'use strict';
 
 import * as assert from 'assert';
-
+import * as fs from 'fs';
 import * as encoding from 'vs/base/node/encoding';
+import { readExactlyByFile } from 'vs/base/node/stream';
+import { Readable } from 'stream';
 
 suite('Encoding', () => {
 	test('detectBOM UTF-8', () => {
@@ -64,4 +66,200 @@ suite('Encoding', () => {
 			assert.equal(enc, 'utf16le');
 		});
 	});
+
+	test('detectEncodingFromBuffer (JSON saved as PNG)', function () {
+		const file = require.toUrl('./fixtures/some.json.png');
+
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (PNG saved as TXT)', function () {
+		const file = require.toUrl('./fixtures/some.png.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (XML saved as PNG)', function () {
+		const file = require.toUrl('./fixtures/some.xml.png');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (QWOFF saved as TXT)', function () {
+		const file = require.toUrl('./fixtures/some.qwoff.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (CSS saved as QWOFF)', function () {
+		const file = require.toUrl('./fixtures/some.css.qwoff');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (PDF)', function () {
+		const file = require.toUrl('./fixtures/some.pdf');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.seemsBinary, true);
+		});
+	});
+
+	test('detectEncodingFromBuffer (guess UTF-16 LE from content without BOM)', function () {
+		const file = require.toUrl('./fixtures/utf16_le_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, encoding.UTF16le);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('detectEncodingFromBuffer (guess UTF-16 BE from content without BOM)', function () {
+		const file = require.toUrl('./fixtures/utf16_be_nobom.txt');
+		return readExactlyByFile(file, 512).then(buffer => {
+			const mimes = encoding.detectEncodingFromBuffer(buffer);
+			assert.equal(mimes.encoding, encoding.UTF16be);
+			assert.equal(mimes.seemsBinary, false);
+		});
+	});
+
+	test('autoGuessEncoding (ShiftJIS)', function () {
+		const file = require.toUrl('./fixtures/some.shiftjis.txt');
+		return readExactlyByFile(file, 512 * 8).then(buffer => {
+			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
+				assert.equal(mimes.encoding, 'shiftjis');
+			});
+		});
+	});
+
+	test('autoGuessEncoding (CP1252)', function () {
+		const file = require.toUrl('./fixtures/some.cp1252.txt');
+		return readExactlyByFile(file, 512 * 8).then(buffer => {
+			return encoding.detectEncodingFromBuffer(buffer, true).then(mimes => {
+				assert.equal(mimes.encoding, 'windows1252');
+			});
+		});
+	});
+
+	async function readAndDecodeFromDisk(path, _encoding) {
+		return new Promise<string>((resolve, reject) => {
+			fs.readFile(path, (err, data) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(encoding.decode(data, _encoding));
+				}
+			});
+		});
+	}
+
+	async function readAllAsString(stream: NodeJS.ReadableStream) {
+		return new Promise<string>((resolve, reject) => {
+			let all = '';
+			stream.on('data', chunk => {
+				all += chunk;
+				assert.equal(typeof chunk, 'string');
+			});
+			stream.on('end', () => {
+				resolve(all);
+			});
+			stream.on('error', reject);
+		});
+	}
+
+	test('toDecodeStream - some stream', async function () {
+
+		let source = new Readable({
+			read(size) {
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(null);
+			}
+		});
+
+		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 4 });
+
+		assert.ok(detected);
+		assert.ok(stream);
+
+		const content = await readAllAsString(stream);
+		assert.equal(content, 'ABCABCABC');
+	});
+
+	test('toDecodeStream - some stream, expect too much data', async function () {
+
+		let source = new Readable({
+			read(size) {
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(Buffer.from([65, 66, 67]));
+				this.push(null);
+			}
+		});
+
+		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64 });
+
+		assert.ok(detected);
+		assert.ok(stream);
+
+		const content = await readAllAsString(stream);
+		assert.equal(content, 'ABCABCABC');
+	});
+
+	test('toDecodeStream - some stream, no data', async function () {
+
+		let source = new Readable({
+			read(size) {
+				this.push(null); // empty
+			}
+		});
+
+		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 512 });
+
+		assert.ok(detected);
+		assert.ok(stream);
+
+		const content = await readAllAsString(stream);
+		assert.equal(content, '');
+	});
+
+
+	test('toDecodeStream - encoding, utf16be', async function () {
+
+		let path = require.toUrl('./fixtures/some_utf16be.css');
+		let source = fs.createReadStream(path);
+
+		let { detected, stream } = await encoding.toDecodeStream(source, { minBytesRequiredForDetection: 64 });
+
+		assert.equal(detected.encoding, 'utf16be');
+		assert.equal(detected.seemsBinary, false);
+
+		let expected = await readAndDecodeFromDisk(path, detected.encoding);
+		let actual = await readAllAsString(stream);
+		assert.equal(actual, expected);
+	});
+
+
+	test('toDecodeStream - empty file', async function () {
+
+		let path = require.toUrl('./fixtures/empty.txt');
+		let source = fs.createReadStream(path);
+		let { detected, stream } = await encoding.toDecodeStream(source, {});
+
+		let expected = await readAndDecodeFromDisk(path, detected.encoding);
+		let actual = await readAllAsString(stream);
+		assert.equal(actual, expected);
+	});
 });
diff --git a/src/vs/base/test/node/mime/fixtures/some.cp1252.txt b/src/vs/base/test/node/encoding/fixtures/some.cp1252.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.cp1252.txt
rename to src/vs/base/test/node/encoding/fixtures/some.cp1252.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.css.qwoff b/src/vs/base/test/node/encoding/fixtures/some.css.qwoff
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.css.qwoff
rename to src/vs/base/test/node/encoding/fixtures/some.css.qwoff
diff --git a/src/vs/base/test/node/mime/fixtures/some.json.png b/src/vs/base/test/node/encoding/fixtures/some.json.png
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.json.png
rename to src/vs/base/test/node/encoding/fixtures/some.json.png
diff --git a/src/vs/base/test/node/mime/fixtures/some.pdf b/src/vs/base/test/node/encoding/fixtures/some.pdf
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.pdf
rename to src/vs/base/test/node/encoding/fixtures/some.pdf
diff --git a/src/vs/base/test/node/mime/fixtures/some.png.txt b/src/vs/base/test/node/encoding/fixtures/some.png.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.png.txt
rename to src/vs/base/test/node/encoding/fixtures/some.png.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.qwoff.txt b/src/vs/base/test/node/encoding/fixtures/some.qwoff.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.qwoff.txt
rename to src/vs/base/test/node/encoding/fixtures/some.qwoff.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.shiftjis.txt b/src/vs/base/test/node/encoding/fixtures/some.shiftjis.txt
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.shiftjis.txt
rename to src/vs/base/test/node/encoding/fixtures/some.shiftjis.txt
diff --git a/src/vs/base/test/node/mime/fixtures/some.xml.png b/src/vs/base/test/node/encoding/fixtures/some.xml.png
similarity index 100%
rename from src/vs/base/test/node/mime/fixtures/some.xml.png
rename to src/vs/base/test/node/encoding/fixtures/some.xml.png
diff --git a/src/vs/base/test/node/encoding/fixtures/utf16_be_nobom.txt b/src/vs/base/test/node/encoding/fixtures/utf16_be_nobom.txt
new file mode 100644
index 00000000000..63c29412093
Binary files /dev/null and b/src/vs/base/test/node/encoding/fixtures/utf16_be_nobom.txt differ
diff --git a/src/vs/base/test/node/encoding/fixtures/utf16_le_nobom.txt b/src/vs/base/test/node/encoding/fixtures/utf16_le_nobom.txt
new file mode 100644
index 00000000000..7b94ff215b0
Binary files /dev/null and b/src/vs/base/test/node/encoding/fixtures/utf16_le_nobom.txt differ
diff --git a/src/vs/base/test/node/mime/mime.test.ts b/src/vs/base/test/node/mime/mime.test.ts
deleted file mode 100644
index f99d59fb012..00000000000
--- a/src/vs/base/test/node/mime/mime.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-
-import * as mimeCommon from 'vs/base/common/mime';
-import * as mime from 'vs/base/node/mime';
-import { readExactlyByFile } from 'vs/base/node/stream';
-
-suite('Mime', () => {
-
-	test('detectMimesFromFile (JSON saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.json.png');
-
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (PNG saved as TXT)', function () {
-		mimeCommon.registerTextMime({ id: 'text', mime: 'text/plain', extension: '.txt' });
-		const file = require.toUrl('./fixtures/some.png.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('detectMimesFromFile (XML saved as PNG)', function () {
-		const file = require.toUrl('./fixtures/some.xml.png');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (QWOFF saved as TXT)', function () {
-		const file = require.toUrl('./fixtures/some.qwoff.txt');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('detectMimesFromFile (CSS saved as QWOFF)', function () {
-		const file = require.toUrl('./fixtures/some.css.qwoff');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['text/plain']);
-		});
-	});
-
-	test('detectMimesFromFile (PDF)', function () {
-		const file = require.toUrl('./fixtures/some.pdf');
-		return readExactlyByFile(file, 512).then(buffer => {
-			const mimes = mime.detectMimeAndEncodingFromBuffer(buffer);
-			assert.deepEqual(mimes.mimes, ['application/octet-stream']);
-		});
-	});
-
-	test('autoGuessEncoding (ShiftJIS)', function () {
-		const file = require.toUrl('./fixtures/some.shiftjis.txt');
-		return readExactlyByFile(file, 512 * 8).then(buffer => {
-			return mime.detectMimeAndEncodingFromBuffer(buffer, true).then(mimes => {
-				assert.equal(mimes.encoding, 'shiftjis');
-			});
-		});
-	});
-
-	test('autoGuessEncoding (CP1252)', function () {
-		const file = require.toUrl('./fixtures/some.cp1252.txt');
-		return readExactlyByFile(file, 512 * 8).then(buffer => {
-			return mime.detectMimeAndEncodingFromBuffer(buffer, true).then(mimes => {
-				assert.equal(mimes.encoding, 'windows1252');
-			});
-		});
-	});
-});
diff --git a/src/vs/base/test/node/processes/fixtures/fork.ts b/src/vs/base/test/node/processes/fixtures/fork.ts
index 10537b1b6cc..9729d543579 100644
--- a/src/vs/base/test/node/processes/fixtures/fork.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork.ts
@@ -7,7 +7,7 @@
 
 import * as processes from 'vs/base/node/processes';
 
-const sender = processes.createQueuedSender(process);
+const sender = processes.createQueuedSender(<any>process);
 
 process.on('message', msg => {
 	sender.send(msg);
diff --git a/src/vs/base/test/node/processes/fixtures/fork_large.ts b/src/vs/base/test/node/processes/fixtures/fork_large.ts
index e89bc4bb394..df17dd8bdc0 100644
--- a/src/vs/base/test/node/processes/fixtures/fork_large.ts
+++ b/src/vs/base/test/node/processes/fixtures/fork_large.ts
@@ -7,7 +7,7 @@
 
 import * as processes from 'vs/base/node/processes';
 
-const sender = processes.createQueuedSender(process);
+const sender = processes.createQueuedSender(<any>process);
 
 process.on('message', msg => {
 	sender.send(msg);
diff --git a/src/vs/base/worker/defaultWorkerFactory.ts b/src/vs/base/worker/defaultWorkerFactory.ts
index 344588ad9ef..4fe3caa2403 100644
--- a/src/vs/base/worker/defaultWorkerFactory.ts
+++ b/src/vs/base/worker/defaultWorkerFactory.ts
@@ -7,17 +7,22 @@
 import { globals } from 'vs/base/common/platform';
 import { logOnceWebWorkerWarning, IWorker, IWorkerCallback, IWorkerFactory } from 'vs/base/common/worker/simpleWorker';
 
-function getWorkerUrl(workerId: string, label: string): string {
-	// Option for hosts to overwrite the worker script url (used in the standalone editor)
-	if (globals.MonacoEnvironment && typeof globals.MonacoEnvironment.getWorkerUrl === 'function') {
-		return globals.MonacoEnvironment.getWorkerUrl(workerId, label);
+function getWorker(workerId: string, label: string): Worker {
+	// Option for hosts to overwrite the worker script (used in the standalone editor)
+	if (globals.MonacoEnvironment) {
+		if (typeof globals.MonacoEnvironment.getWorker === 'function') {
+			return globals.MonacoEnvironment.getWorker(workerId, label);
+		}
+		if (typeof globals.MonacoEnvironment.getWorkerUrl === 'function') {
+			return new Worker(globals.MonacoEnvironment.getWorkerUrl(workerId, label));
+		}
 	}
 	// ESM-comment-begin
 	if (typeof require === 'function') {
-		return require.toUrl('./' + workerId) + '#' + label;
+		return new Worker(require.toUrl('./' + workerId) + '#' + label);
 	}
 	// ESM-comment-end
-	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl`);
+	throw new Error(`You must define a function MonacoEnvironment.getWorkerUrl or MonacoEnvironment.getWorker`);
 }
 
 /**
@@ -31,7 +36,7 @@ class WebWorker implements IWorker {
 
 	constructor(moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
 		this.id = id;
-		this.worker = new Worker(getWorkerUrl('workerMain.js', label));
+		this.worker = getWorker('workerMain.js', label);
 		this.postMessage(moduleId);
 		this.worker.onmessage = function (ev: any) {
 			onMessageCallback(ev.data);
diff --git a/src/vs/code/buildfile.js b/src/vs/code/buildfile.js
index 0293acbb5be..1a39a0a0c2c 100644
--- a/src/vs/code/buildfile.js
+++ b/src/vs/code/buildfile.js
@@ -5,23 +5,26 @@
 'use strict';
 
 function createModuleDescription(name, exclude) {
-	var result= {};
+	var result = {};
 	var excludes = ['vs/css', 'vs/nls'];
-	result.name= name;
+	result.name = name;
 	if (Array.isArray(exclude) && exclude.length > 0) {
 		excludes = excludes.concat(exclude);
 	}
-	result.exclude= excludes;
-	
+	result.exclude = excludes;
+
 	return result;
 }
 
-exports.collectModules= function() {
+exports.collectModules = function () {
 	return [
 		createModuleDescription('vs/code/electron-main/main', []),
 		createModuleDescription('vs/code/node/cli', []),
 		createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
+		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', []),
 		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', []),
-		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', [])
+		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', []),
+		createModuleDescription('vs/platform/driver/node/driver', []),
+		createModuleDescription('vs/code/electron-browser/processExplorer/processExplorerMain', [])
 	];
-};
\ No newline at end of file
+};
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 423dbe75a1c..5b246f9491b 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -9,6 +9,11 @@ const path = require('path');
 const fs = require('fs');
 const remote = require('electron').remote;
 
+function assign(destination, source) {
+	return Object.keys(source)
+		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+}
+
 function parseURLQueryArgs() {
 	const search = window.location.search || '';
 
@@ -44,6 +49,8 @@ function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
 
+	assign(process.env, configuration.userEnv);
+
 	//#region Add support for using node_modules.asar
 	(function () {
 		const path = require('path');
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index f6bbf228784..0c7ffd60be7 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -40,6 +40,7 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
 
 const MAX_URL_LENGTH = platform.isWindows ? 2081 : 5400;
 
@@ -69,6 +70,7 @@ export class IssueReporter extends Disposable {
 	private numberOfSearchResultsDisplayed = 0;
 	private receivedSystemInfo = false;
 	private receivedPerformanceInfo = false;
+	private shouldQueueSearch = false;
 
 	constructor(configuration: IssueReporterConfiguration) {
 		super();
@@ -208,14 +210,14 @@ export class IssueReporter extends Disposable {
 		});
 
 		const numberOfThemeExtesions = themes && themes.length;
-		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes });
+		this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: extensions });
 		this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
 
 		if (this.environmentService.disableExtensions || extensions.length === 0) {
 			(<HTMLButtonElement>document.getElementById('disableExtensions')).disabled = true;
-			(<HTMLInputElement>document.getElementById('reproducesWithoutExtensions')).checked = true;
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
 		}
+
+		this.updateExtensionSelector(extensions);
 	}
 
 	private handleSettingsSearchData(data: ISettingsSearchIssueReporterData): void {
@@ -322,30 +324,33 @@ export class IssueReporter extends Disposable {
 			});
 		}
 
-		this.addEventListener('reproducesWithoutExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: true });
-		});
+		this.addEventListener('issue-source', 'change', (event: Event) => {
+			const fileOnExtension = JSON.parse((<HTMLInputElement>event.target).value);
+			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension });
+			this.render();
 
-		this.addEventListener('reproducesWithExtensions', 'click', (e) => {
-			this.issueReporterModel.update({ reprosWithoutExtensions: false });
+			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+			if (fileOnExtension) {
+				this.searchExtensionIssues(title);
+			} else {
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
+			}
 		});
 
 		this.addEventListener('description', 'input', (event: Event) => {
 			const issueDescription = (<HTMLInputElement>event.target).value;
 			this.issueReporterModel.update({ issueDescription });
 
-			const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
-			if (title || issueDescription) {
-				this.searchDuplicates(title, issueDescription);
-			} else {
-				this.clearSearchResults();
+			// Only search for extension issues on title change
+			if (!this.issueReporterModel.fileOnExtension()) {
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchVSCodeIssues(title, issueDescription);
 			}
 		});
 
 		this.addEventListener('issue-title', 'input', (e) => {
-			const description = this.issueReporterModel.getData().issueDescription;
 			const title = (<HTMLInputElement>event.target).value;
-
 			const lengthValidationMessage = document.getElementById('issue-title-length-validation-error');
 			if (title && this.getIssueUrlWithTitle(title).length > MAX_URL_LENGTH) {
 				show(lengthValidationMessage);
@@ -353,10 +358,11 @@ export class IssueReporter extends Disposable {
 				hide(lengthValidationMessage);
 			}
 
-			if (title || description) {
-				this.searchDuplicates(title, description);
+			if (this.issueReporterModel.fileOnExtension()) {
+				this.searchExtensionIssues(title);
 			} else {
-				this.clearSearchResults();
+				const description = this.issueReporterModel.getData().issueDescription;
+				this.searchVSCodeIssues(title, description);
 			}
 		});
 
@@ -367,43 +373,32 @@ export class IssueReporter extends Disposable {
 		});
 
 		this.addEventListener('disableExtensions', 'keydown', (e: KeyboardEvent) => {
+			e.stopPropagation();
 			if (e.keyCode === 13 || e.keyCode === 32) {
 				ipcRenderer.send('workbenchCommand', 'workbench.extensions.action.disableAll');
 				ipcRenderer.send('workbenchCommand', 'workbench.action.reloadWindow');
 			}
 		});
 
-		this.addEventListener('showRunning', 'click', () => {
-			ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
-		});
-
-		this.addEventListener('showRunning', 'keydown', (e: KeyboardEvent) => {
-			if (e.keyCode === 13 || e.keyCode === 32) {
-				ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
+		document.onkeydown = (e: KeyboardEvent) => {
+			const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+			// Cmd/Ctrl+Enter previews issue and closes window
+			if (cmdOrCtrlKey && e.keyCode === 13) {
+				if (this.createIssue()) {
+					remote.getCurrentWindow().close();
+				}
 			}
-		});
 
-		// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
-		if (platform.isMacintosh) {
-			let prevKeyWasCommand = false;
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (prevKeyWasCommand && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
-				}
+			// Cmd/Ctrl + zooms in
+			if (cmdOrCtrlKey && e.keyCode === 187) {
+				this.applyZoom(webFrame.getZoomLevel() + 1);
+			}
 
-				prevKeyWasCommand = e.keyCode === 91 || e.keyCode === 93;
-			};
-		} else {
-			document.onkeydown = (e: KeyboardEvent) => {
-				if (e.ctrlKey && e.keyCode === 13) {
-					if (this.createIssue()) {
-						remote.getCurrentWindow().close();
-					}
-				}
-			};
-		}
+			// Cmd/Ctrl - zooms out
+			if (cmdOrCtrlKey && e.keyCode === 189) {
+				this.applyZoom(webFrame.getZoomLevel() - 1);
+			}
+		};
 	}
 
 	private updatePreviewButtonState() {
@@ -438,12 +433,77 @@ export class IssueReporter extends Disposable {
 		return false;
 	}
 
+	private getExtensionRepositoryUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.repository && selectedExtension.manifest.repository.url;
+	}
+
+	private getExtensionBugsUrl(): string {
+		const selectedExtension = this.issueReporterModel.getData().selectedExtension;
+		return selectedExtension && selectedExtension.manifest && selectedExtension.manifest.bugs && selectedExtension.manifest.bugs.url;
+	}
+
+	private searchVSCodeIssues(title: string, issueDescription: string): void {
+		if (title) {
+			this.searchDuplicates(title, issueDescription);
+		} else {
+			this.clearSearchResults();
+		}
+	}
+
+	private searchExtensionIssues(title: string): void {
+		const url = this.getExtensionRepositoryUrl();
+		if (title) {
+			const matches = /^https?:\/\/github\.com\/(.*)(?:.git)/.exec(url);
+			if (matches && matches.length) {
+				const repo = matches[1];
+				return this.searchGitHub(repo, title);
+			}
+		}
+
+		this.clearSearchResults();
+	}
+
 	private clearSearchResults(): void {
 		const similarIssues = document.getElementById('similar-issues');
 		similarIssues.innerHTML = '';
 		this.numberOfSearchResultsDisplayed = 0;
 	}
 
+	@debounce(300)
+	private searchGitHub(repo: string, title: string): void {
+		const query = `is:issue+repo:${repo}+${title}`;
+		const similarIssues = document.getElementById('similar-issues');
+
+		window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
+			response.json().then(result => {
+				similarIssues.innerHTML = '';
+				if (result && result.items) {
+					this.displaySearchResults(result.items);
+				} else {
+					// If the items property isn't present, the rate limit has been hit
+					const message = $('div.list-title');
+					message.textContent = localize('rateLimited', "GitHub query limit exceeded. Please wait.");
+					similarIssues.appendChild(message);
+
+					const resetTime = response.headers.get('X-RateLimit-Reset');
+					const timeToWait = parseInt(resetTime) - Math.floor(Date.now() / 1000);
+					if (this.shouldQueueSearch) {
+						this.shouldQueueSearch = false;
+						setTimeout(() => {
+							this.searchGitHub(repo, title);
+							this.shouldQueueSearch = true;
+						}, timeToWait * 1000);
+					}
+				}
+			}).catch(e => {
+				this.logSearchError(e);
+			});
+		}).catch(e => {
+			this.logSearchError(e);
+		});
+	}
+
 	@debounce(300)
 	private searchDuplicates(title: string, body: string): void {
 		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
@@ -515,7 +575,7 @@ export class IssueReporter extends Disposable {
 			similarIssues.appendChild(issues);
 		} else {
 			const message = $('div.list-title');
-			message.textContent = localize('noResults', "No results found");
+			message.textContent = localize('noSimilarIssues', "No similar issues found");
 			similarIssues.appendChild(message);
 		}
 	}
@@ -551,7 +611,7 @@ export class IssueReporter extends Disposable {
 
 	private renderBlocks(): void {
 		// Depending on Issue Type, we render different blocks and text
-		const { issueType } = this.issueReporterModel.getData();
+		const { issueType, fileOnExtension } = this.issueReporterModel.getData();
 		const blockContainer = document.getElementById('block-container');
 		const systemBlock = document.querySelector('.block-system');
 		const processBlock = document.querySelector('.block-process');
@@ -560,9 +620,11 @@ export class IssueReporter extends Disposable {
 		const searchedExtensionsBlock = document.querySelector('.block-searchedExtensions');
 		const settingsSearchResultsBlock = document.querySelector('.block-settingsSearchResults');
 
-		const disabledExtensions = document.getElementById('disabledExtensions');
+		const problemSource = document.getElementById('problem-source');
+		const problemSourceHelpText = document.getElementById('problem-source-help-text');
 		const descriptionTitle = document.getElementById('issue-description-label');
 		const descriptionSubtitle = document.getElementById('issue-description-subtitle');
+		const extensionSelector = document.getElementById('extension-selection');
 
 		// Hide all by default
 		hide(blockContainer);
@@ -572,13 +634,21 @@ export class IssueReporter extends Disposable {
 		hide(extensionsBlock);
 		hide(searchedExtensionsBlock);
 		hide(settingsSearchResultsBlock);
-		hide(disabledExtensions);
+		hide(problemSource);
+		hide(problemSourceHelpText);
+		hide(extensionSelector);
 
 		if (issueType === IssueType.Bug) {
 			show(blockContainer);
 			show(systemBlock);
-			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				show(problemSourceHelpText);
+			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('bugDescription', "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
@@ -587,14 +657,25 @@ export class IssueReporter extends Disposable {
 			show(systemBlock);
 			show(processBlock);
 			show(workspaceBlock);
-			show(extensionsBlock);
-			show(disabledExtensions);
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			} else {
+				show(extensionsBlock);
+				show(problemSourceHelpText);
+			}
 
 			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
 		} else if (issueType === IssueType.FeatureRequest) {
 			descriptionTitle.innerHTML = `${localize('description', "Description")} <span class="required-input">*</span>`;
 			descriptionSubtitle.innerHTML = localize('featureRequestDescription', "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub.");
+			show(problemSource);
+
+			if (fileOnExtension) {
+				show(extensionSelector);
+			}
 		} else if (issueType === IssueType.SettingsSearchIssue) {
 			show(blockContainer);
 			show(searchedExtensionsBlock);
@@ -618,11 +699,14 @@ export class IssueReporter extends Disposable {
 
 	private validateInputs(): boolean {
 		let isValid = true;
-		['issue-title', 'description'].forEach(elementId => {
+		['issue-title', 'description', 'issue-source'].forEach(elementId => {
 			isValid = this.validateInput(elementId) && isValid;
-
 		});
 
+		if (this.issueReporterModel.fileOnExtension()) {
+			isValid = this.validateInput('extension-selector') && isValid;
+		}
+
 		return isValid;
 	}
 
@@ -630,7 +714,10 @@ export class IssueReporter extends Disposable {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
 			// to detect further changes
-			(<HTMLInputElement>document.getElementsByClassName('invalid-input')[0]).focus();
+			const invalidInput = document.getElementsByClassName('invalid-input');
+			if (invalidInput.length) {
+				(<HTMLInputElement>invalidInput[0]).focus();
+			}
 
 			document.getElementById('issue-title').addEventListener('input', (event) => {
 				this.validateInput('issue-title');
@@ -664,24 +751,86 @@ export class IssueReporter extends Disposable {
 		return true;
 	}
 
-	private getIssueUrlWithTitle(issueTitle: string) {
+	private getIssueUrlWithTitle(issueTitle: string): string {
+		let repositoryUrl = product.reportIssueUrl;
+		if (this.issueReporterModel.fileOnExtension()) {
+			const bugsUrl = this.getExtensionBugsUrl();
+			const extensionUrl = this.getExtensionRepositoryUrl();
+			// If given, try to match the extension's bug url
+			if (bugsUrl && bugsUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(bugsUrl);
+			} else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
+				repositoryUrl = normalizeGitHubIssuesUrl(extensionUrl);
+			}
+		}
+
 		const queryStringPrefix = product.reportIssueUrl.indexOf('?') === -1 ? '?' : '&';
-		return `${product.reportIssueUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
+		return `${repositoryUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
 	}
 
 	private updateSystemInfo = (state) => {
 		const target = document.querySelector('.block-system .block-info');
 		let tableHtml = '';
 		Object.keys(state.systemInfo).forEach(k => {
+			const data = typeof state.systemInfo[k] === 'object'
+				? Object.keys(state.systemInfo[k]).map(key => `${key}: ${state.systemInfo[k][key]}`).join('<br>')
+				: state.systemInfo[k];
+
 			tableHtml += `
 				<tr>
 					<td>${k}</td>
-					<td>${state.systemInfo[k]}</td>
+					<td>${data}</td>
 				</tr>`;
 		});
 		target.innerHTML = `<table>${tableHtml}</table>`;
 	}
 
+	private updateExtensionSelector(extensions: ILocalExtension[]): void {
+		interface IOption {
+			name: string;
+			id: string;
+		}
+
+		const extensionOptions: IOption[] = extensions.map(extension => {
+			return {
+				name: extension.manifest.displayName || extension.manifest.name || '',
+				id: extension.identifier.id
+			};
+		});
+
+		// Sort extensions by name
+		extensionOptions.sort((a, b) => {
+			if (a.name > b.name) {
+				return 1;
+			}
+
+			if (a.name < b.name) {
+				return -1;
+			}
+
+			return 0;
+		});
+
+		const makeOption = (extension: IOption) => `<option value="${extension.id}">${escape(extension.name)}</option>`;
+		const extensionsSelector = document.getElementById('extension-selector');
+		extensionsSelector.innerHTML = '<option></option>' + extensionOptions.map(makeOption).join('\n');
+
+		this.addEventListener('extension-selector', 'change', (e: Event) => {
+			const selectedExtensionId = (<HTMLInputElement>e.target).value;
+			const extensions = this.issueReporterModel.getData().allExtensions;
+			const matches = extensions.filter(extension => extension.identifier.id === selectedExtensionId);
+			if (matches.length) {
+				this.issueReporterModel.update({ selectedExtension: matches[0] });
+
+				const title = (<HTMLInputElement>document.getElementById('issue-title')).value;
+				this.searchExtensionIssues(title);
+			} else {
+				this.issueReporterModel.update({ selectedExtension: null });
+				this.clearSearchResults();
+			}
+		});
+	}
+
 	private updateProcessInfo = (state) => {
 		const target = document.querySelector('.block-process .block-info');
 		target.innerHTML = `<code>${state.processInfo}</code>`;
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index a6ec8153424..a31281e1286 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -26,9 +26,11 @@ export interface IssueReporterData {
 	includeSettingsSearchDetails?: boolean;
 
 	numberOfThemeExtesions?: number;
+	allExtensions?: ILocalExtension[];
 	enabledNonThemeExtesions?: ILocalExtension[];
 	extensionsDisabled?: boolean;
-	reprosWithoutExtensions?: boolean;
+	fileOnExtension?: boolean;
+	selectedExtension?: ILocalExtension;
 	actualSearchResults?: ISettingSearchResult[];
 	query?: string;
 	filterResultCount?: number;
@@ -44,8 +46,7 @@ export class IssueReporterModel {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		};
 
 		this._data = initialData ? assign(defaultData, initialData) : defaultData;
@@ -64,7 +65,7 @@ export class IssueReporterModel {
 Issue Type: <b>${this.getIssueTypeTitle()}</b>
 
 ${this._data.issueDescription}
-
+${this.getExtensionVersion()}
 VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
 OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 
@@ -72,6 +73,22 @@ ${this.getInfos()}
 <!-- generated by issue reporter -->`;
 	}
 
+	fileOnExtension(): boolean {
+		const fileOnExtensionSupported = this._data.issueType === IssueType.Bug
+			|| this._data.issueType === IssueType.PerformanceIssue
+			|| this._data.issueType === IssueType.FeatureRequest;
+
+		return fileOnExtensionSupported && this._data.fileOnExtension;
+	}
+
+	private getExtensionVersion(): string {
+		if (this.fileOnExtension()) {
+			return `\nExtension version: ${this._data.selectedExtension.manifest.version}`;
+		} else {
+			return '';
+		}
+	}
+
 	private getIssueTypeTitle(): string {
 		if (this._data.issueType === IssueType.Bug) {
 			return 'Bug';
@@ -108,8 +125,6 @@ ${this.getInfos()}
 			if (this._data.includeExtensions) {
 				info += this.generateExtensionsMd();
 			}
-
-			info += this._data.reprosWithoutExtensions ? '\nReproduces without extensions' : '\nReproduces only with extensions';
 		}
 
 		if (this._data.issueType === IssueType.SettingsSearchIssue) {
@@ -135,7 +150,11 @@ ${this.getInfos()}
 `;
 
 		Object.keys(this._data.systemInfo).forEach(k => {
-			md += `|${k}|${this._data.systemInfo[k]}|\n`;
+			const data = typeof this._data.systemInfo[k] === 'object'
+				? Object.keys(this._data.systemInfo[k]).map(key => `${key}: ${this._data.systemInfo[k][key]}`).join('<br>')
+				: this._data.systemInfo[k];
+
+			md += `|${k}|${data}|\n`;
 		});
 
 		md += '\n</details>';
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index abf3c7b4ad6..4991cd98b70 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -19,6 +19,24 @@ export default (): string => `
 			</select>
 		</div>
 
+		<div class="input-group" id="problem-source">
+			<label class="inline-label" for="issue-source">${escape(localize('issueSourceLabel', "File on"))}</label>
+			<select id="issue-source" class="inline-form-control">
+				<option value="false">${escape(localize('vscode', "Visual Studio Code"))}</option>
+				<option value="true">${escape(localize('extension', "An Extension"))}</option>
+			</select>
+			<div id="problem-source-help-text" class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."))
+		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
+			</div>
+
+			<div id="extension-selection">
+				<label class="inline-label" for="extension-selector">${escape(localize('chooseExtension', "Extension"))} <span class="required-input">*</span></label>
+				<select id="extension-selector" class="inline-form-control">
+					<!-- To be dynamically filled -->
+				</select>
+			</div>
+		</div>
+
 		<div class="input-group">
 			<label class="inline-label" for="issue-title">${escape(localize('issueTitleLabel', "Title"))} <span class="required-input">*</span></label>
 			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(localize('issueTitleRequired', "Please enter a title."))}" required>
@@ -27,6 +45,7 @@ export default (): string => `
 				<!-- To be dynamically filled -->
 			</small>
 		</div>
+
 	</div>
 
 	<div class="system-info" id="block-container">
@@ -112,28 +131,6 @@ export default (): string => `
 		</div>
 	</div>
 
-	<div class="section" id="disabledExtensions">
-		<div class="extensions-form">
-			<label>${escape(localize('tryDisablingExtensions', "Is the problem reproducible when extensions are disabled?"))}</label>
-			<div class="form-buttons">
-				<div class="choice">
-					<input type="radio" id="reproducesWithoutExtensions" value=true name="reprosWithoutExtensions" />
-					<label for="reproducesWithoutExtensions">${escape(localize('yes', "Yes"))}</label>
-				</div>
-				<div class="choice">
-					<input type="radio" id="reproducesWithExtensions" value=false name="reprosWithoutExtensions" checked/>
-					<label for="reproducesWithExtensions">${escape(localize('no', "No"))}</label>
-				</div>
-			</div>
-		</div>
-		<div class="instructions">${escape(localize('disableExtensionsLabelText', "Try to reproduce the problem after {0}."))
-		.replace('{0}', `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(localize('disableExtensions', "disabling all extensions and reloading the window"))}</span>`)}
-		</div>
-		<div class="instructions">${escape(localize('showRunningExtensionsLabelText', "If you suspect it's an extension issue, {0} to report the issue on the extension."))
-		.replace('{0}', `<span tabIndex=0 role="button"id="showRunning" class="workbenchCommand">${escape(localize('showRunningExtensions', "view all running extensions"))}</span>`)}
-		</div>
-	</div>
-
 	<div class="input-group description-section">
 		<label for="description" id="issue-description-label">
 			<!-- To be dynamically filled -->
diff --git a/src/vs/code/electron-browser/issue/issueReporterUtil.ts b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
new file mode 100644
index 00000000000..2212eaf002c
--- /dev/null
+++ b/src/vs/code/electron-browser/issue/issueReporterUtil.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { endsWith, rtrim } from 'vs/base/common/strings';
+
+export function normalizeGitHubIssuesUrl(url: string): string {
+	// If the url has a .git suffix, remove it
+	if (endsWith(url, '.git')) {
+		url = url.substr(0, url.length - 4);
+	}
+
+	// Remove trailing slash
+	url = rtrim(url, '/');
+
+	// If the url already ends with issues/new, it's beautiful, return it
+	if (endsWith(url, 'issues/new')) {
+		return url;
+	}
+
+	// Add new segment if it does not exist
+	if (endsWith(url, 'issues')) {
+		return url + '/new';
+	}
+
+	return url + '/issues/new';
+}
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 0b1cc2300a4..7e7217fe2ba 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -18,16 +18,11 @@ th {
 	vertical-align: bottom;
 	border-bottom: 2px solid #e9ecef;
 	padding: .75rem;
-	border-top: 1px solid #e9ecef;
 	text-align: inherit;
 }
-tr:nth-of-type(even) {
-	background-color: rgba(0,0,0,.05);
-}
 td {
 	padding: .75rem;
 	vertical-align: top;
-	border-top: 1px solid #e9ecef;
 }
 
 .block-settingsSearchResults-details {
@@ -39,7 +34,7 @@ td {
 }
 
 .section {
-	margin-bottom: 1.5em;
+	margin-bottom: .5em;
 }
 
 /**
@@ -185,24 +180,8 @@ textarea {
 	margin-bottom: 1em;
 }
 
-.extensions-form {
-	display: flex;
-}
-
-.extensions-form > .form-buttons {
-	display: flex;
-	margin-left: 20px;
-}
-
-.extensions-form > .form-buttons > .choice {
-	display: flex;
-	align-items: center;
-	margin-right: 20px;
-}
-
-.extensions-form > .form-buttons > .choice > label, .extensions-form  > .form-buttons > .choice > input {
-	cursor: pointer;
-	margin-top: 0;
+#extension-selection {
+	margin-top: 1em;
 }
 
 .system-info {
@@ -323,17 +302,17 @@ button {
 }
 
 #similar-issues {
-	margin-left: 12%;
+	margin-left: 13%;
 	display: block;
 }
 
 @media (max-width: 950px) {
 	.section .inline-label {
-		width: 12%;
+		width: 13%;
 	}
 
 	.section .inline-form-control  {
-		width: calc(88% - 5px);
+		width: calc(87% - 5px);
 	}
 }
 
@@ -342,7 +321,7 @@ button {
 		display: none !important;
 	}
 
-	.inline-form-control {
+	.section .inline-form-control {
 		width: 100%;
 	}
 
@@ -366,7 +345,7 @@ button {
 .issues-container {
 	margin-left: 1.5em;
 	margin-top: .5em;
-	height: 92px;
+	max-height: 92px;
 	overflow-y: auto;
 }
 
diff --git a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index e7ef3aefc59..7c39a334ced 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -7,6 +7,8 @@
 
 import * as assert from 'assert';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
+import { normalizeGitHubIssuesUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
+import { IssueType } from 'vs/platform/issue/common/issue';
 
 suite('IssueReporter', () => {
 
@@ -18,8 +20,7 @@ suite('IssueReporter', () => {
 			includeProcessInfo: true,
 			includeExtensions: true,
 			includeSearchedExtensions: true,
-			includeSettingsSearchDetails: true,
-			reprosWithoutExtensions: false
+			includeSettingsSearchDetails: true
 		});
 	});
 
@@ -37,4 +38,74 @@ OS version: undefined
 
 <!-- generated by issue reporter -->`);
 	});
+
+	test('serializes GPU information when data is provided', () => {
+		const issueReporterModel = new IssueReporterModel({
+			issueType: 0,
+			systemInfo: {
+				'GPU Status': {
+					'2d_canvas': 'enabled',
+					'checker_imaging': 'disabled_off'
+				}
+			}
+		});
+		assert.equal(issueReporterModel.serialize(),
+			`
+Issue Type: <b>Bug</b>
+
+undefined
+
+VS Code version: undefined
+OS version: undefined
+
+<details>
+<summary>System Info</summary>
+
+|Item|Value|
+|---|---|
+|GPU Status|2d_canvas: enabled<br>checker_imaging: disabled_off|
+
+</details>Extensions: none
+<!-- generated by issue reporter -->`);
+	});
+
+	test('should normalize GitHub urls', () => {
+		[
+			'https://github.com/repo',
+			'https://github.com/repo/',
+			'https://github.com/repo.git',
+			'https://github.com/repo/issues',
+			'https://github.com/repo/issues/',
+			'https://github.com/repo/issues/new',
+			'https://github.com/repo/issues/new/'
+		].forEach(url => {
+			assert.equal('https://github.com/repo/issues/new', normalizeGitHubIssuesUrl(url));
+		});
+	});
+
+	test('should have support for filing on extensions for bugs, performance issues, and feature requests', () => {
+		[
+			IssueType.Bug,
+			IssueType.FeatureRequest,
+			IssueType.PerformanceIssue
+		].forEach(type => {
+			const issueReporterModel = new IssueReporterModel({
+				issueType: type,
+				fileOnExtension: true
+			});
+
+			assert.equal(issueReporterModel.fileOnExtension(), true);
+		});
+
+		[
+			IssueType.SettingsSearchIssue
+		].forEach(type => {
+			const issueReporterModel = new IssueReporterModel({
+				issueType: type,
+				fileOnExtension: true
+			});
+
+			assert.equal(issueReporterModel.fileOnExtension(), false);
+		});
+	});
 });
diff --git a/src/vs/code/electron-browser/processExplorer/media/processExplorer.css b/src/vs/code/electron-browser/processExplorer/media/processExplorer.css
new file mode 100644
index 00000000000..6f38b441592
--- /dev/null
+++ b/src/vs/code/electron-browser/processExplorer/media/processExplorer.css
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+html,
+body {
+	margin: 0;
+	padding: 0;
+	height: 100%;
+	width: 100%;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	user-select: none;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
+	font-size: 13px;
+	color: #cccccc;
+}
+
+.cpu {
+	width: 45px;
+}
+
+.pid {
+	width: 50px
+}
+
+.memory {
+	width: 90px;
+}
+
+.process-item {
+	line-height: 22px;
+}
+
+table {
+	border-collapse: collapse;
+	width: 100%;
+	table-layout: fixed;
+}
+th {
+	vertical-align: bottom;
+	border-bottom: 1px solid #cccccc;
+	padding: .5rem;
+	border-top: 1px solid #cccccc;
+	text-align: center;
+}
+td {
+	padding: .25rem;
+	vertical-align: top;
+}
+
+.centered {
+	text-align: center;
+}
+
+.data {
+	white-space: pre;
+}
+
+tbody > tr:hover {
+	background-color: #2A2D2E;
+}
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorer.html b/src/vs/code/electron-browser/processExplorer/processExplorer.html
new file mode 100644
index 00000000000..4d6930d9987
--- /dev/null
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.html
@@ -0,0 +1,17 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="utf-8" />
+	<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
+</head>
+
+<body aria-label="">
+	<div id="process-list"></div>
+</body>
+
+<!-- Startup via processExplorer.js -->
+<script src="processExplorer.js"></script>
+
+</html>
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorer.js b/src/vs/code/electron-browser/processExplorer/processExplorer.js
new file mode 100644
index 00000000000..1fdb4bb8296
--- /dev/null
+++ b/src/vs/code/electron-browser/processExplorer/processExplorer.js
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const remote = require('electron').remote;
+
+function assign(destination, source) {
+	return Object.keys(source)
+		.reduce(function (r, key) { r[key] = source[key]; return r; }, destination);
+}
+
+function parseURLQueryArgs() {
+	const search = window.location.search || '';
+
+	return search.split(/[?&]/)
+		.filter(function (param) { return !!param; })
+		.map(function (param) { return param.split('='); })
+		.filter(function (param) { return param.length === 2; })
+		.reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {});
+}
+
+function uriFromPath(_path) {
+	var pathName = path.resolve(_path).replace(/\\/g, '/');
+	if (pathName.length > 0 && pathName.charAt(0) !== '/') {
+		pathName = '/' + pathName;
+	}
+
+	return encodeURI('file://' + pathName);
+}
+
+function readFile(file) {
+	return new Promise(function(resolve, reject) {
+		fs.readFile(file, 'utf8', function(err, data) {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve(data);
+		});
+	});
+}
+
+function main() {
+	const args = parseURLQueryArgs();
+	const configuration = JSON.parse(args['config'] || '{}') || {};
+
+	assign(process.env, configuration.userEnv);
+
+	//#region Add support for using node_modules.asar
+	(function () {
+		const path = require('path');
+		const Module = require('module');
+		let NODE_MODULES_PATH = path.join(configuration.appRoot, 'node_modules');
+		if (/[a-z]\:/.test(NODE_MODULES_PATH)) {
+			// Make drive letter uppercase
+			NODE_MODULES_PATH = NODE_MODULES_PATH.charAt(0).toUpperCase() + NODE_MODULES_PATH.substr(1);
+		}
+		const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
+
+		const originalResolveLookupPaths = Module._resolveLookupPaths;
+		Module._resolveLookupPaths = function (request, parent, newReturn) {
+			const result = originalResolveLookupPaths(request, parent, newReturn);
+
+			const paths = newReturn ? result : result[1];
+			for (let i = 0, len = paths.length; i < len; i++) {
+				if (paths[i] === NODE_MODULES_PATH) {
+					paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
+					break;
+				}
+			}
+
+			return result;
+		};
+	})();
+	//#endregion
+
+	// Get the nls configuration into the process.env as early as possible.
+	var nlsConfig = { availableLanguages: {} };
+	const config = process.env['VSCODE_NLS_CONFIG'];
+	if (config) {
+		process.env['VSCODE_NLS_CONFIG'] = config;
+		try {
+			nlsConfig = JSON.parse(config);
+		} catch (e) { /*noop*/ }
+	}
+
+	if (nlsConfig._resolvedLanguagePackCoreLocation) {
+		let bundles = Object.create(null);
+		nlsConfig.loadBundle = function(bundle, language, cb) {
+			let result = bundles[bundle];
+			if (result) {
+				cb(undefined, result);
+				return;
+			}
+			let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
+			readFile(bundleFile).then(function (content) {
+				let json = JSON.parse(content);
+				bundles[bundle] = json;
+				cb(undefined, json);
+			})
+			.catch(cb);
+		};
+	}
+
+	var locale = nlsConfig.availableLanguages['*'] || 'en';
+	if (locale === 'zh-tw') {
+		locale = 'zh-Hant';
+	} else if (locale === 'zh-cn') {
+		locale = 'zh-Hans';
+	}
+
+	window.document.documentElement.setAttribute('lang', locale);
+
+	const extractKey = function (e) {
+		return [
+			e.ctrlKey ? 'ctrl-' : '',
+			e.metaKey ? 'meta-' : '',
+			e.altKey ? 'alt-' : '',
+			e.shiftKey ? 'shift-' : '',
+			e.keyCode
+		].join('');
+	};
+
+	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+
+	window.addEventListener('keydown', function (e) {
+		const key = extractKey(e);
+		if (key === TOGGLE_DEV_TOOLS_KB) {
+			remote.getCurrentWebContents().toggleDevTools();
+		} else if (key === RELOAD_KB) {
+			remote.getCurrentWindow().reload();
+		}
+	});
+
+	// Load the loader
+	const loaderFilename = configuration.appRoot + '/out/vs/loader.js';
+	const loaderSource = fs.readFileSync(loaderFilename);
+	require('vm').runInThisContext(loaderSource, { filename: loaderFilename });
+	var define = global.define;
+	global.define = undefined;
+
+	window.nodeRequire = require.__$__nodeRequire;
+
+	define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code
+
+	window.MonacoEnvironment = {};
+	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
+
+	require.config({
+		baseUrl: rootUrl,
+		'vs/nls': nlsConfig,
+		nodeCachedDataDir: configuration.nodeCachedDataDir,
+		nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
+	});
+
+	if (nlsConfig.pseudo) {
+		require(['vs/nls'], function (nlsPlugin) {
+			nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
+		});
+	}
+
+	require([
+		'vs/code/electron-browser/processExplorer/processExplorerMain'
+	], function (processExplorer) {
+		processExplorer.startup(configuration.data);
+	});
+}
+
+main();
diff --git a/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
new file mode 100644
index 00000000000..605f48afab8
--- /dev/null
+++ b/src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./media/processExplorer';
+import { listProcesses, ProcessItem } from 'vs/base/node/ps';
+import { remote, webFrame } from 'electron';
+import { repeat } from 'vs/base/common/strings';
+import { totalmem } from 'os';
+import product from 'vs/platform/node/product';
+import { localize } from 'vs/nls';
+import { ProcessExplorerStyles, ProcessExplorerData } from 'vs/platform/issue/common/issue';
+import * as browser from 'vs/base/browser/browser';
+import * as platform from 'vs/base/common/platform';
+
+let processList: any[];
+
+function getProcessList(rootProcess: ProcessItem) {
+	const processes: any[] = [];
+
+	if (rootProcess) {
+		getProcessItem(processes, rootProcess, 0);
+	}
+
+	return processes;
+}
+
+function getProcessItem(processes: any[], item: ProcessItem, indent: number): void {
+	const isRoot = (indent === 0);
+
+	const MB = 1024 * 1024;
+
+	// Format name with indent
+	const name = isRoot ? `${product.applicationName} main` : item.name;
+	const formattedName = isRoot ? name : `${repeat('    ', indent)} ${name}`;
+	const memory = process.platform === 'win32' ? item.mem : (totalmem() * (item.mem / 100));
+	processes.push({
+		cpu: Number(item.load.toFixed(0)),
+		memory: Number((memory / MB).toFixed(0)),
+		pid: Number((item.pid).toFixed(0)),
+		name,
+		formattedName,
+		cmd: item.cmd
+	});
+
+	// Recurse into children if any
+	if (Array.isArray(item.children)) {
+		item.children.forEach(child => getProcessItem(processes, child, indent + 1));
+	}
+}
+
+function getProcessIdWithHighestProperty(processList, propertyName: string) {
+	let max = 0;
+	let maxProcessId;
+	processList.forEach(process => {
+		if (process[propertyName] > max) {
+			max = process[propertyName];
+			maxProcessId = process.pid;
+		}
+	});
+
+	return maxProcessId;
+}
+
+function updateProcessInfo(processList): void {
+	const target = document.getElementById('process-list');
+	const highestCPUProcess = getProcessIdWithHighestProperty(processList, 'cpu');
+	const highestMemoryProcess = getProcessIdWithHighestProperty(processList, 'memory');
+
+	let tableHtml = `
+		<tr>
+			<th class="cpu">${localize('cpu', "CPU %")}</th>
+			<th class="memory">${localize('memory', "Memory (MB)")}</th>
+			<th class="pid">${localize('pid', "pid")}</th>
+			<th>${localize('name', "Name")}</th>
+		</tr>`;
+
+	processList.forEach(p => {
+		const cpuClass = p.pid === highestCPUProcess ? 'highest' : '';
+		const memoryClass = p.pid === highestMemoryProcess ? 'highest' : '';
+
+		tableHtml += `
+			<tr id=${p.pid}>
+				<td class="centered ${cpuClass}">${p.cpu}</td>
+				<td class="centered ${memoryClass}">${p.memory}</td>
+				<td class="centered">${p.pid}</td>
+				<td title="${p.name}" class="data">${p.formattedName}</td>
+			</tr>`;
+	});
+
+	target.innerHTML = `<table>${tableHtml}</table>`;
+}
+
+function applyStyles(styles: ProcessExplorerStyles): void {
+	const styleTag = document.createElement('style');
+	const content: string[] = [];
+
+	if (styles.hoverBackground) {
+		content.push(`tbody > tr:hover  { background-color: ${styles.hoverBackground}; }`);
+	}
+
+	if (styles.hoverForeground) {
+		content.push(`tbody > tr:hover{ color: ${styles.hoverForeground}; }`);
+	}
+
+	if (styles.highlightForeground) {
+		content.push(`.highest { color: ${styles.highlightForeground}; }`);
+	}
+
+	styleTag.innerHTML = content.join('\n');
+	document.head.appendChild(styleTag);
+	document.body.style.color = styles.color;
+}
+
+function applyZoom(zoomLevel: number): void {
+	webFrame.setZoomLevel(zoomLevel);
+	browser.setZoomFactor(webFrame.getZoomFactor());
+	// See https://github.com/Microsoft/vscode/issues/26151
+	// Cannot be trusted because the webFrame might take some time
+	// until it really applies the new zoom level
+	browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
+}
+
+function showContextMenu(e) {
+	e.preventDefault();
+
+	const pid = parseInt(e.currentTarget.id);
+	if (pid && typeof pid === 'number') {
+		const menu = new remote.Menu();
+		menu.append(new remote.MenuItem({
+			label: localize('killProcess', "Kill Process"),
+			click() {
+				process.kill(pid, 'SIGTERM');
+			}
+		})
+		);
+
+		menu.append(new remote.MenuItem({
+			label: localize('forceKillProcess', "Force Kill Process"),
+			click() {
+				process.kill(pid, 'SIGKILL');
+			}
+		})
+		);
+
+		menu.popup(remote.getCurrentWindow());
+	}
+}
+
+export function startup(data: ProcessExplorerData): void {
+	applyStyles(data.styles);
+	applyZoom(data.zoomLevel);
+
+	setInterval(() => listProcesses(remote.process.pid).then(processes => {
+		processList = getProcessList(processes);
+		updateProcessInfo(processList);
+
+		const tableRows = document.getElementsByTagName('tr');
+		for (let i = 0; i < tableRows.length; i++) {
+			const tableRow = tableRows[i];
+			tableRow.addEventListener('click', (e) => {
+				showContextMenu(e);
+			});
+		}
+	}), 1200);
+
+
+	document.onkeydown = (e: KeyboardEvent) => {
+		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+
+		// Cmd/Ctrl + zooms in
+		if (cmdOrCtrlKey && e.keyCode === 187) {
+			applyZoom(webFrame.getZoomLevel() + 1);
+		}
+
+		// Cmd/Ctrl - zooms out
+		if (cmdOrCtrlKey && e.keyCode === 189) {
+			applyZoom(webFrame.getZoomLevel() - 1);
+		}
+	};
+}
\ No newline at end of file
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 6a255ddf114..2060846bfc5 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { app, ipcMain as ipc, BrowserWindow } from 'electron';
+import { app, ipcMain as ipc } from 'electron';
 import * as platform from 'vs/base/common/platform';
 import { WindowsManager } from 'vs/code/electron-main/windows';
 import { IWindowsService, OpenContext, ActiveWindowManager } from 'vs/platform/windows/common/windows';
@@ -60,6 +60,9 @@ import { IssueService } from 'vs/platform/issue/electron-main/issueService';
 import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
 import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
+import { serve as serveDriver } from 'vs/platform/driver/electron-main/driver';
+import { join } from 'path';
+import { exists, rename } from 'vs/base/node/pfs';
 
 export class CodeApplication {
 
@@ -127,7 +130,7 @@ export class CodeApplication {
 			return srcUri.startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString());
 		};
 
-		app.on('web-contents-created', (_event: any, contents) => {
+		app.on('web-contents-created', (event: any, contents) => {
 			contents.on('will-attach-webview', (event: Electron.Event, webPreferences, params) => {
 				delete webPreferences.preload;
 				webPreferences.nodeIntegration = false;
@@ -182,15 +185,15 @@ export class CodeApplication {
 			this.windowsMainService.openNewWindow(OpenContext.DESKTOP); //macOS native tab "+" button
 		});
 
-		ipc.on('vscode:exit', (_event: any, code: number) => {
+		ipc.on('vscode:exit', (event: any, code: number) => {
 			this.logService.trace('IPC#vscode:exit', code);
 
 			this.dispose();
 			this.lifecycleService.kill(code);
 		});
 
-		ipc.on('vscode:fetchShellEnv', (_event: any, windowId: number) => {
-			const { webContents } = BrowserWindow.fromId(windowId);
+		ipc.on('vscode:fetchShellEnv', event => {
+			const webContents = event.sender.webContents;
 			getShellEnvironment().then(shellEnv => {
 				if (!webContents.isDestroyed()) {
 					webContents.send('vscode:acceptShellEnv', shellEnv);
@@ -204,7 +207,7 @@ export class CodeApplication {
 			});
 		});
 
-		ipc.on('vscode:broadcast', (_event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
+		ipc.on('vscode:broadcast', (event: any, windowId: number, broadcast: { channel: string; payload: any; }) => {
 			if (this.windowsMainService && broadcast.channel && !isUndefinedOrNull(broadcast.payload)) {
 				this.logService.trace('IPC#vscode:broadcast', broadcast.channel, broadcast.payload);
 
@@ -261,38 +264,55 @@ export class CodeApplication {
 		this.logService.debug(`from: ${this.environmentService.appRoot}`);
 		this.logService.debug('args:', this.environmentService.args);
 
-		// Make sure we associate the program with the app user model id
-		// This will help Windows to associate the running program with
-		// any shortcut that is pinned to the taskbar and prevent showing
-		// two icons in the taskbar for the same app.
-		if (platform.isWindows && product.win32AppUserModelId) {
-			app.setAppUserModelId(product.win32AppUserModelId);
-		}
+		// Handle local storage (TODO@Ben remove me after a while)
+		return this.handleLocalStorage().then(() => {
 
-		// Create Electron IPC Server
-		this.electronIpcServer = new ElectronIPCServer();
+			// Make sure we associate the program with the app user model id
+			// This will help Windows to associate the running program with
+			// any shortcut that is pinned to the taskbar and prevent showing
+			// two icons in the taskbar for the same app.
+			if (platform.isWindows && product.win32AppUserModelId) {
+				app.setAppUserModelId(product.win32AppUserModelId);
+			}
 
-		// Resolve unique machine ID
-		this.logService.trace('Resolving machine identifier...');
-		return this.resolveMachineId().then(machineId => {
-			this.logService.trace(`Resolved machine identifier: ${machineId}`);
+			// Create Electron IPC Server
+			this.electronIpcServer = new ElectronIPCServer();
 
-			// Spawn shared process
-			this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
-			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
+			// Resolve unique machine ID
+			this.logService.trace('Resolving machine identifier...');
+			return this.resolveMachineId().then(machineId => {
+				this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
-			// Services
-			const appInstantiationService = this.initServices(machineId);
+				// Spawn shared process
+				this.sharedProcess = new SharedProcess(this.environmentService, this.lifecycleService, this.logService, machineId, this.userEnv);
+				this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
-			// Setup Auth Handler
-			const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
-			this.toDispose.push(authHandler);
+				// Services
+				const appInstantiationService = this.initServices(machineId);
 
-			// Open Windows
-			appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
+				let promise: TPromise<any> = TPromise.as(null);
 
-			// Post Open Windows Tasks
-			appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
+				// Create driver
+				if (this.environmentService.driverHandle) {
+					serveDriver(this.electronIpcServer, this.environmentService.driverHandle, appInstantiationService).then(server => {
+						this.logService.info('Driver started at:', this.environmentService.driverHandle);
+						this.toDispose.push(server);
+					});
+				}
+
+				return promise.then(() => {
+
+					// Setup Auth Handler
+					const authHandler = appInstantiationService.createInstance(ProxyAuthHandler);
+					this.toDispose.push(authHandler);
+
+					// Open Windows
+					appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
+
+					// Post Open Windows Tasks
+					appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
+				});
+			});
 		});
 	}
 
@@ -311,6 +331,23 @@ export class CodeApplication {
 		});
 	}
 
+	private handleLocalStorage(): TPromise<void> {
+		const localStorageFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage');
+		const localStorageJournalFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage-journal');
+		const localStorageBackupFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage.vscbak');
+		const localStorageJournalBackupFile = join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage-journal.vscbak');
+
+		// Electron 1.7.12: Restore storage
+		return exists(localStorageBackupFile).then(localStorageBackupFileExists => {
+			return exists(localStorageJournalBackupFile).then(localStorageJournalBackupFileExists => {
+				return TPromise.join([
+					localStorageBackupFileExists ? rename(localStorageBackupFile, localStorageFile) : TPromise.as(void 0),
+					localStorageJournalBackupFileExists ? rename(localStorageJournalBackupFile, localStorageJournalFile) : TPromise.as(void 0)
+				]);
+			});
+		}).then(() => void 0, () => void 0);
+	}
+
 	private initServices(machineId: string): IInstantiationService {
 		const services = new ServiceCollection();
 
@@ -325,7 +362,7 @@ export class CodeApplication {
 		services.set(IWindowsMainService, new SyncDescriptor(WindowsManager, machineId));
 		services.set(IWindowsService, new SyncDescriptor(WindowsService, this.sharedProcess));
 		services.set(ILaunchService, new SyncDescriptor(LaunchService));
-		services.set(IIssueService, new SyncDescriptor(IssueService, machineId));
+		services.set(IIssueService, new SyncDescriptor(IssueService, machineId, this.userEnv));
 
 		// Telemtry
 		if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
@@ -402,11 +439,12 @@ export class CodeApplication {
 		this.windowsMainService.ready(this.userEnv);
 
 		// Open our first window
+		const macOpenFiles = (<any>global).macOpenFiles as string[];
 		const context = !!process.env['VSCODE_CLI'] ? OpenContext.CLI : OpenContext.DESKTOP;
 		if (args['new-window'] && args._.length === 0) {
 			this.windowsMainService.open({ context, cli: args, forceNewWindow: true, forceEmpty: true, initialStartup: true }); // new window if "-n" was used without paths
-		} else if (global.macOpenFiles && global.macOpenFiles.length && (!args._ || !args._.length)) {
-			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, pathsToOpen: global.macOpenFiles, initialStartup: true }); // mac: open-file event received on startup
+		} else if (macOpenFiles && macOpenFiles.length && (!args._ || !args._.length)) {
+			this.windowsMainService.open({ context: OpenContext.DOCK, cli: args, pathsToOpen: macOpenFiles, initialStartup: true }); // mac: open-file event received on startup
 		} else {
 			this.windowsMainService.open({ context, cli: args, forceNewWindow: args['new-window'] || (!args._.length && args['unity-launch']), diffMode: args.diff, initialStartup: true }); // default: read paths from cli
 		}
diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts
index 8de2d49423c..c2d5a003f9f 100644
--- a/src/vs/code/electron-main/diagnostics.ts
+++ b/src/vs/code/electron-main/diagnostics.ts
@@ -29,6 +29,7 @@ export interface SystemInfo {
 	VM: string;
 	'Screen Reader': string;
 	'Process Argv': string;
+	'GPU Status': Electron.GPUFeatureStatus;
 }
 
 export interface ProcessInfo {
@@ -92,7 +93,8 @@ export function getSystemInfo(info: IMainProcessInfo): SystemInfo {
 		'Memory (System)': `${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`,
 		VM: `${Math.round((virtualMachineHint.value() * 100))}%`,
 		'Screen Reader': `${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`,
-		'Process Argv': `${info.mainArguments.join(' ')}`
+		'Process Argv': `${info.mainArguments.join(' ')}`,
+		'GPU Status': app.getGPUFeatureStatus()
 	};
 
 	const cpus = os.cpus();
@@ -208,7 +210,14 @@ function formatLaunchConfigs(configs: WorkspaceStatItem[]): string {
 	return output.join('\n');
 }
 
-function formatEnvironment(info: IMainProcessInfo): string {
+function expandGPUFeatures(): string {
+	const gpuFeatures = app.getGPUFeatureStatus();
+	const longestFeatureName = Math.max(...Object.keys(gpuFeatures).map(feature => feature.length));
+	// Make columns aligned by adding spaces after feature name
+	return Object.keys(gpuFeatures).map(feature => `${feature}:  ${repeat(' ', longestFeatureName - feature.length)}  ${gpuFeatures[feature]}`).join('\n                  ');
+}
+
+export function formatEnvironment(info: IMainProcessInfo): string {
 	const MB = 1024 * 1024;
 	const GB = 1024 * MB;
 
@@ -226,6 +235,7 @@ function formatEnvironment(info: IMainProcessInfo): string {
 	output.push(`VM:               ${Math.round((virtualMachineHint.value() * 100))}%`);
 	output.push(`Screen Reader:    ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`);
 	output.push(`Process Argv:     ${info.mainArguments.join(' ')}`);
+	output.push(`GPU Status:       ${expandGPUFeatures()}`);
 
 	return output.join('\n');
 }
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 442e70d33c9..8cc7ad73dd1 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -100,7 +100,7 @@ export class CodeMenu {
 		this.windowsMainService.onWindowClose(() => this.updateWorkspaceMenuItems());
 
 		// Listen to extension viewlets
-		ipc.on('vscode:extensionViewlets', (_event: any, rawExtensionViewlets: string) => {
+		ipc.on('vscode:extensionViewlets', (event: any, rawExtensionViewlets: string) => {
 			let extensionViewlets: IExtensionViewlet[] = [];
 			try {
 				extensionViewlets = JSON.parse(rawExtensionViewlets);
@@ -451,7 +451,7 @@ export class CodeMenu {
 	}
 
 	private getPreferencesMenu(): Electron.MenuItem {
-		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openGlobalSettings');
+		const settings = this.createMenuItem(nls.localize({ key: 'miOpenSettings', comment: ['&& denotes a mnemonic'] }, "&&Settings"), 'workbench.action.openSettings');
 		const kebindingSettings = this.createMenuItem(nls.localize({ key: 'miOpenKeymap', comment: ['&& denotes a mnemonic'] }, "&&Keyboard Shortcuts"), 'workbench.action.openGlobalKeybindings');
 		const keymapExtensions = this.createMenuItem(nls.localize({ key: 'miOpenKeymapExtensions', comment: ['&& denotes a mnemonic'] }, "&&Keymap Extensions"), 'workbench.extensions.action.showRecommendedKeymapExtensions');
 		const snippetsSettings = this.createMenuItem(nls.localize({ key: 'miOpenSnippets', comment: ['&& denotes a mnemonic'] }, "User &&Snippets"), 'workbench.action.openSnippets');
@@ -854,6 +854,7 @@ export class CodeMenu {
 		breakpointsMenu.append(this.createMenuItem(nls.localize({ key: 'miConditionalBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Conditional Breakpoint..."), 'editor.debug.action.conditionalBreakpoint'));
 		breakpointsMenu.append(this.createMenuItem(nls.localize({ key: 'miColumnBreakpoint', comment: ['&& denotes a mnemonic'] }, "C&&olumn Breakpoint"), 'editor.debug.action.toggleColumnBreakpoint'));
 		breakpointsMenu.append(this.createMenuItem(nls.localize({ key: 'miFunctionBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&Function Breakpoint..."), 'workbench.debug.viewlet.action.addFunctionBreakpointAction'));
+		breakpointsMenu.append(this.createMenuItem(nls.localize({ key: 'miLogPoint', comment: ['&& denotes a mnemonic'] }, "&&Log Point..."), 'editor.debug.action.toggleLogPoint'));
 		const newBreakpoints = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] }, "&&New Breakpoint")), submenu: breakpointsMenu });
 		const enableAllBreakpoints = this.createMenuItem(nls.localize({ key: 'miEnableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Enable All Breakpoints"), 'workbench.debug.viewlet.action.enableAllBreakpoints');
 		const disableAllBreakpoints = this.createMenuItem(nls.localize({ key: 'miDisableAllBreakpoints', comment: ['&& denotes a mnemonic'] }, "Disable A&&ll Breakpoints"), 'workbench.debug.viewlet.action.disableAllBreakpoints');
@@ -942,6 +943,8 @@ export class CodeMenu {
 			}
 		}, false));
 
+		const openProcessExplorer = new MenuItem({ label: this.mnemonicLabel(nls.localize({ key: 'miOpenProcessExplorerer', comment: ['&& denotes a mnemonic'] }, "Open &&Process Explorer")), click: () => this.runActionInRenderer('workbench.action.openProcessExplorer') });
+
 		let reportIssuesItem: Electron.MenuItem = null;
 		if (product.reportIssueUrl) {
 			const label = nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue");
@@ -990,7 +993,8 @@ export class CodeMenu {
 			}) : null,
 			(product.licenseUrl || product.privacyStatementUrl) ? __separator__() : null,
 			toggleDevToolsItem,
-			isWindows && product.quality !== 'stable' ? showAccessibilityOptions : null
+			openProcessExplorer,
+			isWindows && product.quality !== 'stable' ? showAccessibilityOptions : null,
 		]).forEach(item => helpMenu.append(item));
 
 		if (!isMacintosh) {
@@ -1029,7 +1033,7 @@ export class CodeMenu {
 	}
 
 	private openAccessibilityOptions(): void {
-		let win = new BrowserWindow({
+		const win = new BrowserWindow({
 			alwaysOnTop: true,
 			skipTaskbar: true,
 			resizable: false,
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index dbd4821bea1..af71a291e7b 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -151,8 +151,16 @@ export class CodeWindow implements ICodeWindow {
 
 		const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
 
+		if (isMacintosh) {
+			options.acceptFirstMouse = true; // enabled by default
+
+			if (windowConfig && windowConfig.clickThroughInactive === false) {
+				options.acceptFirstMouse = false;
+			}
+		}
+
 		let useNativeTabs = false;
-		if (windowConfig && windowConfig.nativeTabs) {
+		if (isMacintosh && windowConfig && windowConfig.nativeTabs === true) {
 			options.tabbingIdentifier = product.nameShort; // this opts in to sierra tabs
 			useNativeTabs = true;
 		}
@@ -598,7 +606,7 @@ export class CodeWindow implements ICodeWindow {
 
 		// Perf Counters
 		windowConfiguration.perfEntries = exportEntries();
-		windowConfiguration.perfStartTime = global.perfStartTime;
+		windowConfiguration.perfStartTime = (<any>global).perfStartTime;
 		windowConfiguration.perfWindowLoadTime = Date.now();
 
 		// Config (combination of process.argv and window configuration)
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 85f39a00a01..8f15684a41f 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -169,7 +169,7 @@ export class WindowsManager implements IWindowsMainService {
 		});
 
 		// React to workbench loaded events from windows
-		ipc.on('vscode:workbenchLoaded', (_event: any, windowId: number) => {
+		ipc.on('vscode:workbenchLoaded', (event: any, windowId: number) => {
 			this.logService.trace('IPC#vscode-workbenchLoaded');
 
 			const win = this.getWindowById(windowId);
diff --git a/src/vs/editor/browser/codeEditor.ts b/src/vs/editor/browser/codeEditor.ts
index 1c5ed6d9b6b..160eac3591e 100644
--- a/src/vs/editor/browser/codeEditor.ts
+++ b/src/vs/editor/browser/codeEditor.ts
@@ -12,6 +12,7 @@ import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
 import { EditorAction, EditorExtensionsRegistry, IEditorContributionCtor } from 'vs/editor/browser/editorExtensions';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class CodeEditor extends CodeEditorWidget {
 
@@ -22,9 +23,10 @@ export class CodeEditor extends CodeEditorWidget {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService
 	) {
-		super(domElement, options, false, instantiationService, codeEditorService, commandService, contextKeyService, themeService);
+		super(domElement, options, false, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService);
 	}
 
 	protected _getContributions(): IEditorContributionCtor[] {
diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts
index d89a9095a7b..74cb598bddf 100644
--- a/src/vs/editor/browser/config/configuration.ts
+++ b/src/vs/editor/browser/config/configuration.ts
@@ -276,8 +276,21 @@ class CSSBasedConfiguration extends Disposable {
 
 export class Configuration extends CommonEditorConfiguration {
 
+	private static _massageFontFamily(fontFamily: string): string {
+		if (/[,"']/.test(fontFamily)) {
+			// Looks like the font family might be already escaped
+			return fontFamily;
+		}
+		if (/[+ ]/.test(fontFamily)) {
+			// Wrap a font family using + or <space> with quotes
+			return `"${fontFamily}"`;
+		}
+
+		return fontFamily;
+	}
+
 	public static applyFontInfoSlow(domNode: HTMLElement, fontInfo: BareFontInfo): void {
-		domNode.style.fontFamily = fontInfo.fontFamily;
+		domNode.style.fontFamily = Configuration._massageFontFamily(fontInfo.fontFamily);
 		domNode.style.fontWeight = fontInfo.fontWeight;
 		domNode.style.fontSize = fontInfo.fontSize + 'px';
 		domNode.style.lineHeight = fontInfo.lineHeight + 'px';
@@ -285,7 +298,7 @@ export class Configuration extends CommonEditorConfiguration {
 	}
 
 	public static applyFontInfo(domNode: FastDomNode<HTMLElement>, fontInfo: BareFontInfo): void {
-		domNode.setFontFamily(fontInfo.fontFamily);
+		domNode.setFontFamily(Configuration._massageFontFamily(fontInfo.fontFamily));
 		domNode.setFontWeight(fontInfo.fontWeight);
 		domNode.setFontSize(fontInfo.fontSize);
 		domNode.setLineHeight(fontInfo.lineHeight);
@@ -349,7 +362,7 @@ export class Configuration extends CommonEditorConfiguration {
 			extraEditorClassName: this._getExtraEditorClassName(),
 			outerWidth: this._elementSizeObserver.getWidth(),
 			outerHeight: this._elementSizeObserver.getHeight(),
-			emptySelectionClipboard: browser.isWebKit,
+			emptySelectionClipboard: browser.isWebKit || browser.isFirefox,
 			pixelRatio: browser.getPixelRatio(),
 			zoomLevel: browser.getZoomLevel(),
 			accessibilitySupport: browser.getAccessibilitySupport()
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index efe3c993f16..6657158e914 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -11,7 +11,7 @@ import * as dom from 'vs/base/browser/dom';
 import { Position } from 'vs/editor/common/core/position';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
-import { MouseTarget, MouseTargetFactory, IViewZoneData } from 'vs/editor/browser/controller/mouseTarget';
+import { MouseTarget, MouseTargetFactory, IViewZoneData, HitTestContext } from 'vs/editor/browser/controller/mouseTarget';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { TimeoutTimer, RunOnceScheduler } from 'vs/base/common/async';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
@@ -220,8 +220,8 @@ export class MouseHandler extends ViewEventHandler {
 		let targetIsViewZone = (t.type === editorBrowser.MouseTargetType.CONTENT_VIEW_ZONE || t.type === editorBrowser.MouseTargetType.GUTTER_VIEW_ZONE);
 		let targetIsWidget = (t.type === editorBrowser.MouseTargetType.CONTENT_WIDGET);
 
-		let shouldHandle = e.leftButton;
-		if (platform.isMacintosh && e.ctrlKey) {
+		let shouldHandle = e.leftButton || e.middleButton;
+		if (platform.isMacintosh && e.leftButton && e.ctrlKey) {
 			shouldHandle = false;
 		}
 
@@ -334,6 +334,7 @@ class MouseDownOperation extends Disposable {
 		this._lastMouseEvent = e;
 
 		this._mouseState.setStartedOnLineNumbers(targetType === editorBrowser.MouseTargetType.GUTTER_LINE_NUMBERS);
+		this._mouseState.setStartButtons(e);
 		this._mouseState.setModifiers(e);
 		let position = this._findMousePosition(e, true);
 		if (!position) {
@@ -423,12 +424,30 @@ class MouseDownOperation extends Disposable {
 		const mouseColumn = this._getMouseColumn(e);
 
 		if (e.posy < editorContent.y) {
-			let aboveLineNumber = viewLayout.getLineNumberAtVerticalOffset(Math.max(viewLayout.getCurrentScrollTop() - (editorContent.y - e.posy), 0));
+			const verticalOffset = Math.max(viewLayout.getCurrentScrollTop() - (editorContent.y - e.posy), 0);
+			const viewZoneData = HitTestContext.getZoneAtCoord(this._context, verticalOffset);
+			if (viewZoneData) {
+				const newPosition = this._helpPositionJumpOverViewZone(viewZoneData);
+				if (newPosition) {
+					return new MouseTarget(null, editorBrowser.MouseTargetType.OUTSIDE_EDITOR, mouseColumn, newPosition);
+				}
+			}
+
+			let aboveLineNumber = viewLayout.getLineNumberAtVerticalOffset(verticalOffset);
 			return new MouseTarget(null, editorBrowser.MouseTargetType.OUTSIDE_EDITOR, mouseColumn, new Position(aboveLineNumber, 1));
 		}
 
 		if (e.posy > editorContent.y + editorContent.height) {
-			let belowLineNumber = viewLayout.getLineNumberAtVerticalOffset(viewLayout.getCurrentScrollTop() + (e.posy - editorContent.y));
+			const verticalOffset = viewLayout.getCurrentScrollTop() + (e.posy - editorContent.y);
+			const viewZoneData = HitTestContext.getZoneAtCoord(this._context, verticalOffset);
+			if (viewZoneData) {
+				const newPosition = this._helpPositionJumpOverViewZone(viewZoneData);
+				if (newPosition) {
+					return new MouseTarget(null, editorBrowser.MouseTargetType.OUTSIDE_EDITOR, mouseColumn, newPosition);
+				}
+			}
+
+			let belowLineNumber = viewLayout.getLineNumberAtVerticalOffset(verticalOffset);
 			return new MouseTarget(null, editorBrowser.MouseTargetType.OUTSIDE_EDITOR, mouseColumn, new Position(belowLineNumber, model.getLineMaxColumn(belowLineNumber)));
 		}
 
@@ -458,24 +477,31 @@ class MouseDownOperation extends Disposable {
 		}
 
 		if (t.type === editorBrowser.MouseTargetType.CONTENT_VIEW_ZONE || t.type === editorBrowser.MouseTargetType.GUTTER_VIEW_ZONE) {
-			// Force position on view zones to go above or below depending on where selection started from
-			let selectionStart = new Position(this._currentSelection.selectionStartLineNumber, this._currentSelection.selectionStartColumn);
-			let viewZoneData = <IViewZoneData>t.detail;
-			let positionBefore = viewZoneData.positionBefore;
-			let positionAfter = viewZoneData.positionAfter;
-
-			if (positionBefore && positionAfter) {
-				if (positionBefore.isBefore(selectionStart)) {
-					return new MouseTarget(t.element, t.type, t.mouseColumn, positionBefore, null, t.detail);
-				} else {
-					return new MouseTarget(t.element, t.type, t.mouseColumn, positionAfter, null, t.detail);
-				}
+			const newPosition = this._helpPositionJumpOverViewZone(<IViewZoneData>t.detail);
+			if (newPosition) {
+				return new MouseTarget(t.element, t.type, t.mouseColumn, newPosition, null, t.detail);
 			}
 		}
 
 		return t;
 	}
 
+	private _helpPositionJumpOverViewZone(viewZoneData: IViewZoneData): Position {
+		// Force position on view zones to go above or below depending on where selection started from
+		let selectionStart = new Position(this._currentSelection.selectionStartLineNumber, this._currentSelection.selectionStartColumn);
+		let positionBefore = viewZoneData.positionBefore;
+		let positionAfter = viewZoneData.positionAfter;
+
+		if (positionBefore && positionAfter) {
+			if (positionBefore.isBefore(selectionStart)) {
+				return positionBefore;
+			} else {
+				return positionAfter;
+			}
+		}
+		return null;
+	}
+
 	private _dispatchMouse(position: MouseTarget, inSelectionMode: boolean): void {
 		this._viewController.dispatchMouse({
 			position: position.position,
@@ -488,6 +514,9 @@ class MouseDownOperation extends Disposable {
 			ctrlKey: this._mouseState.ctrlKey,
 			metaKey: this._mouseState.metaKey,
 			shiftKey: this._mouseState.shiftKey,
+
+			leftButton: this._mouseState.leftButton,
+			middleButton: this._mouseState.middleButton,
 		});
 	}
 }
@@ -508,6 +537,12 @@ class MouseDownState {
 	private _shiftKey: boolean;
 	public get shiftKey(): boolean { return this._shiftKey; }
 
+	private _leftButton: boolean;
+	public get leftButton(): boolean { return this._leftButton; }
+
+	private _middleButton: boolean;
+	public get middleButton(): boolean { return this._middleButton; }
+
 	private _startedOnLineNumbers: boolean;
 	public get startedOnLineNumbers(): boolean { return this._startedOnLineNumbers; }
 
@@ -522,6 +557,8 @@ class MouseDownState {
 		this._ctrlKey = false;
 		this._metaKey = false;
 		this._shiftKey = false;
+		this._leftButton = false;
+		this._middleButton = false;
 		this._startedOnLineNumbers = false;
 		this._lastMouseDownPosition = null;
 		this._lastMouseDownPositionEqualCount = 0;
@@ -541,6 +578,11 @@ class MouseDownState {
 		this._shiftKey = source.shiftKey;
 	}
 
+	public setStartButtons(source: EditorMouseEvent) {
+		this._leftButton = source.leftButton;
+		this._middleButton = source.middleButton;
+	}
+
 	public setStartedOnLineNumbers(startedOnLineNumbers: boolean): void {
 		this._startedOnLineNumbers = startedOnLineNumbers;
 	}
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
index 436f7a96967..bab014e28eb 100644
--- a/src/vs/editor/browser/controller/mouseTarget.ts
+++ b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -16,6 +16,7 @@ import { PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPa
 import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
 import { EditorLayoutInfo } from 'vs/editor/common/config/editorOptions';
 import { ViewLine } from 'vs/editor/browser/viewParts/lines/viewLine';
+import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
 
 export interface IViewZoneData {
 	viewZoneId: number;
@@ -174,6 +175,14 @@ class ElementPath {
 		);
 	}
 
+	public static isStrictChildOfViewLines(path: Uint8Array): boolean {
+		return (
+			path.length > 4
+			&& path[0] === PartFingerprint.OverflowGuard
+			&& path[3] === PartFingerprint.ViewLines
+		);
+	}
+
 	public static isChildOfScrollableElement(path: Uint8Array): boolean {
 		return (
 			path.length >= 2
@@ -214,7 +223,7 @@ class ElementPath {
 	}
 }
 
-class HitTestContext {
+export class HitTestContext {
 
 	public readonly model: IViewModel;
 	public readonly layoutInfo: EditorLayoutInfo;
@@ -238,12 +247,16 @@ class HitTestContext {
 	}
 
 	public getZoneAtCoord(mouseVerticalOffset: number): IViewZoneData {
+		return HitTestContext.getZoneAtCoord(this._context, mouseVerticalOffset);
+	}
+
+	public static getZoneAtCoord(context: ViewContext, mouseVerticalOffset: number): IViewZoneData {
 		// The target is either a view zone or the empty space after the last view-line
-		let viewZoneWhitespace = this._context.viewLayout.getWhitespaceAtVerticalOffset(mouseVerticalOffset);
+		let viewZoneWhitespace = context.viewLayout.getWhitespaceAtVerticalOffset(mouseVerticalOffset);
 
 		if (viewZoneWhitespace) {
 			let viewZoneMiddle = viewZoneWhitespace.verticalOffset + viewZoneWhitespace.height / 2,
-				lineCount = this._context.model.getLineCount(),
+				lineCount = context.model.getLineCount(),
 				positionBefore: Position = null,
 				position: Position,
 				positionAfter: Position = null;
@@ -254,7 +267,7 @@ class HitTestContext {
 			}
 			if (viewZoneWhitespace.afterLineNumber > 0) {
 				// There are more lines above this view zone
-				positionBefore = new Position(viewZoneWhitespace.afterLineNumber, this._context.model.getLineMaxColumn(viewZoneWhitespace.afterLineNumber));
+				positionBefore = new Position(viewZoneWhitespace.afterLineNumber, context.model.getLineMaxColumn(viewZoneWhitespace.afterLineNumber));
 			}
 
 			if (positionAfter === null) {
@@ -330,7 +343,7 @@ class HitTestContext {
 		return this._viewHelper.getLineWidth(lineNumber);
 	}
 
-	public visibleRangeForPosition2(lineNumber: number, column: number) {
+	public visibleRangeForPosition2(lineNumber: number, column: number): HorizontalRange {
 		return this._viewHelper.visibleRangeForPosition2(lineNumber, column);
 	}
 
@@ -621,6 +634,15 @@ export class MouseTargetFactory {
 		}
 
 		if (domHitTestExecuted) {
+			// Check if we are hitting a view-line (can happen in the case of inline decorations on empty lines)
+			// See https://github.com/Microsoft/vscode/issues/46942
+			if (ElementPath.isStrictChildOfViewLines(request.targetPath)) {
+				const lineNumber = ctx.getLineNumberAtVerticalOffset(request.mouseVerticalOffset);
+				if (ctx.model.getLineLength(lineNumber) === 0) {
+					return request.fulfill(MouseTargetType.CONTENT_EMPTY, new Position(lineNumber, 1), void 0, EMPTY_CONTENT_IN_LINES);
+				}
+			}
+
 			// We have already executed hit test...
 			return request.fulfill(MouseTargetType.UNKNOWN);
 		}
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
index cf5620fdb7c..098af888c20 100644
--- a/src/vs/editor/browser/controller/textAreaHandler.ts
+++ b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -27,6 +27,7 @@ import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/line
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { RenderLineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { EndOfLinePreference } from 'vs/editor/common/model';
+import { getMapForWordSeparators, WordCharacterClass } from 'vs/editor/common/controller/wordCharacterClassifier';
 
 export interface ITextAreaHandlerHelper {
 	visibleRangeForPositionRelativeToEditor(lineNumber: number, column: number): HorizontalRange;
@@ -203,16 +204,19 @@ export class TextAreaHandler extends ViewPart {
 				if (this._accessibilitySupport === platform.AccessibilitySupport.Disabled) {
 					// We know for a fact that a screen reader is not attached
 					// On OSX, we write the character before the cursor to allow for "long-press" composition
+					// Also on OSX, we write the word before the cursor to allow for the Accessibility Keyboard to give good hints
 					if (platform.isMacintosh) {
 						const selection = this._selections[0];
 						if (selection.isEmpty()) {
 							const position = selection.getStartPosition();
-							if (position.column > 1) {
-								const lineContent = this._context.model.getLineContent(position.lineNumber);
-								const charBefore = lineContent.charAt(position.column - 2);
-								if (!strings.isHighSurrogate(charBefore.charCodeAt(0))) {
-									return new TextAreaState(charBefore, 1, 1, position, position);
-								}
+
+							let textBefore = this._getWordBeforePosition(position);
+							if (textBefore.length === 0) {
+								textBefore = this._getCharacterBeforePosition(position);
+							}
+
+							if (textBefore.length > 0) {
+								return new TextAreaState(textBefore, textBefore.length, textBefore.length, position, position);
 							}
 						}
 					}
@@ -328,6 +332,35 @@ export class TextAreaHandler extends ViewPart {
 		super.dispose();
 	}
 
+	private _getWordBeforePosition(position: Position): string {
+		const lineContent = this._context.model.getLineContent(position.lineNumber);
+		const wordSeparators = getMapForWordSeparators(this._context.configuration.editor.wordSeparators);
+
+		let column = position.column;
+		let distance = 0;
+		while (column > 1) {
+			const charCode = lineContent.charCodeAt(column - 2);
+			const charClass = wordSeparators.get(charCode);
+			if (charClass !== WordCharacterClass.Regular || distance > 50) {
+				return lineContent.substring(column - 1, position.column - 1);
+			}
+			distance++;
+			column--;
+		}
+		return lineContent.substring(0, position.column - 1);
+	}
+
+	private _getCharacterBeforePosition(position: Position): string {
+		if (position.column > 1) {
+			const lineContent = this._context.model.getLineContent(position.lineNumber);
+			const charBefore = lineContent.charAt(position.column - 2);
+			if (!strings.isHighSurrogate(charBefore.charCodeAt(0))) {
+				return charBefore;
+			}
+		}
+		return '';
+	}
+
 	// --- begin event handlers
 
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
@@ -509,7 +542,7 @@ export class TextAreaHandler extends ViewPart {
 		tac.setHeight(1);
 
 		if (this._context.configuration.editor.viewInfo.glyphMargin) {
-			tac.setClassName('monaco-editor-background textAreaCover ' + Margin.CLASS_NAME);
+			tac.setClassName('monaco-editor-background textAreaCover ' + Margin.OUTER_CLASS_NAME);
 		} else {
 			if (this._context.configuration.editor.viewInfo.renderLineNumbers !== RenderLineNumbersType.Off) {
 				tac.setClassName('monaco-editor-background textAreaCover ' + LineNumbersOverlay.CLASS_NAME);
diff --git a/src/vs/editor/browser/controller/textAreaInput.ts b/src/vs/editor/browser/controller/textAreaInput.ts
index 054dbaa48e4..d3dd81fac4e 100644
--- a/src/vs/editor/browser/controller/textAreaInput.ts
+++ b/src/vs/editor/browser/controller/textAreaInput.ts
@@ -42,6 +42,19 @@ export interface ITextAreaInputHost {
 	deduceModelPosition(viewAnchorPosition: Position, deltaOffset: number, lineFeedCnt: number): Position;
 }
 
+const enum TextAreaInputEventType {
+	none,
+	compositionstart,
+	compositionupdate,
+	compositionend,
+	input,
+	cut,
+	copy,
+	paste,
+	focus,
+	blur
+}
+
 /**
  * Writes screen reader content to the textarea and is able to analyze its input events to generate:
  *  - onCut
@@ -89,6 +102,7 @@ export class TextAreaInput extends Disposable {
 
 	private readonly _host: ITextAreaInputHost;
 	private readonly _textArea: TextAreaWrapper;
+	private _lastTextAreaEvent: TextAreaInputEventType;
 	private readonly _asyncTriggerCut: RunOnceScheduler;
 
 	private _textAreaState: TextAreaState;
@@ -101,6 +115,7 @@ export class TextAreaInput extends Disposable {
 		super();
 		this._host = host;
 		this._textArea = this._register(new TextAreaWrapper(textArea));
+		this._lastTextAreaEvent = TextAreaInputEventType.none;
 		this._asyncTriggerCut = this._register(new RunOnceScheduler(() => this._onCut.fire(), 0));
 
 		this._textAreaState = TextAreaState.EMPTY;
@@ -129,6 +144,8 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionstart', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionstart;
+
 			if (this._isDoingComposition) {
 				return;
 			}
@@ -145,10 +162,10 @@ export class TextAreaInput extends Disposable {
 		/**
 		 * Deduce the typed input from a text area's value and the last observed state.
 		 */
-		const deduceInputFromTextAreaValue = (couldBeEmojiInput: boolean): [TextAreaState, ITypeData] => {
+		const deduceInputFromTextAreaValue = (couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean): [TextAreaState, ITypeData] => {
 			const oldState = this._textAreaState;
-			const newState = this._textAreaState.readFromTextArea(this._textArea);
-			return [newState, TextAreaState.deduceInput(oldState, newState, couldBeEmojiInput)];
+			const newState = TextAreaState.readFromTextArea(this._textArea);
+			return [newState, TextAreaState.deduceInput(oldState, newState, couldBeEmojiInput, couldBeTypingAtOffset0)];
 		};
 
 		/**
@@ -185,6 +202,8 @@ export class TextAreaInput extends Disposable {
 		};
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionupdate', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionupdate;
+
 			if (browser.isChromev56) {
 				// See https://github.com/Microsoft/monaco-editor/issues/320
 				// where compositionupdate .data is broken in Chrome v55 and v56
@@ -195,7 +214,7 @@ export class TextAreaInput extends Disposable {
 			}
 
 			if (compositionDataInValid(e.locale)) {
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
+				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
 				this._textAreaState = newState;
 				this._onType.fire(typeInput);
 				this._onCompositionUpdate.fire(e);
@@ -209,9 +228,11 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'compositionend', (e: CompositionEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.compositionend;
+
 			if (compositionDataInValid(e.locale)) {
 				// https://github.com/Microsoft/monaco-editor/issues/339
-				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false);
+				const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/false, /*couldBeTypingAtOffset0*/false);
 				this._textAreaState = newState;
 				this._onType.fire(typeInput);
 			} else {
@@ -223,7 +244,7 @@ export class TextAreaInput extends Disposable {
 			// Due to isEdgeOrIE (where the textarea was not cleared initially) and isChrome (the textarea is not updated correctly when composition ends)
 			// we cannot assume the text at the end consists only of the composited text
 			if (browser.isEdgeOrIE || browser.isChrome) {
-				this._textAreaState = this._textAreaState.readFromTextArea(this._textArea);
+				this._textAreaState = TextAreaState.readFromTextArea(this._textArea);
 			}
 
 			if (!this._isDoingComposition) {
@@ -235,6 +256,10 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'input', () => {
+			// We want to find out if this is the first `input` after a `focus`.
+			const previousEventWasFocus = (this._lastTextAreaEvent === TextAreaInputEventType.focus);
+			this._lastTextAreaEvent = TextAreaInputEventType.input;
+
 			// Pretend here we touched the text area, as the `input` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received input event');
@@ -254,7 +279,7 @@ export class TextAreaInput extends Disposable {
 				return;
 			}
 
-			const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/platform.isMacintosh);
+			const [newState, typeInput] = deduceInputFromTextAreaValue(/*couldBeEmojiInput*/platform.isMacintosh, /*couldBeTypingAtOffset0*/previousEventWasFocus && platform.isMacintosh);
 			if (typeInput.replaceCharCnt === 0 && typeInput.text.length === 1 && strings.isHighSurrogate(typeInput.text.charCodeAt(0))) {
 				// Ignore invalid input but keep it around for next time
 				return;
@@ -279,6 +304,8 @@ export class TextAreaInput extends Disposable {
 		// --- Clipboard operations
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'cut', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.cut;
+
 			// Pretend here we touched the text area, as the `cut` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received cut event');
@@ -288,10 +315,14 @@ export class TextAreaInput extends Disposable {
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'copy', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.copy;
+
 			this._ensureClipboardGetsEditorSelection(e);
 		}));
 
 		this._register(dom.addDisposableListener(textArea.domNode, 'paste', (e: ClipboardEvent) => {
+			this._lastTextAreaEvent = TextAreaInputEventType.paste;
+
 			// Pretend here we touched the text area, as the `paste` event will most likely
 			// result in a `selectionchange` event which we want to ignore
 			this._textArea.setIgnoreSelectionChangeTime('received paste event');
@@ -312,8 +343,14 @@ export class TextAreaInput extends Disposable {
 			}
 		}));
 
-		this._register(dom.addDisposableListener(textArea.domNode, 'focus', () => this._setHasFocus(true)));
-		this._register(dom.addDisposableListener(textArea.domNode, 'blur', () => this._setHasFocus(false)));
+		this._register(dom.addDisposableListener(textArea.domNode, 'focus', () => {
+			this._lastTextAreaEvent = TextAreaInputEventType.focus;
+			this._setHasFocus(true);
+		}));
+		this._register(dom.addDisposableListener(textArea.domNode, 'blur', () => {
+			this._lastTextAreaEvent = TextAreaInputEventType.blur;
+			this._setHasFocus(false);
+		}));
 
 
 		// See https://github.com/Microsoft/vscode/issues/27216
@@ -419,12 +456,6 @@ export class TextAreaInput extends Disposable {
 		}
 		this._hasFocus = newHasFocus;
 
-		if (this._isDoingComposition) {
-			// textarea gets focus, so the state should be clean
-			// https://github.com/Microsoft/monaco-editor/issues/552
-			this._isDoingComposition = false;
-		}
-
 		if (this._hasFocus) {
 			if (browser.isEdge) {
 				// Edge has a bug where setting the selection range while the focus event
diff --git a/src/vs/editor/browser/controller/textAreaState.ts b/src/vs/editor/browser/controller/textAreaState.ts
index c46ad756789..09f54a8a013 100644
--- a/src/vs/editor/browser/controller/textAreaState.ts
+++ b/src/vs/editor/browser/controller/textAreaState.ts
@@ -51,7 +51,7 @@ export class TextAreaState {
 		return '[ <' + this.value + '>, selectionStart: ' + this.selectionStart + ', selectionEnd: ' + this.selectionEnd + ']';
 	}
 
-	public readFromTextArea(textArea: ITextAreaWrapper): TextAreaState {
+	public static readFromTextArea(textArea: ITextAreaWrapper): TextAreaState {
 		return new TextAreaState(textArea.getValue(), textArea.getSelectionStart(), textArea.getSelectionEnd(), null, null);
 	}
 
@@ -60,7 +60,7 @@ export class TextAreaState {
 	}
 
 	public writeToTextArea(reason: string, textArea: ITextAreaWrapper, select: boolean): void {
-		// console.log(Date.now() + ': applyToTextArea ' + reason + ': ' + this.toString());
+		// console.log(Date.now() + ': writeToTextArea ' + reason + ': ' + this.toString());
 		textArea.setValue(reason, this.value);
 		if (select) {
 			textArea.setSelectionRange(reason, this.selectionStart, this.selectionEnd);
@@ -97,7 +97,7 @@ export class TextAreaState {
 		return new TextAreaState(text, 0, text.length, null, null);
 	}
 
-	public static deduceInput(previousState: TextAreaState, currentState: TextAreaState, couldBeEmojiInput: boolean): ITypeData {
+	public static deduceInput(previousState: TextAreaState, currentState: TextAreaState, couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean): ITypeData {
 		if (!previousState) {
 			// This is the EMPTY state
 			return {
@@ -117,6 +117,18 @@ export class TextAreaState {
 		let currentSelectionStart = currentState.selectionStart;
 		let currentSelectionEnd = currentState.selectionEnd;
 
+		if (couldBeTypingAtOffset0 && previousValue.length > 0 && previousSelectionStart === previousSelectionEnd && currentSelectionStart === currentSelectionEnd) {
+			// See https://github.com/Microsoft/vscode/issues/42251
+			// where typing always happens at offset 0 in the textarea
+			// when using a custom title area in OSX and moving the window
+			if (strings.endsWith(currentValue, previousValue)) {
+				// Looks like something was typed at offset 0
+				// ==> pretend we placed the cursor at offset 0 to begin with...
+				previousSelectionStart = 0;
+				previousSelectionEnd = 0;
+			}
+		}
+
 		// Strip the previous suffix from the value (without interfering with the current selection)
 		const previousSuffix = previousValue.substring(previousSelectionEnd);
 		const currentSuffix = currentValue.substring(currentSelectionEnd);
diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts
index 79d5d54e20b..18810f9d54f 100644
--- a/src/vs/editor/browser/editorBrowser.ts
+++ b/src/vs/editor/browser/editorBrowser.ts
@@ -391,6 +391,12 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 * @internal
 	 */
 	onDidType(listener: (text: string) => void): IDisposable;
+	/**
+	 * An event emitted when editing failed because the editor is read-only.
+	 * @event
+	 * @internal
+	 */
+	onDidAttemptReadOnlyEdit(listener: () => void): IDisposable;
 	/**
 	 * An event emitted when users paste text in the editor.
 	 * @event
@@ -619,11 +625,6 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	 */
 	getLayoutInfo(): editorOptions.EditorLayoutInfo;
 
-	/**
-	 * Returns the range that is currently centered in the view port.
-	 */
-	getCenteredRangeInViewport(): Range;
-
 	/**
 	 * Returns the ranges that are currently visible.
 	 * Does not account for horizontal scrolling.
diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
index 6f2bde8d93c..64938f0b602 100644
--- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts
+++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts
@@ -126,6 +126,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 
 	public className: string;
 	public inlineClassName: string;
+	public inlineClassNameAffectsLetterSpacing: boolean;
 	public beforeContentClassName: string;
 	public afterContentClassName: string;
 	public glyphMarginClassName: string;
@@ -145,9 +146,21 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 			}
 			return void 0;
 		};
+		let createInlineCSSRules = (type: ModelDecorationCSSRuleType) => {
+			let rules = new DecorationCSSRules(type, providerArgs, themeService);
+			if (rules.hasContent) {
+				this._disposables.push(rules);
+				return { className: rules.className, hasLetterSpacing: rules.hasLetterSpacing };
+			}
+			return null;
+		};
 
 		this.className = createCSSRules(ModelDecorationCSSRuleType.ClassName);
-		this.inlineClassName = createCSSRules(ModelDecorationCSSRuleType.InlineClassName);
+		const inlineData = createInlineCSSRules(ModelDecorationCSSRuleType.InlineClassName);
+		if (inlineData) {
+			this.inlineClassName = inlineData.className;
+			this.inlineClassNameAffectsLetterSpacing = inlineData.hasLetterSpacing;
+		}
 		this.beforeContentClassName = createCSSRules(ModelDecorationCSSRuleType.BeforeContentClassName);
 		this.afterContentClassName = createCSSRules(ModelDecorationCSSRuleType.AfterContentClassName);
 		this.glyphMarginClassName = createCSSRules(ModelDecorationCSSRuleType.GlyphMarginClassName);
@@ -194,6 +207,7 @@ class DecorationTypeOptionsProvider implements IModelDecorationOptionsProvider {
 
 const _CSS_MAP = {
 	color: 'color:{0} !important;',
+	opacity: 'opacity:{0};',
 	backgroundColor: 'background-color:{0};',
 
 	outline: 'outline:{0};',
@@ -231,6 +245,7 @@ class DecorationCSSRules {
 	private _className: string;
 	private _unThemedSelector: string;
 	private _hasContent: boolean;
+	private _hasLetterSpacing: boolean;
 	private _ruleType: ModelDecorationCSSRuleType;
 	private _themeListener: IDisposable;
 	private _providerArgs: ProviderArguments;
@@ -242,6 +257,7 @@ class DecorationCSSRules {
 		this._providerArgs = providerArgs;
 		this._usesThemeColors = false;
 		this._hasContent = false;
+		this._hasLetterSpacing = false;
 
 		let className = CSSNameHelper.getClassName(this._providerArgs.key, ruleType);
 		if (this._providerArgs.parentTypeKey) {
@@ -277,6 +293,10 @@ class DecorationCSSRules {
 		return this._hasContent;
 	}
 
+	public get hasLetterSpacing(): boolean {
+		return this._hasLetterSpacing;
+	}
+
 	public get className(): string {
 		return this._className;
 	}
@@ -357,7 +377,10 @@ class DecorationCSSRules {
 			return '';
 		}
 		let cssTextArr: string[] = [];
-		this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'cursor', 'color', 'letterSpacing'], cssTextArr);
+		this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'cursor', 'color', 'opacity', 'letterSpacing'], cssTextArr);
+		if (opts.letterSpacing) {
+			this._hasLetterSpacing = true;
+		}
 		return cssTextArr.join('');
 	}
 
@@ -385,7 +408,7 @@ class DecorationCSSRules {
 
 				cssTextArr.push(strings.format(_CSS_MAP.contentText, escaped));
 			}
-			this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'color', 'backgroundColor', 'margin'], cssTextArr);
+			this.collectCSSText(opts, ['fontStyle', 'fontWeight', 'textDecoration', 'color', 'opacity', 'backgroundColor', 'margin'], cssTextArr);
 			if (this.collectCSSText(opts, ['width', 'height'], cssTextArr)) {
 				cssTextArr.push('display:inline-block;');
 			}
diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts
index 8dfebb34b87..31233148de5 100644
--- a/src/vs/editor/browser/view/viewController.ts
+++ b/src/vs/editor/browser/view/viewController.ts
@@ -31,6 +31,9 @@ export interface IMouseDispatchData {
 	ctrlKey: boolean;
 	metaKey: boolean;
 	shiftKey: boolean;
+
+	leftButton: boolean;
+	middleButton: boolean;
 }
 
 export interface ICommandDelegate {
@@ -133,7 +136,13 @@ export class ViewController {
 	}
 
 	public dispatchMouse(data: IMouseDispatchData): void {
-		if (data.startedOnLineNumbers) {
+		if (data.middleButton) {
+			if (data.inSelectionMode) {
+				this.columnSelect(data.position, data.mouseColumn);
+			} else {
+				this.moveTo(data.position);
+			}
+		} else if (data.startedOnLineNumbers) {
 			// If the dragging started on the gutter, then have operations work on the entire line
 			if (this._hasMulticursorModifier(data)) {
 				if (data.inSelectionMode) {
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
index 88fa7e2ed2d..22de5aae513 100644
--- a/src/vs/editor/browser/view/viewImpl.ts
+++ b/src/vs/editor/browser/view/viewImpl.ts
@@ -321,6 +321,7 @@ export class View extends ViewEventHandler {
 	}
 	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this.domNode.setClassName(this.getEditorClassName());
+		this._context.model.setHasFocus(e.isFocused);
 		if (e.isFocused) {
 			this.outgoingEvents.emitViewFocusGained();
 		} else {
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index 93934f1131b..6dbaa2e4525 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -308,7 +308,8 @@ class Widget {
 	private _layoutBoxInPage(topLeft: Coordinate, width: number, height: number, ctx: RenderingContext): IBoxLayoutResult {
 		let left0 = topLeft.left - ctx.scrollLeft;
 
-		if (left0 + width < 0 || left0 > this._contentWidth) {
+		if (left0 < 0 || left0 > this._contentWidth) {
+			// Don't render if position is scrolled outside viewport
 			return null;
 		}
 
diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts
index da0359739fe..f72476f8f30 100644
--- a/src/vs/editor/browser/viewParts/decorations/decorations.ts
+++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts
@@ -85,8 +85,14 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 
 		// Sort decorations for consistent render output
 		decorations = decorations.sort((a, b) => {
-			let aClassName = a.options.className;
-			let bClassName = b.options.className;
+			if (a.options.zIndex < b.options.zIndex) {
+				return -1;
+			}
+			if (a.options.zIndex > b.options.zIndex) {
+				return 1;
+			}
+			const aClassName = a.options.className;
+			const bClassName = b.options.className;
 
 			if (aClassName < bClassName) {
 				return -1;
@@ -142,8 +148,12 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 	}
 
 	private _renderNormalDecorations(ctx: RenderingContext, decorations: ViewModelDecoration[], output: string[]): void {
-		let lineHeight = String(this._lineHeight);
-		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
+		const lineHeight = String(this._lineHeight);
+		const visibleStartLineNumber = ctx.visibleRange.startLineNumber;
+
+		let prevClassName: string = null;
+		let prevShowIfCollapsed: boolean = false;
+		let prevRange: Range = null;
 
 		for (let i = 0, lenI = decorations.length; i < lenI; i++) {
 			const d = decorations[i];
@@ -160,39 +170,60 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 				range = new Range(range.startLineNumber, range.startColumn, range.endLineNumber - 1, this._context.model.getLineMaxColumn(range.endLineNumber - 1));
 			}
 
-			let linesVisibleRanges = ctx.linesVisibleRangesForRange(range, /*TODO@Alex*/className === 'findMatch');
-			if (!linesVisibleRanges) {
+			if (prevClassName === className && prevShowIfCollapsed === showIfCollapsed && Range.areIntersectingOrTouching(prevRange, range)) {
+				// merge into previous decoration
+				prevRange = Range.plusRange(prevRange, range);
 				continue;
 			}
 
-			for (let j = 0, lenJ = linesVisibleRanges.length; j < lenJ; j++) {
-				let lineVisibleRanges = linesVisibleRanges[j];
-				const lineIndex = lineVisibleRanges.lineNumber - visibleStartLineNumber;
+			// flush previous decoration
+			if (prevClassName !== null) {
+				this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShowIfCollapsed, lineHeight, visibleStartLineNumber, output);
+			}
 
-				if (showIfCollapsed && lineVisibleRanges.ranges.length === 1) {
-					const singleVisibleRange = lineVisibleRanges.ranges[0];
-					if (singleVisibleRange.width === 0) {
-						// collapsed range case => make the decoration visible by faking its width
-						lineVisibleRanges.ranges[0] = new HorizontalRange(singleVisibleRange.left, this._typicalHalfwidthCharacterWidth);
-					}
-				}
+			prevClassName = className;
+			prevShowIfCollapsed = showIfCollapsed;
+			prevRange = range;
+		}
 
-				for (let k = 0, lenK = lineVisibleRanges.ranges.length; k < lenK; k++) {
-					const visibleRange = lineVisibleRanges.ranges[k];
-					const decorationOutput = (
-						'<div class="cdr '
-						+ className
-						+ '" style="left:'
-						+ String(visibleRange.left)
-						+ 'px;width:'
-						+ String(visibleRange.width)
-						+ 'px;height:'
-						+ lineHeight
-						+ 'px;"></div>'
-					);
-					output[lineIndex] += decorationOutput;
+		if (prevClassName !== null) {
+			this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShowIfCollapsed, lineHeight, visibleStartLineNumber, output);
+		}
+	}
+
+	private _renderNormalDecoration(ctx: RenderingContext, range: Range, className: string, showIfCollapsed: boolean, lineHeight: string, visibleStartLineNumber: number, output: string[]): void {
+		let linesVisibleRanges = ctx.linesVisibleRangesForRange(range, /*TODO@Alex*/className === 'findMatch');
+		if (!linesVisibleRanges) {
+			return;
+		}
+
+		for (let j = 0, lenJ = linesVisibleRanges.length; j < lenJ; j++) {
+			let lineVisibleRanges = linesVisibleRanges[j];
+			const lineIndex = lineVisibleRanges.lineNumber - visibleStartLineNumber;
+
+			if (showIfCollapsed && lineVisibleRanges.ranges.length === 1) {
+				const singleVisibleRange = lineVisibleRanges.ranges[0];
+				if (singleVisibleRange.width === 0) {
+					// collapsed range case => make the decoration visible by faking its width
+					lineVisibleRanges.ranges[0] = new HorizontalRange(singleVisibleRange.left, this._typicalHalfwidthCharacterWidth);
 				}
 			}
+
+			for (let k = 0, lenK = lineVisibleRanges.ranges.length; k < lenK; k++) {
+				const visibleRange = lineVisibleRanges.ranges[k];
+				const decorationOutput = (
+					'<div class="cdr '
+					+ className
+					+ '" style="left:'
+					+ String(visibleRange.left)
+					+ 'px;width:'
+					+ String(visibleRange.width)
+					+ 'px;height:'
+					+ lineHeight
+					+ 'px;"></div>'
+				);
+				output[lineIndex] += decorationOutput;
+			}
 		}
 	}
 
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.css b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.css
index 45992137d18..3055ad67e4e 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.css
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.css
@@ -10,3 +10,6 @@
 .monaco-editor .lines-content .cigr {
 	position: absolute;
 }
+.monaco-editor .lines-content .cigra {
+	position: absolute;
+}
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 8e97e032f30..8834b5fed88 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -11,13 +11,13 @@ import { ViewContext } from 'vs/editor/common/view/viewContext';
 import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
-import { editorIndentGuides } from 'vs/editor/common/view/editorColorRegistry';
-import * as dom from 'vs/base/browser/dom';
+import { editorIndentGuides, editorActiveIndentGuides } from 'vs/editor/common/view/editorColorRegistry';
 import { Position } from 'vs/editor/common/core/position';
 
 export class IndentGuidesOverlay extends DynamicViewOverlay {
 
 	private _context: ViewContext;
+	private _primaryLineNumber: number;
 	private _lineHeight: number;
 	private _spaceWidth: number;
 	private _renderResult: string[];
@@ -26,6 +26,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 	constructor(context: ViewContext) {
 		super();
 		this._context = context;
+		this._primaryLineNumber = 0;
 		this._lineHeight = this._context.configuration.editor.lineHeight;
 		this._spaceWidth = this._context.configuration.editor.fontInfo.spaceWidth;
 		this._enabled = this._context.configuration.editor.viewInfo.renderIndentGuides;
@@ -55,6 +56,17 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		}
 		return true;
 	}
+	public onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
+		const selection = e.selections[0];
+		const newPrimaryLineNumber = selection.isEmpty() ? selection.positionLineNumber : 0;
+
+		if (this._primaryLineNumber !== newPrimaryLineNumber) {
+			this._primaryLineNumber = newPrimaryLineNumber;
+			return true;
+		}
+
+		return false;
+	}
 	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
 		// true for inline decorations
 		return true;
@@ -94,20 +106,32 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 		const tabSize = this._context.model.getTabSize();
 		const tabWidth = tabSize * this._spaceWidth;
 		const lineHeight = this._lineHeight;
-		const indentGuideWidth = dom.computeScreenAwareSize(1);
+		const indentGuideWidth = tabWidth;
 
 		const indents = this._context.model.getLinesIndentGuides(visibleStartLineNumber, visibleEndLineNumber);
 
+		let activeIndentStartLineNumber = 0;
+		let activeIndentEndLineNumber = 0;
+		let activeIndentLevel = 0;
+		if (this._primaryLineNumber) {
+			const activeIndentInfo = this._context.model.getActiveIndentGuide(this._primaryLineNumber);
+			activeIndentStartLineNumber = activeIndentInfo.startLineNumber;
+			activeIndentEndLineNumber = activeIndentInfo.endLineNumber;
+			activeIndentLevel = activeIndentInfo.indent;
+		}
+
 		let output: string[] = [];
 		for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
+			const containsActiveIndentGuide = (activeIndentStartLineNumber <= lineNumber && lineNumber <= activeIndentEndLineNumber);
 			const lineIndex = lineNumber - visibleStartLineNumber;
 			const indent = indents[lineIndex];
 
 			let result = '';
 			let leftMostVisiblePosition = ctx.visibleRangeForPosition(new Position(lineNumber, 1));
 			let left = leftMostVisiblePosition ? leftMostVisiblePosition.left : 0;
-			for (let i = 0; i < indent; i++) {
-				result += `<div class="cigr" style="left:${left}px;height:${lineHeight}px;width:${indentGuideWidth}px"></div>`;
+			for (let i = 1; i <= indent; i++) {
+				let className = (containsActiveIndentGuide && i === activeIndentLevel ? 'cigra' : 'cigr');
+				result += `<div class="${className}" style="left:${left}px;height:${lineHeight}px;width:${indentGuideWidth}px"></div>`;
 				left += tabWidth;
 			}
 
@@ -129,8 +153,12 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 }
 
 registerThemingParticipant((theme, collector) => {
-	let editorGuideColor = theme.getColor(editorIndentGuides);
-	if (editorGuideColor) {
-		collector.addRule(`.monaco-editor .lines-content .cigr { background-color: ${editorGuideColor}; }`);
+	let editorIndentGuidesColor = theme.getColor(editorIndentGuides);
+	if (editorIndentGuidesColor) {
+		collector.addRule(`.monaco-editor .lines-content .cigr { box-shadow: 1px 0 0 0 ${editorIndentGuidesColor} inset; }`);
+	}
+	let editorActiveIndentGuidesColor = theme.getColor(editorActiveIndentGuides) || editorIndentGuidesColor;
+	if (editorActiveIndentGuidesColor) {
+		collector.addRule(`.monaco-editor .lines-content .cigra { box-shadow: 1px 0 0 0 ${editorActiveIndentGuidesColor} inset; }`);
 	}
 });
diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 7a9761d20d8..dcfc1dc3ad3 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -6,11 +6,10 @@
 
 import * as browser from 'vs/base/browser/browser';
 import * as platform from 'vs/base/common/platform';
-import * as strings from 'vs/base/common/strings';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IConfiguration } from 'vs/editor/common/editorCommon';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
-import { renderViewLine, RenderLineInput, CharacterMapping } from 'vs/editor/common/viewLayout/viewLineRenderer';
+import { renderViewLine, RenderLineInput, CharacterMapping, ForeignElementType } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { IVisibleLine } from 'vs/editor/browser/view/viewLayer';
 import { RangeUtil } from 'vs/editor/browser/viewParts/lines/rangeUtil';
 import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
@@ -192,7 +191,8 @@ export class ViewLine implements IVisibleLine {
 		let renderLineInput = new RenderLineInput(
 			options.useMonospaceOptimizations,
 			lineData.content,
-			lineData.mightContainRTL,
+			lineData.isBasicASCII,
+			lineData.containsRTL,
 			lineData.minColumn - 1,
 			lineData.tokens,
 			actualInlineDecorations,
@@ -222,18 +222,16 @@ export class ViewLine implements IVisibleLine {
 		sb.appendASCIIString('</div>');
 
 		let renderedViewLine: IRenderedViewLine = null;
-		if (canUseFastRenderedViewLine && options.useMonospaceOptimizations && !output.containsForeignElements) {
-			let isRegularASCII = true;
-			if (lineData.mightContainNonBasicASCII) {
-				isRegularASCII = strings.isBasicASCII(lineData.content);
-			}
-
-			if (isRegularASCII && lineData.content.length < 1000 && renderLineInput.lineTokens.getCount() < 100) {
+		if (canUseFastRenderedViewLine && lineData.isBasicASCII && options.useMonospaceOptimizations && output.containsForeignElements === ForeignElementType.None) {
+			if (lineData.content.length < 300 && renderLineInput.lineTokens.getCount() < 100) {
 				// Browser rounding errors have been observed in Chrome and IE, so using the fast
 				// view line only for short lines. Please test before removing the length check...
 				// ---
 				// Another rounding error has been observed on Linux in VSCode, where <span> width
 				// rounding errors add up to an observable large number...
+				// ---
+				// Also see another example of rounding errors on Windows in 
+				// https://github.com/Microsoft/vscode/issues/33178
 				renderedViewLine = new FastRenderedViewLine(
 					this._renderedViewLine ? this._renderedViewLine.domNode : null,
 					renderLineInput,
@@ -385,7 +383,7 @@ class RenderedViewLine implements IRenderedViewLine {
 
 	protected readonly _characterMapping: CharacterMapping;
 	private readonly _isWhitespaceOnly: boolean;
-	private readonly _containsForeignElements: boolean;
+	private readonly _containsForeignElements: ForeignElementType;
 	private _cachedWidth: number;
 
 	/**
@@ -393,7 +391,7 @@ class RenderedViewLine implements IRenderedViewLine {
 	 */
 	private _pixelOffsetCache: Int32Array;
 
-	constructor(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: boolean) {
+	constructor(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: ForeignElementType) {
 		this.domNode = domNode;
 		this.input = renderLineInput;
 		this._characterMapping = characterMapping;
@@ -471,10 +469,18 @@ class RenderedViewLine implements IRenderedViewLine {
 	protected _readPixelOffset(column: number, context: DomReadingContext): number {
 		if (this._characterMapping.length === 0) {
 			// This line has no content
-			if (!this._containsForeignElements) {
+			if (this._containsForeignElements === ForeignElementType.None) {
 				// We can assume the line is really empty
 				return 0;
 			}
+			if (this._containsForeignElements === ForeignElementType.After) {
+				// We have foreign elements after the (empty) line
+				return 0;
+			}
+			if (this._containsForeignElements === ForeignElementType.Before) {
+				// We have foreign element before the (empty) line
+				return this.getWidth();
+			}
 		}
 
 		if (this._pixelOffsetCache !== null) {
@@ -503,7 +509,7 @@ class RenderedViewLine implements IRenderedViewLine {
 			return r[0].left;
 		}
 
-		if (column === this._characterMapping.length && this._isWhitespaceOnly && !this._containsForeignElements) {
+		if (column === this._characterMapping.length && this._isWhitespaceOnly && this._containsForeignElements === ForeignElementType.None) {
 			// This branch helps in the case of whitespace only lines which have a width set
 			return this.getWidth();
 		}
@@ -586,17 +592,17 @@ class WebKitRenderedViewLine extends RenderedViewLine {
 	}
 }
 
-const createRenderedLine: (domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: boolean) => RenderedViewLine = (function () {
+const createRenderedLine: (domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: ForeignElementType) => RenderedViewLine = (function () {
 	if (browser.isWebKit) {
 		return createWebKitRenderedLine;
 	}
 	return createNormalRenderedLine;
 })();
 
-function createWebKitRenderedLine(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: boolean): RenderedViewLine {
+function createWebKitRenderedLine(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: ForeignElementType): RenderedViewLine {
 	return new WebKitRenderedViewLine(domNode, renderLineInput, characterMapping, containsRTL, containsForeignElements);
 }
 
-function createNormalRenderedLine(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: boolean): RenderedViewLine {
+function createNormalRenderedLine(domNode: FastDomNode<HTMLElement>, renderLineInput: RenderLineInput, characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: ForeignElementType): RenderedViewLine {
 	return new RenderedViewLine(domNode, renderLineInput, characterMapping, containsRTL, containsForeignElements);
 }
diff --git a/src/vs/editor/browser/viewParts/margin/margin.ts b/src/vs/editor/browser/viewParts/margin/margin.ts
index 40efb4b4ef7..63a228dea04 100644
--- a/src/vs/editor/browser/viewParts/margin/margin.ts
+++ b/src/vs/editor/browser/viewParts/margin/margin.ts
@@ -14,6 +14,7 @@ import * as viewEvents from 'vs/editor/common/view/viewEvents';
 export class Margin extends ViewPart {
 
 	public static readonly CLASS_NAME = 'glyph-margin';
+	public static readonly OUTER_CLASS_NAME = 'margin';
 
 	private _domNode: FastDomNode<HTMLElement>;
 	private _canUseLayerHinting: boolean;
@@ -42,7 +43,7 @@ export class Margin extends ViewPart {
 
 	private _createDomNode(): FastDomNode<HTMLElement> {
 		let domNode = createFastDomNode(document.createElement('div'));
-		domNode.setClassName('margin');
+		domNode.setClassName(Margin.OUTER_CLASS_NAME);
 		domNode.setPosition('absolute');
 		domNode.setAttribute('role', 'presentation');
 		domNode.setAttribute('aria-hidden', 'true');
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index deebf469211..35ad7ff531b 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -7,6 +7,7 @@
 
 import 'vs/css!./minimap';
 import { ViewPart, PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
+import * as strings from 'vs/base/common/strings';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
 import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { getOrCreateMinimapCharRenderer } from 'vs/editor/common/view/runtimeMinimapCharRenderer';
@@ -897,17 +898,22 @@ export class Minimap extends ViewPart {
 					// No need to render anything since space is invisible
 					dx += charWidth;
 				} else {
-					if (renderMinimap === RenderMinimap.Large) {
-						minimapCharRenderer.x2RenderChar(target, dx, dy, charCode, tokenColor, backgroundColor, useLighterFont);
-					} else if (renderMinimap === RenderMinimap.Small) {
-						minimapCharRenderer.x1RenderChar(target, dx, dy, charCode, tokenColor, backgroundColor, useLighterFont);
-					} else if (renderMinimap === RenderMinimap.LargeBlocks) {
-						minimapCharRenderer.x2BlockRenderChar(target, dx, dy, tokenColor, backgroundColor, useLighterFont);
-					} else {
-						// RenderMinimap.SmallBlocks
-						minimapCharRenderer.x1BlockRenderChar(target, dx, dy, tokenColor, backgroundColor, useLighterFont);
+					// Render twice for a full width character
+					let count = strings.isFullWidthCharacter(charCode) ? 2 : 1;
+
+					for (let i = 0; i < count; i++) {
+						if (renderMinimap === RenderMinimap.Large) {
+							minimapCharRenderer.x2RenderChar(target, dx, dy, charCode, tokenColor, backgroundColor, useLighterFont);
+						} else if (renderMinimap === RenderMinimap.Small) {
+							minimapCharRenderer.x1RenderChar(target, dx, dy, charCode, tokenColor, backgroundColor, useLighterFont);
+						} else if (renderMinimap === RenderMinimap.LargeBlocks) {
+							minimapCharRenderer.x2BlockRenderChar(target, dx, dy, tokenColor, backgroundColor, useLighterFont);
+						} else {
+							// RenderMinimap.SmallBlocks
+							minimapCharRenderer.x1BlockRenderChar(target, dx, dy, tokenColor, backgroundColor, useLighterFont);
+						}
+						dx += charWidth;
 					}
-					dx += charWidth;
 				}
 			}
 		}
diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.ts b/src/vs/editor/browser/viewParts/rulers/rulers.ts
index 036ff988cb7..bac590e8174 100644
--- a/src/vs/editor/browser/viewParts/rulers/rulers.ts
+++ b/src/vs/editor/browser/viewParts/rulers/rulers.ts
@@ -13,7 +13,6 @@ import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/v
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { editorRuler } from 'vs/editor/common/view/editorColorRegistry';
-import * as dom from 'vs/base/browser/dom';
 
 export class Rulers extends ViewPart {
 
@@ -67,7 +66,7 @@ export class Rulers extends ViewPart {
 		}
 
 		if (currentCount < desiredCount) {
-			const rulerWidth = dom.computeScreenAwareSize(1);
+			const rulerWidth = this._context.model.getTabSize();
 			let addCount = desiredCount - currentCount;
 			while (addCount > 0) {
 				let node = createFastDomNode(document.createElement('div'));
@@ -104,6 +103,6 @@ export class Rulers extends ViewPart {
 registerThemingParticipant((theme, collector) => {
 	let rulerColor = theme.getColor(editorRuler);
 	if (rulerColor) {
-		collector.addRule(`.monaco-editor .view-ruler { background-color: ${rulerColor}; }`);
+		collector.addRule(`.monaco-editor .view-ruler { box-shadow: 1px 0 0 0 ${rulerColor} inset; }`);
 	}
 });
diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts
index c844dfc3516..a3e1d9e1dec 100644
--- a/src/vs/editor/browser/viewParts/selections/selections.ts
+++ b/src/vs/editor/browser/viewParts/selections/selections.ts
@@ -78,6 +78,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 	private _context: ViewContext;
 	private _lineHeight: number;
 	private _roundedSelection: boolean;
+	private _typicalHalfwidthCharacterWidth: number;
 	private _selections: Range[];
 	private _renderResult: string[];
 
@@ -86,6 +87,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		this._context = context;
 		this._lineHeight = this._context.configuration.editor.lineHeight;
 		this._roundedSelection = this._context.configuration.editor.viewInfo.roundedSelection;
+		this._typicalHalfwidthCharacterWidth = this._context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth;
 		this._selections = [];
 		this._renderResult = null;
 		this._context.addEventHandler(this);
@@ -108,6 +110,9 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		if (e.viewInfo) {
 			this._roundedSelection = this._context.configuration.editor.viewInfo.roundedSelection;
 		}
+		if (e.fontInfo) {
+			this._typicalHalfwidthCharacterWidth = this._context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth;
+		}
 		return true;
 	}
 	public onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
@@ -153,23 +158,28 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		return false;
 	}
 
-	private _enrichVisibleRangesWithStyle(linesVisibleRanges: LineVisibleRangesWithStyle[], previousFrame: LineVisibleRangesWithStyle[]): void {
+	private _enrichVisibleRangesWithStyle(viewport: Range, linesVisibleRanges: LineVisibleRangesWithStyle[], previousFrame: LineVisibleRangesWithStyle[]): void {
+		const epsilon = this._typicalHalfwidthCharacterWidth / 4;
 		let previousFrameTop: HorizontalRangeWithStyle = null;
 		let previousFrameBottom: HorizontalRangeWithStyle = null;
 
 		if (previousFrame && previousFrame.length > 0 && linesVisibleRanges.length > 0) {
 
 			let topLineNumber = linesVisibleRanges[0].lineNumber;
-			for (let i = 0; !previousFrameTop && i < previousFrame.length; i++) {
-				if (previousFrame[i].lineNumber === topLineNumber) {
-					previousFrameTop = previousFrame[i].ranges[0];
+			if (topLineNumber === viewport.startLineNumber) {
+				for (let i = 0; !previousFrameTop && i < previousFrame.length; i++) {
+					if (previousFrame[i].lineNumber === topLineNumber) {
+						previousFrameTop = previousFrame[i].ranges[0];
+					}
 				}
 			}
 
 			let bottomLineNumber = linesVisibleRanges[linesVisibleRanges.length - 1].lineNumber;
-			for (let i = previousFrame.length - 1; !previousFrameBottom && i >= 0; i--) {
-				if (previousFrame[i].lineNumber === bottomLineNumber) {
-					previousFrameBottom = previousFrame[i].ranges[0];
+			if (bottomLineNumber === viewport.endLineNumber) {
+				for (let i = previousFrame.length - 1; !previousFrameBottom && i >= 0; i--) {
+					if (previousFrame[i].lineNumber === bottomLineNumber) {
+						previousFrameBottom = previousFrame[i].ranges[0];
+					}
 				}
 			}
 
@@ -202,13 +212,13 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 				let prevLeft = linesVisibleRanges[i - 1].ranges[0].left;
 				let prevRight = linesVisibleRanges[i - 1].ranges[0].left + linesVisibleRanges[i - 1].ranges[0].width;
 
-				if (curLeft === prevLeft) {
+				if (abs(curLeft - prevLeft) < epsilon) {
 					startStyle.top = CornerStyle.FLAT;
 				} else if (curLeft > prevLeft) {
 					startStyle.top = CornerStyle.INTERN;
 				}
 
-				if (curRight === prevRight) {
+				if (abs(curRight - prevRight) < epsilon) {
 					endStyle.top = CornerStyle.FLAT;
 				} else if (prevLeft < curRight && curRight < prevRight) {
 					endStyle.top = CornerStyle.INTERN;
@@ -224,13 +234,13 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 				let nextLeft = linesVisibleRanges[i + 1].ranges[0].left;
 				let nextRight = linesVisibleRanges[i + 1].ranges[0].left + linesVisibleRanges[i + 1].ranges[0].width;
 
-				if (curLeft === nextLeft) {
+				if (abs(curLeft - nextLeft) < epsilon) {
 					startStyle.bottom = CornerStyle.FLAT;
 				} else if (nextLeft < curLeft && curLeft < nextRight) {
 					startStyle.bottom = CornerStyle.INTERN;
 				}
 
-				if (curRight === nextRight) {
+				if (abs(curRight - nextRight) < epsilon) {
 					endStyle.bottom = CornerStyle.FLAT;
 				} else if (curRight < nextRight) {
 					endStyle.bottom = CornerStyle.INTERN;
@@ -252,7 +262,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		let visibleRangesHaveGaps = this._visibleRangesHaveGaps(linesVisibleRanges);
 
 		if (!isIEWithZoomingIssuesNearRoundedBorders && !visibleRangesHaveGaps && this._roundedSelection) {
-			this._enrichVisibleRangesWithStyle(linesVisibleRanges, previousFrame);
+			this._enrichVisibleRangesWithStyle(ctx.visibleRange, linesVisibleRanges, previousFrame);
 		}
 
 		// The visible ranges are sorted TOP-BOTTOM and LEFT-RIGHT
@@ -407,3 +417,7 @@ registerThemingParticipant((theme, collector) => {
 		collector.addRule(`.monaco-editor .view-line span.inline-selected-text { color: ${editorSelectionForegroundColor}; }`);
 	}
 });
+
+function abs(n: number): number {
+	return n < 0 ? -n : n;
+}
\ No newline at end of file
diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
index 008e7c65129..175b237a2dd 100644
--- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
+++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
@@ -99,7 +99,11 @@ export class ViewZones extends ViewPart {
 	}
 
 	public onLineMappingChanged(e: viewEvents.ViewLineMappingChangedEvent): boolean {
-		return this._recomputeWhitespacesProps();
+		const hadAChange = this._recomputeWhitespacesProps();
+		if (hadAChange) {
+			this._context.viewLayout.onHeightMaybeChanged();
+		}
+		return hadAChange;
 	}
 
 	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
index 8c517a711d6..7103fb97b39 100644
--- a/src/vs/editor/browser/widget/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -34,6 +34,7 @@ import { IMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ClassName } from 'vs/editor/common/model/intervalTree';
 import { ITextModel, IModelDecorationOptions } from 'vs/editor/common/model';
 import { ICommandDelegate } from 'vs/editor/browser/view/viewController';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export abstract class CodeEditorWidget extends CommonCodeEditor implements editorBrowser.ICodeEditor {
 
@@ -92,22 +93,17 @@ export abstract class CodeEditorWidget extends CommonCodeEditor implements edito
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService
 	) {
-		super(domElement, options, isSimpleWidget, instantiationService, contextKeyService);
+		super(domElement, options, isSimpleWidget, instantiationService, contextKeyService, notificationService);
 		this._codeEditorService = codeEditorService;
 		this._commandService = commandService;
 		this._themeService = themeService;
 
 		this._focusTracker = new CodeEditorWidgetFocusTracker(domElement);
 		this._focusTracker.onChange(() => {
-			let hasFocus = this._focusTracker.hasFocus();
-
-			if (hasFocus) {
-				this._onDidFocusEditor.fire();
-			} else {
-				this._onDidBlurEditor.fire();
-			}
+			this._editorFocus.setValue(this._focusTracker.hasFocus());
 		});
 
 		this.contentWidgets = {};
@@ -431,13 +427,13 @@ export abstract class CodeEditorWidget extends CommonCodeEditor implements edito
 		const viewEventBus = this._view.getInternalEventBus();
 
 		viewEventBus.onDidGainFocus = () => {
-			this._onDidFocusEditorText.fire();
+			this._editorTextFocus.setValue(true);
 			// In IE, the focus is not synchronous, so we give it a little help
-			this._onDidFocusEditor.fire();
+			this._editorFocus.setValue(true);
 		};
 
 		viewEventBus.onDidScroll = (e) => this._onDidScrollChange.fire(e);
-		viewEventBus.onDidLoseFocus = () => this._onDidBlurEditorText.fire();
+		viewEventBus.onDidLoseFocus = () => this._editorTextFocus.setValue(false);
 		viewEventBus.onContextMenu = (e) => this._onContextMenu.fire(e);
 		viewEventBus.onMouseDown = (e) => this._onMouseDown.fire(e);
 		viewEventBus.onMouseUp = (e) => this._onMouseUp.fire(e);
@@ -455,11 +451,11 @@ export abstract class CodeEditorWidget extends CommonCodeEditor implements edito
 			return;
 		}
 		if (s && s.cursorState && s.viewState) {
-			const reducedState = this.viewModel.viewLayout.reduceRestoreState(s.viewState);
+			const reducedState = this.viewModel.reduceRestoreState(s.viewState);
 			const linesViewportData = this.viewModel.viewLayout.getLinesViewportDataAtScrollTop(reducedState.scrollTop);
-			const startViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.startLineNumber, 1));
-			const endViewPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.endLineNumber, 1));
-			this.model.tokenizeViewport(startViewPosition.lineNumber, endViewPosition.lineNumber);
+			const startPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.startLineNumber, 1));
+			const endPosition = this.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(linesViewportData.endLineNumber, 1));
+			this.model.tokenizeViewport(startPosition.lineNumber, endPosition.lineNumber);
 			this._view.restoreState(reducedState);
 		}
 	}
diff --git a/src/vs/editor/browser/widget/diffEditorWidget.ts b/src/vs/editor/browser/widget/diffEditorWidget.ts
index 8bd844fdf8e..fd92e00b778 100644
--- a/src/vs/editor/browser/widget/diffEditorWidget.ts
+++ b/src/vs/editor/browser/widget/diffEditorWidget.ts
@@ -27,7 +27,7 @@ import { LineTokens } from 'vs/editor/common/core/lineTokens';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { Selection, ISelection } from 'vs/editor/common/core/selection';
-import { InlineDecoration, InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
+import { InlineDecoration, InlineDecorationType, ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ColorId, MetadataConsts, FontStyle } from 'vs/editor/common/modes';
 import { Event, Emitter } from 'vs/base/common/event';
@@ -99,12 +99,7 @@ class VisualEditorState {
 		this._zonesMap = {};
 
 		// (2) Model decorations
-		if (this._decorations.length > 0) {
-			editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-				changeAccessor.deltaDecorations(this._decorations, []);
-			});
-		}
-		this._decorations = [];
+		this._decorations = editor.deltaDecorations(this._decorations, []);
 	}
 
 	public apply(editor: CodeEditor, overviewRuler: editorBrowser.IOverviewRuler, newDecorations: IEditorDiffDecorationsWithZones): void {
@@ -1998,10 +1993,13 @@ class InlineViewZonesComputer extends ViewZonesComputer {
 		sb.appendASCIIString(String(count * config.lineHeight));
 		sb.appendASCIIString('px;width:1000000px;">');
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, originalModel.mightContainNonBasicASCII());
+		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, originalModel.mightContainRTL());
 		renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
 			lineContent,
-			originalModel.mightContainRTL(),
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			actualDecorations,
@@ -2032,27 +2030,31 @@ function createFakeLinesDiv(): HTMLElement {
 }
 
 registerThemingParticipant((theme, collector) => {
-	let added = theme.getColor(diffInserted);
+	const added = theme.getColor(diffInserted);
 	if (added) {
 		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { background-color: ${added}; }`);
 		collector.addRule(`.monaco-diff-editor .line-insert, .monaco-diff-editor .char-insert { background-color: ${added}; }`);
 		collector.addRule(`.monaco-editor .inline-added-margin-view-zone { background-color: ${added}; }`);
 	}
-	let removed = theme.getColor(diffRemoved);
+
+	const removed = theme.getColor(diffRemoved);
 	if (removed) {
 		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { background-color: ${removed}; }`);
 		collector.addRule(`.monaco-diff-editor .line-delete, .monaco-diff-editor .char-delete { background-color: ${removed}; }`);
 		collector.addRule(`.monaco-editor .inline-deleted-margin-view-zone { background-color: ${removed}; }`);
 	}
-	let addedOutline = theme.getColor(diffInsertedOutline);
+
+	const addedOutline = theme.getColor(diffInsertedOutline);
 	if (addedOutline) {
-		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px dashed ${addedOutline}; }`);
+		collector.addRule(`.monaco-editor .line-insert, .monaco-editor .char-insert { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${addedOutline}; }`);
 	}
-	let removedOutline = theme.getColor(diffRemovedOutline);
+
+	const removedOutline = theme.getColor(diffRemovedOutline);
 	if (removedOutline) {
-		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px dashed ${removedOutline}; }`);
+		collector.addRule(`.monaco-editor .line-delete, .monaco-editor .char-delete { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${removedOutline}; }`);
 	}
-	let shadow = theme.getColor(scrollbarShadow);
+
+	const shadow = theme.getColor(scrollbarShadow);
 	if (shadow) {
 		collector.addRule(`.monaco-diff-editor.side-by-side .editor.modified { box-shadow: -6px 0 5px -5px ${shadow}; }`);
 	}
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index 0f6af96eedd..f1d0c81f619 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -29,6 +29,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
+import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 
 const DIFF_LINES_PADDING = 3;
 
@@ -583,9 +584,34 @@ export class DiffReview extends Disposable {
 
 		let cell = document.createElement('div');
 		cell.className = 'diff-review-cell diff-review-summary';
-		cell.appendChild(document.createTextNode(`${diffIndex + 1}/${this._diffs.length}: @@ -${minOriginalLine},${maxOriginalLine - minOriginalLine + 1} +${minModifiedLine},${maxModifiedLine - minModifiedLine + 1} @@`));
+		const originalChangedLinesCnt = maxOriginalLine - minOriginalLine + 1;
+		const modifiedChangedLinesCnt = maxModifiedLine - minModifiedLine + 1;
+		cell.appendChild(document.createTextNode(`${diffIndex + 1}/${this._diffs.length}: @@ -${minOriginalLine},${originalChangedLinesCnt} +${minModifiedLine},${modifiedChangedLinesCnt} @@`));
 		header.setAttribute('data-line', String(minModifiedLine));
-		header.setAttribute('aria-label', nls.localize('header', "Difference {0} of {1}: original {2}, {3} lines, modified {4}, {5} lines", (diffIndex + 1), this._diffs.length, minOriginalLine, maxOriginalLine - minOriginalLine + 1, minModifiedLine, maxModifiedLine - minModifiedLine + 1));
+
+		const getAriaLines = (lines: number) => {
+			if (lines === 0) {
+				return nls.localize('no_lines', "no lines");
+			} else if (lines === 1) {
+				return nls.localize('one_line', "1 line");
+			} else {
+				return nls.localize('more_lines', "{0} lines", lines);
+			}
+		};
+
+		const originalChangedLinesCntAria = getAriaLines(originalChangedLinesCnt);
+		const modifiedChangedLinesCntAria = getAriaLines(modifiedChangedLinesCnt);
+		header.setAttribute('aria-label', nls.localize({
+			key: 'header',
+			comment: [
+				'This is the ARIA label for a git diff header.',
+				'A git diff header looks like this: @@ -154,12 +159,39 @@.',
+				'That encodes that at original line 154 (which is now line 159), 12 lines were removed/changed with 39 lines.',
+				'Variables 0 and 1 refer to the diff index out of total number of diffs.',
+				'Variables 2 and 4 will be numbers (a line number).',
+				'Variables 3 and 4 will be "no lines", "1 line" or "X lines", localized separately.'
+			]
+		}, "Difference {0} of {1}: original {2}, {3}, modified {4}, {5}", (diffIndex + 1), this._diffs.length, minOriginalLine, originalChangedLinesCntAria, minModifiedLine, modifiedChangedLinesCntAria));
 		header.appendChild(cell);
 
 		// @@ -504,7 +517,7 @@
@@ -738,10 +764,13 @@ export class DiffReview extends Disposable {
 
 		const lineTokens = new LineTokens(tokens, lineContent);
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
+		const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
 		const r = renderViewLine(new RenderLineInput(
 			(config.fontInfo.isMonospace && !config.viewInfo.disableMonospaceOptimizations),
 			lineContent,
-			model.mightContainRTL(),
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			[],
diff --git a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
index 68a61cec024..b24d4a9b62d 100644
--- a/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/embeddedCodeEditorWidget.ts
@@ -30,9 +30,10 @@ export class EmbeddedCodeEditorWidget extends CodeEditor {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService
 	) {
-		super(domElement, parentEditor.getRawConfiguration(), instantiationService, codeEditorService, commandService, contextKeyService, themeService);
+		super(domElement, parentEditor.getRawConfiguration(), instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService);
 
 		this._parentEditor = parentEditor;
 		this._overwriteOptions = options;
diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts
index 91af610e886..99b0be6b3aa 100644
--- a/src/vs/editor/common/commonCodeEditor.ts
+++ b/src/vs/editor/common/commonCodeEditor.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import * as nls from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -30,6 +31,7 @@ import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceCompute
 import * as modes from 'vs/editor/common/modes';
 import { Schemas } from 'vs/base/common/network';
 import { ITextModel, EndOfLinePreference, IIdentifiedSingleEditOperation, IModelDecorationsChangeAccessor, IModelDecoration, IModelDeltaDecoration, IModelDecorationOptions } from 'vs/editor/common/model';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 let EDITOR_ID = 0;
 
@@ -65,20 +67,19 @@ export abstract class CommonCodeEditor extends Disposable {
 	private readonly _onDidChangeCursorSelection: Emitter<ICursorSelectionChangedEvent> = this._register(new Emitter<ICursorSelectionChangedEvent>());
 	public readonly onDidChangeCursorSelection: Event<ICursorSelectionChangedEvent> = this._onDidChangeCursorSelection.event;
 
+	private readonly _onDidAttemptReadOnlyEdit: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidAttemptReadOnlyEdit: Event<void> = this._onDidAttemptReadOnlyEdit.event;
+
 	private readonly _onDidLayoutChange: Emitter<editorOptions.EditorLayoutInfo> = this._register(new Emitter<editorOptions.EditorLayoutInfo>());
 	public readonly onDidLayoutChange: Event<editorOptions.EditorLayoutInfo> = this._onDidLayoutChange.event;
 
-	protected readonly _onDidFocusEditorText: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidFocusEditorText: Event<void> = this._onDidFocusEditorText.event;
+	protected _editorTextFocus: BooleanEventEmitter = this._register(new BooleanEventEmitter());
+	public readonly onDidFocusEditorText: Event<void> = this._editorTextFocus.onDidChangeToTrue;
+	public readonly onDidBlurEditorText: Event<void> = this._editorTextFocus.onDidChangeToFalse;
 
-	protected readonly _onDidBlurEditorText: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidBlurEditorText: Event<void> = this._onDidBlurEditorText.event;
-
-	protected readonly _onDidFocusEditor: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidFocusEditor: Event<void> = this._onDidFocusEditor.event;
-
-	protected readonly _onDidBlurEditor: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onDidBlurEditor: Event<void> = this._onDidBlurEditor.event;
+	protected _editorFocus: BooleanEventEmitter = this._register(new BooleanEventEmitter());
+	public readonly onDidFocusEditor: Event<void> = this._editorFocus.onDidChangeToTrue;
+	public readonly onDidBlurEditor: Event<void> = this._editorFocus.onDidChangeToFalse;
 
 	private readonly _onWillType: Emitter<string> = this._register(new Emitter<string>());
 	public readonly onWillType = this._onWillType.event;
@@ -108,6 +109,7 @@ export abstract class CommonCodeEditor extends Disposable {
 
 	protected readonly _instantiationService: IInstantiationService;
 	protected readonly _contextKeyService: IContextKeyService;
+	protected readonly _notificationService: INotificationService;
 
 	/**
 	 * map from "parent" decoration type to live decoration ids.
@@ -121,7 +123,8 @@ export abstract class CommonCodeEditor extends Disposable {
 		options: editorOptions.IEditorOptions,
 		isSimpleWidget: boolean,
 		instantiationService: IInstantiationService,
-		contextKeyService: IContextKeyService
+		contextKeyService: IContextKeyService,
+		notificationService: INotificationService,
 	) {
 		super();
 		this.domElement = domElement;
@@ -141,6 +144,7 @@ export abstract class CommonCodeEditor extends Disposable {
 		}));
 
 		this._contextKeyService = this._register(contextKeyService.createScoped(this.domElement));
+		this._notificationService = notificationService;
 		this._register(new EditorContextKeysManager(this, this._contextKeyService));
 		this._register(new EditorModeContext(this, this._contextKeyService));
 
@@ -252,13 +256,6 @@ export abstract class CommonCodeEditor extends Disposable {
 		}
 	}
 
-	public getCenteredRangeInViewport(): Range {
-		if (!this.hasView) {
-			return null;
-		}
-		return this.viewModel.getCenteredRangeInViewport();
-	}
-
 	public getVisibleRanges(): Range[] {
 		if (!this.hasView) {
 			return [];
@@ -641,7 +638,7 @@ export abstract class CommonCodeEditor extends Disposable {
 		}
 
 		const cursorState = this.cursor.saveState();
-		const viewState = this.viewModel.viewLayout.saveState();
+		const viewState = this.viewModel.saveState();
 		return {
 			cursorState: cursorState,
 			viewState: viewState,
@@ -801,7 +798,7 @@ export abstract class CommonCodeEditor extends Disposable {
 		}
 
 		this.model.pushEditOperations(this.cursor.getSelections(), edits, () => {
-			return endCursorState ? endCursorState : this.cursor.getSelections();
+			return endCursorState ? endCursorState : null;
 		});
 
 		if (endCursorState) {
@@ -970,6 +967,14 @@ export abstract class CommonCodeEditor extends Disposable {
 
 			this._createView();
 
+			this.listenersToRemove.push(this.cursor.onDidReachMaxCursorCount(() => {
+				this._notificationService.warn(nls.localize('cursors.maximum', "The number of cursors has been limited to {0}.", Cursor.MAX_CURSOR_COUNT));
+			}));
+
+			this.listenersToRemove.push(this.cursor.onDidAttemptReadOnlyEdit(() => {
+				this._onDidAttemptReadOnlyEdit.fire(void 0);
+			}));
+
 			this.listenersToRemove.push(this.cursor.onDidChange((e: CursorStateChangedEvent) => {
 
 				let positions: Position[] = [];
@@ -1047,6 +1052,40 @@ export abstract class CommonCodeEditor extends Disposable {
 	}
 }
 
+const enum BooleanEventValue {
+	NotSet,
+	False,
+	True
+}
+
+export class BooleanEventEmitter extends Disposable {
+	private readonly _onDidChangeToTrue: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidChangeToTrue: Event<void> = this._onDidChangeToTrue.event;
+
+	private readonly _onDidChangeToFalse: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidChangeToFalse: Event<void> = this._onDidChangeToFalse.event;
+
+	private _value: BooleanEventValue;
+
+	constructor() {
+		super();
+		this._value = BooleanEventValue.NotSet;
+	}
+
+	public setValue(_value: boolean) {
+		let value = (_value ? BooleanEventValue.True : BooleanEventValue.False);
+		if (this._value === value) {
+			return;
+		}
+		this._value = value;
+		if (this._value === BooleanEventValue.True) {
+			this._onDidChangeToTrue.fire();
+		} else if (this._value === BooleanEventValue.False) {
+			this._onDidChangeToFalse.fire();
+		}
+	}
+}
+
 class EditorContextKeysManager extends Disposable {
 
 	private _editor: CommonCodeEditor;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index 2435ca97847..62ebc3a17d9 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -211,7 +211,7 @@ const editorConfiguration: IConfigurationNode = {
 				nls.localize('lineNumbers.interval', "Line numbers are rendered every 10 lines.")
 			],
 			'default': 'on',
-			'description': nls.localize('lineNumbers', "Controls the display of line numbers. Possible values are 'on', 'off', 'relative' and 'interval'.")
+			'description': nls.localize('lineNumbers', "Controls the display of line numbers.")
 		},
 		'editor.rulers': {
 			'type': 'array',
@@ -268,13 +268,13 @@ const editorConfiguration: IConfigurationNode = {
 			'type': 'string',
 			'enum': ['left', 'right'],
 			'default': EDITOR_DEFAULTS.viewInfo.minimap.side,
-			'description': nls.localize('minimap.side', "Controls the side where to render the minimap. Possible values are \'right\' and \'left\'")
+			'description': nls.localize('minimap.side', "Controls the side where to render the minimap.")
 		},
 		'editor.minimap.showSlider': {
 			'type': 'string',
 			'enum': ['always', 'mouseover'],
 			'default': EDITOR_DEFAULTS.viewInfo.minimap.showSlider,
-			'description': nls.localize('minimap.showSlider', "Controls whether the minimap slider is automatically hidden. Possible values are \'always\' and \'mouseover\'")
+			'description': nls.localize('minimap.showSlider', "Controls whether the minimap slider is automatically hidden.")
 		},
 		'editor.minimap.renderCharacters': {
 			'type': 'boolean',
@@ -370,6 +370,11 @@ const editorConfiguration: IConfigurationNode = {
 				]
 			}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
 		},
+		'editor.multiCursorMergeOverlapping': {
+			'type': 'boolean',
+			'default': EDITOR_DEFAULTS.multiCursorMergeOverlapping,
+			'description': nls.localize('multiCursorMergeOverlapping', "Merge multiple cursors when they are overlapping.")
+		},
 		'editor.quickSuggestions': {
 			'anyOf': [
 				{
@@ -515,7 +520,7 @@ const editorConfiguration: IConfigurationNode = {
 			'type': 'string',
 			'enum': ['blink', 'smooth', 'phase', 'expand', 'solid'],
 			'default': editorOptions.blinkingStyleToString(EDITOR_DEFAULTS.viewInfo.cursorBlinking),
-			'description': nls.localize('cursorBlinking', "Control the cursor animation style, possible values are 'blink', 'smooth', 'phase', 'expand' and 'solid'")
+			'description': nls.localize('cursorBlinking', "Control the cursor animation style.")
 		},
 		'editor.mouseWheelZoom': {
 			'type': 'boolean',
@@ -568,13 +573,23 @@ const editorConfiguration: IConfigurationNode = {
 		'editor.codeLens': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.codeLens,
-			'description': nls.localize('codeLens', "Controls if the editor shows code lenses")
+			'description': nls.localize('codeLens', "Controls if the editor shows CodeLens")
 		},
 		'editor.folding': {
 			'type': 'boolean',
 			'default': EDITOR_DEFAULTS.contribInfo.folding,
 			'description': nls.localize('folding', "Controls whether the editor has code folding enabled")
 		},
+		'editor.foldingStrategy': {
+			'type': 'string',
+			'enum': ['auto', 'indentation'],
+			'enumDescriptions': [
+				nls.localize('foldingStrategyAuto', 'If available, use a language specific folding strategy, otherwise falls back to the indentation based strategy.'),
+				nls.localize('foldingStrategyIndentation', 'Always use the indentation based folding strategy')
+			],
+			'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
+			'description': nls.localize('foldingStrategy', "Controls the way folding ranges are computed. 'auto' picks uses a language specific folding strategy, if available. 'indentation' forces that the indentation based folding strategy is used.")
+		},
 		'editor.showFoldingControls': {
 			'type': 'string',
 			'enum': ['always', 'mouseover'],
@@ -653,6 +668,16 @@ const editorConfiguration: IConfigurationNode = {
 			'default': true,
 			'description': nls.localize('ignoreTrimWhitespace', "Controls if the diff editor shows changes in leading or trailing whitespace as diffs")
 		},
+		'editor.largeFileSize': {
+			'type': 'number',
+			'default': EDITOR_MODEL_DEFAULTS.largeFileSize,
+			'description': nls.localize('largeFileSize', "Controls file size threshold in bytes beyond which special optimization rules are applied")
+		},
+		'editor.largeFileLineCount': {
+			'type': 'number',
+			'default': EDITOR_MODEL_DEFAULTS.largeFileLineCount,
+			'description': nls.localize('largeFileLineCount', "Controls file size threshold in terms of line count beyond which special optimization rules are applied")
+		},
 		'diffEditor.renderIndicators': {
 			'type': 'boolean',
 			'default': true,
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 011cdb3dbf4..e4aa5cf65af 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -10,6 +10,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
 import { Constants } from 'vs/editor/common/core/uint';
 import { USUAL_WORD_SEPARATORS } from 'vs/editor/common/model/wordHelper';
+import * as arrays from 'vs/base/common/arrays';
 
 /**
  * Configuration options for editor scrollbars
@@ -381,6 +382,11 @@ export interface IEditorOptions {
 	 * Defaults to 'alt'
 	 */
 	multiCursorModifier?: 'ctrlCmd' | 'alt';
+	/**
+	 * Merge overlapping selections.
+	 * Defaults to true
+	 */
+	multiCursorMergeOverlapping?: boolean;
 	/**
 	 * Configure the editor's accessibility support.
 	 * Defaults to 'auto'. It is best to leave this to 'auto'.
@@ -486,11 +492,6 @@ export interface IEditorOptions {
 	 * Defaults to true.
 	 */
 	codeLens?: boolean;
-	/**
-	 * @deprecated - use codeLens instead
-	 * @internal
-	 */
-	referenceInfos?: boolean;
 	/**
 	 * Control the behavior and rendering of the code action lightbulb.
 	 */
@@ -500,6 +501,11 @@ export interface IEditorOptions {
 	 * Defaults to true.
 	 */
 	folding?: boolean;
+	/**
+	 * Selects the folding strategy. 'auto' uses the strategies contributed for the current document, 'indentation' uses the indentation based folding strategy.
+	 * Defaults to 'auto'.
+	 */
+	foldingStrategy?: 'auto' | 'indentation';
 	/**
 	 * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter.
 	 * Defaults to 'mouseover'.
@@ -838,6 +844,7 @@ export interface EditorContribOptions {
 	readonly occurrencesHighlight: boolean;
 	readonly codeLens: boolean;
 	readonly folding: boolean;
+	readonly foldingStrategy: 'auto' | 'indentation';
 	readonly showFoldingControls: 'always' | 'mouseover';
 	readonly matchBrackets: boolean;
 	readonly find: InternalEditorFindOptions;
@@ -872,6 +879,7 @@ export interface IValidatedEditorOptions {
 	readonly emptySelectionClipboard: boolean;
 	readonly useTabStops: boolean;
 	readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
+	readonly multiCursorMergeOverlapping: boolean;
 	readonly accessibilitySupport: 'auto' | 'off' | 'on';
 
 	readonly viewInfo: InternalEditorViewOptions;
@@ -894,6 +902,7 @@ export class InternalEditorOptions {
 	 */
 	readonly accessibilitySupport: platform.AccessibilitySupport;
 	readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
+	readonly multiCursorMergeOverlapping: boolean;
 
 	// ---- cursor options
 	readonly wordSeparators: string;
@@ -922,6 +931,7 @@ export class InternalEditorOptions {
 		readOnly: boolean;
 		accessibilitySupport: platform.AccessibilitySupport;
 		multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
+		multiCursorMergeOverlapping: boolean;
 		wordSeparators: string;
 		autoClosingBrackets: boolean;
 		autoIndent: boolean;
@@ -942,6 +952,7 @@ export class InternalEditorOptions {
 		this.readOnly = source.readOnly;
 		this.accessibilitySupport = source.accessibilitySupport;
 		this.multiCursorModifier = source.multiCursorModifier;
+		this.multiCursorMergeOverlapping = source.multiCursorMergeOverlapping;
 		this.wordSeparators = source.wordSeparators;
 		this.autoClosingBrackets = source.autoClosingBrackets;
 		this.autoIndent = source.autoIndent;
@@ -968,6 +979,7 @@ export class InternalEditorOptions {
 			&& this.readOnly === other.readOnly
 			&& this.accessibilitySupport === other.accessibilitySupport
 			&& this.multiCursorModifier === other.multiCursorModifier
+			&& this.multiCursorMergeOverlapping === other.multiCursorMergeOverlapping
 			&& this.wordSeparators === other.wordSeparators
 			&& this.autoClosingBrackets === other.autoClosingBrackets
 			&& this.autoIndent === other.autoIndent
@@ -995,6 +1007,7 @@ export class InternalEditorOptions {
 			readOnly: (this.readOnly !== newOpts.readOnly),
 			accessibilitySupport: (this.accessibilitySupport !== newOpts.accessibilitySupport),
 			multiCursorModifier: (this.multiCursorModifier !== newOpts.multiCursorModifier),
+			multiCursorMergeOverlapping: (this.multiCursorMergeOverlapping !== newOpts.multiCursorMergeOverlapping),
 			wordSeparators: (this.wordSeparators !== newOpts.wordSeparators),
 			autoClosingBrackets: (this.autoClosingBrackets !== newOpts.autoClosingBrackets),
 			autoIndent: (this.autoIndent !== newOpts.autoIndent),
@@ -1058,7 +1071,7 @@ export class InternalEditorOptions {
 		return (
 			a.extraEditorClassName === b.extraEditorClassName
 			&& a.disableMonospaceOptimizations === b.disableMonospaceOptimizations
-			&& this._equalsNumberArrays(a.rulers, b.rulers)
+			&& arrays.equals(a.rulers, b.rulers)
 			&& a.ariaLabel === b.ariaLabel
 			&& a.renderLineNumbers === b.renderLineNumbers
 			&& a.renderCustomLineNumbers === b.renderCustomLineNumbers
@@ -1120,18 +1133,6 @@ export class InternalEditorOptions {
 		);
 	}
 
-	private static _equalsNumberArrays(a: number[], b: number[]): boolean {
-		if (a.length !== b.length) {
-			return false;
-		}
-		for (let i = 0; i < a.length; i++) {
-			if (a[i] !== b[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 	/**
 	 * @internal
 	 */
@@ -1188,6 +1189,7 @@ export class InternalEditorOptions {
 			&& a.occurrencesHighlight === b.occurrencesHighlight
 			&& a.codeLens === b.codeLens
 			&& a.folding === b.folding
+			&& a.foldingStrategy === b.foldingStrategy
 			&& a.showFoldingControls === b.showFoldingControls
 			&& a.matchBrackets === b.matchBrackets
 			&& this._equalFindOptions(a.find, b.find)
@@ -1347,6 +1349,7 @@ export interface IConfigurationChangedEvent {
 	readonly readOnly: boolean;
 	readonly accessibilitySupport: boolean;
 	readonly multiCursorModifier: boolean;
+	readonly multiCursorMergeOverlapping: boolean;
 	readonly wordSeparators: boolean;
 	readonly autoClosingBrackets: boolean;
 	readonly autoIndent: boolean;
@@ -1532,6 +1535,7 @@ export class EditorOptionsValidator {
 			emptySelectionClipboard: _boolean(opts.emptySelectionClipboard, defaults.emptySelectionClipboard),
 			useTabStops: _boolean(opts.useTabStops, defaults.useTabStops),
 			multiCursorModifier: multiCursorModifier,
+			multiCursorMergeOverlapping: _boolean(opts.multiCursorMergeOverlapping, defaults.multiCursorMergeOverlapping),
 			accessibilitySupport: _stringSet<'auto' | 'on' | 'off'>(opts.accessibilitySupport, defaults.accessibilitySupport, ['auto', 'on', 'off']),
 			viewInfo: viewInfo,
 			contribInfo: contribInfo,
@@ -1652,7 +1656,11 @@ export class EditorOptionsValidator {
 			renderLineHighlight = _stringSet<'none' | 'gutter' | 'line' | 'all'>(opts.renderLineHighlight, defaults.renderLineHighlight, ['none', 'gutter', 'line', 'all']);
 		}
 
-		const mouseWheelScrollSensitivity = _float(opts.mouseWheelScrollSensitivity, defaults.scrollbar.mouseWheelScrollSensitivity);
+		let mouseWheelScrollSensitivity = _float(opts.mouseWheelScrollSensitivity, defaults.scrollbar.mouseWheelScrollSensitivity);
+		if (mouseWheelScrollSensitivity === 0) {
+			// Disallow 0, as it would prevent/block scrolling
+			mouseWheelScrollSensitivity = 1;
+		}
 		const scrollbar = this._sanitizeScrollbarOpts(opts.scrollbar, defaults.scrollbar, mouseWheelScrollSensitivity);
 		const minimap = this._sanitizeMinimapOpts(opts.minimap, defaults.minimap);
 
@@ -1721,8 +1729,9 @@ export class EditorOptionsValidator {
 			suggestLineHeight: _clampedInt(opts.suggestLineHeight, defaults.suggestLineHeight, 0, 1000),
 			selectionHighlight: _boolean(opts.selectionHighlight, defaults.selectionHighlight),
 			occurrencesHighlight: _boolean(opts.occurrencesHighlight, defaults.occurrencesHighlight),
-			codeLens: _boolean(opts.codeLens, defaults.codeLens) && _boolean(opts.referenceInfos, true),
+			codeLens: _boolean(opts.codeLens, defaults.codeLens),
 			folding: _boolean(opts.folding, defaults.folding),
+			foldingStrategy: _stringSet<'auto' | 'indentation'>(opts.foldingStrategy, defaults.foldingStrategy, ['auto', 'indentation']),
 			showFoldingControls: _stringSet<'always' | 'mouseover'>(opts.showFoldingControls, defaults.showFoldingControls, ['always', 'mouseover']),
 			matchBrackets: _boolean(opts.matchBrackets, defaults.matchBrackets),
 			find: find,
@@ -1762,6 +1771,7 @@ export class InternalEditorOptionsFactory {
 			emptySelectionClipboard: opts.emptySelectionClipboard,
 			useTabStops: opts.useTabStops,
 			multiCursorModifier: opts.multiCursorModifier,
+			multiCursorMergeOverlapping: opts.multiCursorMergeOverlapping,
 			accessibilitySupport: opts.accessibilitySupport,
 
 			viewInfo: {
@@ -1824,6 +1834,7 @@ export class InternalEditorOptionsFactory {
 				occurrencesHighlight: (accessibilityIsOn ? false : opts.contribInfo.occurrencesHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
 				codeLens: (accessibilityIsOn ? false : opts.contribInfo.codeLens), // DISABLED WHEN SCREEN READER IS ATTACHED
 				folding: (accessibilityIsOn ? false : opts.contribInfo.folding), // DISABLED WHEN SCREEN READER IS ATTACHED
+				foldingStrategy: opts.contribInfo.foldingStrategy,
 				showFoldingControls: opts.contribInfo.showFoldingControls,
 				matchBrackets: (accessibilityIsOn ? false : opts.contribInfo.matchBrackets), // DISABLED WHEN SCREEN READER IS ATTACHED
 				find: opts.contribInfo.find,
@@ -1968,6 +1979,7 @@ export class InternalEditorOptionsFactory {
 			readOnly: opts.readOnly,
 			accessibilitySupport: accessibilitySupport,
 			multiCursorModifier: opts.multiCursorModifier,
+			multiCursorMergeOverlapping: opts.multiCursorMergeOverlapping,
 			wordSeparators: opts.wordSeparators,
 			autoClosingBrackets: opts.autoClosingBrackets,
 			autoIndent: opts.autoIndent,
@@ -2078,18 +2090,19 @@ export class EditorLayoutProvider {
 			}
 
 			// Given:
-			// viewportColumn = (contentWidth - verticalScrollbarWidth) / typicalHalfwidthCharacterWidth
+			// (leaving 2px for the cursor to have space after the last character)
+			// viewportColumn = (contentWidth - verticalScrollbarWidth - 2) / typicalHalfwidthCharacterWidth
 			// minimapWidth = viewportColumn * minimapCharWidth
 			// contentWidth = remainingWidth - minimapWidth
 			// What are good values for contentWidth and minimapWidth ?
 
-			// minimapWidth = ((contentWidth - verticalScrollbarWidth) / typicalHalfwidthCharacterWidth) * minimapCharWidth
-			// typicalHalfwidthCharacterWidth * minimapWidth = (contentWidth - verticalScrollbarWidth) * minimapCharWidth
-			// typicalHalfwidthCharacterWidth * minimapWidth = (remainingWidth - minimapWidth - verticalScrollbarWidth) * minimapCharWidth
-			// (typicalHalfwidthCharacterWidth + minimapCharWidth) * minimapWidth = (remainingWidth - verticalScrollbarWidth) * minimapCharWidth
-			// minimapWidth = ((remainingWidth - verticalScrollbarWidth) * minimapCharWidth) / (typicalHalfwidthCharacterWidth + minimapCharWidth)
+			// minimapWidth = ((contentWidth - verticalScrollbarWidth - 2) / typicalHalfwidthCharacterWidth) * minimapCharWidth
+			// typicalHalfwidthCharacterWidth * minimapWidth = (contentWidth - verticalScrollbarWidth - 2) * minimapCharWidth
+			// typicalHalfwidthCharacterWidth * minimapWidth = (remainingWidth - minimapWidth - verticalScrollbarWidth - 2) * minimapCharWidth
+			// (typicalHalfwidthCharacterWidth + minimapCharWidth) * minimapWidth = (remainingWidth - verticalScrollbarWidth - 2) * minimapCharWidth
+			// minimapWidth = ((remainingWidth - verticalScrollbarWidth - 2) * minimapCharWidth) / (typicalHalfwidthCharacterWidth + minimapCharWidth)
 
-			minimapWidth = Math.max(0, Math.floor(((remainingWidth - verticalScrollbarWidth) * minimapCharWidth) / (typicalHalfwidthCharacterWidth + minimapCharWidth)));
+			minimapWidth = Math.max(0, Math.floor(((remainingWidth - verticalScrollbarWidth - 2) * minimapCharWidth) / (typicalHalfwidthCharacterWidth + minimapCharWidth)));
 			let minimapColumns = minimapWidth / minimapCharWidth;
 			if (minimapColumns > minimapMaxColumn) {
 				minimapWidth = Math.floor(minimapMaxColumn * minimapCharWidth);
@@ -2107,7 +2120,8 @@ export class EditorLayoutProvider {
 			}
 		}
 
-		const viewportColumn = Math.max(1, Math.floor((contentWidth - verticalScrollbarWidth) / typicalHalfwidthCharacterWidth));
+		// (leaving 2px for the cursor to have space after the last character)
+		const viewportColumn = Math.max(1, Math.floor((contentWidth - verticalScrollbarWidth - 2) / typicalHalfwidthCharacterWidth));
 
 		const verticalArrowSize = (verticalScrollbarHasArrows ? scrollbarArrowSize : 0);
 
@@ -2176,7 +2190,9 @@ export const EDITOR_MODEL_DEFAULTS = {
 	tabSize: 4,
 	insertSpaces: true,
 	detectIndentation: true,
-	trimAutoWhitespace: true
+	trimAutoWhitespace: true,
+	largeFileSize: 20 * 1024 * 1024, // 20 MB
+	largeFileLineCount: 300 * 1000 // 300K lines
 };
 
 /**
@@ -2204,6 +2220,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 	emptySelectionClipboard: true,
 	useTabStops: true,
 	multiCursorModifier: 'altKey',
+	multiCursorMergeOverlapping: true,
 	accessibilitySupport: 'auto',
 
 	viewInfo: {
@@ -2279,6 +2296,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
 		occurrencesHighlight: true,
 		codeLens: true,
 		folding: true,
+		foldingStrategy: 'auto',
 		showFoldingControls: 'mouseover',
 		matchBrackets: true,
 		find: {
diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 85045434b1d..36833531a0a 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -87,6 +87,14 @@ export class CursorModelState {
 
 export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
+	public static MAX_CURSOR_COUNT = 10000;
+
+	private readonly _onDidReachMaxCursorCount: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidReachMaxCursorCount: Event<void> = this._onDidReachMaxCursorCount.event;
+
+	private readonly _onDidAttemptReadOnlyEdit: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onDidAttemptReadOnlyEdit: Event<void> = this._onDidAttemptReadOnlyEdit.event;
+
 	private readonly _onDidChange: Emitter<CursorStateChangedEvent> = this._register(new Emitter<CursorStateChangedEvent>());
 	public readonly onDidChange: Event<CursorStateChangedEvent> = this._onDidChange.event;
 
@@ -185,6 +193,11 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 	}
 
 	public setStates(source: string, reason: CursorChangeReason, states: CursorState[]): void {
+		if (states.length > Cursor.MAX_CURSOR_COUNT) {
+			states = states.slice(0, Cursor.MAX_CURSOR_COUNT);
+			this._onDidReachMaxCursorCount.fire(void 0);
+		}
+
 		const oldState = new CursorModelState(this._model, this);
 
 		this._cursors.setStates(states);
@@ -361,7 +374,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
 	private _interpretCommandResult(cursorState: Selection[]): void {
 		if (!cursorState || cursorState.length === 0) {
-			return;
+			cursorState = this._cursors.readSelectionFromMarkers();
 		}
 
 		this._columnSelectData = null;
@@ -456,6 +469,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 		if (this._configuration.editor.readOnly) {
 			// All the remaining handlers will try to edit the model,
 			// but we cannot edit when read only...
+			this._onDidAttemptReadOnlyEdit.fire(void 0);
 			return;
 		}
 
diff --git a/src/vs/editor/common/controller/cursorCollection.ts b/src/vs/editor/common/controller/cursorCollection.ts
index 9fcae512f2f..c50e7d3e4e6 100644
--- a/src/vs/editor/common/controller/cursorCollection.ts
+++ b/src/vs/editor/common/controller/cursorCollection.ts
@@ -193,6 +193,10 @@ export class CursorCollection {
 			const currentViewSelection = current.viewSelection;
 			const nextViewSelection = next.viewSelection;
 
+			if (!this.context.config.multiCursorMergeOverlapping) {
+				continue;
+			}
+
 			let shouldMergeCursors: boolean;
 			if (nextViewSelection.isEmpty() || currentViewSelection.isEmpty()) {
 				// Merge touching cursors if one of them is collapsed
diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts
index 8c6c99f2d0c..8f0ff9075d2 100644
--- a/src/vs/editor/common/controller/cursorCommon.ts
+++ b/src/vs/editor/common/controller/cursorCommon.ts
@@ -78,6 +78,7 @@ export class CursorConfiguration {
 	public readonly useTabStops: boolean;
 	public readonly wordSeparators: string;
 	public readonly emptySelectionClipboard: boolean;
+	public readonly multiCursorMergeOverlapping: boolean;
 	public readonly autoClosingBrackets: boolean;
 	public readonly autoIndent: boolean;
 	public readonly autoClosingPairsOpen: CharacterMap;
@@ -92,6 +93,7 @@ export class CursorConfiguration {
 			e.layoutInfo
 			|| e.wordSeparators
 			|| e.emptySelectionClipboard
+			|| e.multiCursorMergeOverlapping
 			|| e.autoClosingBrackets
 			|| e.useTabStops
 			|| e.lineHeight
@@ -118,6 +120,7 @@ export class CursorConfiguration {
 		this.useTabStops = c.useTabStops;
 		this.wordSeparators = c.wordSeparators;
 		this.emptySelectionClipboard = c.emptySelectionClipboard;
+		this.multiCursorMergeOverlapping = c.multiCursorMergeOverlapping;
 		this.autoClosingBrackets = c.autoClosingBrackets;
 		this.autoIndent = c.autoIndent;
 
diff --git a/src/vs/editor/common/controller/cursorTypeOperations.ts b/src/vs/editor/common/controller/cursorTypeOperations.ts
index 320f1f8b9c2..12077751e66 100644
--- a/src/vs/editor/common/controller/cursorTypeOperations.ts
+++ b/src/vs/editor/common/controller/cursorTypeOperations.ts
@@ -18,6 +18,7 @@ import { IndentAction, EnterAction } from 'vs/editor/common/modes/languageConfig
 import { SurroundSelectionCommand } from 'vs/editor/common/commands/surroundSelectionCommand';
 import { IElectricAction } from 'vs/editor/common/modes/supports/electricCharacter';
 import { getMapForWordSeparators, WordCharacterClass } from 'vs/editor/common/controller/wordCharacterClassifier';
+import { CharCode } from 'vs/base/common/charCode';
 
 export class TypeOperations {
 
@@ -123,6 +124,15 @@ export class TypeOperations {
 			return multicursorText;
 		}
 
+		// Remove trailing \n if present
+		if (text.charCodeAt(text.length - 1) === CharCode.LineFeed) {
+			text = text.substr(0, text.length - 1);
+		}
+		let lines = text.split(/\r\n|\r|\n/);
+		if (lines.length === selections.length) {
+			return lines;
+		}
+
 		return null;
 	}
 
diff --git a/src/vs/editor/common/controller/cursorWordOperations.ts b/src/vs/editor/common/controller/cursorWordOperations.ts
index 8f83c1f8621..8bd73b791f0 100644
--- a/src/vs/editor/common/controller/cursorWordOperations.ts
+++ b/src/vs/editor/common/controller/cursorWordOperations.ts
@@ -24,6 +24,10 @@ interface IFindWordResult {
 	 * The word type.
 	 */
 	wordType: WordType;
+	/**
+	 * The reason the word ended.
+	 */
+	nextCharClass: WordCharacterClass;
 }
 
 const enum WordType {
@@ -39,9 +43,9 @@ export const enum WordNavigationType {
 
 export class WordOperations {
 
-	private static _createWord(lineContent: string, wordType: WordType, start: number, end: number): IFindWordResult {
+	private static _createWord(lineContent: string, wordType: WordType, nextCharClass: WordCharacterClass, start: number, end: number): IFindWordResult {
 		// console.log('WORD ==> ' + start + ' => ' + end + ':::: <<<' + lineContent.substring(start, end) + '>>>');
-		return { start: start, end: end, wordType: wordType };
+		return { start: start, end: end, wordType: wordType, nextCharClass: nextCharClass };
 	}
 
 	private static _findPreviousWordOnLine(wordSeparators: WordCharacterClassifier, model: ICursorSimpleModel, position: Position): IFindWordResult {
@@ -57,23 +61,23 @@ export class WordOperations {
 
 			if (chClass === WordCharacterClass.Regular) {
 				if (wordType === WordType.Separator) {
-					return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
+					return this._createWord(lineContent, wordType, chClass, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
 				}
 				wordType = WordType.Regular;
 			} else if (chClass === WordCharacterClass.WordSeparator) {
 				if (wordType === WordType.Regular) {
-					return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
+					return this._createWord(lineContent, wordType, chClass, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
 				}
 				wordType = WordType.Separator;
 			} else if (chClass === WordCharacterClass.Whitespace) {
 				if (wordType !== WordType.None) {
-					return this._createWord(lineContent, wordType, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
+					return this._createWord(lineContent, wordType, chClass, chIndex + 1, this._findEndOfWord(lineContent, wordSeparators, wordType, chIndex + 1));
 				}
 			}
 		}
 
 		if (wordType !== WordType.None) {
-			return this._createWord(lineContent, wordType, 0, this._findEndOfWord(lineContent, wordSeparators, wordType, 0));
+			return this._createWord(lineContent, wordType, WordCharacterClass.Whitespace, 0, this._findEndOfWord(lineContent, wordSeparators, wordType, 0));
 		}
 
 		return null;
@@ -113,23 +117,23 @@ export class WordOperations {
 
 			if (chClass === WordCharacterClass.Regular) {
 				if (wordType === WordType.Separator) {
-					return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
+					return this._createWord(lineContent, wordType, chClass, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
 				}
 				wordType = WordType.Regular;
 			} else if (chClass === WordCharacterClass.WordSeparator) {
 				if (wordType === WordType.Regular) {
-					return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
+					return this._createWord(lineContent, wordType, chClass, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
 				}
 				wordType = WordType.Separator;
 			} else if (chClass === WordCharacterClass.Whitespace) {
 				if (wordType !== WordType.None) {
-					return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
+					return this._createWord(lineContent, wordType, chClass, this._findStartOfWord(lineContent, wordSeparators, wordType, chIndex - 1), chIndex);
 				}
 			}
 		}
 
 		if (wordType !== WordType.None) {
-			return this._createWord(lineContent, wordType, this._findStartOfWord(lineContent, wordSeparators, wordType, len - 1), len);
+			return this._createWord(lineContent, wordType, WordCharacterClass.Whitespace, this._findStartOfWord(lineContent, wordSeparators, wordType, len - 1), len);
 		}
 
 		return null;
@@ -167,6 +171,12 @@ export class WordOperations {
 		let prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, column));
 
 		if (wordNavigationType === WordNavigationType.WordStart) {
+			if (prevWordOnLine && prevWordOnLine.wordType === WordType.Separator) {
+				if (prevWordOnLine.end - prevWordOnLine.start === 1 && prevWordOnLine.nextCharClass === WordCharacterClass.Regular) {
+					// Skip over a word made up of one single separator and followed by a regular character
+					prevWordOnLine = WordOperations._findPreviousWordOnLine(wordSeparators, model, new Position(lineNumber, prevWordOnLine.start + 1));
+				}
+			}
 			if (prevWordOnLine) {
 				column = prevWordOnLine.start + 1;
 			} else {
@@ -200,6 +210,12 @@ export class WordOperations {
 		let nextWordOnLine = WordOperations._findNextWordOnLine(wordSeparators, model, new Position(lineNumber, column));
 
 		if (wordNavigationType === WordNavigationType.WordEnd) {
+			if (nextWordOnLine && nextWordOnLine.wordType === WordType.Separator) {
+				if (nextWordOnLine.end - nextWordOnLine.start === 1 && nextWordOnLine.nextCharClass === WordCharacterClass.Regular) {
+					// Skip over a word made up of one single separator and followed by a regular character
+					nextWordOnLine = WordOperations._findNextWordOnLine(wordSeparators, model, new Position(lineNumber, nextWordOnLine.end + 1));
+				}
+			}
 			if (nextWordOnLine) {
 				column = nextWordOnLine.end + 1;
 			} else {
@@ -374,20 +390,20 @@ export class WordOperations {
 	public static word(config: CursorConfiguration, model: ICursorSimpleModel, cursor: SingleCursorState, inSelectionMode: boolean, position: Position): SingleCursorState {
 		const wordSeparators = getMapForWordSeparators(config.wordSeparators);
 		let prevWord = WordOperations._findPreviousWordOnLine(wordSeparators, model, position);
-		let isInPrevWord = (prevWord && prevWord.wordType === WordType.Regular && prevWord.start < position.column - 1 && position.column - 1 <= prevWord.end);
 		let nextWord = WordOperations._findNextWordOnLine(wordSeparators, model, position);
-		let isInNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start < position.column - 1 && position.column - 1 <= nextWord.end);
 
 		if (!inSelectionMode) {
 			// Entering word selection for the first time
+			const isTouchingPrevWord = (prevWord && prevWord.wordType === WordType.Regular && prevWord.start <= position.column - 1 && position.column - 1 <= prevWord.end);
+			const isTouchingNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start <= position.column - 1 && position.column - 1 <= nextWord.end);
 
 			let startColumn: number;
 			let endColumn: number;
 
-			if (isInPrevWord) {
+			if (isTouchingPrevWord) {
 				startColumn = prevWord.start + 1;
 				endColumn = prevWord.end + 1;
-			} else if (isInNextWord) {
+			} else if (isTouchingNextWord) {
 				startColumn = nextWord.start + 1;
 				endColumn = nextWord.end + 1;
 			} else {
@@ -409,13 +425,16 @@ export class WordOperations {
 			);
 		}
 
+		const isInsidePrevWord = (prevWord && prevWord.wordType === WordType.Regular && prevWord.start < position.column - 1 && position.column - 1 < prevWord.end);
+		const isInsideNextWord = (nextWord && nextWord.wordType === WordType.Regular && nextWord.start < position.column - 1 && position.column - 1 < nextWord.end);
+
 		let startColumn: number;
 		let endColumn: number;
 
-		if (isInPrevWord) {
+		if (isInsidePrevWord) {
 			startColumn = prevWord.start + 1;
 			endColumn = prevWord.end + 1;
-		} else if (isInNextWord) {
+		} else if (isInsideNextWord) {
 			startColumn = nextWord.start + 1;
 			endColumn = nextWord.end + 1;
 		} else {
diff --git a/src/vs/editor/common/controller/oneCursor.ts b/src/vs/editor/common/controller/oneCursor.ts
index 30d6a1fb615..363cda5bb40 100644
--- a/src/vs/editor/common/controller/oneCursor.ts
+++ b/src/vs/editor/common/controller/oneCursor.ts
@@ -93,11 +93,6 @@ export class OneCursor {
 			viewState = new SingleCursorState(viewSelectionStart, modelState.selectionStartLeftoverVisibleColumns, viewPosition, modelState.leftoverVisibleColumns);
 		}
 
-		if (this.modelState && this.viewState && this.modelState.equals(modelState) && this.viewState.equals(viewState)) {
-			// No-op, early return
-			return;
-		}
-
 		this.modelState = modelState;
 		this.viewState = viewState;
 
diff --git a/src/vs/editor/common/diff/diffComputer.ts b/src/vs/editor/common/diff/diffComputer.ts
index a1b88e19a4b..6bccc31a789 100644
--- a/src/vs/editor/common/diff/diffComputer.ts
+++ b/src/vs/editor/common/diff/diffComputer.ts
@@ -284,7 +284,7 @@ class LineChange implements ILineChange {
 			const originalCharSequence = originalLineSequence.getCharSequence(diffChange.originalStart, diffChange.originalStart + diffChange.originalLength - 1);
 			const modifiedCharSequence = modifiedLineSequence.getCharSequence(diffChange.modifiedStart, diffChange.modifiedStart + diffChange.modifiedLength - 1);
 
-			let rawChanges = computeDiff(originalCharSequence, modifiedCharSequence, continueProcessingPredicate, false);
+			let rawChanges = computeDiff(originalCharSequence, modifiedCharSequence, continueProcessingPredicate, true);
 
 			if (shouldPostProcessCharChanges) {
 				rawChanges = postProcessCharChanges(rawChanges);
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
index 44106c97324..8be479866df 100644
--- a/src/vs/editor/common/editorCommon.ts
+++ b/src/vs/editor/common/editorCommon.ts
@@ -199,9 +199,13 @@ export interface ICursorState {
  * A (serializable) state of the view.
  */
 export interface IViewState {
-	scrollTop: number;
-	scrollTopWithoutViewZones: number;
+	/** written by previous versions */
+	scrollTop?: number;
+	/** written by previous versions */
+	scrollTopWithoutViewZones?: number;
 	scrollLeft: number;
+	firstPosition: IPosition;
+	firstPositionDeltaTop: number;
 }
 /**
  * A (serializable) state of the code editor.
@@ -505,6 +509,7 @@ export interface IThemeDecorationRenderOptions {
 	textDecoration?: string;
 	cursor?: string;
 	color?: string | ThemeColor;
+	opacity?: number;
 	letterSpacing?: string;
 
 	gutterIconPath?: string | UriComponents;
diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 4dc552e92d2..3f628c4136a 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -81,7 +81,12 @@ export interface IModelDecorationOptions {
 	 * Always render the decoration (even when the range it encompasses is collapsed).
 	 * @internal
 	 */
-	readonly showIfCollapsed?: boolean;
+	showIfCollapsed?: boolean;
+	/**
+	 * Specifies the stack order of a decoration.
+	 * A decoration with greater stack order is always in front of a decoration with a lower stack order.
+	 */
+	zIndex?: number;
 	/**
 	 * If set, render this decoration in the overview ruler.
 	 */
@@ -104,6 +109,10 @@ export interface IModelDecorationOptions {
 	 * to have a background color decoration.
 	 */
 	inlineClassName?: string;
+	/**
+	 * If there is an `inlineClassName` which affects letter spacing.
+	 */
+	inlineClassNameAffectsLetterSpacing?: boolean;
 	/**
 	 * If set, the decoration will be rendered before the text with this CSS class name.
 	 */
@@ -391,6 +400,8 @@ export interface ITextModelCreationOptions {
 	trimAutoWhitespace: boolean;
 	defaultEOL: DefaultEndOfLine;
 	isForSimpleWidget: boolean;
+	largeFileSize: number;
+	largeFileLineCount: number;
 }
 
 export interface ITextModelUpdateOptions {
@@ -435,6 +446,15 @@ export enum TrackedRangeStickiness {
 	GrowsOnlyWhenTypingAfter = 3,
 }
 
+/**
+ * @internal
+ */
+export interface IActiveIndentGuideInfo {
+	startLineNumber: number;
+	endLineNumber: number;
+	indent: number;
+}
+
 /**
  * A model.
  */
@@ -561,6 +581,10 @@ export interface ITextModel {
 	 */
 	getLineContent(lineNumber: number): string;
 
+	/**
+	 * Get the text length for a certain line.
+	 */
+	getLineLength(lineNumber: number): number;
 
 	/**
 	 * Get the text for all lines.
@@ -842,6 +866,11 @@ export interface ITextModel {
 	 */
 	matchBracket(position: IPosition): [Range, Range];
 
+	/**
+	 * @internal
+	 */
+	getActiveIndentGuide(lineNumber: number): IActiveIndentGuideInfo;
+
 	/**
 	 * @internal
 	 */
@@ -1002,6 +1031,13 @@ export interface ITextModel {
 	 */
 	redo(): Selection[];
 
+	/**
+	 * @deprecated Please use `onDidChangeContent` instead.
+	 * An event emitted when the contents of the model have changed.
+	 * @internal
+	 * @event
+	 */
+	onDidChangeRawContentFast(listener: (e: ModelRawContentChangedEvent) => void): IDisposable;
 	/**
 	 * @deprecated Please use `onDidChangeContent` instead.
 	 * An event emitted when the contents of the model have changed.
@@ -1067,6 +1103,12 @@ export interface ITextModel {
 	 * @internal
 	 */
 	isAttachedToEditor(): boolean;
+
+	/**
+	 * Returns the count of editors this model is attached to.
+	 * @internal
+	 */
+	getAttachedEditorCount(): number;
 }
 
 /**
@@ -1134,6 +1176,5 @@ export class ApplyEditsResult {
  */
 export interface IInternalModelContentChange extends IModelContentChange {
 	range: Range;
-	rangeOffset: number;
 	forceMoveMarkers: boolean;
 }
diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts
deleted file mode 100644
index 53063409aea..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { CharCode } from 'vs/base/common/charCode';
-
-export class LeafOffsetLenEdit {
-	constructor(
-		public readonly start: number,
-		public readonly length: number,
-		public readonly text: string
-	) { }
-}
-
-export class BufferPiece {
-	private readonly _str: string;
-	public get text(): string { return this._str; }
-
-	private readonly _lineStarts: Uint32Array;
-
-	constructor(str: string, lineStarts: Uint32Array = null) {
-		this._str = str;
-		if (lineStarts === null) {
-			this._lineStarts = createLineStartsFast(str);
-		} else {
-			this._lineStarts = lineStarts;
-		}
-	}
-
-	public length(): number {
-		return this._str.length;
-	}
-
-	public newLineCount(): number {
-		return this._lineStarts.length;
-	}
-
-	public lineStartFor(relativeLineIndex: number): number {
-		return this._lineStarts[relativeLineIndex];
-	}
-
-	public charCodeAt(index: number): number {
-		return this._str.charCodeAt(index);
-	}
-
-	public substr(from: number, length: number): string {
-		return this._str.substr(from, length);
-	}
-
-	public findLineStartBeforeOffset(offset: number): number {
-		if (this._lineStarts.length === 0 || offset < this._lineStarts[0]) {
-			return -1;
-		}
-
-		let low = 0, high = this._lineStarts.length - 1;
-
-		while (low < high) {
-			let mid = low + Math.ceil((high - low) / 2);
-			let lineStart = this._lineStarts[mid];
-
-			if (offset === lineStart) {
-				return mid;
-			} else if (offset < lineStart) {
-				high = mid - 1;
-			} else {
-				low = mid;
-			}
-		}
-
-		return low;
-	}
-
-	public findLineFirstNonWhitespaceIndex(searchStartOffset: number): number {
-		for (let i = searchStartOffset, len = this._str.length; i < len; i++) {
-			const chCode = this._str.charCodeAt(i);
-			if (chCode === CharCode.CarriageReturn || chCode === CharCode.LineFeed) {
-				// Reached EOL
-				return -2;
-			}
-			if (chCode !== CharCode.Space && chCode !== CharCode.Tab) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public findLineLastNonWhitespaceIndex(searchStartOffset: number): number {
-		for (let i = searchStartOffset - 1; i >= 0; i--) {
-			const chCode = this._str.charCodeAt(i);
-			if (chCode === CharCode.CarriageReturn || chCode === CharCode.LineFeed) {
-				// Reached EOL
-				return -2;
-			}
-			if (chCode !== CharCode.Space && chCode !== CharCode.Tab) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public static normalizeEOL(target: BufferPiece, eol: '\r\n' | '\n'): BufferPiece {
-		return new BufferPiece(target._str.replace(/\r\n|\r|\n/g, eol));
-	}
-
-	public static deleteLastChar(target: BufferPiece): BufferPiece {
-		const targetCharsLength = target.length();
-		const targetLineStartsLength = target.newLineCount();
-		const targetLineStarts = target._lineStarts;
-
-		let newLineStartsLength;
-		if (targetLineStartsLength > 0 && targetLineStarts[targetLineStartsLength - 1] === targetCharsLength) {
-			newLineStartsLength = targetLineStartsLength - 1;
-		} else {
-			newLineStartsLength = targetLineStartsLength;
-		}
-
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-		newLineStarts.set(targetLineStarts);
-
-		return new BufferPiece(
-			target._str.substr(0, targetCharsLength - 1),
-			newLineStarts
-		);
-	}
-
-	public static insertFirstChar(target: BufferPiece, character: number): BufferPiece {
-		const targetLineStartsLength = target.newLineCount();
-		const targetLineStarts = target._lineStarts;
-		const insertLineStart = ((character === CharCode.CarriageReturn && (targetLineStartsLength === 0 || targetLineStarts[0] !== 1 || target.charCodeAt(0) !== CharCode.LineFeed)) || (character === CharCode.LineFeed));
-
-		const newLineStartsLength = (insertLineStart ? targetLineStartsLength + 1 : targetLineStartsLength);
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-
-		if (insertLineStart) {
-			newLineStarts[0] = 1;
-			for (let i = 0; i < targetLineStartsLength; i++) {
-				newLineStarts[i + 1] = targetLineStarts[i] + 1;
-			}
-		} else {
-			for (let i = 0; i < targetLineStartsLength; i++) {
-				newLineStarts[i] = targetLineStarts[i] + 1;
-			}
-		}
-
-		return new BufferPiece(
-			String.fromCharCode(character) + target._str,
-			newLineStarts
-		);
-	}
-
-	public static join(first: BufferPiece, second: BufferPiece): BufferPiece {
-		const firstCharsLength = first._str.length;
-
-		const firstLineStartsLength = first._lineStarts.length;
-		const secondLineStartsLength = second._lineStarts.length;
-
-		const firstLineStarts = first._lineStarts;
-		const secondLineStarts = second._lineStarts;
-
-		const newLineStartsLength = firstLineStartsLength + secondLineStartsLength;
-		let newLineStarts = new Uint32Array(newLineStartsLength);
-		newLineStarts.set(firstLineStarts, 0);
-		for (let i = 0; i < secondLineStartsLength; i++) {
-			newLineStarts[i + firstLineStartsLength] = secondLineStarts[i] + firstCharsLength;
-		}
-
-		return new BufferPiece(first._str + second._str, newLineStarts);
-	}
-
-	public static replaceOffsetLen(target: BufferPiece, edits: LeafOffsetLenEdit[], idealLeafLength: number, maxLeafLength: number, result: BufferPiece[]): void {
-		const editsSize = edits.length;
-		const originalCharsLength = target.length();
-		if (editsSize === 1 && edits[0].text.length === 0 && edits[0].start === 0 && edits[0].length === originalCharsLength) {
-			// special case => deleting everything
-			return;
-		}
-
-		let pieces: string[] = new Array<string>(2 * editsSize + 1);
-		let originalFromIndex = 0;
-		let piecesTextLength = 0;
-		for (let i = 0; i < editsSize; i++) {
-			const edit = edits[i];
-
-			const originalText = target._str.substr(originalFromIndex, edit.start - originalFromIndex);
-			pieces[2 * i] = originalText;
-			piecesTextLength += originalText.length;
-
-			originalFromIndex = edit.start + edit.length;
-			pieces[2 * i + 1] = edit.text;
-			piecesTextLength += edit.text.length;
-		}
-
-		// maintain the chars that survive to the right of the last edit
-		let text = target._str.substr(originalFromIndex, originalCharsLength - originalFromIndex);
-		pieces[2 * editsSize] = text;
-		piecesTextLength += text.length;
-
-		let targetDataLength = piecesTextLength > maxLeafLength ? idealLeafLength : piecesTextLength;
-		let targetDataOffset = 0;
-
-		let data: string = '';
-
-		for (let pieceIndex = 0, pieceCount = pieces.length; pieceIndex < pieceCount; pieceIndex++) {
-			const pieceText = pieces[pieceIndex];
-			const pieceLength = pieceText.length;
-			if (pieceLength === 0) {
-				continue;
-			}
-
-			let pieceOffset = 0;
-			while (pieceOffset < pieceLength) {
-				if (targetDataOffset >= targetDataLength) {
-					result.push(new BufferPiece(data));
-					targetDataLength = piecesTextLength > maxLeafLength ? idealLeafLength : piecesTextLength;
-					targetDataOffset = 0;
-					data = '';
-				}
-
-				let writingCnt = min(pieceLength - pieceOffset, targetDataLength - targetDataOffset);
-				data += pieceText.substr(pieceOffset, writingCnt);
-				pieceOffset += writingCnt;
-				targetDataOffset += writingCnt;
-				piecesTextLength -= writingCnt;
-
-				// check that the buffer piece does not end in a \r or high surrogate
-				if (targetDataOffset === targetDataLength && piecesTextLength > 0) {
-					const lastChar = data.charCodeAt(targetDataLength - 1);
-					if (lastChar === CharCode.CarriageReturn || (0xD800 <= lastChar && lastChar <= 0xDBFF)) {
-						// move lastChar over to next buffer piece
-						targetDataLength -= 1;
-						pieceOffset -= 1;
-						targetDataOffset -= 1;
-						piecesTextLength += 1;
-						data = data.substr(0, data.length - 1);
-					}
-				}
-			}
-		}
-
-		result.push(new BufferPiece(data));
-	}
-}
-
-function min(a: number, b: number): number {
-	return (a < b ? a : b);
-}
-
-export function createUint32Array(arr: number[]): Uint32Array {
-	let r = new Uint32Array(arr.length);
-	r.set(arr, 0);
-	return r;
-}
-
-export class LineStarts {
-	constructor(
-		public readonly lineStarts: Uint32Array,
-		public readonly cr: number,
-		public readonly lf: number,
-		public readonly crlf: number,
-		public readonly isBasicASCII: boolean
-	) { }
-}
-
-export function createLineStartsFast(str: string): Uint32Array {
-	let r: number[] = [], rLength = 0;
-	for (let i = 0, len = str.length; i < len; i++) {
-		const chr = str.charCodeAt(i);
-
-		if (chr === CharCode.CarriageReturn) {
-			if (i + 1 < len && str.charCodeAt(i + 1) === CharCode.LineFeed) {
-				// \r\n... case
-				r[rLength++] = i + 2;
-				i++; // skip \n
-			} else {
-				// \r... case
-				r[rLength++] = i + 1;
-			}
-		} else if (chr === CharCode.LineFeed) {
-			r[rLength++] = i + 1;
-		}
-	}
-	return createUint32Array(r);
-}
-
-export function createLineStarts(r: number[], str: string): LineStarts {
-	r.length = 0;
-
-	let rLength = 0;
-	let cr = 0, lf = 0, crlf = 0;
-	let isBasicASCII = true;
-	for (let i = 0, len = str.length; i < len; i++) {
-		const chr = str.charCodeAt(i);
-
-		if (chr === CharCode.CarriageReturn) {
-			if (i + 1 < len && str.charCodeAt(i + 1) === CharCode.LineFeed) {
-				// \r\n... case
-				crlf++;
-				r[rLength++] = i + 2;
-				i++; // skip \n
-			} else {
-				cr++;
-				// \r... case
-				r[rLength++] = i + 1;
-			}
-		} else if (chr === CharCode.LineFeed) {
-			lf++;
-			r[rLength++] = i + 1;
-		} else {
-			if (isBasicASCII) {
-				if (chr !== CharCode.Tab && (chr < 32 || chr > 126)) {
-					isBasicASCII = false;
-				}
-			}
-		}
-	}
-
-	const result = new LineStarts(createUint32Array(r), cr, lf, crlf, isBasicASCII);
-	r.length = 0;
-
-	return result;
-}
diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
deleted file mode 100644
index 046f3387ea5..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
+++ /dev/null
@@ -1,1526 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { CharCode } from 'vs/base/common/charCode';
-import { ITextBuffer, EndOfLinePreference, IIdentifiedSingleEditOperation, ApplyEditsResult, ISingleEditOperationIdentifier, IInternalModelContentChange } from 'vs/editor/common/model';
-import { BufferPiece, LeafOffsetLenEdit } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-import { Position } from 'vs/editor/common/core/position';
-import { Range } from 'vs/editor/common/core/range';
-import * as strings from 'vs/base/common/strings';
-import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export interface IValidatedEditOperation {
-	sortIndex: number;
-	identifier: ISingleEditOperationIdentifier;
-	range: Range;
-	rangeOffset: number;
-	rangeLength: number;
-	lines: string[];
-	forceMoveMarkers: boolean;
-	isAutoWhitespaceEdit: boolean;
-}
-
-export class ChunksTextBuffer implements ITextBuffer {
-
-	private _BOM: string;
-	private _actual: Buffer;
-	private _mightContainRTL: boolean;
-	private _mightContainNonBasicASCII: boolean;
-
-	constructor(pieces: BufferPiece[], _averageChunkSize: number, BOM: string, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) {
-		this._BOM = BOM;
-		const averageChunkSize = Math.floor(Math.min(65536.0, Math.max(128.0, _averageChunkSize)));
-		const delta = Math.floor(averageChunkSize / 3);
-		const min = averageChunkSize - delta;
-		const max = 2 * min;
-		this._actual = new Buffer(pieces, min, max, eol);
-		this._mightContainRTL = containsRTL;
-		this._mightContainNonBasicASCII = !isBasicASCII;
-	}
-
-	equals(other: ITextBuffer): boolean {
-		if (!(other instanceof ChunksTextBuffer)) {
-			return false;
-		}
-		return this._actual.equals(other._actual);
-	}
-	mightContainRTL(): boolean {
-		return this._mightContainRTL;
-	}
-	mightContainNonBasicASCII(): boolean {
-		return this._mightContainNonBasicASCII;
-	}
-	getBOM(): string {
-		return this._BOM;
-	}
-	getEOL(): string {
-		return this._actual.getEOL();
-	}
-	getOffsetAt(lineNumber: number, column: number): number {
-		return this._actual.convertPositionToOffset(lineNumber, column);
-	}
-	getPositionAt(offset: number): Position {
-		return this._actual.convertOffsetToPosition(offset);
-	}
-	getRangeAt(offset: number, length: number): Range {
-		return this._actual.convertOffsetLenToRange(offset, length);
-	}
-	getValueInRange(range: Range, eol: EndOfLinePreference): string {
-		if (range.isEmpty()) {
-			return '';
-		}
-
-		const text = this._actual.getValueInRange(range);
-		switch (eol) {
-			case EndOfLinePreference.TextDefined:
-				return text;
-			case EndOfLinePreference.LF:
-				if (this.getEOL() === '\n') {
-					return text;
-				} else {
-					return text.replace(/\r\n/g, '\n');
-				}
-			case EndOfLinePreference.CRLF:
-				if (this.getEOL() === '\r\n') {
-					return text;
-				} else {
-					return text.replace(/\n/g, '\r\n');
-				}
-		}
-		return null;
-	}
-
-	public createSnapshot(preserveBOM: boolean): ITextSnapshot {
-		return this._actual.createSnapshot(preserveBOM ? this._BOM : '');
-	}
-
-	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number {
-		if (range.isEmpty()) {
-			return 0;
-		}
-		const eolCount = range.endLineNumber - range.startLineNumber;
-		const result = this._actual.getValueLengthInRange(range);
-		switch (eol) {
-			case EndOfLinePreference.TextDefined:
-				return result;
-			case EndOfLinePreference.LF:
-				if (this.getEOL() === '\n') {
-					return result;
-				} else {
-					return result - eolCount; // \r\n => \n
-				}
-			case EndOfLinePreference.CRLF:
-				if (this.getEOL() === '\r\n') {
-					return result;
-				} else {
-					return result + eolCount; // \n => \r\n
-				}
-		}
-		return 0;
-	}
-
-	public getLength(): number {
-		return this._actual.getLength();
-	}
-
-	getLineCount(): number {
-		return this._actual.getLineCount();
-	}
-
-	getLinesContent(): string[] {
-		return this._actual.getLinesContent();
-	}
-
-	getLineContent(lineNumber: number): string {
-		return this._actual.getLineContent(lineNumber);
-	}
-
-	getLineCharCode(lineNumber: number, index: number): number {
-		return this._actual.getLineCharCode(lineNumber, index);
-	}
-
-	getLineLength(lineNumber: number): number {
-		return this._actual.getLineLength(lineNumber);
-	}
-
-	getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		const result = this._actual.getLineFirstNonWhitespaceIndex(lineNumber);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-	getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		const result = this._actual.getLineLastNonWhitespaceIndex(lineNumber);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-	setEOL(newEOL: '\r\n' | '\n'): void {
-		if (this.getEOL() === newEOL) {
-			// nothing to do...
-			return;
-		}
-		this._actual.setEOL(newEOL);
-	}
-
-	private static _sortOpsAscending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return a.sortIndex - b.sortIndex;
-		}
-		return r;
-	}
-
-	private static _sortOpsDescending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return b.sortIndex - a.sortIndex;
-		}
-		return -r;
-	}
-
-	applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult {
-		if (rawOperations.length === 0) {
-			return new ApplyEditsResult([], [], []);
-		}
-
-		let mightContainRTL = this._mightContainRTL;
-		let mightContainNonBasicASCII = this._mightContainNonBasicASCII;
-		let canReduceOperations = true;
-
-		let operations: IValidatedEditOperation[] = [];
-		for (let i = 0; i < rawOperations.length; i++) {
-			let op = rawOperations[i];
-			if (canReduceOperations && op._isTracked) {
-				canReduceOperations = false;
-			}
-			let validatedRange = op.range;
-			if (!mightContainRTL && op.text) {
-				// check if the new inserted text contains RTL
-				mightContainRTL = strings.containsRTL(op.text);
-			}
-			if (!mightContainNonBasicASCII && op.text) {
-				mightContainNonBasicASCII = !strings.isBasicASCII(op.text);
-			}
-			operations[i] = {
-				sortIndex: i,
-				identifier: op.identifier || null,
-				range: validatedRange,
-				rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn),
-				rangeLength: this.getValueLengthInRange(validatedRange, EndOfLinePreference.TextDefined),
-				lines: op.text ? op.text.split(/\r\n|\r|\n/) : null,
-				forceMoveMarkers: op.forceMoveMarkers || false,
-				isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false
-			};
-		}
-
-		// Sort operations ascending
-		operations.sort(ChunksTextBuffer._sortOpsAscending);
-
-		for (let i = 0, count = operations.length - 1; i < count; i++) {
-			let rangeEnd = operations[i].range.getEndPosition();
-			let nextRangeStart = operations[i + 1].range.getStartPosition();
-
-			if (nextRangeStart.isBefore(rangeEnd)) {
-				// overlapping ranges
-				throw new Error('Overlapping ranges are not allowed!');
-			}
-		}
-
-		if (canReduceOperations) {
-			operations = this._reduceOperations(operations);
-		}
-
-		// Delta encode operations
-		let reverseRanges = ChunksTextBuffer._getInverseEditRanges(operations);
-		let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = [];
-
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			if (recordTrimAutoWhitespace && op.isAutoWhitespaceEdit && op.range.isEmpty()) {
-				// Record already the future line numbers that might be auto whitespace removal candidates on next edit
-				for (let lineNumber = reverseRange.startLineNumber; lineNumber <= reverseRange.endLineNumber; lineNumber++) {
-					let currentLineContent = '';
-					if (lineNumber === reverseRange.startLineNumber) {
-						currentLineContent = this.getLineContent(op.range.startLineNumber);
-						if (strings.firstNonWhitespaceIndex(currentLineContent) !== -1) {
-							continue;
-						}
-					}
-					newTrimAutoWhitespaceCandidates.push({ lineNumber: lineNumber, oldContent: currentLineContent });
-				}
-			}
-		}
-
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			reverseOperations[i] = {
-				identifier: op.identifier,
-				range: reverseRange,
-				text: this.getValueInRange(op.range, EndOfLinePreference.TextDefined),
-				forceMoveMarkers: op.forceMoveMarkers
-			};
-		}
-
-		this._mightContainRTL = mightContainRTL;
-		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
-
-		const contentChanges = this._doApplyEdits(operations);
-
-		let trimAutoWhitespaceLineNumbers: number[] = null;
-		if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) {
-			// sort line numbers auto whitespace removal candidates for next edit descending
-			newTrimAutoWhitespaceCandidates.sort((a, b) => b.lineNumber - a.lineNumber);
-
-			trimAutoWhitespaceLineNumbers = [];
-			for (let i = 0, len = newTrimAutoWhitespaceCandidates.length; i < len; i++) {
-				let lineNumber = newTrimAutoWhitespaceCandidates[i].lineNumber;
-				if (i > 0 && newTrimAutoWhitespaceCandidates[i - 1].lineNumber === lineNumber) {
-					// Do not have the same line number twice
-					continue;
-				}
-
-				let prevContent = newTrimAutoWhitespaceCandidates[i].oldContent;
-				let lineContent = this.getLineContent(lineNumber);
-
-				if (lineContent.length === 0 || lineContent === prevContent || strings.firstNonWhitespaceIndex(lineContent) !== -1) {
-					continue;
-				}
-
-				trimAutoWhitespaceLineNumbers.push(lineNumber);
-			}
-		}
-
-		return new ApplyEditsResult(
-			reverseOperations,
-			contentChanges,
-			trimAutoWhitespaceLineNumbers
-		);
-	}
-
-	/**
-	 * Transform operations such that they represent the same logic edit,
-	 * but that they also do not cause OOM crashes.
-	 */
-	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
-		if (operations.length < 1000) {
-			// We know from empirical testing that a thousand edits work fine regardless of their shape.
-			return operations;
-		}
-
-		// At one point, due to how events are emitted and how each operation is handled,
-		// some operations can trigger a high ammount of temporary string allocations,
-		// that will immediately get edited again.
-		// e.g. a formatter inserting ridiculous ammounts of \n on a model with a single line
-		// Therefore, the strategy is to collapse all the operations into a huge single edit operation
-		return [this._toSingleEditOperation(operations)];
-	}
-
-	_toSingleEditOperation(operations: IValidatedEditOperation[]): IValidatedEditOperation {
-		let forceMoveMarkers = false,
-			firstEditRange = operations[0].range,
-			lastEditRange = operations[operations.length - 1].range,
-			entireEditRange = new Range(firstEditRange.startLineNumber, firstEditRange.startColumn, lastEditRange.endLineNumber, lastEditRange.endColumn),
-			lastEndLineNumber = firstEditRange.startLineNumber,
-			lastEndColumn = firstEditRange.startColumn,
-			result: string[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let operation = operations[i],
-				range = operation.range;
-
-			forceMoveMarkers = forceMoveMarkers || operation.forceMoveMarkers;
-
-			// (1) -- Push old text
-			for (let lineNumber = lastEndLineNumber; lineNumber < range.startLineNumber; lineNumber++) {
-				if (lineNumber === lastEndLineNumber) {
-					result.push(this.getLineContent(lineNumber).substring(lastEndColumn - 1));
-				} else {
-					result.push('\n');
-					result.push(this.getLineContent(lineNumber));
-				}
-			}
-
-			if (range.startLineNumber === lastEndLineNumber) {
-				result.push(this.getLineContent(range.startLineNumber).substring(lastEndColumn - 1, range.startColumn - 1));
-			} else {
-				result.push('\n');
-				result.push(this.getLineContent(range.startLineNumber).substring(0, range.startColumn - 1));
-			}
-
-			// (2) -- Push new text
-			if (operation.lines) {
-				for (let j = 0, lenJ = operation.lines.length; j < lenJ; j++) {
-					if (j !== 0) {
-						result.push('\n');
-					}
-					result.push(operation.lines[j]);
-				}
-			}
-
-			lastEndLineNumber = operation.range.endLineNumber;
-			lastEndColumn = operation.range.endColumn;
-		}
-
-		return {
-			sortIndex: 0,
-			identifier: operations[0].identifier,
-			range: entireEditRange,
-			rangeOffset: this.getOffsetAt(entireEditRange.startLineNumber, entireEditRange.startColumn),
-			rangeLength: this.getValueLengthInRange(entireEditRange, EndOfLinePreference.TextDefined),
-			lines: result.join('').split('\n'),
-			forceMoveMarkers: forceMoveMarkers,
-			isAutoWhitespaceEdit: false
-		};
-	}
-
-	private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] {
-
-		// Sort operations descending
-		operations.sort(ChunksTextBuffer._sortOpsDescending);
-
-		let contentChanges: IInternalModelContentChange[] = [];
-		let edits: OffsetLenEdit[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			const op = operations[i];
-
-			const text = (op.lines ? op.lines.join(this.getEOL()) : '');
-			edits[i] = new OffsetLenEdit(op.sortIndex, op.rangeOffset, op.rangeLength, text);
-
-			const startLineNumber = op.range.startLineNumber;
-			const startColumn = op.range.startColumn;
-			const endLineNumber = op.range.endLineNumber;
-			const endColumn = op.range.endColumn;
-
-			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.lines || op.lines.length === 0)) {
-				// no-op
-				continue;
-			}
-
-			contentChanges.push({
-				range: op.range,
-				rangeLength: op.rangeLength,
-				text: text,
-				rangeOffset: op.rangeOffset,
-				forceMoveMarkers: op.forceMoveMarkers
-			});
-		}
-
-		this._actual.replaceOffsetLen(edits);
-
-		return contentChanges;
-	}
-
-	/**
-	 * Assumes `operations` are validated and sorted ascending
-	 */
-	public static _getInverseEditRanges(operations: IValidatedEditOperation[]): Range[] {
-		let result: Range[] = [];
-
-		let prevOpEndLineNumber: number;
-		let prevOpEndColumn: number;
-		let prevOp: IValidatedEditOperation = null;
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let op = operations[i];
-
-			let startLineNumber: number;
-			let startColumn: number;
-
-			if (prevOp) {
-				if (prevOp.range.endLineNumber === op.range.startLineNumber) {
-					startLineNumber = prevOpEndLineNumber;
-					startColumn = prevOpEndColumn + (op.range.startColumn - prevOp.range.endColumn);
-				} else {
-					startLineNumber = prevOpEndLineNumber + (op.range.startLineNumber - prevOp.range.endLineNumber);
-					startColumn = op.range.startColumn;
-				}
-			} else {
-				startLineNumber = op.range.startLineNumber;
-				startColumn = op.range.startColumn;
-			}
-
-			let resultRange: Range;
-
-			if (op.lines && op.lines.length > 0) {
-				// the operation inserts something
-				let lineCount = op.lines.length;
-				let firstLine = op.lines[0];
-				let lastLine = op.lines[lineCount - 1];
-
-				if (lineCount === 1) {
-					// single line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn + firstLine.length);
-				} else {
-					// multi line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber + lineCount - 1, lastLine.length + 1);
-				}
-			} else {
-				// There is nothing to insert
-				resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn);
-			}
-
-			prevOpEndLineNumber = resultRange.endLineNumber;
-			prevOpEndColumn = resultRange.endColumn;
-
-			result.push(resultRange);
-			prevOp = op;
-		}
-
-		return result;
-	}
-}
-
-
-class BufferNodes {
-
-	public length: Uint32Array;
-	public newLineCount: Uint32Array;
-
-	constructor(count: number) {
-		this.length = new Uint32Array(count);
-		this.newLineCount = new Uint32Array(count);
-	}
-
-}
-
-class BufferCursor {
-	constructor(
-		public offset: number,
-		public leafIndex: number,
-		public leafStartOffset: number,
-		public leafStartNewLineCount: number
-	) { }
-
-	public set(offset: number, leafIndex: number, leafStartOffset: number, leafStartNewLineCount: number) {
-		this.offset = offset;
-		this.leafIndex = leafIndex;
-		this.leafStartOffset = leafStartOffset;
-		this.leafStartNewLineCount = leafStartNewLineCount;
-	}
-}
-
-class OffsetLenEdit {
-	constructor(
-		public readonly initialIndex: number,
-		public readonly offset: number,
-		public length: number,
-		public text: string
-	) { }
-}
-
-class InternalOffsetLenEdit {
-	constructor(
-		public readonly startLeafIndex: number,
-		public readonly startInnerOffset: number,
-		public readonly endLeafIndex: number,
-		public readonly endInnerOffset: number,
-		public text: string
-	) { }
-}
-
-class LeafReplacement {
-	constructor(
-		public readonly startLeafIndex: number,
-		public readonly endLeafIndex: number,
-		public readonly replacements: BufferPiece[]
-	) { }
-}
-
-const BUFFER_CURSOR_POOL_SIZE = 10;
-const BufferCursorPool = new class {
-	private _pool: BufferCursor[];
-	private _len: number;
-
-	constructor() {
-		this._pool = [];
-		for (let i = 0; i < BUFFER_CURSOR_POOL_SIZE; i++) {
-			this._pool[i] = new BufferCursor(0, 0, 0, 0);
-		}
-		this._len = this._pool.length;
-	}
-
-	public put(cursor: BufferCursor): void {
-		if (this._len > this._pool.length) {
-			// oh, well
-			return;
-		}
-		this._pool[this._len++] = cursor;
-	}
-
-	public take(): BufferCursor {
-		if (this._len === 0) {
-			// oh, well
-			console.log(`insufficient BufferCursor pool`);
-			return new BufferCursor(0, 0, 0, 0);
-		}
-		const result = this._pool[this._len - 1];
-		this._pool[this._len--] = null;
-		return result;
-	}
-};
-
-class BufferSnapshot implements ITextSnapshot {
-
-	private readonly _pieces: BufferPiece[];
-	private readonly _piecesLength: number;
-	private readonly _BOM: string;
-	private _piecesIndex: number;
-
-	constructor(pieces: BufferPiece[], BOM: string) {
-		this._pieces = pieces;
-		this._piecesLength = this._pieces.length;
-		this._BOM = BOM;
-		this._piecesIndex = 0;
-	}
-
-	public read(): string {
-		if (this._piecesIndex >= this._piecesLength) {
-			return null;
-		}
-
-		let result: string = null;
-		if (this._piecesIndex === 0) {
-			result = this._BOM + this._pieces[this._piecesIndex].text;
-		} else {
-			result = this._pieces[this._piecesIndex].text;
-		}
-
-		this._piecesIndex++;
-		return result;
-	}
-}
-
-class Buffer {
-
-	private _minLeafLength: number;
-	private _maxLeafLength: number;
-	private _idealLeafLength: number;
-
-	private _eol: '\r\n' | '\n';
-	private _eolLength: number;
-
-	private _leafs: BufferPiece[];
-	private _nodes: BufferNodes;
-	private _nodesCount: number;
-	private _leafsStart: number;
-	private _leafsEnd: number;
-
-	constructor(pieces: BufferPiece[], minLeafLength: number, maxLeafLength: number, eol: '\r\n' | '\n') {
-		if (!(2 * minLeafLength >= maxLeafLength)) {
-			throw new Error(`assertion violation`);
-		}
-
-		this._minLeafLength = minLeafLength;
-		this._maxLeafLength = maxLeafLength;
-		this._idealLeafLength = (minLeafLength + maxLeafLength) >>> 1;
-
-		this._eol = eol;
-		this._eolLength = this._eol.length;
-
-		this._leafs = pieces;
-		this._nodes = null;
-		this._nodesCount = 0;
-		this._leafsStart = 0;
-		this._leafsEnd = 0;
-
-		this._rebuildNodes();
-	}
-
-	equals(other: Buffer): boolean {
-		return Buffer.equals(this, other);
-	}
-
-	private static equals(a: Buffer, b: Buffer): boolean {
-		const aLength = a.getLength();
-		const bLength = b.getLength();
-		if (aLength !== bLength) {
-			return false;
-		}
-		if (a.getLineCount() !== b.getLineCount()) {
-			return false;
-		}
-
-		let remaining = aLength;
-		let aLeafIndex = -1, aLeaf = null, aLeafLength = 0, aLeafRemaining = 0;
-		let bLeafIndex = -1, bLeaf = null, bLeafLength = 0, bLeafRemaining = 0;
-
-		while (remaining > 0) {
-			if (aLeafRemaining === 0) {
-				aLeafIndex++;
-				aLeaf = a._leafs[aLeafIndex];
-				aLeafLength = aLeaf.length();
-				aLeafRemaining = aLeafLength;
-			}
-
-			if (bLeafRemaining === 0) {
-				bLeafIndex++;
-				bLeaf = b._leafs[bLeafIndex];
-				bLeafLength = bLeaf.length();
-				bLeafRemaining = bLeafLength;
-			}
-
-			let consuming = Math.min(aLeafRemaining, bLeafRemaining);
-
-			let aStr = aLeaf.substr(aLeafLength - aLeafRemaining, consuming);
-			let bStr = bLeaf.substr(bLeafLength - bLeafRemaining, consuming);
-
-			if (aStr !== bStr) {
-				return false;
-			}
-
-			remaining -= consuming;
-			aLeafRemaining -= consuming;
-			bLeafRemaining -= consuming;
-		}
-
-		return true;
-	}
-
-	public getEOL(): string {
-		return this._eol;
-	}
-
-	private _rebuildNodes() {
-		const leafsCount = this._leafs.length;
-
-		this._nodesCount = (1 << log2(leafsCount));
-		this._leafsStart = this._nodesCount;
-		this._leafsEnd = this._leafsStart + leafsCount;
-
-		this._nodes = new BufferNodes(this._nodesCount);
-		for (let i = this._nodesCount - 1; i >= 1; i--) {
-			this._updateSingleNode(i);
-		}
-	}
-
-	private _updateSingleNode(nodeIndex: number): void {
-		const left = LEFT_CHILD(nodeIndex);
-		const right = RIGHT_CHILD(nodeIndex);
-
-		let length = 0;
-		let newLineCount = 0;
-
-		if (this.IS_NODE(left)) {
-			length += this._nodes.length[left];
-			newLineCount += this._nodes.newLineCount[left];
-		} else if (this.IS_LEAF(left)) {
-			const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-			length += leaf.length();
-			newLineCount += leaf.newLineCount();
-		}
-
-		if (this.IS_NODE(right)) {
-			length += this._nodes.length[right];
-			newLineCount += this._nodes.newLineCount[right];
-		} else if (this.IS_LEAF(right)) {
-			const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(right)];
-			length += leaf.length();
-			newLineCount += leaf.newLineCount();
-		}
-
-		this._nodes.length[nodeIndex] = length;
-		this._nodes.newLineCount[nodeIndex] = newLineCount;
-	}
-
-	private _findOffset(offset: number, result: BufferCursor): boolean {
-		if (offset > this._nodes.length[1]) {
-			return false;
-		}
-
-		let it = 1;
-		let searchOffset = offset;
-		let leafStartOffset = 0;
-		let leafStartNewLineCount = 0;
-		while (!this.IS_LEAF(it)) {
-			const left = LEFT_CHILD(it);
-			const right = RIGHT_CHILD(it);
-
-			let leftNewLineCount = 0;
-			let leftLength = 0;
-			if (this.IS_NODE(left)) {
-				leftNewLineCount = this._nodes.newLineCount[left];
-				leftLength = this._nodes.length[left];
-			} else if (this.IS_LEAF(left)) {
-				const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-				leftNewLineCount = leaf.newLineCount();
-				leftLength = leaf.length();
-			}
-
-			let rightLength = 0;
-			if (this.IS_NODE(right)) {
-				rightLength += this._nodes.length[right];
-			} else if (this.IS_LEAF(right)) {
-				rightLength += this._leafs[this.NODE_TO_LEAF_INDEX(right)].length();
-			}
-
-			if (searchOffset < leftLength || rightLength === 0) {
-				// go left
-				it = left;
-			} else {
-				// go right
-				searchOffset -= leftLength;
-				leafStartOffset += leftLength;
-				leafStartNewLineCount += leftNewLineCount;
-				it = right;
-			}
-		}
-		it = this.NODE_TO_LEAF_INDEX(it);
-
-		result.set(offset, it, leafStartOffset, leafStartNewLineCount);
-		return true;
-	}
-
-	private _findOffsetCloseAfter(offset: number, start: BufferCursor, result: BufferCursor): boolean {
-		if (offset > this._nodes.length[1]) {
-			return false;
-		}
-
-		let innerOffset = offset - start.leafStartOffset;
-		const leafsCount = this._leafs.length;
-
-		let leafIndex = start.leafIndex;
-		let leafStartOffset = start.leafStartOffset;
-		let leafStartNewLineCount = start.leafStartNewLineCount;
-
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (innerOffset < leaf.length() || (innerOffset === leaf.length() && leafIndex + 1 === leafsCount)) {
-				result.set(offset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return true;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				result.set(offset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return true;
-			}
-
-			leafStartOffset += leaf.length();
-			leafStartNewLineCount += leaf.newLineCount();
-			innerOffset -= leaf.length();
-		}
-	}
-
-	private _findLineStart(lineNumber: number, result: BufferCursor): boolean {
-		let lineIndex = lineNumber - 1;
-		if (lineIndex < 0 || lineIndex > this._nodes.newLineCount[1]) {
-			result.set(0, 0, 0, 0);
-			return false;
-		}
-
-		let it = 1;
-		let leafStartOffset = 0;
-		let leafStartNewLineCount = 0;
-		while (!this.IS_LEAF(it)) {
-			const left = LEFT_CHILD(it);
-			const right = RIGHT_CHILD(it);
-
-			let leftNewLineCount = 0;
-			let leftLength = 0;
-			if (this.IS_NODE(left)) {
-				leftNewLineCount = this._nodes.newLineCount[left];
-				leftLength = this._nodes.length[left];
-			} else if (this.IS_LEAF(left)) {
-				const leaf = this._leafs[this.NODE_TO_LEAF_INDEX(left)];
-				leftNewLineCount = leaf.newLineCount();
-				leftLength = leaf.length();
-			}
-
-			if (lineIndex <= leftNewLineCount) {
-				// go left
-				it = left;
-				continue;
-			}
-
-			// go right
-			lineIndex -= leftNewLineCount;
-			leafStartOffset += leftLength;
-			leafStartNewLineCount += leftNewLineCount;
-			it = right;
-		}
-		it = this.NODE_TO_LEAF_INDEX(it);
-
-		const innerLineStartOffset = (lineIndex === 0 ? 0 : this._leafs[it].lineStartFor(lineIndex - 1));
-
-		result.set(leafStartOffset + innerLineStartOffset, it, leafStartOffset, leafStartNewLineCount);
-		return true;
-	}
-
-	private _findLineEnd(start: BufferCursor, lineNumber: number, result: BufferCursor): void {
-		let innerLineIndex = lineNumber - 1 - start.leafStartNewLineCount;
-		const leafsCount = this._leafs.length;
-
-		let leafIndex = start.leafIndex;
-		let leafStartOffset = start.leafStartOffset;
-		let leafStartNewLineCount = start.leafStartNewLineCount;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (innerLineIndex < leaf.newLineCount()) {
-				const lineEndOffset = this._leafs[leafIndex].lineStartFor(innerLineIndex);
-				result.set(leafStartOffset + lineEndOffset, leafIndex, leafStartOffset, leafStartNewLineCount);
-				return;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				result.set(leafStartOffset + leaf.length(), leafIndex - 1, leafStartOffset, leafStartNewLineCount);
-				return;
-			}
-
-			leafStartOffset += leaf.length();
-			leafStartNewLineCount += leaf.newLineCount();
-			innerLineIndex = 0;
-		}
-	}
-
-	private _findLine(lineNumber: number, start: BufferCursor, end: BufferCursor): boolean {
-		if (!this._findLineStart(lineNumber, start)) {
-			return false;
-		}
-
-		this._findLineEnd(start, lineNumber, end);
-		return true;
-	}
-
-	public getLength(): number {
-		return this._nodes.length[1];
-	}
-
-	public getLineCount(): number {
-		return this._nodes.newLineCount[1] + 1;
-	}
-
-	public getLineContent(lineNumber: number): string {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLine(lineNumber, start, end)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		let result: string;
-		if (lineNumber === this.getLineCount()) {
-			// last line is not trailed by an eol
-			result = this.extractString(start, end.offset - start.offset);
-		} else {
-			result = this.extractString(start, end.offset - start.offset - this._eolLength);
-		}
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-		return result;
-	}
-
-	public getLineCharCode(lineNumber: number, index: number): number {
-		const start = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		const tmp = BufferCursorPool.take();
-		this._findOffsetCloseAfter(start.offset + index, start, tmp);
-		const result = this._leafs[tmp.leafIndex].charCodeAt(tmp.offset - tmp.leafStartNewLineCount);
-		BufferCursorPool.put(tmp);
-
-		BufferCursorPool.put(start);
-		return result;
-	}
-
-	public getLineLength(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLine(lineNumber, start, end)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		let result: number;
-		if (lineNumber === this.getLineCount()) {
-			// last line is not trailed by an eol
-			result = end.offset - start.offset;
-		} else {
-			result = end.offset - start.offset - this._eolLength;
-		}
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-		return result;
-	}
-
-	public getLineFirstNonWhitespaceIndex(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		let leafIndex = start.leafIndex;
-		let searchStartOffset = start.offset - start.leafStartOffset;
-		BufferCursorPool.put(start);
-
-		const leafsCount = this._leafs.length;
-		let totalDelta = 0;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			const leafResult = leaf.findLineFirstNonWhitespaceIndex(searchStartOffset);
-			if (leafResult === -2) {
-				// reached EOL
-				return -1;
-			}
-			if (leafResult !== -1) {
-				return (leafResult - searchStartOffset) + totalDelta;
-			}
-
-			leafIndex++;
-
-			if (leafIndex >= leafsCount) {
-				return -1;
-			}
-
-			totalDelta += (leaf.length() - searchStartOffset);
-			searchStartOffset = 0;
-		}
-	}
-
-	public getLineLastNonWhitespaceIndex(lineNumber: number): number {
-		const start = BufferCursorPool.take();
-		const end = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, start)) {
-			BufferCursorPool.put(start);
-			BufferCursorPool.put(end);
-			throw new Error(`Line not found`);
-		}
-
-		this._findLineEnd(start, lineNumber, end);
-
-		const startOffset = start.offset;
-		const endOffset = end.offset;
-		let leafIndex = end.leafIndex;
-		let searchStartOffset = end.offset - end.leafStartOffset - this._eolLength;
-
-		BufferCursorPool.put(start);
-		BufferCursorPool.put(end);
-
-		let totalDelta = 0;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			const leafResult = leaf.findLineLastNonWhitespaceIndex(searchStartOffset);
-			if (leafResult === -2) {
-				// reached EOL
-				return -1;
-			}
-			if (leafResult !== -1) {
-				const delta = (searchStartOffset - 1 - leafResult);
-				const absoluteOffset = (endOffset - this._eolLength) - delta - totalDelta;
-				return absoluteOffset - startOffset;
-			}
-
-			leafIndex--;
-
-			if (leafIndex < 0) {
-				return -1;
-			}
-
-			totalDelta += searchStartOffset;
-			searchStartOffset = leaf.length();
-		}
-	}
-
-	public getLinesContent(): string[] {
-		let result: string[] = new Array<string>(this.getLineCount());
-		let resultIndex = 0;
-
-		let currentLine = '';
-		for (let leafIndex = 0, leafsCount = this._leafs.length; leafIndex < leafsCount; leafIndex++) {
-			const leaf = this._leafs[leafIndex];
-			const leafNewLineCount = leaf.newLineCount();
-
-			if (leafNewLineCount === 0) {
-				// special case => push entire leaf text
-				currentLine += leaf.text;
-				continue;
-			}
-
-			let leafSubstrOffset = 0;
-			for (let newLineIndex = 0; newLineIndex < leafNewLineCount; newLineIndex++) {
-				const newLineStart = leaf.lineStartFor(newLineIndex);
-				currentLine += leaf.substr(leafSubstrOffset, newLineStart - leafSubstrOffset - this._eolLength);
-				result[resultIndex++] = currentLine;
-
-				currentLine = '';
-				leafSubstrOffset = newLineStart;
-			}
-			currentLine += leaf.substr(leafSubstrOffset, leaf.length());
-		}
-		result[resultIndex++] = currentLine;
-
-		return result;
-	}
-
-	public extractString(start: BufferCursor, len: number): string {
-		if (!(start.offset + len <= this._nodes.length[1])) {
-			throw new Error(`assertion violation`);
-		}
-
-		let innerLeafOffset = start.offset - start.leafStartOffset;
-		let leafIndex = start.leafIndex;
-		let res = '';
-		while (len > 0) {
-			const leaf = this._leafs[leafIndex];
-			const cnt = Math.min(len, leaf.length() - innerLeafOffset);
-			res += leaf.substr(innerLeafOffset, cnt);
-
-			len -= cnt;
-			innerLeafOffset = 0;
-
-			if (len === 0) {
-				break;
-			}
-
-			leafIndex++;
-		}
-		return res;
-	}
-
-	private _getOffsetAt(lineNumber: number, column: number, result: BufferCursor): boolean {
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, lineStart)) {
-			BufferCursorPool.put(lineStart);
-			return false;
-		}
-
-		const startOffset = lineStart.offset + column - 1;
-		if (!this._findOffsetCloseAfter(startOffset, lineStart, result)) {
-			BufferCursorPool.put(lineStart);
-			return false;
-		}
-
-		BufferCursorPool.put(lineStart);
-		return true;
-	}
-
-	public convertPositionToOffset(lineNumber: number, column: number): number {
-		const r = BufferCursorPool.take();
-
-		if (!this._findLineStart(lineNumber, r)) {
-			BufferCursorPool.put(r);
-			throw new Error(`Position not found`);
-		}
-
-		const result = r.offset + column - 1;
-
-		BufferCursorPool.put(r);
-		return result;
-	}
-
-	/**
-	 * returns `lineNumber`
-	 */
-	private _findLineStartBeforeOffsetInLeaf(offset: number, leafIndex: number, leafStartOffset: number, leafStartNewLineCount: number, result: BufferCursor): number {
-		const leaf = this._leafs[leafIndex];
-		const lineStartIndex = leaf.findLineStartBeforeOffset(offset - leafStartOffset);
-		const lineStartOffset = leafStartOffset + leaf.lineStartFor(lineStartIndex);
-
-		result.set(lineStartOffset, leafIndex, leafStartOffset, leafStartNewLineCount);
-		return leafStartNewLineCount + lineStartIndex + 2;
-	}
-
-	/**
-	 * returns `lineNumber`.
-	 */
-	private _findLineStartBeforeOffset(offset: number, location: BufferCursor, result: BufferCursor): number {
-
-		let leafIndex = location.leafIndex;
-		let leafStartOffset = location.leafStartOffset;
-		let leafStartNewLineCount = location.leafStartNewLineCount;
-		while (true) {
-			const leaf = this._leafs[leafIndex];
-
-			if (leaf.newLineCount() >= 1 && leaf.lineStartFor(0) + leafStartOffset <= offset) {
-				// must be in this leaf
-				return this._findLineStartBeforeOffsetInLeaf(offset, leafIndex, leafStartOffset, leafStartNewLineCount, result);
-			}
-
-			// continue looking in previous leaf
-			leafIndex--;
-
-			if (leafIndex < 0) {
-				result.set(0, 0, 0, 0);
-				return 1;
-			}
-
-			leafStartOffset -= this._leafs[leafIndex].length();
-			leafStartNewLineCount -= this._leafs[leafIndex].newLineCount();
-		}
-	}
-
-	public convertOffsetToPosition(offset: number): Position {
-		const r = BufferCursorPool.take();
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findOffset(offset, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-
-		const lineNumber = this._findLineStartBeforeOffset(offset, r, lineStart);
-		const column = offset - lineStart.offset + 1;
-
-		BufferCursorPool.put(r);
-		BufferCursorPool.put(lineStart);
-
-		return new Position(lineNumber, column);
-	}
-
-	public convertOffsetLenToRange(offset: number, len: number): Range {
-		const r = BufferCursorPool.take();
-		const lineStart = BufferCursorPool.take();
-
-		if (!this._findOffset(offset, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-		const startLineNumber = this._findLineStartBeforeOffset(offset, r, lineStart);
-		const startColumn = offset - lineStart.offset + 1;
-
-		if (!this._findOffset(offset + len, r)) {
-			BufferCursorPool.put(r);
-			BufferCursorPool.put(lineStart);
-			throw new Error(`Offset not found`);
-		}
-		const endLineNumber = this._findLineStartBeforeOffset(offset + len, r, lineStart);
-		const endColumn = offset + len - lineStart.offset + 1;
-
-		BufferCursorPool.put(r);
-		BufferCursorPool.put(lineStart);
-
-		return new Range(startLineNumber, startColumn, endLineNumber, endColumn);
-	}
-
-	public getValueInRange(range: Range): string {
-		const start = BufferCursorPool.take();
-
-		if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) {
-			BufferCursorPool.put(start);
-			throw new Error(`Line not found`);
-		}
-
-		const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn);
-		const result = this.extractString(start, endOffset - start.offset);
-
-		BufferCursorPool.put(start);
-		return result;
-	}
-
-	public createSnapshot(BOM: string): ITextSnapshot {
-		return new BufferSnapshot(this._leafs, BOM);
-	}
-
-	public getValueLengthInRange(range: Range): number {
-		const startOffset = this.convertPositionToOffset(range.startLineNumber, range.startColumn);
-		const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn);
-		return endOffset - startOffset;
-	}
-
-	//#region Editing
-
-	private _mergeAdjacentEdits(edits: OffsetLenEdit[]): OffsetLenEdit[] {
-		// Check if we must merge adjacent edits
-		let merged: OffsetLenEdit[] = [], mergedLength = 0;
-		let prev = edits[0];
-		for (let i = 1, len = edits.length; i < len; i++) {
-			const curr = edits[i];
-			if (prev.offset + prev.length === curr.offset) {
-				// merge into `prev`
-				prev.length = prev.length + curr.length;
-				prev.text = prev.text + curr.text;
-			} else {
-				merged[mergedLength++] = prev;
-				prev = curr;
-			}
-		}
-		merged[mergedLength++] = prev;
-
-		return merged;
-	}
-
-	private _resolveEdits(edits: OffsetLenEdit[]): InternalOffsetLenEdit[] {
-		edits = this._mergeAdjacentEdits(edits);
-
-		let result: InternalOffsetLenEdit[] = [];
-		let tmp = new BufferCursor(0, 0, 0, 0);
-		let tmp2 = new BufferCursor(0, 0, 0, 0);
-		for (let i = 0, len = edits.length; i < len; i++) {
-			const edit = edits[i];
-
-			let text = edit.text;
-
-			this._findOffset(edit.offset, tmp);
-			let startLeafIndex = tmp.leafIndex;
-			let startInnerOffset = tmp.offset - tmp.leafStartOffset;
-			if (startInnerOffset > 0) {
-				const startLeaf = this._leafs[startLeafIndex];
-				const charBefore = startLeaf.charCodeAt(startInnerOffset - 1);
-				if (charBefore === CharCode.CarriageReturn) {
-					// include the replacement of \r in the edit
-					text = '\r' + text;
-
-					this._findOffsetCloseAfter(edit.offset - 1, tmp, tmp2);
-					startLeafIndex = tmp2.leafIndex;
-					startInnerOffset = tmp2.offset - tmp2.leafStartOffset;
-					// this._findOffset(edit.offset - 1, tmp);
-					// startLeafIndex = tmp.leafIndex;
-					// startInnerOffset = tmp.offset - tmp.leafStartOffset;
-				}
-			}
-
-			this._findOffset(edit.offset + edit.length, tmp);
-			let endLeafIndex = tmp.leafIndex;
-			let endInnerOffset = tmp.offset - tmp.leafStartOffset;
-			const endLeaf = this._leafs[endLeafIndex];
-			if (endInnerOffset < endLeaf.length()) {
-				const charAfter = endLeaf.charCodeAt(endInnerOffset);
-				if (charAfter === CharCode.LineFeed) {
-					// include the replacement of \n in the edit
-					text = text + '\n';
-
-					this._findOffsetCloseAfter(edit.offset + edit.length + 1, tmp, tmp2);
-					endLeafIndex = tmp2.leafIndex;
-					endInnerOffset = tmp2.offset - tmp2.leafStartOffset;
-					// this._findOffset(edit.offset + edit.length + 1, tmp);
-					// endLeafIndex = tmp.leafIndex;
-					// endInnerOffset = tmp.offset - tmp.leafStartOffset;
-				}
-			}
-
-			result[i] = new InternalOffsetLenEdit(
-				startLeafIndex, startInnerOffset,
-				endLeafIndex, endInnerOffset,
-				text
-			);
-		}
-
-		return result;
-	}
-
-	private _pushLeafReplacement(startLeafIndex: number, endLeafIndex: number, replacements: LeafReplacement[]): LeafReplacement {
-		const res = new LeafReplacement(startLeafIndex, endLeafIndex, []);
-		replacements.push(res);
-		return res;
-	}
-
-	private _flushLeafEdits(accumulatedLeafIndex: number, accumulatedLeafEdits: LeafOffsetLenEdit[], replacements: LeafReplacement[]): void {
-		if (accumulatedLeafEdits.length > 0) {
-			const rep = this._pushLeafReplacement(accumulatedLeafIndex, accumulatedLeafIndex, replacements);
-			BufferPiece.replaceOffsetLen(this._leafs[accumulatedLeafIndex], accumulatedLeafEdits, this._idealLeafLength, this._maxLeafLength, rep.replacements);
-		}
-		accumulatedLeafEdits.length = 0;
-	}
-
-	private _pushLeafEdits(start: number, length: number, text: string, accumulatedLeafEdits: LeafOffsetLenEdit[]): void {
-		if (length !== 0 || text.length !== 0) {
-			accumulatedLeafEdits.push(new LeafOffsetLenEdit(start, length, text));
-		}
-	}
-
-	private _appendLeaf(leaf: BufferPiece, leafs: BufferPiece[], prevLeaf: BufferPiece): BufferPiece {
-		if (prevLeaf === null) {
-			leafs.push(leaf);
-			prevLeaf = leaf;
-			return prevLeaf;
-		}
-
-		let prevLeafLength = prevLeaf.length();
-		let currLeafLength = leaf.length();
-
-		if ((prevLeafLength < this._minLeafLength || currLeafLength < this._minLeafLength) && prevLeafLength + currLeafLength <= this._maxLeafLength) {
-			const joinedLeaf = BufferPiece.join(prevLeaf, leaf);
-			leafs[leafs.length - 1] = joinedLeaf;
-			prevLeaf = joinedLeaf;
-			return prevLeaf;
-		}
-
-		const lastChar = prevLeaf.charCodeAt(prevLeafLength - 1);
-		const firstChar = leaf.charCodeAt(0);
-
-		if (
-			(lastChar >= 0xd800 && lastChar <= 0xdbff) || (lastChar === CharCode.CarriageReturn && firstChar === CharCode.LineFeed)
-		) {
-			const modifiedPrevLeaf = BufferPiece.deleteLastChar(prevLeaf);
-			leafs[leafs.length - 1] = modifiedPrevLeaf;
-
-			const modifiedLeaf = BufferPiece.insertFirstChar(leaf, lastChar);
-			leaf = modifiedLeaf;
-		}
-
-		leafs.push(leaf);
-		prevLeaf = leaf;
-		return prevLeaf;
-	}
-
-	private static _compareEdits(a: OffsetLenEdit, b: OffsetLenEdit): number {
-		if (a.offset === b.offset) {
-			if (a.length === b.length) {
-				return (a.initialIndex - b.initialIndex);
-			}
-			return (a.length - b.length);
-		}
-		return a.offset - b.offset;
-	}
-
-	public replaceOffsetLen(_edits: OffsetLenEdit[]): void {
-		_edits.sort(Buffer._compareEdits);
-
-		const initialLeafLength = this._leafs.length;
-		const edits = this._resolveEdits(_edits);
-
-		let accumulatedLeafIndex = 0;
-		let accumulatedLeafEdits: LeafOffsetLenEdit[] = [];
-		let replacements: LeafReplacement[] = [];
-
-		for (let i = 0, len = edits.length; i < len; i++) {
-			const edit = edits[i];
-
-			const startLeafIndex = edit.startLeafIndex;
-			const endLeafIndex = edit.endLeafIndex;
-
-			if (startLeafIndex !== accumulatedLeafIndex) {
-				this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-				accumulatedLeafIndex = startLeafIndex;
-			}
-
-			const leafEditStart = edit.startInnerOffset;
-			const leafEditEnd = (startLeafIndex === endLeafIndex ? edit.endInnerOffset : this._leafs[startLeafIndex].length());
-			this._pushLeafEdits(leafEditStart, leafEditEnd - leafEditStart, edit.text, accumulatedLeafEdits);
-
-			if (startLeafIndex < endLeafIndex) {
-				this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-				accumulatedLeafIndex = endLeafIndex;
-
-				// delete leafs in the middle
-				if (startLeafIndex + 1 < endLeafIndex) {
-					this._pushLeafReplacement(startLeafIndex + 1, endLeafIndex - 1, replacements);
-				}
-
-				// delete on last leaf
-				const leafEditStart = 0;
-				const leafEditEnd = edit.endInnerOffset;
-				this._pushLeafEdits(leafEditStart, leafEditEnd - leafEditStart, '', accumulatedLeafEdits);
-			}
-		}
-		this._flushLeafEdits(accumulatedLeafIndex, accumulatedLeafEdits, replacements);
-
-		let leafs: BufferPiece[] = [];
-		let leafIndex = 0;
-		let prevLeaf: BufferPiece = null;
-
-		for (let i = 0, len = replacements.length; i < len; i++) {
-			const replaceStartLeafIndex = replacements[i].startLeafIndex;
-			const replaceEndLeafIndex = replacements[i].endLeafIndex;
-			const innerLeafs = replacements[i].replacements;
-
-			// add leafs to the left of this replace op.
-			while (leafIndex < replaceStartLeafIndex) {
-				prevLeaf = this._appendLeaf(this._leafs[leafIndex], leafs, prevLeaf);
-				leafIndex++;
-			}
-
-			// delete leafs that get replaced.
-			while (leafIndex <= replaceEndLeafIndex) {
-				leafIndex++;
-			}
-
-			// add new leafs.
-			for (let j = 0, lenJ = innerLeafs.length; j < lenJ; j++) {
-				prevLeaf = this._appendLeaf(innerLeafs[j], leafs, prevLeaf);
-			}
-		}
-
-		// add remaining leafs to the right of the last replacement.
-		while (leafIndex < initialLeafLength) {
-			prevLeaf = this._appendLeaf(this._leafs[leafIndex], leafs, prevLeaf);
-			leafIndex++;
-		}
-
-		if (leafs.length === 0) {
-			// don't leave behind an empty leafs array
-			leafs.push(new BufferPiece(''));
-		}
-
-		this._leafs = leafs;
-		this._rebuildNodes();
-	}
-
-	public setEOL(newEOL: '\r\n' | '\n'): void {
-		let leafs: BufferPiece[] = [];
-		for (let i = 0, len = this._leafs.length; i < len; i++) {
-			leafs[i] = BufferPiece.normalizeEOL(this._leafs[i], newEOL);
-		}
-		this._leafs = leafs;
-		this._rebuildNodes();
-		this._eol = newEOL;
-		this._eolLength = this._eol.length;
-	}
-
-	//#endregion
-
-	private IS_NODE(i: number): boolean {
-		return (i < this._nodesCount);
-	}
-	private IS_LEAF(i: number): boolean {
-		return (i >= this._leafsStart && i < this._leafsEnd);
-	}
-	private NODE_TO_LEAF_INDEX(i: number): number {
-		return (i - this._leafsStart);
-	}
-	// private LEAF_TO_NODE_INDEX(i: number): number {
-	// 	return (i + this._leafsStart);
-	// }
-}
-
-function log2(n: number): number {
-	let v = 1;
-	for (let pow = 1; ; pow++) {
-		v = v << 1;
-		if (v >= n) {
-			return pow;
-		}
-	}
-	// return -1;
-}
-
-function LEFT_CHILD(i: number): number {
-	return (i << 1);
-}
-
-function RIGHT_CHILD(i: number): number {
-	return (i << 1) + 1;
-}
diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts
deleted file mode 100644
index 12eaf167b28..00000000000
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as strings from 'vs/base/common/strings';
-import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { BufferPiece, createLineStarts } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-import { ChunksTextBuffer } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBuffer';
-import { CharCode } from 'vs/base/common/charCode';
-
-export class TextBufferFactory implements ITextBufferFactory {
-
-	constructor(
-		private readonly _pieces: BufferPiece[],
-		private readonly _averageChunkSize: number,
-		private readonly _BOM: string,
-		private readonly _cr: number,
-		private readonly _lf: number,
-		private readonly _crlf: number,
-		private readonly _containsRTL: boolean,
-		private readonly _isBasicASCII: boolean,
-	) {
-	}
-
-	/**
-	 * if text source is empty or with precisely one line, returns null. No end of line is detected.
-	 * if text source contains more lines ending with '\r\n', returns '\r\n'.
-	 * Otherwise returns '\n'. More lines end with '\n'.
-	 */
-	private _getEOL(defaultEOL: DefaultEndOfLine): '\r\n' | '\n' {
-		const totalEOLCount = this._cr + this._lf + this._crlf;
-		const totalCRCount = this._cr + this._crlf;
-		if (totalEOLCount === 0) {
-			// This is an empty file or a file with precisely one line
-			return (defaultEOL === DefaultEndOfLine.LF ? '\n' : '\r\n');
-		}
-		if (totalCRCount > totalEOLCount / 2) {
-			// More than half of the file contains \r\n ending lines
-			return '\r\n';
-		}
-		// At least one line more ends in \n
-		return '\n';
-	}
-
-	public create(defaultEOL: DefaultEndOfLine): ITextBuffer {
-		const eol = this._getEOL(defaultEOL);
-		let pieces = this._pieces;
-
-		if (
-			(eol === '\r\n' && (this._cr > 0 || this._lf > 0))
-			|| (eol === '\n' && (this._cr > 0 || this._crlf > 0))
-		) {
-			// Normalize pieces
-			for (let i = 0, len = pieces.length; i < len; i++) {
-				pieces[i] = BufferPiece.normalizeEOL(pieces[i], eol);
-			}
-		}
-		return new ChunksTextBuffer(pieces, this._averageChunkSize, this._BOM, eol, this._containsRTL, this._isBasicASCII);
-	}
-
-	public getFirstLineText(lengthLimit: number): string {
-		const firstPiece = this._pieces[0];
-		if (firstPiece.newLineCount() === 0) {
-			return firstPiece.substr(0, lengthLimit);
-		}
-
-		const firstEOLOffset = firstPiece.lineStartFor(0);
-		return firstPiece.substr(0, Math.min(lengthLimit, firstEOLOffset));
-	}
-}
-
-export class ChunksTextBufferBuilder implements ITextBufferBuilder {
-
-	private _rawPieces: BufferPiece[];
-	private _hasPreviousChar: boolean;
-	private _previousChar: number;
-	private _averageChunkSize: number;
-	private _tmpLineStarts: number[];
-
-	private BOM: string;
-	private cr: number;
-	private lf: number;
-	private crlf: number;
-	private containsRTL: boolean;
-	private isBasicASCII: boolean;
-
-	constructor() {
-		this._rawPieces = [];
-		this._hasPreviousChar = false;
-		this._previousChar = 0;
-		this._averageChunkSize = 0;
-		this._tmpLineStarts = [];
-
-		this.BOM = '';
-		this.cr = 0;
-		this.lf = 0;
-		this.crlf = 0;
-		this.containsRTL = false;
-		this.isBasicASCII = true;
-	}
-
-	public acceptChunk(chunk: string): void {
-		if (chunk.length === 0) {
-			return;
-		}
-
-		if (this._rawPieces.length === 0) {
-			if (strings.startsWithUTF8BOM(chunk)) {
-				this.BOM = strings.UTF8_BOM_CHARACTER;
-				chunk = chunk.substr(1);
-			}
-		}
-
-		this._averageChunkSize = (this._averageChunkSize * this._rawPieces.length + chunk.length) / (this._rawPieces.length + 1);
-
-		const lastChar = chunk.charCodeAt(chunk.length - 1);
-		if (lastChar === CharCode.CarriageReturn || (lastChar >= 0xd800 && lastChar <= 0xdbff)) {
-			// last character is \r or a high surrogate => keep it back
-			this._acceptChunk1(chunk.substr(0, chunk.length - 1), false);
-			this._hasPreviousChar = true;
-			this._previousChar = lastChar;
-		} else {
-			this._acceptChunk1(chunk, false);
-			this._hasPreviousChar = false;
-			this._previousChar = lastChar;
-		}
-	}
-
-	private _acceptChunk1(chunk: string, allowEmptyStrings: boolean): void {
-		if (!allowEmptyStrings && chunk.length === 0) {
-			// Nothing to do
-			return;
-		}
-
-		if (this._hasPreviousChar) {
-			this._acceptChunk2(chunk + String.fromCharCode(this._previousChar));
-		} else {
-			this._acceptChunk2(chunk);
-		}
-	}
-
-	private _acceptChunk2(chunk: string): void {
-		const lineStarts = createLineStarts(this._tmpLineStarts, chunk);
-
-		this._rawPieces.push(new BufferPiece(chunk, lineStarts.lineStarts));
-		this.cr += lineStarts.cr;
-		this.lf += lineStarts.lf;
-		this.crlf += lineStarts.crlf;
-
-		if (this.isBasicASCII) {
-			this.isBasicASCII = lineStarts.isBasicASCII;
-		}
-		if (!this.isBasicASCII && !this.containsRTL) {
-			// No need to check if is basic ASCII
-			this.containsRTL = strings.containsRTL(chunk);
-		}
-	}
-
-	public finish(): TextBufferFactory {
-		this._finish();
-		return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.BOM, this.cr, this.lf, this.crlf, this.containsRTL, this.isBasicASCII);
-	}
-
-	private _finish(): void {
-		if (this._rawPieces.length === 0) {
-			// no chunks => forcefully go through accept chunk
-			this._acceptChunk1('', true);
-			return;
-		}
-
-		if (this._hasPreviousChar) {
-			this._hasPreviousChar = false;
-
-			// recreate last chunk
-			const lastPiece = this._rawPieces[this._rawPieces.length - 1];
-			const tmp = new BufferPiece(String.fromCharCode(this._previousChar));
-			const newLastPiece = BufferPiece.join(lastPiece, tmp);
-			this._rawPieces[this._rawPieces.length - 1] = newLastPiece;
-			if (this._previousChar === CharCode.CarriageReturn) {
-				this.cr++;
-			}
-		}
-	}
-}
diff --git a/src/vs/editor/common/model/intervalTree.ts b/src/vs/editor/common/model/intervalTree.ts
index 07f7200be6e..55636d2eace 100644
--- a/src/vs/editor/common/model/intervalTree.ts
+++ b/src/vs/editor/common/model/intervalTree.ts
@@ -12,14 +12,11 @@ import { IModelDecoration } from 'vs/editor/common/model';
 // The red-black tree is based on the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
 //
 
-/**
- * The class name sort order must match the severity order. Highest severity last.
- */
 export const ClassName = {
-	EditorHintDecoration: 'squiggly-a-hint',
-	EditorInfoDecoration: 'squiggly-b-info',
-	EditorWarningDecoration: 'squiggly-c-warning',
-	EditorErrorDecoration: 'squiggly-d-error'
+	EditorHintDecoration: 'squiggly-hint',
+	EditorInfoDecoration: 'squiggly-info',
+	EditorWarningDecoration: 'squiggly-warning',
+	EditorErrorDecoration: 'squiggly-error'
 };
 
 /**
diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
deleted file mode 100644
index 0d03ecd90a0..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
+++ /dev/null
@@ -1,660 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { Range } from 'vs/editor/common/core/range';
-import { Position } from 'vs/editor/common/core/position';
-import * as strings from 'vs/base/common/strings';
-import * as arrays from 'vs/base/common/arrays';
-import { PrefixSumComputer } from 'vs/editor/common/viewModel/prefixSumComputer';
-import { ISingleEditOperationIdentifier, IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model';
-import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export interface IValidatedEditOperation {
-	sortIndex: number;
-	identifier: ISingleEditOperationIdentifier;
-	range: Range;
-	rangeOffset: number;
-	rangeLength: number;
-	lines: string[];
-	forceMoveMarkers: boolean;
-	isAutoWhitespaceEdit: boolean;
-}
-
-/**
- * A processed string with its EOL resolved ready to be turned into an editor model.
- */
-export interface ITextSource {
-	/**
-	 * The text split into lines.
-	 */
-	readonly lines: string[];
-	/**
-	 * The BOM (leading character sequence of the file).
-	 */
-	readonly BOM: string;
-	/**
-	 * The end of line sequence.
-	 */
-	readonly EOL: string;
-	/**
-	 * The text contains Unicode characters classified as "R" or "AL".
-	 */
-	readonly containsRTL: boolean;
-	/**
-	 * The text contains only characters inside the ASCII range 32-126 or \t \r \n
-	 */
-	readonly isBasicASCII: boolean;
-}
-
-class LinesTextBufferSnapshot implements ITextSnapshot {
-
-	private readonly _lines: string[];
-	private readonly _linesLength: number;
-	private readonly _eol: string;
-	private readonly _bom: string;
-	private _lineIndex: number;
-
-	constructor(lines: string[], eol: string, bom: string) {
-		this._lines = lines;
-		this._linesLength = this._lines.length;
-		this._eol = eol;
-		this._bom = bom;
-		this._lineIndex = 0;
-	}
-
-	public read(): string {
-		if (this._lineIndex >= this._linesLength) {
-			return null;
-		}
-
-		let result: string = null;
-
-		if (this._lineIndex === 0) {
-			result = this._bom + this._lines[this._lineIndex];
-		} else {
-			result = this._lines[this._lineIndex];
-		}
-
-		this._lineIndex++;
-
-		if (this._lineIndex < this._linesLength) {
-			result += this._eol;
-		}
-
-		return result;
-	}
-}
-
-export class LinesTextBuffer implements ITextBuffer {
-
-	private _lines: string[];
-	private _BOM: string;
-	private _EOL: string;
-	private _mightContainRTL: boolean;
-	private _mightContainNonBasicASCII: boolean;
-	private _lineStarts: PrefixSumComputer;
-
-	constructor(textSource: ITextSource) {
-		this._lines = textSource.lines.slice(0);
-		this._BOM = textSource.BOM;
-		this._EOL = textSource.EOL;
-		this._mightContainRTL = textSource.containsRTL;
-		this._mightContainNonBasicASCII = !textSource.isBasicASCII;
-		this._constructLineStarts();
-	}
-
-	private _constructLineStarts(): void {
-		const eolLength = this._EOL.length;
-		const linesLength = this._lines.length;
-		const lineStartValues = new Uint32Array(linesLength);
-		for (let i = 0; i < linesLength; i++) {
-			lineStartValues[i] = this._lines[i].length + eolLength;
-		}
-		this._lineStarts = new PrefixSumComputer(lineStartValues);
-	}
-
-	public equals(other: ITextBuffer): boolean {
-		if (!(other instanceof LinesTextBuffer)) {
-			return false;
-		}
-		if (this._BOM !== other._BOM) {
-			return false;
-		}
-		if (this._EOL !== other._EOL) {
-			return false;
-		}
-		if (this._lines.length !== other._lines.length) {
-			return false;
-		}
-		for (let i = 0, len = this._lines.length; i < len; i++) {
-			if (this._lines[i] !== other._lines[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public mightContainRTL(): boolean {
-		return this._mightContainRTL;
-	}
-
-	public mightContainNonBasicASCII(): boolean {
-		return this._mightContainNonBasicASCII;
-	}
-
-	public getBOM(): string {
-		return this._BOM;
-	}
-
-	public getEOL(): string {
-		return this._EOL;
-	}
-
-	public getOffsetAt(lineNumber: number, column: number): number {
-		return this._lineStarts.getAccumulatedValue(lineNumber - 2) + column - 1;
-	}
-
-	public getPositionAt(offset: number): Position {
-		offset = Math.floor(offset);
-		offset = Math.max(0, offset);
-
-		let out = this._lineStarts.getIndexOf(offset);
-
-		let lineLength = this._lines[out.index].length;
-
-		// Ensure we return a valid position
-		return new Position(out.index + 1, Math.min(out.remainder + 1, lineLength + 1));
-	}
-
-	public getRangeAt(offset: number, length: number): Range {
-		const startResult = this._lineStarts.getIndexOf(offset);
-		const startLineLength = this._lines[startResult.index].length;
-		const startColumn = Math.min(startResult.remainder + 1, startLineLength + 1);
-
-		const endResult = this._lineStarts.getIndexOf(offset + length);
-		const endLineLength = this._lines[endResult.index].length;
-		const endColumn = Math.min(endResult.remainder + 1, endLineLength + 1);
-
-		return new Range(startResult.index + 1, startColumn, endResult.index + 1, endColumn);
-	}
-
-	private _getEndOfLine(eol: EndOfLinePreference): string {
-		switch (eol) {
-			case EndOfLinePreference.LF:
-				return '\n';
-			case EndOfLinePreference.CRLF:
-				return '\r\n';
-			case EndOfLinePreference.TextDefined:
-				return this.getEOL();
-		}
-		throw new Error('Unknown EOL preference');
-	}
-
-	public getValueInRange(range: Range, eol: EndOfLinePreference): string {
-		if (range.isEmpty()) {
-			return '';
-		}
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
-		}
-
-		const lineEnding = this._getEndOfLine(eol);
-		const startLineIndex = range.startLineNumber - 1;
-		const endLineIndex = range.endLineNumber - 1;
-		let resultLines: string[] = [];
-
-		resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
-		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
-			resultLines.push(this._lines[i]);
-		}
-		resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
-
-		return resultLines.join(lineEnding);
-	}
-
-	public createSnapshot(preserveBOM: boolean): ITextSnapshot {
-		return new LinesTextBufferSnapshot(this._lines.slice(0), this._EOL, preserveBOM ? this._BOM : '');
-	}
-
-	public getValueLengthInRange(range: Range, eol: EndOfLinePreference): number {
-		if (range.isEmpty()) {
-			return 0;
-		}
-
-		if (range.startLineNumber === range.endLineNumber) {
-			return (range.endColumn - range.startColumn);
-		}
-
-		let startOffset = this.getOffsetAt(range.startLineNumber, range.startColumn);
-		let endOffset = this.getOffsetAt(range.endLineNumber, range.endColumn);
-		return endOffset - startOffset;
-	}
-
-	public getLineCount(): number {
-		return this._lines.length;
-	}
-
-	public getLinesContent(): string[] {
-		return this._lines.slice(0);
-	}
-
-	public getLength(): number {
-		return this._lineStarts.getTotalValue();
-	}
-
-	public getLineContent(lineNumber: number): string {
-		return this._lines[lineNumber - 1];
-	}
-
-	public getLineCharCode(lineNumber: number, index: number): number {
-		return this._lines[lineNumber - 1].charCodeAt(index);
-	}
-
-	public getLineLength(lineNumber: number): number {
-		return this._lines[lineNumber - 1].length;
-	}
-
-	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.firstNonWhitespaceIndex(this._lines[lineNumber - 1]);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-
-	public getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.lastNonWhitespaceIndex(this._lines[lineNumber - 1]);
-		if (result === -1) {
-			return 0;
-		}
-		return result + 2;
-	}
-
-	//#region Editing
-
-	public setEOL(newEOL: '\r\n' | '\n'): void {
-		this._EOL = newEOL;
-		this._constructLineStarts();
-	}
-
-	private static _sortOpsAscending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return a.sortIndex - b.sortIndex;
-		}
-		return r;
-	}
-
-	private static _sortOpsDescending(a: IValidatedEditOperation, b: IValidatedEditOperation): number {
-		let r = Range.compareRangesUsingEnds(a.range, b.range);
-		if (r === 0) {
-			return b.sortIndex - a.sortIndex;
-		}
-		return -r;
-	}
-
-	public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult {
-		if (rawOperations.length === 0) {
-			return new ApplyEditsResult([], [], []);
-		}
-
-		let mightContainRTL = this._mightContainRTL;
-		let mightContainNonBasicASCII = this._mightContainNonBasicASCII;
-		let canReduceOperations = true;
-
-		let operations: IValidatedEditOperation[] = [];
-		for (let i = 0; i < rawOperations.length; i++) {
-			let op = rawOperations[i];
-			if (canReduceOperations && op._isTracked) {
-				canReduceOperations = false;
-			}
-			let validatedRange = op.range;
-			if (!mightContainRTL && op.text) {
-				// check if the new inserted text contains RTL
-				mightContainRTL = strings.containsRTL(op.text);
-			}
-			if (!mightContainNonBasicASCII && op.text) {
-				mightContainNonBasicASCII = !strings.isBasicASCII(op.text);
-			}
-			operations[i] = {
-				sortIndex: i,
-				identifier: op.identifier || null,
-				range: validatedRange,
-				rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn),
-				rangeLength: this.getValueLengthInRange(validatedRange, EndOfLinePreference.TextDefined),
-				lines: op.text ? op.text.split(/\r\n|\r|\n/) : null,
-				forceMoveMarkers: op.forceMoveMarkers || false,
-				isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false
-			};
-		}
-
-		// Sort operations ascending
-		operations.sort(LinesTextBuffer._sortOpsAscending);
-
-		for (let i = 0, count = operations.length - 1; i < count; i++) {
-			let rangeEnd = operations[i].range.getEndPosition();
-			let nextRangeStart = operations[i + 1].range.getStartPosition();
-
-			if (nextRangeStart.isBefore(rangeEnd)) {
-				// overlapping ranges
-				throw new Error('Overlapping ranges are not allowed!');
-			}
-		}
-
-		if (canReduceOperations) {
-			operations = this._reduceOperations(operations);
-		}
-
-		// Delta encode operations
-		let reverseRanges = LinesTextBuffer._getInverseEditRanges(operations);
-		let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = [];
-
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			if (recordTrimAutoWhitespace && op.isAutoWhitespaceEdit && op.range.isEmpty()) {
-				// Record already the future line numbers that might be auto whitespace removal candidates on next edit
-				for (let lineNumber = reverseRange.startLineNumber; lineNumber <= reverseRange.endLineNumber; lineNumber++) {
-					let currentLineContent = '';
-					if (lineNumber === reverseRange.startLineNumber) {
-						currentLineContent = this.getLineContent(op.range.startLineNumber);
-						if (strings.firstNonWhitespaceIndex(currentLineContent) !== -1) {
-							continue;
-						}
-					}
-					newTrimAutoWhitespaceCandidates.push({ lineNumber: lineNumber, oldContent: currentLineContent });
-				}
-			}
-		}
-
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
-		for (let i = 0; i < operations.length; i++) {
-			let op = operations[i];
-			let reverseRange = reverseRanges[i];
-
-			reverseOperations[i] = {
-				identifier: op.identifier,
-				range: reverseRange,
-				text: this.getValueInRange(op.range, EndOfLinePreference.TextDefined),
-				forceMoveMarkers: op.forceMoveMarkers
-			};
-		}
-
-		this._mightContainRTL = mightContainRTL;
-		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
-
-		const contentChanges = this._doApplyEdits(operations);
-
-		let trimAutoWhitespaceLineNumbers: number[] = null;
-		if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) {
-			// sort line numbers auto whitespace removal candidates for next edit descending
-			newTrimAutoWhitespaceCandidates.sort((a, b) => b.lineNumber - a.lineNumber);
-
-			trimAutoWhitespaceLineNumbers = [];
-			for (let i = 0, len = newTrimAutoWhitespaceCandidates.length; i < len; i++) {
-				let lineNumber = newTrimAutoWhitespaceCandidates[i].lineNumber;
-				if (i > 0 && newTrimAutoWhitespaceCandidates[i - 1].lineNumber === lineNumber) {
-					// Do not have the same line number twice
-					continue;
-				}
-
-				let prevContent = newTrimAutoWhitespaceCandidates[i].oldContent;
-				let lineContent = this.getLineContent(lineNumber);
-
-				if (lineContent.length === 0 || lineContent === prevContent || strings.firstNonWhitespaceIndex(lineContent) !== -1) {
-					continue;
-				}
-
-				trimAutoWhitespaceLineNumbers.push(lineNumber);
-			}
-		}
-
-		return new ApplyEditsResult(
-			reverseOperations,
-			contentChanges,
-			trimAutoWhitespaceLineNumbers
-		);
-	}
-
-	/**
-	 * Transform operations such that they represent the same logic edit,
-	 * but that they also do not cause OOM crashes.
-	 */
-	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
-		if (operations.length < 1000) {
-			// We know from empirical testing that a thousand edits work fine regardless of their shape.
-			return operations;
-		}
-
-		// At one point, due to how events are emitted and how each operation is handled,
-		// some operations can trigger a high ammount of temporary string allocations,
-		// that will immediately get edited again.
-		// e.g. a formatter inserting ridiculous ammounts of \n on a model with a single line
-		// Therefore, the strategy is to collapse all the operations into a huge single edit operation
-		return [this._toSingleEditOperation(operations)];
-	}
-
-	_toSingleEditOperation(operations: IValidatedEditOperation[]): IValidatedEditOperation {
-		let forceMoveMarkers = false,
-			firstEditRange = operations[0].range,
-			lastEditRange = operations[operations.length - 1].range,
-			entireEditRange = new Range(firstEditRange.startLineNumber, firstEditRange.startColumn, lastEditRange.endLineNumber, lastEditRange.endColumn),
-			lastEndLineNumber = firstEditRange.startLineNumber,
-			lastEndColumn = firstEditRange.startColumn,
-			result: string[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let operation = operations[i],
-				range = operation.range;
-
-			forceMoveMarkers = forceMoveMarkers || operation.forceMoveMarkers;
-
-			// (1) -- Push old text
-			for (let lineNumber = lastEndLineNumber; lineNumber < range.startLineNumber; lineNumber++) {
-				if (lineNumber === lastEndLineNumber) {
-					result.push(this._lines[lineNumber - 1].substring(lastEndColumn - 1));
-				} else {
-					result.push('\n');
-					result.push(this._lines[lineNumber - 1]);
-				}
-			}
-
-			if (range.startLineNumber === lastEndLineNumber) {
-				result.push(this._lines[range.startLineNumber - 1].substring(lastEndColumn - 1, range.startColumn - 1));
-			} else {
-				result.push('\n');
-				result.push(this._lines[range.startLineNumber - 1].substring(0, range.startColumn - 1));
-			}
-
-			// (2) -- Push new text
-			if (operation.lines) {
-				for (let j = 0, lenJ = operation.lines.length; j < lenJ; j++) {
-					if (j !== 0) {
-						result.push('\n');
-					}
-					result.push(operation.lines[j]);
-				}
-			}
-
-			lastEndLineNumber = operation.range.endLineNumber;
-			lastEndColumn = operation.range.endColumn;
-		}
-
-		return {
-			sortIndex: 0,
-			identifier: operations[0].identifier,
-			range: entireEditRange,
-			rangeOffset: this.getOffsetAt(entireEditRange.startLineNumber, entireEditRange.startColumn),
-			rangeLength: this.getValueLengthInRange(entireEditRange, EndOfLinePreference.TextDefined),
-			lines: result.join('').split('\n'),
-			forceMoveMarkers: forceMoveMarkers,
-			isAutoWhitespaceEdit: false
-		};
-	}
-
-	private _setLineContent(lineNumber: number, content: string): void {
-		this._lines[lineNumber - 1] = content;
-		this._lineStarts.changeValue(lineNumber - 1, content.length + this._EOL.length);
-	}
-
-	private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] {
-
-		// Sort operations descending
-		operations.sort(LinesTextBuffer._sortOpsDescending);
-
-		let contentChanges: IInternalModelContentChange[] = [];
-
-		for (let i = 0, len = operations.length; i < len; i++) {
-			const op = operations[i];
-
-			const startLineNumber = op.range.startLineNumber;
-			const startColumn = op.range.startColumn;
-			const endLineNumber = op.range.endLineNumber;
-			const endColumn = op.range.endColumn;
-
-			if (startLineNumber === endLineNumber && startColumn === endColumn && (!op.lines || op.lines.length === 0)) {
-				// no-op
-				continue;
-			}
-
-			const deletingLinesCnt = endLineNumber - startLineNumber;
-			const insertingLinesCnt = (op.lines ? op.lines.length - 1 : 0);
-			const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt);
-
-			for (let j = editingLinesCnt; j >= 0; j--) {
-				const editLineNumber = startLineNumber + j;
-				let editText = (op.lines ? op.lines[j] : '');
-
-				if (editLineNumber === startLineNumber || editLineNumber === endLineNumber) {
-					const editStartColumn = (editLineNumber === startLineNumber ? startColumn : 1);
-					const editEndColumn = (editLineNumber === endLineNumber ? endColumn : this.getLineLength(editLineNumber) + 1);
-
-					editText = (
-						this._lines[editLineNumber - 1].substring(0, editStartColumn - 1)
-						+ editText
-						+ this._lines[editLineNumber - 1].substring(editEndColumn - 1)
-					);
-				}
-
-				this._setLineContent(editLineNumber, editText);
-			}
-
-			if (editingLinesCnt < deletingLinesCnt) {
-				// Must delete some lines
-
-				const spliceStartLineNumber = startLineNumber + editingLinesCnt;
-				const endLineRemains = this._lines[endLineNumber - 1].substring(endColumn - 1);
-
-				// Reconstruct first line
-				this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains);
-
-				this._lines.splice(spliceStartLineNumber, endLineNumber - spliceStartLineNumber);
-				this._lineStarts.removeValues(spliceStartLineNumber, endLineNumber - spliceStartLineNumber);
-			}
-
-			if (editingLinesCnt < insertingLinesCnt) {
-				// Must insert some lines
-
-				const spliceLineNumber = startLineNumber + editingLinesCnt;
-				let spliceColumn = (spliceLineNumber === startLineNumber ? startColumn : 1);
-				if (op.lines) {
-					spliceColumn += op.lines[editingLinesCnt].length;
-				}
-
-				// Split last line
-				const leftoverLine = this._lines[spliceLineNumber - 1].substring(spliceColumn - 1);
-
-				this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1));
-
-				// Lines in the middle
-				let newLines: string[] = new Array<string>(insertingLinesCnt - editingLinesCnt);
-				let newLinesLengths = new Uint32Array(insertingLinesCnt - editingLinesCnt);
-				for (let j = editingLinesCnt + 1; j <= insertingLinesCnt; j++) {
-					newLines[j - editingLinesCnt - 1] = op.lines[j];
-					newLinesLengths[j - editingLinesCnt - 1] = op.lines[j].length + this._EOL.length;
-				}
-				newLines[newLines.length - 1] += leftoverLine;
-				newLinesLengths[newLines.length - 1] += leftoverLine.length;
-				this._lines = arrays.arrayInsert(this._lines, startLineNumber + editingLinesCnt, newLines);
-				this._lineStarts.insertValues(startLineNumber + editingLinesCnt, newLinesLengths);
-			}
-
-			const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn);
-			const text = (op.lines ? op.lines.join(this.getEOL()) : '');
-			contentChanges.push({
-				range: contentChangeRange,
-				rangeLength: op.rangeLength,
-				text: text,
-				rangeOffset: op.rangeOffset,
-				forceMoveMarkers: op.forceMoveMarkers
-			});
-		}
-
-		return contentChanges;
-	}
-
-	/**
-	 * Assumes `operations` are validated and sorted ascending
-	 */
-	public static _getInverseEditRanges(operations: IValidatedEditOperation[]): Range[] {
-		let result: Range[] = [];
-
-		let prevOpEndLineNumber: number;
-		let prevOpEndColumn: number;
-		let prevOp: IValidatedEditOperation = null;
-		for (let i = 0, len = operations.length; i < len; i++) {
-			let op = operations[i];
-
-			let startLineNumber: number;
-			let startColumn: number;
-
-			if (prevOp) {
-				if (prevOp.range.endLineNumber === op.range.startLineNumber) {
-					startLineNumber = prevOpEndLineNumber;
-					startColumn = prevOpEndColumn + (op.range.startColumn - prevOp.range.endColumn);
-				} else {
-					startLineNumber = prevOpEndLineNumber + (op.range.startLineNumber - prevOp.range.endLineNumber);
-					startColumn = op.range.startColumn;
-				}
-			} else {
-				startLineNumber = op.range.startLineNumber;
-				startColumn = op.range.startColumn;
-			}
-
-			let resultRange: Range;
-
-			if (op.lines && op.lines.length > 0) {
-				// the operation inserts something
-				let lineCount = op.lines.length;
-				let firstLine = op.lines[0];
-				let lastLine = op.lines[lineCount - 1];
-
-				if (lineCount === 1) {
-					// single line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn + firstLine.length);
-				} else {
-					// multi line insert
-					resultRange = new Range(startLineNumber, startColumn, startLineNumber + lineCount - 1, lastLine.length + 1);
-				}
-			} else {
-				// There is nothing to insert
-				resultRange = new Range(startLineNumber, startColumn, startLineNumber, startColumn);
-			}
-
-			prevOpEndLineNumber = resultRange.endLineNumber;
-			prevOpEndColumn = resultRange.endColumn;
-
-			result.push(resultRange);
-			prevOp = op;
-		}
-
-		return result;
-	}
-
-	//#endregion
-}
diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts
deleted file mode 100644
index 3c46fd8d3e1..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as strings from 'vs/base/common/strings';
-import { CharCode } from 'vs/base/common/charCode';
-import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { IRawTextSource, TextSource } from 'vs/editor/common/model/linesTextBuffer/textSource';
-import { LinesTextBuffer } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
-
-export class TextBufferFactory implements ITextBufferFactory {
-
-	constructor(public readonly rawTextSource: IRawTextSource) {
-	}
-
-	public create(defaultEOL: DefaultEndOfLine): ITextBuffer {
-		const textSource = TextSource.fromRawTextSource(this.rawTextSource, defaultEOL);
-		return new LinesTextBuffer(textSource);
-	}
-
-	public getFirstLineText(lengthLimit: number): string {
-		return this.rawTextSource.lines[0].substr(0, lengthLimit);
-	}
-}
-
-class ModelLineBasedBuilder {
-
-	private BOM: string;
-	private lines: string[];
-	private currLineIndex: number;
-
-	constructor() {
-		this.BOM = '';
-		this.lines = [];
-		this.currLineIndex = 0;
-	}
-
-	public acceptLines(lines: string[]): void {
-		if (this.currLineIndex === 0) {
-			// Remove the BOM (if present)
-			if (strings.startsWithUTF8BOM(lines[0])) {
-				this.BOM = strings.UTF8_BOM_CHARACTER;
-				lines[0] = lines[0].substr(1);
-			}
-		}
-
-		for (let i = 0, len = lines.length; i < len; i++) {
-			this.lines[this.currLineIndex++] = lines[i];
-		}
-	}
-
-	public finish(carriageReturnCnt: number, containsRTL: boolean, isBasicASCII: boolean): TextBufferFactory {
-		return new TextBufferFactory({
-			BOM: this.BOM,
-			lines: this.lines,
-			containsRTL: containsRTL,
-			totalCRCount: carriageReturnCnt,
-			isBasicASCII,
-		});
-	}
-}
-
-export class LinesTextBufferBuilder implements ITextBufferBuilder {
-
-	private leftoverPrevChunk: string;
-	private leftoverEndsInCR: boolean;
-	private totalCRCount: number;
-	private lineBasedBuilder: ModelLineBasedBuilder;
-	private containsRTL: boolean;
-	private isBasicASCII: boolean;
-
-	constructor() {
-		this.leftoverPrevChunk = '';
-		this.leftoverEndsInCR = false;
-		this.totalCRCount = 0;
-		this.lineBasedBuilder = new ModelLineBasedBuilder();
-		this.containsRTL = false;
-		this.isBasicASCII = true;
-	}
-
-	private _updateCRCount(chunk: string): void {
-		// Count how many \r are present in chunk to determine the majority EOL sequence
-		let chunkCarriageReturnCnt = 0;
-		let lastCarriageReturnIndex = -1;
-		while ((lastCarriageReturnIndex = chunk.indexOf('\r', lastCarriageReturnIndex + 1)) !== -1) {
-			chunkCarriageReturnCnt++;
-		}
-		this.totalCRCount += chunkCarriageReturnCnt;
-	}
-
-	public acceptChunk(chunk: string): void {
-		if (chunk.length === 0) {
-			return;
-		}
-
-		this._updateCRCount(chunk);
-
-		if (!this.containsRTL) {
-			this.containsRTL = strings.containsRTL(chunk);
-		}
-		if (this.isBasicASCII) {
-			this.isBasicASCII = strings.isBasicASCII(chunk);
-		}
-
-		// Avoid dealing with a chunk that ends in \r (push the \r to the next chunk)
-		if (this.leftoverEndsInCR) {
-			chunk = '\r' + chunk;
-		}
-		if (chunk.charCodeAt(chunk.length - 1) === CharCode.CarriageReturn) {
-			this.leftoverEndsInCR = true;
-			chunk = chunk.substr(0, chunk.length - 1);
-		} else {
-			this.leftoverEndsInCR = false;
-		}
-
-		let lines = chunk.split(/\r\n|\r|\n/);
-
-		if (lines.length === 1) {
-			// no \r or \n encountered
-			this.leftoverPrevChunk += lines[0];
-			return;
-		}
-
-		lines[0] = this.leftoverPrevChunk + lines[0];
-		this.lineBasedBuilder.acceptLines(lines.slice(0, lines.length - 1));
-		this.leftoverPrevChunk = lines[lines.length - 1];
-	}
-
-	public finish(): TextBufferFactory {
-		let finalLines = [this.leftoverPrevChunk];
-		if (this.leftoverEndsInCR) {
-			finalLines.push('');
-		}
-		this.lineBasedBuilder.acceptLines(finalLines);
-		return this.lineBasedBuilder.finish(this.totalCRCount, this.containsRTL, this.isBasicASCII);
-	}
-}
diff --git a/src/vs/editor/common/model/linesTextBuffer/textSource.ts b/src/vs/editor/common/model/linesTextBuffer/textSource.ts
deleted file mode 100644
index 79c06f1c9f1..00000000000
--- a/src/vs/editor/common/model/linesTextBuffer/textSource.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { ITextSource } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
-
-/**
- * A processed string ready to be turned into an editor model.
- */
-export interface IRawTextSource {
-	/**
-	 * The text split into lines.
-	 */
-	readonly lines: string[];
-	/**
-	 * The BOM (leading character sequence of the file).
-	 */
-	readonly BOM: string;
-	/**
-	 * The number of lines ending with '\r\n'
-	 */
-	readonly totalCRCount: number;
-	/**
-	 * The text contains Unicode characters classified as "R" or "AL".
-	 */
-	readonly containsRTL: boolean;
-	/**
-	 * The text contains only characters inside the ASCII range 32-126 or \t \r \n
-	 */
-	readonly isBasicASCII: boolean;
-}
-
-export class TextSource {
-
-	/**
-	 * if text source is empty or with precisely one line, returns null. No end of line is detected.
-	 * if text source contains more lines ending with '\r\n', returns '\r\n'.
-	 * Otherwise returns '\n'. More lines end with '\n'.
-	 */
-	private static _getEOL(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): '\r\n' | '\n' {
-		const lineFeedCnt = rawTextSource.lines.length - 1;
-		if (lineFeedCnt === 0) {
-			// This is an empty file or a file with precisely one line
-			return (defaultEOL === DefaultEndOfLine.LF ? '\n' : '\r\n');
-		}
-		if (rawTextSource.totalCRCount > lineFeedCnt / 2) {
-			// More than half of the file contains \r\n ending lines
-			return '\r\n';
-		}
-		// At least one line more ends in \n
-		return '\n';
-	}
-
-	public static fromRawTextSource(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): ITextSource {
-		return {
-			lines: rawTextSource.lines,
-			BOM: rawTextSource.BOM,
-			EOL: TextSource._getEOL(rawTextSource, defaultEOL),
-			containsRTL: rawTextSource.containsRTL,
-			isBasicASCII: rawTextSource.isBasicASCII,
-		};
-	}
-}
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 13c81a70acb..360bbb4fa59 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -13,6 +13,7 @@ import { SearchData, isValidMatch, Searcher, createFindMatch } from 'vs/editor/c
 import { FindMatch } from 'vs/editor/common/model';
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
+export const AverageBufferSize = 65535;
 
 export function createUintArray(arr: number[]): Uint32Array | Uint16Array {
 	let r;
@@ -311,7 +312,7 @@ export class PieceTreeBase {
 	}
 
 	normalizeEOL(eol: '\r\n' | '\n') {
-		let averageBufferSize = 65536;
+		let averageBufferSize = AverageBufferSize;
 		let min = averageBufferSize - Math.floor(averageBufferSize / 3);
 		let max = min * 2;
 
@@ -536,11 +537,23 @@ export class PieceTreeBase {
 
 	public getLineCharCode(lineNumber: number, index: number): number {
 		let nodePos = this.nodeAt2(lineNumber, index + 1);
-		let buffer = this._buffers[nodePos.node.piece.bufferIndex];
-		let startOffset = this.offsetInBuffer(nodePos.node.piece.bufferIndex, nodePos.node.piece.start);
-		let targetOffset = startOffset + index;
+		if (nodePos.remainder === nodePos.node.piece.length) {
+			// the char we want to fetch is at the head of next node.
+			let matchingNode = nodePos.node.next();
+			if (!matchingNode) {
+				return 0;
+			}
 
-		return buffer.buffer.charCodeAt(targetOffset);
+			let buffer = this._buffers[matchingNode.piece.bufferIndex];
+			let startOffset = this.offsetInBuffer(matchingNode.piece.bufferIndex, matchingNode.piece.start);
+			return buffer.buffer.charCodeAt(startOffset);
+		} else {
+			let buffer = this._buffers[nodePos.node.piece.bufferIndex];
+			let startOffset = this.offsetInBuffer(nodePos.node.piece.bufferIndex, nodePos.node.piece.start);
+			let targetOffset = startOffset + nodePos.remainder;
+
+			return buffer.buffer.charCodeAt(targetOffset);
+		}
 	}
 
 	public getLineLength(lineNumber: number): number {
@@ -712,7 +725,8 @@ export class PieceTreeBase {
 			if (node.piece.bufferIndex === 0 &&
 				piece.end.line === this._lastChangeBufferPos.line &&
 				piece.end.column === this._lastChangeBufferPos.column &&
-				(nodeStartOffset + piece.length === offset)
+				(nodeStartOffset + piece.length === offset) &&
+				value.length < AverageBufferSize
 			) {
 				// changed buffer
 				this.appendToNode(node, value);
@@ -769,19 +783,27 @@ export class PieceTreeBase {
 					this.deleteNodeTail(node, insertPosInBuffer);
 				}
 
-				let newPiece = this.createNewPiece(value);
+				let newPieces = this.createNewPieces(value);
 				if (newRightPiece.length > 0) {
 					this.rbInsertRight(node, newRightPiece);
 				}
-				this.rbInsertRight(node, newPiece);
+
+				let tmpNode = node;
+				for (let k = 0; k < newPieces.length; k++) {
+					tmpNode = this.rbInsertRight(tmpNode, newPieces[k]);
+				}
 				this.deleteNodes(nodesToDel);
 			} else {
 				this.insertContentToNodeRight(value, node);
 			}
 		} else {
 			// insert new node
-			let piece = this.createNewPiece(value);
-			this.rbInsertLeft(null, piece);
+			let pieces = this.createNewPieces(value);
+			let node = this.rbInsertLeft(null, pieces[0]);
+
+			for (let k = 1; k < pieces.length; k++) {
+				node = this.rbInsertRight(node, pieces[k]);
+			}
 		}
 
 		// todo, this is too brutal. Total line feed count should be updated the same way as lf_left.
@@ -887,8 +909,11 @@ export class PieceTreeBase {
 			}
 		}
 
-		let newPiece = this.createNewPiece(value);
-		let newNode = this.rbInsertLeft(node, newPiece);
+		let newPieces = this.createNewPieces(value);
+		let newNode = this.rbInsertLeft(node, newPieces[newPieces.length - 1]);
+		for (let k = newPieces.length - 2; k >= 0; k--) {
+			newNode = this.rbInsertLeft(newNode, newPieces[k]);
+		}
 		this.validateCRLFWithPrevNode(newNode);
 		this.deleteNodes(nodesToDel);
 	}
@@ -900,8 +925,14 @@ export class PieceTreeBase {
 			value += '\n';
 		}
 
-		let newPiece = this.createNewPiece(value);
-		let newNode = this.rbInsertRight(node, newPiece);
+		let newPieces = this.createNewPieces(value);
+		let newNode = this.rbInsertRight(node, newPieces[0]);
+		let tmpNode = newNode;
+
+		for (let k = 1; k < newPieces.length; k++) {
+			tmpNode = this.rbInsertRight(tmpNode, newPieces[k]);
+		}
+
 		this.validateCRLFWithPrevNode(newNode);
 	}
 
@@ -994,7 +1025,47 @@ export class PieceTreeBase {
 		}
 	}
 
-	createNewPiece(text: string): Piece {
+	createNewPieces(text: string): Piece[] {
+		if (text.length > AverageBufferSize) {
+			// the content is large, operations like substring, charCode becomes slow
+			// so here we split it into smaller chunks, just like what we did for CR/LF normalization
+			let newPieces = [];
+			while (text.length > AverageBufferSize) {
+				const lastChar = text.charCodeAt(AverageBufferSize - 1);
+				let splitText;
+				if (lastChar === CharCode.CarriageReturn || (lastChar >= 0xd800 && lastChar <= 0xdbff)) {
+					// last character is \r or a high surrogate => keep it back
+					splitText = text.substring(0, AverageBufferSize - 1);
+					text = text.substring(AverageBufferSize - 1);
+				} else {
+					splitText = text.substring(0, AverageBufferSize);
+					text = text.substring(AverageBufferSize);
+				}
+
+				let lineStarts = createLineStartsFast(splitText);
+				newPieces.push(new Piece(
+					this._buffers.length, /* buffer index */
+					{ line: 0, column: 0 },
+					{ line: lineStarts.length - 1, column: splitText.length - lineStarts[lineStarts.length - 1] },
+					lineStarts.length - 1,
+					splitText.length
+				));
+				this._buffers.push(new StringBuffer(splitText, lineStarts));
+			}
+
+			let lineStarts = createLineStartsFast(text);
+			newPieces.push(new Piece(
+				this._buffers.length, /* buffer index */
+				{ line: 0, column: 0 },
+				{ line: lineStarts.length - 1, column: text.length - lineStarts[lineStarts.length - 1] },
+				lineStarts.length - 1,
+				text.length
+			));
+			this._buffers.push(new StringBuffer(text, lineStarts));
+
+			return newPieces;
+		}
+
 		let startOffset = this._buffers[0].buffer.length;
 		const lineStarts = createLineStartsFast(text, false);
 
@@ -1029,14 +1100,14 @@ export class PieceTreeBase {
 		let endColumn = endOffset - this._buffers[0].lineStarts[endIndex];
 		let endPos = { line: endIndex, column: endColumn };
 		let newPiece = new Piece(
-			0,
+			0, /** todo */
 			start,
 			endPos,
 			this.getLineFeedCnt(0, start, endPos),
 			endOffset - startOffset
 		);
 		this._lastChangeBufferPos = endPos;
-		return newPiece;
+		return [newPiece];
 	}
 
 	getLinesRawContent(): string {
@@ -1519,8 +1590,8 @@ export class PieceTreeBase {
 		}
 
 		// create new piece which contains \r\n
-		let piece = this.createNewPiece('\r\n');
-		this.rbInsertRight(prev, piece);
+		let pieces = this.createNewPieces('\r\n');
+		this.rbInsertRight(prev, pieces[0]);
 		// delete empty nodes
 
 		for (let i = 0; i < nodesToDel.length; i++) {
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index 3695a9597ab..27416907f49 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -7,12 +7,26 @@
 import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import * as strings from 'vs/base/common/strings';
-import { IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
 import { PieceTreeBase, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange, FindMatch } from 'vs/editor/common/model';
+import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange, FindMatch, ISingleEditOperationIdentifier } from 'vs/editor/common/model';
 import { ITextSnapshot } from 'vs/platform/files/common/files';
 import { SearchData } from 'vs/editor/common/model/textModelSearch';
 
+export interface IValidatedEditOperation {
+	sortIndex: number;
+	identifier: ISingleEditOperationIdentifier;
+	range: Range;
+	rangeOffset: number;
+	rangeLength: number;
+	lines: string[];
+	forceMoveMarkers: boolean;
+	isAutoWhitespaceEdit: boolean;
+}
+
+export interface IReverseSingleEditOperation extends IIdentifiedSingleEditOperation {
+	sortIndex: number;
+}
+
 export class PieceTreeTextBuffer implements ITextBuffer {
 	private _pieceTree: PieceTreeBase;
 	private _BOM: string;
@@ -229,18 +243,20 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 			}
 		}
 
-		let reverseOperations: IIdentifiedSingleEditOperation[] = [];
+		let reverseOperations: IReverseSingleEditOperation[] = [];
 		for (let i = 0; i < operations.length; i++) {
 			let op = operations[i];
 			let reverseRange = reverseRanges[i];
 
 			reverseOperations[i] = {
+				sortIndex: op.sortIndex,
 				identifier: op.identifier,
 				range: reverseRange,
 				text: this.getValueInRange(op.range),
 				forceMoveMarkers: op.forceMoveMarkers
 			};
 		}
+		reverseOperations.sort((a, b) => a.sortIndex - b.sortIndex);
 
 		this._mightContainRTL = mightContainRTL;
 		this._mightContainNonBasicASCII = mightContainNonBasicASCII;
@@ -279,9 +295,9 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 	}
 
 	/**
- * Transform operations such that they represent the same logic edit,
- * but that they also do not cause OOM crashes.
- */
+	 * Transform operations such that they represent the same logic edit,
+	 * but that they also do not cause OOM crashes.
+	 */
 	private _reduceOperations(operations: IValidatedEditOperation[]): IValidatedEditOperation[] {
 		if (operations.length < 1000) {
 			// We know from empirical testing that a thousand edits work fine regardless of their shape.
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index ccc986b4d0f..3f50b4cf63e 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -33,28 +33,10 @@ import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { TextModelSearch, SearchParams, SearchData } from 'vs/editor/common/model/textModelSearch';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IStringStream, ITextSnapshot } from 'vs/platform/files/common/files';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
-
-export enum TextBufferType {
-	LinesArray,
-	PieceTree,
-	Chunks
-}
-// Here is the master switch for the text buffer implementation:
-export const OPTIONS = {
-	TEXT_BUFFER_IMPLEMENTATION: TextBufferType.PieceTree
-};
 
 function createTextBufferBuilder() {
-	if (OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
-		return new PieceTreeTextBufferBuilder();
-	}
-	if (OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.Chunks) {
-		return new ChunksTextBufferBuilder();
-	}
-	return new LinesTextBufferBuilder();
+	return new PieceTreeTextBufferBuilder();
 }
 
 export function createTextBufferFactory(text: string): model.ITextBufferFactory {
@@ -173,8 +155,6 @@ class TextModelSnapshot implements ITextSnapshot {
 export class TextModel extends Disposable implements model.ITextModel {
 
 	private static readonly MODEL_SYNC_LIMIT = 50 * 1024 * 1024; // 50 MB
-	private static readonly MODEL_TOKENIZATION_LIMIT = 20 * 1024 * 1024; // 20 MB
-	private static readonly MANY_MANY_LINES = 300 * 1000; // 300K lines
 
 	public static DEFAULT_CREATION_OPTIONS: model.ITextModelCreationOptions = {
 		isForSimpleWidget: false,
@@ -183,6 +163,8 @@ export class TextModel extends Disposable implements model.ITextModel {
 		detectIndentation: false,
 		defaultEOL: model.DefaultEndOfLine.LF,
 		trimAutoWhitespace: EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
+		largeFileSize: EDITOR_MODEL_DEFAULTS.largeFileSize,
+		largeFileLineCount: EDITOR_MODEL_DEFAULTS.largeFileLineCount,
 	};
 
 	public static createFromString(text: string, options: model.ITextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS, languageIdentifier: LanguageIdentifier = null, uri: URI = null): TextModel {
@@ -229,11 +211,14 @@ export class TextModel extends Disposable implements model.ITextModel {
 	public readonly onDidChangeOptions: Event<IModelOptionsChangedEvent> = this._onDidChangeOptions.event;
 
 	private readonly _eventEmitter: DidChangeContentEmitter = this._register(new DidChangeContentEmitter());
+	public onDidChangeRawContentFast(listener: (e: ModelRawContentChangedEvent) => void): IDisposable {
+		return this._eventEmitter.fastEvent((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
+	}
 	public onDidChangeRawContent(listener: (e: ModelRawContentChangedEvent) => void): IDisposable {
-		return this._eventEmitter.event((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
+		return this._eventEmitter.slowEvent((e: InternalModelContentChangeEvent) => listener(e.rawContentChangedEvent));
 	}
 	public onDidChangeContent(listener: (e: IModelContentChangedEvent) => void): IDisposable {
-		return this._eventEmitter.event((e: InternalModelContentChangeEvent) => listener(e.contentChangedEvent));
+		return this._eventEmitter.slowEvent((e: InternalModelContentChangeEvent) => listener(e.contentChangedEvent));
 	}
 	//#endregion
 
@@ -304,8 +289,8 @@ export class TextModel extends Disposable implements model.ITextModel {
 		// If a model is too large at construction time, it will never get tokenized,
 		// under no circumstances.
 		this._isTooLargeForTokenization = (
-			(bufferTextLength > TextModel.MODEL_TOKENIZATION_LIMIT)
-			|| (bufferLineCount > TextModel.MANY_MANY_LINES)
+			(bufferTextLength > creationOptions.largeFileSize)
+			|| (bufferLineCount > creationOptions.largeFileLineCount)
 		);
 
 		this._shouldSimplifyMode = (
@@ -401,10 +386,11 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this.setValueFromTextBuffer(textBuffer);
 	}
 
-	private _createContentChanged2(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeLength: number, text: string, isUndoing: boolean, isRedoing: boolean, isFlush: boolean): IModelContentChangedEvent {
+	private _createContentChanged2(range: Range, rangeOffset: number, rangeLength: number, text: string, isUndoing: boolean, isRedoing: boolean, isFlush: boolean): IModelContentChangedEvent {
 		return {
 			changes: [{
-				range: new Range(startLineNumber, startColumn, endLineNumber, endColumn),
+				range: range,
+				rangeOffset: rangeOffset,
 				rangeLength: rangeLength,
 				text: text,
 			}],
@@ -450,7 +436,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 				false,
 				false
 			),
-			this._createContentChanged2(1, 1, endLineNumber, endColumn, oldModelValueLength, this.getValue(), false, false, true)
+			this._createContentChanged2(new Range(1, 1, endLineNumber, endColumn), 0, oldModelValueLength, this.getValue(), false, false, true)
 		);
 	}
 
@@ -481,7 +467,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 				false,
 				false
 			),
-			this._createContentChanged2(1, 1, endLineNumber, endColumn, oldModelValueLength, this.getValue(), false, false, false)
+			this._createContentChanged2(new Range(1, 1, endLineNumber, endColumn), 0, oldModelValueLength, this.getValue(), false, false, false)
 		);
 	}
 
@@ -551,6 +537,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return this._attachedEditorCount > 0;
 	}
 
+	public getAttachedEditorCount(): number {
+		return this._attachedEditorCount;
+	}
+
 	public isTooLargeForHavingARichMode(): boolean {
 		return this._shouldSimplifyMode;
 	}
@@ -782,6 +772,15 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return this._buffer.getLineContent(lineNumber);
 	}
 
+	public getLineLength(lineNumber: number): number {
+		this._assertNotDisposed();
+		if (lineNumber < 1 || lineNumber > this.getLineCount()) {
+			throw new Error('Illegal value for lineNumber');
+		}
+
+		return this._buffer.getLineLength(lineNumber);
+	}
+
 	public getLinesContent(): string[] {
 		this._assertNotDisposed();
 		return this._buffer.getLinesContent();
@@ -892,6 +891,41 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return new Range(startLineNumber, startColumn, endLineNumber, endColumn);
 	}
 
+	/**
+	 * @param strict Do NOT allow a position inside a high-low surrogate pair
+	 */
+	private _isValidPosition(lineNumber: number, column: number, strict: boolean): boolean {
+
+		if (lineNumber < 1) {
+			return false;
+		}
+
+		const lineCount = this._buffer.getLineCount();
+		if (lineNumber > lineCount) {
+			return false;
+		}
+
+		if (column < 1) {
+			return false;
+		}
+
+		const maxColumn = this.getLineMaxColumn(lineNumber);
+		if (column > maxColumn) {
+			return false;
+		}
+
+		if (strict) {
+			if (column > 1) {
+				const charCodeBefore = this._buffer.getLineCharCode(lineNumber, column - 2);
+				if (strings.isHighSurrogate(charCodeBefore)) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * @param strict Do NOT allow a position inside a high-low surrogate pair
 	 */
@@ -932,11 +966,60 @@ export class TextModel extends Disposable implements model.ITextModel {
 
 	public validatePosition(position: IPosition): Position {
 		this._assertNotDisposed();
+
+		// Avoid object allocation and cover most likely case
+		if (position instanceof Position) {
+			if (this._isValidPosition(position.lineNumber, position.column, true)) {
+				return position;
+			}
+		}
+
 		return this._validatePosition(position.lineNumber, position.column, true);
 	}
 
+	/**
+	 * @param strict Do NOT allow a range to have its boundaries inside a high-low surrogate pair
+	 */
+	private _isValidRange(range: Range, strict: boolean): boolean {
+		const startLineNumber = range.startLineNumber;
+		const startColumn = range.startColumn;
+		const endLineNumber = range.endLineNumber;
+		const endColumn = range.endColumn;
+
+		if (!this._isValidPosition(startLineNumber, startColumn, false)) {
+			return false;
+		}
+		if (!this._isValidPosition(endLineNumber, endColumn, false)) {
+			return false;
+		}
+
+		if (strict) {
+			const charCodeBeforeStart = (startColumn > 1 ? this._buffer.getLineCharCode(startLineNumber, startColumn - 2) : 0);
+			const charCodeBeforeEnd = (endColumn > 1 && endColumn <= this._buffer.getLineLength(endLineNumber) ? this._buffer.getLineCharCode(endLineNumber, endColumn - 2) : 0);
+
+			const startInsideSurrogatePair = strings.isHighSurrogate(charCodeBeforeStart);
+			const endInsideSurrogatePair = strings.isHighSurrogate(charCodeBeforeEnd);
+
+			if (!startInsideSurrogatePair && !endInsideSurrogatePair) {
+				return true;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
 	public validateRange(_range: IRange): Range {
 		this._assertNotDisposed();
+
+		// Avoid object allocation and cover most likely case
+		if ((_range instanceof Range) && !(_range instanceof Selection)) {
+			if (this._isValidRange(_range, true)) {
+				return _range;
+			}
+		}
+
 		const start = this._validatePosition(_range.startLineNumber, _range.startColumn, false);
 		const end = this._validatePosition(_range.endLineNumber, _range.endColumn, false);
 
@@ -1000,7 +1083,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 			searchRange = this.getFullModelRange();
 		}
 
-		if (!isRegex && searchString.indexOf('\n') < 0 && OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
+		if (!isRegex && searchString.indexOf('\n') < 0) {
 			// not regex, not multi line
 			const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
 			const searchData = searchParams.parseSearchRequest();
@@ -1019,7 +1102,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 		this._assertNotDisposed();
 		const searchStart = this.validatePosition(rawSearchStart);
 
-		if (!isRegex && searchString.indexOf('\n') < 0 && OPTIONS.TEXT_BUFFER_IMPLEMENTATION === TextBufferType.PieceTree) {
+		if (!isRegex && searchString.indexOf('\n') < 0) {
 			const searchParams = new SearchParams(searchString, isRegex, matchCase, wordSeparators);
 			const searchData = searchParams.parseSearchRequest();
 			const lineCount = this.getLineCount();
@@ -1686,8 +1769,15 @@ export class TextModel extends Disposable implements model.ITextModel {
 			let text = this.getLineContent(i);
 			let r = this._tokens._tokenizeText(this._buffer, text, state);
 			if (r) {
-				state = r.endState.clone();
 				this._tokens._setTokens(this._tokens.languageIdentifier.id, i - 1, text.length, r.tokens);
+				/*
+				 * we think it's valid and give it a state but we don't update `_invalidLineStartIndex` then the top-to-bottom tokenization
+				 * goes through the viewport, it can skip them if they already have correct tokens and state, and the lines after the viewport
+				 * can still be tokenized.
+				 */
+				this._tokens._setIsInvalid(i - 1, false);
+				this._tokens._setState(i - 1, state);
+				state = r.endState.clone();
 				eventBuilder.registerChangedTokens(i);
 			} else {
 				state = initialState.clone();
@@ -2021,6 +2111,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 	}
 
 	private _matchFoundBracket(foundBracket: Range, data: RichEditBracket, isOpen: boolean): [Range, Range] {
+		if (!data) {
+			return null;
+		}
+
 		if (isOpen) {
 			let matched = this._findMatchingBracketDown(data, foundBracket.getEndPosition());
 			if (matched) {
@@ -2300,6 +2394,168 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return TextModel.computeIndentLevel(this._buffer.getLineContent(lineIndex + 1), this._options.tabSize);
 	}
 
+	public getActiveIndentGuide(lineNumber: number): model.IActiveIndentGuideInfo {
+		this._assertNotDisposed();
+		const lineCount = this.getLineCount();
+
+		if (lineNumber < 1 || lineNumber > lineCount) {
+			throw new Error('Illegal value for lineNumber');
+		}
+
+		const foldingRules = LanguageConfigurationRegistry.getFoldingRules(this._languageIdentifier.id);
+		const offSide = foldingRules && foldingRules.offSide;
+
+		let up_aboveContentLineIndex = -2; /* -2 is a marker for not having computed it */
+		let up_aboveContentLineIndent = -1;
+		let up_belowContentLineIndex = -2; /* -2 is a marker for not having computed it */
+		let up_belowContentLineIndent = -1;
+		const up_resolveIndents = (lineNumber: number) => {
+			if (up_aboveContentLineIndex !== -1 && (up_aboveContentLineIndex === -2 || up_aboveContentLineIndex > lineNumber - 1)) {
+				up_aboveContentLineIndex = -1;
+				up_aboveContentLineIndent = -1;
+
+				// must find previous line with content
+				for (let lineIndex = lineNumber - 2; lineIndex >= 0; lineIndex--) {
+					let indent = this._computeIndentLevel(lineIndex);
+					if (indent >= 0) {
+						up_aboveContentLineIndex = lineIndex;
+						up_aboveContentLineIndent = indent;
+						break;
+					}
+				}
+			}
+
+			if (up_belowContentLineIndex === -2) {
+				up_belowContentLineIndex = -1;
+				up_belowContentLineIndent = -1;
+
+				// must find next line with content
+				for (let lineIndex = lineNumber; lineIndex < lineCount; lineIndex++) {
+					let indent = this._computeIndentLevel(lineIndex);
+					if (indent >= 0) {
+						up_belowContentLineIndex = lineIndex;
+						up_belowContentLineIndent = indent;
+						break;
+					}
+				}
+			}
+		};
+
+		let down_aboveContentLineIndex = -2; /* -2 is a marker for not having computed it */
+		let down_aboveContentLineIndent = -1;
+		let down_belowContentLineIndex = -2; /* -2 is a marker for not having computed it */
+		let down_belowContentLineIndent = -1;
+		const down_resolveIndents = (lineNumber: number) => {
+			if (down_aboveContentLineIndex === -2) {
+				down_aboveContentLineIndex = -1;
+				down_aboveContentLineIndent = -1;
+
+				// must find previous line with content
+				for (let lineIndex = lineNumber - 2; lineIndex >= 0; lineIndex--) {
+					let indent = this._computeIndentLevel(lineIndex);
+					if (indent >= 0) {
+						down_aboveContentLineIndex = lineIndex;
+						down_aboveContentLineIndent = indent;
+						break;
+					}
+				}
+			}
+
+			if (down_belowContentLineIndex !== -1 && (down_belowContentLineIndex === -2 || down_belowContentLineIndex < lineNumber - 1)) {
+				down_belowContentLineIndex = -1;
+				down_belowContentLineIndent = -1;
+
+				// must find next line with content
+				for (let lineIndex = lineNumber; lineIndex < lineCount; lineIndex++) {
+					let indent = this._computeIndentLevel(lineIndex);
+					if (indent >= 0) {
+						down_belowContentLineIndex = lineIndex;
+						down_belowContentLineIndent = indent;
+						break;
+					}
+				}
+			}
+		};
+
+		let startLineNumber = 0;
+		let goUp = true;
+		let endLineNumber = 0;
+		let goDown = true;
+		let indent = 0;
+
+		for (let distance = 0; goUp || goDown; distance++) {
+			const upLineNumber = lineNumber - distance;
+			const downLineNumber = lineNumber + distance;
+
+			if (upLineNumber < 1) {
+				goUp = false;
+			}
+			if (downLineNumber > lineCount) {
+				goDown = false;
+			}
+
+			if (goUp) {
+				// compute indent level going up
+				let upLineIndentLevel: number;
+
+				const currentIndent = this._computeIndentLevel(upLineNumber - 1);
+				if (currentIndent >= 0) {
+					// This line has content (besides whitespace)
+					// Use the line's indent
+					up_belowContentLineIndex = upLineNumber - 1;
+					up_belowContentLineIndent = currentIndent;
+					upLineIndentLevel = Math.ceil(currentIndent / this._options.tabSize);
+				} else {
+					up_resolveIndents(upLineNumber);
+					upLineIndentLevel = this._getIndentLevelForWhitespaceLine(offSide, up_aboveContentLineIndent, up_belowContentLineIndent);
+				}
+
+				if (distance === 0) {
+					// This is the initial line number
+					startLineNumber = upLineNumber;
+					endLineNumber = downLineNumber;
+					indent = upLineIndentLevel;
+					if (indent === 0) {
+						// No need to continue
+						return { startLineNumber, endLineNumber, indent };
+					}
+					continue;
+				}
+
+				if (upLineIndentLevel >= indent) {
+					startLineNumber = upLineNumber;
+				} else {
+					goUp = false;
+				}
+			}
+
+			if (goDown) {
+				// compute indent level going down
+				let downLineIndentLevel: number;
+
+				const currentIndent = this._computeIndentLevel(downLineNumber - 1);
+				if (currentIndent >= 0) {
+					// This line has content (besides whitespace)
+					// Use the line's indent
+					down_aboveContentLineIndex = downLineNumber - 1;
+					down_aboveContentLineIndent = currentIndent;
+					downLineIndentLevel = Math.ceil(currentIndent / this._options.tabSize);
+				} else {
+					down_resolveIndents(downLineNumber);
+					downLineIndentLevel = this._getIndentLevelForWhitespaceLine(offSide, down_aboveContentLineIndent, down_belowContentLineIndent);
+				}
+
+				if (downLineIndentLevel >= indent) {
+					endLineNumber = downLineNumber;
+				} else {
+					goDown = false;
+				}
+			}
+		}
+
+		return { startLineNumber, endLineNumber, indent };
+	}
+
 	public getLinesIndentGuides(startLineNumber: number, endLineNumber: number): number[] {
 		this._assertNotDisposed();
 		const lineCount = this.getLineCount();
@@ -2365,32 +2621,38 @@ export class TextModel extends Disposable implements model.ITextModel {
 				}
 			}
 
-			if (aboveContentLineIndent === -1 || belowContentLineIndent === -1) {
-				// At the top or bottom of the file
-				result[resultIndex] = 0;
+			result[resultIndex] = this._getIndentLevelForWhitespaceLine(offSide, aboveContentLineIndent, belowContentLineIndent);
 
-			} else if (aboveContentLineIndent < belowContentLineIndent) {
-				// we are inside the region above
-				result[resultIndex] = (1 + Math.floor(aboveContentLineIndent / this._options.tabSize));
-
-			} else if (aboveContentLineIndent === belowContentLineIndent) {
-				// we are in between two regions
-				result[resultIndex] = Math.ceil(belowContentLineIndent / this._options.tabSize);
-
-			} else {
-
-				if (offSide) {
-					// same level as region below
-					result[resultIndex] = Math.ceil(belowContentLineIndent / this._options.tabSize);
-				} else {
-					// we are inside the region that ends below
-					result[resultIndex] = (1 + Math.floor(belowContentLineIndent / this._options.tabSize));
-				}
-
-			}
 		}
 		return result;
 	}
+
+	private _getIndentLevelForWhitespaceLine(offSide: boolean, aboveContentLineIndent: number, belowContentLineIndent: number): number {
+		if (aboveContentLineIndent === -1 || belowContentLineIndent === -1) {
+			// At the top or bottom of the file
+			return 0;
+
+		} else if (aboveContentLineIndent < belowContentLineIndent) {
+			// we are inside the region above
+			return (1 + Math.floor(aboveContentLineIndent / this._options.tabSize));
+
+		} else if (aboveContentLineIndent === belowContentLineIndent) {
+			// we are in between two regions
+			return Math.ceil(belowContentLineIndent / this._options.tabSize);
+
+		} else {
+
+			if (offSide) {
+				// same level as region below
+				return Math.ceil(belowContentLineIndent / this._options.tabSize);
+			} else {
+				// we are inside the region that ends below
+				return (1 + Math.floor(belowContentLineIndent / this._options.tabSize));
+			}
+
+		}
+	}
+
 	//#endregion
 }
 
@@ -2505,22 +2767,20 @@ export class ModelDecorationOverviewRulerOptions implements model.IModelDecorati
 	}
 }
 
-let lastStaticId = 0;
-
 export class ModelDecorationOptions implements model.IModelDecorationOptions {
 
 	public static EMPTY: ModelDecorationOptions;
 
 	public static register(options: model.IModelDecorationOptions): ModelDecorationOptions {
-		return new ModelDecorationOptions(++lastStaticId, options);
+		return new ModelDecorationOptions(options);
 	}
 
 	public static createDynamic(options: model.IModelDecorationOptions): ModelDecorationOptions {
-		return new ModelDecorationOptions(0, options);
+		return new ModelDecorationOptions(options);
 	}
 
-	readonly staticId: number;
 	readonly stickiness: model.TrackedRangeStickiness;
+	readonly zIndex: number;
 	readonly className: string;
 	readonly hoverMessage: IMarkdownString | IMarkdownString[];
 	readonly glyphMarginHoverMessage: IMarkdownString | IMarkdownString[];
@@ -2531,12 +2791,13 @@ export class ModelDecorationOptions implements model.IModelDecorationOptions {
 	readonly linesDecorationsClassName: string;
 	readonly marginClassName: string;
 	readonly inlineClassName: string;
+	readonly inlineClassNameAffectsLetterSpacing: boolean;
 	readonly beforeContentClassName: string;
 	readonly afterContentClassName: string;
 
-	private constructor(staticId: number, options: model.IModelDecorationOptions) {
-		this.staticId = staticId;
+	private constructor(options: model.IModelDecorationOptions) {
 		this.stickiness = options.stickiness || model.TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges;
+		this.zIndex = options.zIndex || 0;
 		this.className = options.className ? cleanClassName(options.className) : strings.empty;
 		this.hoverMessage = options.hoverMessage || [];
 		this.glyphMarginHoverMessage = options.glyphMarginHoverMessage || [];
@@ -2547,6 +2808,7 @@ export class ModelDecorationOptions implements model.IModelDecorationOptions {
 		this.linesDecorationsClassName = options.linesDecorationsClassName ? cleanClassName(options.linesDecorationsClassName) : strings.empty;
 		this.marginClassName = options.marginClassName ? cleanClassName(options.marginClassName) : strings.empty;
 		this.inlineClassName = options.inlineClassName ? cleanClassName(options.inlineClassName) : strings.empty;
+		this.inlineClassNameAffectsLetterSpacing = options.inlineClassNameAffectsLetterSpacing || false;
 		this.beforeContentClassName = options.beforeContentClassName ? cleanClassName(options.beforeContentClassName) : strings.empty;
 		this.afterContentClassName = options.afterContentClassName ? cleanClassName(options.afterContentClassName) : strings.empty;
 	}
@@ -2607,8 +2869,13 @@ export class DidChangeDecorationsEmitter extends Disposable {
 
 export class DidChangeContentEmitter extends Disposable {
 
-	private readonly _actual: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
-	public readonly event: Event<InternalModelContentChangeEvent> = this._actual.event;
+	/**
+	 * Both `fastEvent` and `slowEvent` work the same way and contain the same events, but first we invoke `fastEvent` and then `slowEvent`.
+	 */
+	private readonly _fastEmitter: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
+	public readonly fastEvent: Event<InternalModelContentChangeEvent> = this._fastEmitter.event;
+	private readonly _slowEmitter: Emitter<InternalModelContentChangeEvent> = this._register(new Emitter<InternalModelContentChangeEvent>());
+	public readonly slowEvent: Event<InternalModelContentChangeEvent> = this._slowEmitter.event;
 
 	private _deferredCnt: number;
 	private _deferredEvent: InternalModelContentChangeEvent;
@@ -2629,7 +2896,8 @@ export class DidChangeContentEmitter extends Disposable {
 			if (this._deferredEvent !== null) {
 				const e = this._deferredEvent;
 				this._deferredEvent = null;
-				this._actual.fire(e);
+				this._fastEmitter.fire(e);
+				this._slowEmitter.fire(e);
 			}
 		}
 	}
@@ -2643,6 +2911,7 @@ export class DidChangeContentEmitter extends Disposable {
 			}
 			return;
 		}
-		this._actual.fire(e);
+		this._fastEmitter.fire(e);
+		this._slowEmitter.fire(e);
 	}
 }
diff --git a/src/vs/editor/common/model/textModelEvents.ts b/src/vs/editor/common/model/textModelEvents.ts
index f65fdca1ef2..d6593abd1cb 100644
--- a/src/vs/editor/common/model/textModelEvents.ts
+++ b/src/vs/editor/common/model/textModelEvents.ts
@@ -32,6 +32,10 @@ export interface IModelContentChange {
 	 * The range that got replaced.
 	 */
 	readonly range: IRange;
+	/**
+	 * The offset of the range that got replaced.
+	 */
+	readonly rangeOffset: number;
 	/**
 	 * The length of the range that got replaced.
 	 */
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
index 80e5e1c7287..ab4e221927f 100644
--- a/src/vs/editor/common/model/textModelTokens.ts
+++ b/src/vs/editor/common/model/textModelTokens.ts
@@ -233,7 +233,7 @@ export class ModelLinesTokens {
 		}
 	}
 
-	private _setIsInvalid(lineIndex: number, invalid: boolean): void {
+	_setIsInvalid(lineIndex: number, invalid: boolean): void {
 		if (lineIndex < this._tokens.length && this._tokens[lineIndex]) {
 			this._tokens[lineIndex]._invalid = invalid;
 		}
@@ -278,7 +278,7 @@ export class ModelLinesTokens {
 		target._lineTokens = tokens.buffer;
 	}
 
-	private _setState(lineIndex: number, state: IState): void {
+	_setState(lineIndex: number, state: IState): void {
 		if (lineIndex < this._tokens.length && this._tokens[lineIndex]) {
 			this._tokens[lineIndex]._state = state;
 		} else {
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 6d7f7468e84..e9caa888ae2 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -230,7 +230,7 @@ export interface Hover {
 	 * editor will use the range at the current position or the
 	 * current position itself.
 	 */
-	range: IRange;
+	range?: IRange;
 }
 
 /**
@@ -364,6 +364,11 @@ export interface CodeActionProvider {
 	 * Provide commands for the given document and range.
 	 */
 	provideCodeActions(model: model.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): CodeAction[] | Thenable<CodeAction[]>;
+
+	/**
+	 * Optional list of of CodeActionKinds that this provider returns.
+	 */
+	providedCodeActionKinds?: string[];
 }
 
 /**
@@ -825,73 +830,60 @@ export interface DocumentColorProvider {
 	 */
 	provideColorPresentations(model: model.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable<IColorPresentation[]>;
 }
-
-/**
- * @internal
- */
 export interface FoldingContext {
-	maxRanges?: number;
 }
-
 /**
  * A provider of colors for editor models.
  */
-/**
- * @internal
- */
-export interface FoldingProvider {
+export interface FoldingRangeProvider {
 	/**
 	 * Provides the color ranges for a specific model.
 	 */
-	provideFoldingRanges(model: model.ITextModel, context: FoldingContext, token: CancellationToken): IFoldingRangeList | Thenable<IFoldingRangeList>;
+	provideFoldingRanges(model: model.ITextModel, context: FoldingContext, token: CancellationToken): FoldingRange[] | Thenable<FoldingRange[]>;
 }
-/**
- * @internal
- */
-export interface IFoldingRangeList {
 
-	ranges: IFoldingRange[];
+export interface FoldingRange {
+
+	/**
+	 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+	 */
+	start: number;
+
+	/**
+	 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+	 */
+	end: number;
+
+	/**
+	 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
+	 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
+	 * like 'Fold all comments'. See
+	 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of standardized kinds.
+	 */
+	kind?: FoldingRangeKind;
 }
-/**
- * @internal
- */
-export interface IFoldingRange {
+export class FoldingRangeKind {
+	/**
+	 * Kind for folding range representing a comment. The value of the kind is 'comment'.
+	 */
+	static readonly Comment = new FoldingRangeKind('comment');
+	/**
+	 * Kind for folding range representing a import. The value of the kind is 'imports'.
+	 */
+	static readonly Imports = new FoldingRangeKind('imports');
+	/**
+	 * Kind for folding range representing regions (for example marked by `#region`, `#endregion`).
+	 * The value of the kind is 'region'.
+	 */
+	static readonly Region = new FoldingRangeKind('region');
 
 	/**
-	 * The start line number
+	 * Creates a new [FoldingRangeKind](#FoldingRangeKind).
+	 *
+	 * @param value of the kind.
 	 */
-	startLineNumber: number;
-
-	/**
-	 * The end line number
-	 */
-	endLineNumber: number;
-
-	/**
-	 * The optional type of the folding range
-	 */
-	type?: FoldingRangeType | string;
-
-	// auto-collapse
-	// header span
-
-}
-/**
- * @internal
- */
-export enum FoldingRangeType {
-	/**
-	 * Folding range for a comment
-	 */
-	Comment = 'comment',
-	/**
-	 * Folding range for a imports or includes
-	 */
-	Imports = 'imports',
-	/**
-	 * Folding range for a region (e.g. `#region`)
-	 */
-	Region = 'region'
+	public constructor(public value: string) {
+	}
 }
 
 /**
@@ -924,15 +916,14 @@ export interface WorkspaceEdit {
 	rejectReason?: string; // TODO@joh, move to rename
 }
 
-export interface RenameContext {
+export interface RenameLocation {
 	range: IRange;
 	text: string;
-	message?: string;
 }
 
 export interface RenameProvider {
 	provideRenameEdits(model: model.ITextModel, position: Position, newName: string, token: CancellationToken): WorkspaceEdit | Thenable<WorkspaceEdit>;
-	resolveRenameLocation?(model: model.ITextModel, position: Position, token: CancellationToken): RenameContext | Thenable<RenameContext>;
+	resolveRenameLocation?(model: model.ITextModel, position: Position, token: CancellationToken): RenameLocation | Thenable<RenameLocation>;
 }
 
 
@@ -1043,7 +1034,7 @@ export const ColorProviderRegistry = new LanguageFeatureRegistry<DocumentColorPr
 /**
  * @internal
  */
-export const FoldingProviderRegistry = new LanguageFeatureRegistry<FoldingProvider>();
+export const FoldingRangeProviderRegistry = new LanguageFeatureRegistry<FoldingRangeProvider>();
 
 /**
  * @internal
diff --git a/src/vs/editor/common/services/editorSimpleWorker.ts b/src/vs/editor/common/services/editorSimpleWorker.ts
index b7302571032..046b0f32902 100644
--- a/src/vs/editor/common/services/editorSimpleWorker.ts
+++ b/src/vs/editor/common/services/editorSimpleWorker.ts
@@ -22,6 +22,7 @@ import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model
 import { createMonacoBaseAPI } from 'vs/editor/common/standalone/standaloneBase';
 import { IWordAtPosition, EndOfLineSequence } from 'vs/editor/common/model';
 import { globals } from 'vs/base/common/platform';
+import { IIterator } from 'vs/base/common/iterator';
 
 export interface IMirrorModel {
 	readonly uri: URI;
@@ -58,8 +59,8 @@ export interface ICommonModel {
 	getLinesContent(): string[];
 	getLineCount(): number;
 	getLineContent(lineNumber: number): string;
+	createWordIterator(wordDefinition: RegExp): IIterator<string>;
 	getWordUntilPosition(position: IPosition, wordDefinition: RegExp): IWordAtPosition;
-	getAllUniqueWords(wordDefinition: RegExp, skipWordOnce?: string): string[];
 	getValueInRange(range: IRange): string;
 	getWordAtPosition(position: IPosition, wordDefinition: RegExp): Range;
 	offsetAt(position: IPosition): number;
@@ -146,30 +147,37 @@ class MirrorModel extends BaseMirrorModel implements ICommonModel {
 		};
 	}
 
-	private _getAllWords(wordDefinition: RegExp): string[] {
-		let result: string[] = [];
-		this._lines.forEach((line) => {
-			this._wordenize(line, wordDefinition).forEach((info) => {
-				result.push(line.substring(info.start, info.end));
-			});
-		});
-		return result;
-	}
+	public createWordIterator(wordDefinition: RegExp): IIterator<string> {
+		let obj = {
+			done: false,
+			value: ''
+		};
+		let lineNumber = 0;
+		let lineText: string;
+		let wordRangesIdx = 0;
+		let wordRanges: IWordRange[] = [];
+		let next = () => {
+
+			if (wordRangesIdx < wordRanges.length) {
+				obj.done = false;
+				obj.value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
+				wordRangesIdx += 1;
+
+			} else if (lineNumber >= this._lines.length) {
+				obj.done = true;
+				obj.value = undefined;
 
-	public getAllUniqueWords(wordDefinition: RegExp, skipWordOnce?: string): string[] {
-		let foundSkipWord = false;
-		let uniqueWords = Object.create(null);
-		return this._getAllWords(wordDefinition).filter((word) => {
-			if (skipWordOnce && !foundSkipWord && skipWordOnce === word) {
-				foundSkipWord = true;
-				return false;
-			} else if (uniqueWords[word]) {
-				return false;
 			} else {
-				uniqueWords[word] = true;
-				return true;
+				lineText = this._lines[lineNumber];
+				wordRanges = this._wordenize(lineText, wordDefinition);
+				wordRangesIdx = 0;
+				lineNumber += 1;
+				return next();
 			}
-		});
+
+			return obj;
+		};
+		return { next };
 	}
 
 	private _wordenize(content: string, wordDefinition: RegExp): IWordRange[] {
@@ -427,6 +435,8 @@ export abstract class BaseEditorSimpleWorker {
 
 	// ---- BEGIN suggest --------------------------------------------------------------------------
 
+	private static readonly _suggestionsLimit = 10000;
+
 	public textualSuggest(modelUrl: string, position: IPosition, wordDef: string, wordDefFlags: string): TPromise<ISuggestResult> {
 		const model = this._getModel(modelUrl);
 		if (model) {
@@ -434,17 +444,32 @@ export abstract class BaseEditorSimpleWorker {
 			const wordDefRegExp = new RegExp(wordDef, wordDefFlags);
 			const currentWord = model.getWordUntilPosition(position, wordDefRegExp).word;
 
-			for (const word of model.getAllUniqueWords(wordDefRegExp)) {
-				if (word !== currentWord && isNaN(Number(word))) {
-					suggestions.push({
-						type: 'text',
-						label: word,
-						insertText: word,
-						noAutoAccept: true,
-						overwriteBefore: currentWord.length
-					});
+			const seen: Record<string, boolean> = Object.create(null);
+			seen[currentWord] = true;
+
+			for (
+				let iter = model.createWordIterator(wordDefRegExp), e = iter.next();
+				!e.done && suggestions.length <= BaseEditorSimpleWorker._suggestionsLimit;
+				e = iter.next()
+			) {
+				const word = e.value;
+				if (seen[word]) {
+					continue;
 				}
+				seen[word] = true;
+				if (!isNaN(Number(word))) {
+					continue;
+				}
+
+				suggestions.push({
+					type: 'text',
+					label: word,
+					insertText: word,
+					noAutoAccept: true,
+					overwriteBefore: currentWord.length
+				});
 			}
+
 			return TPromise.as({ suggestions });
 		}
 		return undefined;
diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index 546aa1bbc17..13225e51b8c 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -111,13 +111,9 @@ export class LanguagesRegistry {
 
 		let primaryMime: string = null;
 
-		if (typeof lang.mimetypes !== 'undefined' && Array.isArray(lang.mimetypes)) {
-			for (let i = 0; i < lang.mimetypes.length; i++) {
-				if (!primaryMime) {
-					primaryMime = lang.mimetypes[i];
-				}
-				resolvedLanguage.mimetypes.push(lang.mimetypes[i]);
-			}
+		if (Array.isArray(lang.mimetypes) && lang.mimetypes.length > 0) {
+			resolvedLanguage.mimetypes.push(...lang.mimetypes);
+			primaryMime = lang.mimetypes[0];
 		}
 
 		if (!primaryMime) {
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
index b2dbb1d5720..6490f6d7a0e 100644
--- a/src/vs/editor/common/services/modelServiceImpl.ts
+++ b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -13,7 +13,6 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IMarker, IMarkerService, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { Range } from 'vs/editor/common/core/range';
-import { Selection } from 'vs/editor/common/core/selection';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
 import { IMode, LanguageIdentifier } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -83,15 +82,23 @@ class ModelMarkerHandler {
 	}
 
 	private static _createDecorationRange(model: ITextModel, rawMarker: IMarker): Range {
-		let marker = model.validateRange(new Range(rawMarker.startLineNumber, rawMarker.startColumn, rawMarker.endLineNumber, rawMarker.endColumn));
-		let ret: Range = new Range(marker.startLineNumber, marker.startColumn, marker.endLineNumber, marker.endColumn);
+
+		let ret = Range.lift(rawMarker);
+
+		if (rawMarker.severity === MarkerSeverity.Hint && Range.spansMultipleLines(ret)) {
+			// never render hints on multiple lines
+			ret = ret.setEndPosition(ret.startLineNumber, ret.startColumn);
+		}
+
+		ret = model.validateRange(ret);
+
 		if (ret.isEmpty()) {
 			let word = model.getWordAtPosition(ret.getStartPosition());
 			if (word) {
 				ret = new Range(ret.startLineNumber, word.startColumn, ret.endLineNumber, word.endColumn);
 			} else {
-				let maxColumn = model.getLineLastNonWhitespaceColumn(marker.startLineNumber) ||
-					model.getLineMaxColumn(marker.startLineNumber);
+				let maxColumn = model.getLineLastNonWhitespaceColumn(ret.startLineNumber) ||
+					model.getLineMaxColumn(ret.startLineNumber);
 
 				if (maxColumn === 1) {
 					// empty line
@@ -119,26 +126,31 @@ class ModelMarkerHandler {
 		let className: string;
 		let color: ThemeColor;
 		let darkColor: ThemeColor;
+		let zIndex: number;
 
 		switch (marker.severity) {
 			case MarkerSeverity.Hint:
 				className = ClassName.EditorHintDecoration;
+				zIndex = 0;
 				break;
 			case MarkerSeverity.Warning:
 				className = ClassName.EditorWarningDecoration;
 				color = themeColorFromId(overviewRulerWarning);
 				darkColor = themeColorFromId(overviewRulerWarning);
+				zIndex = 20;
 				break;
 			case MarkerSeverity.Info:
 				className = ClassName.EditorInfoDecoration;
 				color = themeColorFromId(overviewRulerInfo);
 				darkColor = themeColorFromId(overviewRulerInfo);
+				zIndex = 10;
 				break;
 			case MarkerSeverity.Error:
 			default:
 				className = ClassName.EditorErrorDecoration;
 				color = themeColorFromId(overviewRulerError);
 				darkColor = themeColorFromId(overviewRulerError);
+				zIndex = 30;
 				break;
 		}
 
@@ -178,7 +190,8 @@ class ModelMarkerHandler {
 				color,
 				darkColor,
 				position: OverviewRulerLane.Right
-			}
+			},
+			zIndex
 		};
 	}
 }
@@ -192,6 +205,8 @@ interface IRawConfig {
 		insertSpaces?: any;
 		detectIndentation?: any;
 		trimAutoWhitespace?: any;
+		largeFileSize?: any;
+		largeFileLineCount?: any;
 	};
 }
 
@@ -270,13 +285,31 @@ export class ModelServiceImpl implements IModelService {
 			detectIndentation = (config.editor.detectIndentation === 'false' ? false : Boolean(config.editor.detectIndentation));
 		}
 
+		let largeFileSize = EDITOR_MODEL_DEFAULTS.largeFileSize;
+		if (config.editor && typeof config.editor.largeFileSize !== 'undefined') {
+			let parsedlargeFileSize = parseInt(config.editor.largeFileSize, 10);
+			if (!isNaN(parsedlargeFileSize)) {
+				largeFileSize = parsedlargeFileSize;
+			}
+		}
+
+		let largeFileLineCount = EDITOR_MODEL_DEFAULTS.largeFileLineCount;
+		if (config.editor && typeof config.editor.largeFileLineCount !== 'undefined') {
+			let parsedlargeFileLineCount = parseInt(config.editor.largeFileLineCount, 10);
+			if (!isNaN(parsedlargeFileLineCount)) {
+				largeFileLineCount = parsedlargeFileLineCount;
+			}
+		}
+
 		return {
 			isForSimpleWidget: isForSimpleWidget,
 			tabSize: tabSize,
 			insertSpaces: insertSpaces,
 			detectIndentation: detectIndentation,
 			defaultEOL: newDefaultEOL,
-			trimAutoWhitespace: trimAutoWhitespace
+			trimAutoWhitespace: trimAutoWhitespace,
+			largeFileSize: largeFileSize,
+			largeFileLineCount: largeFileLineCount
 		};
 	}
 
@@ -396,12 +429,14 @@ export class ModelServiceImpl implements IModelService {
 		}
 
 		// Otherwise find a diff between the values and update model
+		model.pushStackElement();
 		model.setEOL(textBuffer.getEOL() === '\r\n' ? EndOfLineSequence.CRLF : EndOfLineSequence.LF);
 		model.pushEditOperations(
-			[new Selection(1, 1, 1, 1)],
+			[],
 			ModelServiceImpl._computeEdits(model, textBuffer),
-			(inverseEditOperations: IIdentifiedSingleEditOperation[]) => [new Selection(1, 1, 1, 1)]
+			(inverseEditOperations: IIdentifiedSingleEditOperation[]) => []
 		);
+		model.pushStackElement();
 	}
 
 	private static _commonPrefix(a: ILineSequence, aLen: number, aDelta: number, b: ILineSequence, bLen: number, bDelta: number): number {
@@ -451,7 +486,7 @@ export class ModelServiceImpl implements IModelService {
 			newRange = new Range(1, 1, textBufferLineCount, 1 + textBuffer.getLineLength(textBufferLineCount));
 		}
 
-		return [EditOperation.replace(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
+		return [EditOperation.replaceMove(oldRange, textBuffer.getValueInRange(newRange, EndOfLinePreference.TextDefined))];
 	}
 
 	public createModel(value: string | ITextBufferFactory, modeOrPromise: TPromise<IMode> | IMode, resource: URI, isForSimpleWidget: boolean = false): ITextModel {
diff --git a/src/vs/editor/common/services/resourceConfigurationImpl.ts b/src/vs/editor/common/services/resourceConfigurationImpl.ts
index a407bf1c698..6b75152e474 100644
--- a/src/vs/editor/common/services/resourceConfigurationImpl.ts
+++ b/src/vs/editor/common/services/resourceConfigurationImpl.ts
@@ -11,6 +11,7 @@ import { ITextResourceConfigurationService } from 'vs/editor/common/services/res
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
+import { basename } from 'vs/base/common/paths';
 
 export class TextResourceConfigurationService extends Disposable implements ITextResourceConfigurationService {
 
@@ -42,6 +43,6 @@ export class TextResourceConfigurationService extends Disposable implements ITex
 		if (model) {
 			return position ? this.modeService.getLanguageIdentifier(model.getLanguageIdAtPosition(position.lineNumber, position.column)).language : model.getLanguageIdentifier().language;
 		}
-		return this.modeService.getModeIdByFilenameOrFirstLine(resource.fsPath);
+		return this.modeService.getModeIdByFilenameOrFirstLine(basename(resource.path));
 	}
 }
\ No newline at end of file
diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts
index e92db6d8195..92f67358ba7 100644
--- a/src/vs/editor/common/view/editorColorRegistry.ts
+++ b/src/vs/editor/common/view/editorColorRegistry.ts
@@ -20,8 +20,12 @@ export const editorCursorForeground = registerColor('editorCursor.foreground', {
 export const editorCursorBackground = registerColor('editorCursor.background', null, nls.localize('editorCursorBackground', 'The background color of the editor cursor. Allows customizing the color of a character overlapped by a block cursor.'));
 export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.'));
 export const editorIndentGuides = registerColor('editorIndentGuide.background', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorIndentGuides', 'Color of the editor indentation guides.'));
+export const editorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', { dark: editorWhitespaces, light: editorWhitespaces, hc: editorWhitespaces }, nls.localize('editorActiveIndentGuide', 'Color of the active editor indentation guides.'));
 export const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#5A5A5A', light: '#2B91AF', hc: Color.white }, nls.localize('editorLineNumbers', 'Color of editor line numbers.'));
-export const editorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: null, light: null, hc: null }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+
+const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: null, light: null, hc: null }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'), false, nls.localize('deprecatedEditorActiveLineNumber', 'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'));
+export const editorActiveLineNumber = registerColor('editorLineNumber.activeForeground', { dark: deprecatedEditorActiveLineNumber, light: deprecatedEditorActiveLineNumber, hc: deprecatedEditorActiveLineNumber }, nls.localize('editorActiveLineNumber', 'Color of editor active line number'));
+
 export const editorRuler = registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hc: Color.white }, nls.localize('editorRuler', 'Color of the editor rulers.'));
 
 export const editorCodeLensForeground = registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#999999', hc: '#999999' }, nls.localize('editorCodeLensForeground', 'Foreground color of editor code lenses'));
@@ -53,27 +57,32 @@ export const overviewRulerInfo = registerColor('editorOverviewRuler.infoForegrou
 
 // contains all color rules that used to defined in editor/browser/widget/editor.css
 registerThemingParticipant((theme, collector) => {
-	let background = theme.getColor(editorBackground);
+	const background = theme.getColor(editorBackground);
 	if (background) {
 		collector.addRule(`.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input { background-color: ${background}; }`);
 	}
-	let foreground = theme.getColor(editorForeground);
+
+	const foreground = theme.getColor(editorForeground);
 	if (foreground) {
 		collector.addRule(`.monaco-editor, .monaco-editor .inputarea.ime-input { color: ${foreground}; }`);
 	}
-	let gutter = theme.getColor(editorGutter);
+
+	const gutter = theme.getColor(editorGutter);
 	if (gutter) {
 		collector.addRule(`.monaco-editor .margin { background-color: ${gutter}; }`);
 	}
-	let rangeHighlight = theme.getColor(editorRangeHighlight);
+
+	const rangeHighlight = theme.getColor(editorRangeHighlight);
 	if (rangeHighlight) {
 		collector.addRule(`.monaco-editor .rangeHighlight { background-color: ${rangeHighlight}; }`);
 	}
-	let rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
+
+	const rangeHighlightBorder = theme.getColor(editorRangeHighlightBorder);
 	if (rangeHighlightBorder) {
-		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px dotted ${rangeHighlightBorder}; }`);
+		collector.addRule(`.monaco-editor .rangeHighlight { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${rangeHighlightBorder}; }`);
 	}
-	let invisibles = theme.getColor(editorWhitespaces);
+
+	const invisibles = theme.getColor(editorWhitespaces);
 	if (invisibles) {
 		collector.addRule(`.vs-whitespace { color: ${invisibles} !important; }`);
 	}
diff --git a/src/vs/editor/common/viewLayout/lineDecorations.ts b/src/vs/editor/common/viewLayout/lineDecorations.ts
index a791061e928..fe3397d94de 100644
--- a/src/vs/editor/common/viewLayout/lineDecorations.ts
+++ b/src/vs/editor/common/viewLayout/lineDecorations.ts
@@ -58,7 +58,7 @@ export class LineDecoration {
 				continue;
 			}
 
-			if (range.isEmpty() && d.type === InlineDecorationType.Regular) {
+			if (range.isEmpty() && (d.type === InlineDecorationType.Regular || d.type === InlineDecorationType.RegularAffectingLetterSpacing)) {
 				// Ignore empty range decorations
 				continue;
 			}
diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
index d04c5657afb..a7e1f091386 100644
--- a/src/vs/editor/common/viewLayout/viewLayout.ts
+++ b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -163,7 +163,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
 
 	// ---- view state
 
-	public saveState(): editorCommon.IViewState {
+	public saveState(): { scrollTop: number; scrollTopWithoutViewZones: number; scrollLeft: number; } {
 		const currentScrollPosition = this.scrollable.getFutureScrollPosition();
 		let scrollTop = currentScrollPosition.scrollTop;
 		let firstLineNumberInViewport = this._linesLayout.getLineNumberAtOrAfterVerticalOffset(scrollTop);
@@ -175,17 +175,6 @@ export class ViewLayout extends Disposable implements IViewLayout {
 		};
 	}
 
-	public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
-		let restoreScrollTop = state.scrollTop;
-		if (typeof state.scrollTopWithoutViewZones === 'number' && !this._linesLayout.hasWhitespace()) {
-			restoreScrollTop = state.scrollTopWithoutViewZones;
-		}
-		return {
-			scrollLeft: state.scrollLeft,
-			scrollTop: restoreScrollTop
-		};
-	}
-
 	// ---- IVerticalLayoutProvider
 
 	public addWhitespace(afterLineNumber: number, ordinal: number, height: number): number {
diff --git a/src/vs/editor/common/viewLayout/viewLineRenderer.ts b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
index a3c3bef72de..e4c075e7c15 100644
--- a/src/vs/editor/common/viewLayout/viewLineRenderer.ts
+++ b/src/vs/editor/common/viewLayout/viewLineRenderer.ts
@@ -36,7 +36,8 @@ export class RenderLineInput {
 
 	public readonly useMonospaceOptimizations: boolean;
 	public readonly lineContent: string;
-	public readonly mightContainRTL: boolean;
+	public readonly isBasicASCII: boolean;
+	public readonly containsRTL: boolean;
 	public readonly fauxIndentLength: number;
 	public readonly lineTokens: IViewLineTokens;
 	public readonly lineDecorations: LineDecoration[];
@@ -50,7 +51,8 @@ export class RenderLineInput {
 	constructor(
 		useMonospaceOptimizations: boolean,
 		lineContent: string,
-		mightContainRTL: boolean,
+		isBasicASCII: boolean,
+		containsRTL: boolean,
 		fauxIndentLength: number,
 		lineTokens: IViewLineTokens,
 		lineDecorations: LineDecoration[],
@@ -63,7 +65,8 @@ export class RenderLineInput {
 	) {
 		this.useMonospaceOptimizations = useMonospaceOptimizations;
 		this.lineContent = lineContent;
-		this.mightContainRTL = mightContainRTL;
+		this.isBasicASCII = isBasicASCII;
+		this.containsRTL = containsRTL;
 		this.fauxIndentLength = fauxIndentLength;
 		this.lineTokens = lineTokens;
 		this.lineDecorations = lineDecorations;
@@ -85,7 +88,8 @@ export class RenderLineInput {
 		return (
 			this.useMonospaceOptimizations === other.useMonospaceOptimizations
 			&& this.lineContent === other.lineContent
-			&& this.mightContainRTL === other.mightContainRTL
+			&& this.isBasicASCII === other.isBasicASCII
+			&& this.containsRTL === other.containsRTL
 			&& this.fauxIndentLength === other.fauxIndentLength
 			&& this.tabSize === other.tabSize
 			&& this.spaceWidth === other.spaceWidth
@@ -217,14 +221,20 @@ export class CharacterMapping {
 	}
 }
 
+export const enum ForeignElementType {
+	None = 0,
+	Before = 1,
+	After = 2
+}
+
 export class RenderLineOutput {
 	_renderLineOutputBrand: void;
 
 	readonly characterMapping: CharacterMapping;
 	readonly containsRTL: boolean;
-	readonly containsForeignElements: boolean;
+	readonly containsForeignElements: ForeignElementType;
 
-	constructor(characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: boolean) {
+	constructor(characterMapping: CharacterMapping, containsRTL: boolean, containsForeignElements: ForeignElementType) {
 		this.characterMapping = characterMapping;
 		this.containsRTL = containsRTL;
 		this.containsForeignElements = containsForeignElements;
@@ -234,7 +244,7 @@ export class RenderLineOutput {
 export function renderViewLine(input: RenderLineInput, sb: IStringBuilder): RenderLineOutput {
 	if (input.lineContent.length === 0) {
 
-		let containsForeignElements = false;
+		let containsForeignElements = ForeignElementType.None;
 
 		// This is basically for IE's hit test to work
 		let content: string = '<span><span>\u00a0</span></span>';
@@ -244,13 +254,17 @@ export function renderViewLine(input: RenderLineInput, sb: IStringBuilder): Rend
 			let classNames: string[] = [];
 			for (let i = 0, len = input.lineDecorations.length; i < len; i++) {
 				const lineDecoration = input.lineDecorations[i];
-				if (lineDecoration.type !== InlineDecorationType.Regular) {
+				if (lineDecoration.type === InlineDecorationType.Before) {
 					classNames.push(input.lineDecorations[i].className);
-					containsForeignElements = true;
+					containsForeignElements |= ForeignElementType.Before;
+				}
+				if (lineDecoration.type === InlineDecorationType.After) {
+					classNames.push(input.lineDecorations[i].className);
+					containsForeignElements |= ForeignElementType.After;
 				}
 			}
 
-			if (containsForeignElements) {
+			if (containsForeignElements !== ForeignElementType.None) {
 				content = `<span><span class="${classNames.join(' ')}"></span></span>`;
 			}
 		}
@@ -271,7 +285,7 @@ export class RenderLineOutput2 {
 		public readonly characterMapping: CharacterMapping,
 		public readonly html: string,
 		public readonly containsRTL: boolean,
-		public readonly containsForeignElements: boolean
+		public readonly containsForeignElements: ForeignElementType
 	) {
 	}
 }
@@ -289,7 +303,7 @@ class ResolvedRenderLineInput {
 		public readonly len: number,
 		public readonly isOverflowing: boolean,
 		public readonly parts: LinePart[],
-		public readonly containsForeignElements: boolean,
+		public readonly containsForeignElements: ForeignElementType,
 		public readonly tabSize: number,
 		public readonly containsRTL: boolean,
 		public readonly spaceWidth: number,
@@ -319,22 +333,22 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 	if (input.renderWhitespace === RenderWhitespace.All || input.renderWhitespace === RenderWhitespace.Boundary) {
 		tokens = _applyRenderWhitespace(lineContent, len, tokens, input.fauxIndentLength, input.tabSize, useMonospaceOptimizations, input.renderWhitespace === RenderWhitespace.Boundary);
 	}
-	let containsForeignElements = false;
+	let containsForeignElements = ForeignElementType.None;
 	if (input.lineDecorations.length > 0) {
 		for (let i = 0, len = input.lineDecorations.length; i < len; i++) {
 			const lineDecoration = input.lineDecorations[i];
-			if (lineDecoration.type !== InlineDecorationType.Regular) {
-				containsForeignElements = true;
-				break;
+			if (lineDecoration.type === InlineDecorationType.RegularAffectingLetterSpacing) {
+				// Pretend there are foreign elements... although not 100% accurate.
+				containsForeignElements |= ForeignElementType.Before;
+			} else if (lineDecoration.type === InlineDecorationType.Before) {
+				containsForeignElements |= ForeignElementType.Before;
+			} else if (lineDecoration.type === InlineDecorationType.After) {
+				containsForeignElements |= ForeignElementType.After;
 			}
 		}
 		tokens = _applyInlineDecorations(lineContent, len, tokens, input.lineDecorations);
 	}
-	let containsRTL = false;
-	if (input.mightContainRTL) {
-		containsRTL = strings.containsRTL(lineContent);
-	}
-	if (!containsRTL && !input.fontLigatures) {
+	if (input.isBasicASCII && !input.fontLigatures) {
 		tokens = splitLargeTokens(lineContent, tokens);
 	}
 
@@ -346,7 +360,7 @@ function resolveRenderLineInput(input: RenderLineInput): ResolvedRenderLineInput
 		tokens,
 		containsForeignElements,
 		input.tabSize,
-		containsRTL,
+		input.containsRTL,
 		input.spaceWidth,
 		input.renderWhitespace,
 		input.renderControlCharacters
@@ -406,11 +420,6 @@ function splitLargeTokens(lineContent: string, tokens: LinePart[]): LinePart[] {
 			const piecesCount = Math.ceil(diff / Constants.LongToken);
 			for (let j = 1; j < piecesCount; j++) {
 				let pieceEndIndex = lastTokenEndIndex + (j * Constants.LongToken);
-				let lastCharInPiece = lineContent.charCodeAt(pieceEndIndex - 1);
-				if (strings.isHighSurrogate(lastCharInPiece)) {
-					// Don't cut in the middle of a surrogate pair
-					pieceEndIndex--;
-				}
 				result[resultLen++] = new LinePart(pieceEndIndex, tokenType);
 			}
 			result[resultLen++] = new LinePart(tokenEndIndex, tokenType);
diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts
index 3141915e9df..73f02436877 100644
--- a/src/vs/editor/common/viewModel/splitLinesCollection.ts
+++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts
@@ -14,7 +14,7 @@ import { WrappingIndent } from 'vs/editor/common/config/editorOptions';
 import { ModelDecorationOptions, ModelDecorationOverviewRulerOptions } from 'vs/editor/common/model/textModel';
 import { ThemeColor, ITheme } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
-import { IModelDecoration, ITextModel, IModelDeltaDecoration, EndOfLinePreference } from 'vs/editor/common/model';
+import { IModelDecoration, ITextModel, IModelDeltaDecoration, EndOfLinePreference, IActiveIndentGuideInfo } from 'vs/editor/common/model';
 
 export class OutputPosition {
 	_outputPositionBrand: void;
@@ -41,6 +41,7 @@ export interface ILineMapperFactory {
 export interface ISimpleModel {
 	getLineTokens(lineNumber: number): LineTokens;
 	getLineContent(lineNumber: number): string;
+	getLineLength(lineNumber: number): number;
 	getLineMinColumn(lineNumber: number): number;
 	getLineMaxColumn(lineNumber: number): number;
 	getValueInRange(range: IRange, eol?: EndOfLinePreference): string;
@@ -52,6 +53,7 @@ export interface ISplitLine {
 
 	getViewLineCount(): number;
 	getViewLineContent(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): string;
+	getViewLineLength(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number;
 	getViewLineMinColumn(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number;
 	getViewLineMaxColumn(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number;
 	getViewLineData(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): ViewLineData;
@@ -80,8 +82,10 @@ export interface IViewModelLinesCollection {
 
 	getViewLineCount(): number;
 	warmUpLookupCache(viewStartLineNumber: number, viewEndLineNumber: number): void;
+	getActiveIndentGuide(viewLineNumber: number): IActiveIndentGuideInfo;
 	getViewLinesIndentGuides(viewStartLineNumber: number, viewEndLineNumber: number): number[];
 	getViewLineContent(viewLineNumber: number): string;
+	getViewLineLength(viewLineNumber: number): number;
 	getViewLineMinColumn(viewLineNumber: number): number;
 	getViewLineMaxColumn(viewLineNumber: number): number;
 	getViewLineData(viewLineNumber: number): ViewLineData;
@@ -501,6 +505,22 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
 		this.prefixSumComputer.warmUpCache(viewStartLineNumber - 1, viewEndLineNumber - 1);
 	}
 
+	public getActiveIndentGuide(viewLineNumber: number): IActiveIndentGuideInfo {
+		this._ensureValidState();
+		viewLineNumber = this._toValidViewLineNumber(viewLineNumber);
+
+		const modelPosition = this.convertViewPositionToModelPosition(viewLineNumber, this.getViewLineMinColumn(viewLineNumber));
+		const result = this.model.getActiveIndentGuide(modelPosition.lineNumber);
+
+		const viewStartPosition = this.convertModelPositionToViewPosition(result.startLineNumber, 1);
+		const viewEndPosition = this.convertModelPositionToViewPosition(result.endLineNumber, 1);
+		return {
+			startLineNumber: viewStartPosition.lineNumber,
+			endLineNumber: viewEndPosition.lineNumber,
+			indent: result.indent
+		};
+	}
+
 	public getViewLinesIndentGuides(viewStartLineNumber: number, viewEndLineNumber: number): number[] {
 		this._ensureValidState();
 		viewStartLineNumber = this._toValidViewLineNumber(viewStartLineNumber);
@@ -570,6 +590,16 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
 		return this.lines[lineIndex].getViewLineContent(this.model, lineIndex + 1, remainder);
 	}
 
+	public getViewLineLength(viewLineNumber: number): number {
+		this._ensureValidState();
+		viewLineNumber = this._toValidViewLineNumber(viewLineNumber);
+		let r = this.prefixSumComputer.getIndexOf(viewLineNumber - 1);
+		let lineIndex = r.index;
+		let remainder = r.remainder;
+
+		return this.lines[lineIndex].getViewLineLength(this.model, lineIndex + 1, remainder);
+	}
+
 	public getViewLineMinColumn(viewLineNumber: number): number {
 		this._ensureValidState();
 		viewLineNumber = this._toValidViewLineNumber(viewLineNumber);
@@ -815,6 +845,10 @@ class VisibleIdentitySplitLine implements ISplitLine {
 		return model.getLineContent(modelLineNumber);
 	}
 
+	public getViewLineLength(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number {
+		return model.getLineLength(modelLineNumber);
+	}
+
 	public getViewLineMinColumn(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number {
 		return model.getLineMinColumn(modelLineNumber);
 	}
@@ -880,6 +914,10 @@ class InvisibleIdentitySplitLine implements ISplitLine {
 		throw new Error('Not supported');
 	}
 
+	public getViewLineLength(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number {
+		throw new Error('Not supported');
+	}
+
 	public getViewLineMinColumn(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number {
 		throw new Error('Not supported');
 	}
@@ -973,6 +1011,21 @@ export class SplitLine implements ISplitLine {
 		return r;
 	}
 
+	public getViewLineLength(model: ISimpleModel, modelLineNumber: number, outputLineIndex: number): number {
+		if (!this._isVisible) {
+			throw new Error('Not supported');
+		}
+		let startOffset = this.getInputStartOffsetOfOutputLineIndex(outputLineIndex);
+		let endOffset = this.getInputEndOffsetOfOutputLineIndex(model, modelLineNumber, outputLineIndex);
+		let r = endOffset - startOffset;
+
+		if (outputLineIndex > 0) {
+			r = this.wrappedIndent.length + r;
+		}
+
+		return r;
+	}
+
 	public getViewLineMinColumn(model: ITextModel, modelLineNumber: number, outputLineIndex: number): number {
 		if (!this._isVisible) {
 			throw new Error('Not supported');
@@ -1205,6 +1258,14 @@ export class IdentityLinesCollection implements IViewModelLinesCollection {
 	public warmUpLookupCache(viewStartLineNumber: number, viewEndLineNumber: number): void {
 	}
 
+	public getActiveIndentGuide(viewLineNumber: number): IActiveIndentGuideInfo {
+		return {
+			startLineNumber: viewLineNumber,
+			endLineNumber: viewLineNumber,
+			indent: 0
+		};
+	}
+
 	public getViewLinesIndentGuides(viewStartLineNumber: number, viewEndLineNumber: number): number[] {
 		const viewLineCount = viewEndLineNumber - viewStartLineNumber + 1;
 		let result = new Array<number>(viewLineCount);
@@ -1218,6 +1279,10 @@ export class IdentityLinesCollection implements IViewModelLinesCollection {
 		return this.model.getLineContent(viewLineNumber);
 	}
 
+	public getViewLineLength(viewLineNumber: number): number {
+		return this.model.getLineLength(viewLineNumber);
+	}
+
 	public getViewLineMinColumn(viewLineNumber: number): number {
 		return this.model.getLineMinColumn(viewLineNumber);
 	}
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index c3b771d2c31..c97d919393a 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { INewScrollPosition, IViewState } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference, IModelDecorationOptions } from 'vs/editor/common/model';
+import { INewScrollPosition } from 'vs/editor/common/editorCommon';
+import { EndOfLinePreference, IModelDecorationOptions, IActiveIndentGuideInfo } from 'vs/editor/common/model';
 import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import { Position, IPosition } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
@@ -15,6 +15,7 @@ import { Scrollable, IScrollPosition } from 'vs/base/common/scrollable';
 import { IPartialViewLinesViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
 import { ITheme } from 'vs/platform/theme/common/themeService';
+import * as strings from 'vs/base/common/strings';
 
 export interface IViewWhitespaceViewportData {
 	readonly id: number;
@@ -63,9 +64,6 @@ export interface IViewLayout {
 	getLinesViewportDataAtScrollTop(scrollTop: number): IPartialViewLinesViewportData;
 	getWhitespaces(): IEditorWhitespace[];
 
-	saveState(): IViewState;
-	reduceRestoreState(state: IViewState): { scrollLeft: number; scrollTop: number; };
-
 	isAfterLines(verticalOffset: number): boolean;
 	getLineNumberAtVerticalOffset(verticalOffset: number): number;
 	getVerticalOffsetForLineNumber(lineNumber: number): number;
@@ -122,6 +120,7 @@ export interface IViewModel {
 	 * Gives a hint that a lot of requests are about to come in for these line numbers.
 	 */
 	setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void;
+	setHasFocus(hasFocus: boolean): void;
 
 	getDecorationsInViewport(visibleRange: Range): ViewModelDecoration[];
 	getViewLineRenderingData(visibleRange: Range, lineNumber: number): ViewLineRenderingData;
@@ -132,6 +131,8 @@ export interface IViewModel {
 	getTabSize(): number;
 	getLineCount(): number;
 	getLineContent(lineNumber: number): string;
+	getLineLength(lineNumber: number): number;
+	getActiveIndentGuide(lineNumber: number): IActiveIndentGuideInfo;
 	getLinesIndentGuides(startLineNumber: number, endLineNumber: number): number[];
 	getLineMinColumn(lineNumber: number): number;
 	getLineMaxColumn(lineNumber: number): number;
@@ -210,13 +211,13 @@ export class ViewLineRenderingData {
 	 */
 	public readonly content: string;
 	/**
-	 * If set to false, it is guaranteed that `content` contains only LTR chars.
+	 * Describes if `content` contains RTL characters.
 	 */
-	public readonly mightContainRTL: boolean;
+	public readonly containsRTL: boolean;
 	/**
-	 * If set to false, it is guaranteed that `content` contains only basic ASCII chars.
+	 * Describes if `content` contains non basic ASCII chars.
 	 */
-	public readonly mightContainNonBasicASCII: boolean;
+	public readonly isBasicASCII: boolean;
 	/**
 	 * The tokens at this view line.
 	 */
@@ -243,18 +244,35 @@ export class ViewLineRenderingData {
 		this.minColumn = minColumn;
 		this.maxColumn = maxColumn;
 		this.content = content;
-		this.mightContainRTL = mightContainRTL;
-		this.mightContainNonBasicASCII = mightContainNonBasicASCII;
+
+		this.isBasicASCII = ViewLineRenderingData.isBasicASCII(content, mightContainNonBasicASCII);
+		this.containsRTL = ViewLineRenderingData.containsRTL(content, this.isBasicASCII, mightContainRTL);
+
 		this.tokens = tokens;
 		this.inlineDecorations = inlineDecorations;
 		this.tabSize = tabSize;
 	}
+
+	public static isBasicASCII(lineContent: string, mightContainNonBasicASCII: boolean): boolean {
+		if (mightContainNonBasicASCII) {
+			return strings.isBasicASCII(lineContent);
+		}
+		return true;
+	}
+
+	public static containsRTL(lineContent: string, isBasicASCII: boolean, mightContainRTL: boolean): boolean {
+		if (!isBasicASCII && mightContainRTL) {
+			return strings.containsRTL(lineContent);
+		}
+		return false;
+	}
 }
 
 export const enum InlineDecorationType {
 	Regular = 0,
 	Before = 1,
-	After = 2
+	After = 2,
+	RegularAffectingLetterSpacing = 3
 }
 
 export class InlineDecoration {
diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts
index 7f69b5af0c2..7faf9dfb56f 100644
--- a/src/vs/editor/common/viewModel/viewModelDecorations.ts
+++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts
@@ -124,7 +124,7 @@ export class ViewModelDecorations implements IDisposable {
 			decorationsInViewport[decorationsInViewportLen++] = viewModelDecoration;
 
 			if (decorationOptions.inlineClassName) {
-				let inlineDecoration = new InlineDecoration(viewRange, decorationOptions.inlineClassName, InlineDecorationType.Regular);
+				let inlineDecoration = new InlineDecoration(viewRange, decorationOptions.inlineClassName, decorationOptions.inlineClassNameAffectsLetterSpacing ? InlineDecorationType.RegularAffectingLetterSpacing : InlineDecorationType.Regular);
 				let intersectedStartLineNumber = Math.max(startLineNumber, viewRange.startLineNumber);
 				let intersectedEndLineNumber = Math.min(endLineNumber, viewRange.endLineNumber);
 				for (let j = intersectedStartLineNumber; j <= intersectedEndLineNumber; j++) {
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 6c8176bf41b..8fbfa9939e7 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -23,7 +23,7 @@ import { Color } from 'vs/base/common/color';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ITheme } from 'vs/platform/theme/common/themeService';
 import { ModelDecorationOverviewRulerOptions } from 'vs/editor/common/model/textModel';
-import { ITextModel, EndOfLinePreference } from 'vs/editor/common/model';
+import { ITextModel, EndOfLinePreference, TrackedRangeStickiness, IActiveIndentGuideInfo } from 'vs/editor/common/model';
 
 const USE_IDENTITY_LINES_COLLECTION = true;
 
@@ -32,20 +32,26 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 	private readonly editorId: number;
 	private readonly configuration: editorCommon.IConfiguration;
 	private readonly model: ITextModel;
+	private hasFocus: boolean;
+	private viewportStartLine: number;
+	private viewportStartLineTrackedRange: string;
+	private viewportStartLineTop: number;
 	private readonly lines: IViewModelLinesCollection;
 	public readonly coordinatesConverter: ICoordinatesConverter;
 	public readonly viewLayout: ViewLayout;
 
 	private readonly decorations: ViewModelDecorations;
 
-	private _centeredViewLine: number;
-
 	constructor(editorId: number, configuration: editorCommon.IConfiguration, model: ITextModel, scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable) {
 		super();
 
 		this.editorId = editorId;
 		this.configuration = configuration;
 		this.model = model;
+		this.hasFocus = false;
+		this.viewportStartLine = -1;
+		this.viewportStartLineTrackedRange = null;
+		this.viewportStartLineTop = 0;
 
 		if (USE_IDENTITY_LINES_COLLECTION && this.model.isTooLargeForTokenization()) {
 
@@ -83,8 +89,6 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 			}
 		}));
 
-		this._centeredViewLine = -1;
-
 		this.decorations = new ViewModelDecorations(this.editorId, this.model, this.configuration, this.lines, this.coordinatesConverter);
 
 		this._registerModelEvents();
@@ -114,13 +118,22 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		super.dispose();
 		this.decorations.dispose();
 		this.lines.dispose();
+		this.viewportStartLineTrackedRange = this.model._setTrackedRange(this.viewportStartLineTrackedRange, null, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+	}
+
+	public setHasFocus(hasFocus: boolean): void {
+		this.hasFocus = hasFocus;
 	}
 
 	private _onConfigurationChanged(eventsCollector: viewEvents.ViewEventsCollector, e: IConfigurationChangedEvent): void {
 
 		// We might need to restore the current centered view range, so save it (if available)
-		const previousCenteredModelRange = this.getCenteredRangeInViewport();
-		let revealPreviousCenteredModelRange = false;
+		let previousViewportStartModelPosition: Position = null;
+		if (this.viewportStartLine !== -1) {
+			let previousViewportStartViewPosition = new Position(this.viewportStartLine, this.getLineMinColumn(this.viewportStartLine));
+			previousViewportStartModelPosition = this.coordinatesConverter.convertViewPositionToModelPosition(previousViewportStartViewPosition);
+		}
+		let restorePreviousViewportStart = false;
 
 		const conf = this.configuration.editor;
 
@@ -133,7 +146,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 
 			if (this.viewLayout.getCurrentScrollTop() !== 0) {
 				// Never change the scroll position from 0 to something else...
-				revealPreviousCenteredModelRange = true;
+				restorePreviousViewportStart = true;
 			}
 		}
 
@@ -146,23 +159,16 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		eventsCollector.emit(new viewEvents.ViewConfigurationChangedEvent(e));
 		this.viewLayout.onConfigurationChanged(e);
 
-		if (revealPreviousCenteredModelRange && previousCenteredModelRange) {
-			// modelLine -> viewLine
-			const newCenteredViewRange = this.coordinatesConverter.convertModelRangeToViewRange(previousCenteredModelRange);
-
-			// Send a reveal event to restore the centered content
-			eventsCollector.emit(new viewEvents.ViewRevealRangeRequestEvent(
-				newCenteredViewRange,
-				viewEvents.VerticalRevealType.Center,
-				false,
-				editorCommon.ScrollType.Immediate
-			));
+		if (restorePreviousViewportStart && previousViewportStartModelPosition) {
+			const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(previousViewportStartModelPosition);
+			const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
+			this.viewLayout.deltaScrollNow(0, viewPositionTop - this.viewportStartLineTop);
 		}
 	}
 
 	private _registerModelEvents(): void {
 
-		this._register(this.model.onDidChangeRawContent((e) => {
+		this._register(this.model.onDidChangeRawContentFast((e) => {
 			try {
 				const eventsCollector = this._beginEmit();
 
@@ -236,8 +242,18 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 			}
 
 			// Update the configuration and reset the centered view line
-			this._centeredViewLine = -1;
+			this.viewportStartLine = -1;
 			this.configuration.setMaxLineNumber(this.model.getLineCount());
+
+			// Recover viewport
+			if (!this.hasFocus && this.model.getAttachedEditorCount() >= 2 && this.viewportStartLineTrackedRange) {
+				const modelRange = this.model._getTrackedRange(this.viewportStartLineTrackedRange);
+				if (modelRange) {
+					const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelRange.getStartPosition());
+					const viewPositionTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber);
+					this.viewLayout.deltaScrollNow(0, viewPositionTop - this.viewportStartLineTop);
+				}
+			}
 		}));
 
 		this._register(this.model.onDidChangeTokens((e) => {
@@ -311,16 +327,6 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		}
 	}
 
-	public getCenteredRangeInViewport(): Range {
-		if (this._centeredViewLine === -1) {
-			// Never got rendered or not rendered since last content change event
-			return null;
-		}
-		let viewLineNumber = this._centeredViewLine;
-		let currentCenteredViewRange = new Range(viewLineNumber, this.getLineMinColumn(viewLineNumber), viewLineNumber, this.getLineMaxColumn(viewLineNumber));
-		return this.coordinatesConverter.convertViewRangeToModelRange(currentCenteredViewRange);
-	}
-
 	public getVisibleRanges(): Range[] {
 		const visibleViewRange = this.getCompletelyVisibleViewRange();
 		const visibleRange = this.coordinatesConverter.convertViewRangeToModelRange(visibleViewRange);
@@ -388,6 +394,43 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		);
 	}
 
+	public saveState(): editorCommon.IViewState {
+		const compatViewState = this.viewLayout.saveState();
+
+		const scrollTop = compatViewState.scrollTop;
+		const firstViewLineNumber = this.viewLayout.getLineNumberAtVerticalOffset(scrollTop);
+		const firstPosition = this.coordinatesConverter.convertViewPositionToModelPosition(new Position(firstViewLineNumber, this.getLineMinColumn(firstViewLineNumber)));
+		const firstPositionDeltaTop = this.viewLayout.getVerticalOffsetForLineNumber(firstViewLineNumber) - scrollTop;
+
+		return {
+			scrollLeft: compatViewState.scrollLeft,
+			firstPosition: firstPosition,
+			firstPositionDeltaTop: firstPositionDeltaTop
+		};
+	}
+
+	public reduceRestoreState(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
+		if (typeof state.firstPosition === 'undefined') {
+			// This is a view state serialized by an older version
+			return this._reduceRestoreStateCompatibility(state);
+		}
+
+		const modelPosition = this.model.validatePosition(state.firstPosition);
+		const viewPosition = this.coordinatesConverter.convertModelPositionToViewPosition(modelPosition);
+		const scrollTop = this.viewLayout.getVerticalOffsetForLineNumber(viewPosition.lineNumber) - state.firstPositionDeltaTop;
+		return {
+			scrollLeft: state.scrollLeft,
+			scrollTop: scrollTop
+		};
+	}
+
+	private _reduceRestoreStateCompatibility(state: editorCommon.IViewState): { scrollLeft: number; scrollTop: number; } {
+		return {
+			scrollLeft: state.scrollLeft,
+			scrollTop: state.scrollTopWithoutViewZones
+		};
+	}
+
 	public getTabSize(): number {
 		return this.model.getOptions().tabSize;
 	}
@@ -400,8 +443,16 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 	 * Gives a hint that a lot of requests are about to come in for these line numbers.
 	 */
 	public setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void {
-		this._centeredViewLine = centeredLineNumber;
 		this.lines.warmUpLookupCache(startLineNumber, endLineNumber);
+
+		this.viewportStartLine = startLineNumber;
+		let position = this.coordinatesConverter.convertViewPositionToModelPosition(new Position(startLineNumber, this.getLineMinColumn(startLineNumber)));
+		this.viewportStartLineTrackedRange = this.model._setTrackedRange(this.viewportStartLineTrackedRange, new Range(position.lineNumber, position.column, position.lineNumber, position.column), TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
+		this.viewportStartLineTop = this.viewLayout.getVerticalOffsetForLineNumber(startLineNumber);
+	}
+
+	public getActiveIndentGuide(lineNumber: number): IActiveIndentGuideInfo {
+		return this.lines.getActiveIndentGuide(lineNumber);
 	}
 
 	public getLinesIndentGuides(startLineNumber: number, endLineNumber: number): number[] {
@@ -412,6 +463,10 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 		return this.lines.getViewLineContent(lineNumber);
 	}
 
+	public getLineLength(lineNumber: number): number {
+		return this.lines.getViewLineLength(lineNumber);
+	}
+
 	public getLineMinColumn(lineNumber: number): number {
 		return this.lines.getViewLineMinColumn(lineNumber);
 	}
diff --git a/src/vs/editor/contrib/caretOperations/transpose.ts b/src/vs/editor/contrib/caretOperations/transpose.ts
index 8c7bfd8dfdc..6523327b253 100644
--- a/src/vs/editor/contrib/caretOperations/transpose.ts
+++ b/src/vs/editor/contrib/caretOperations/transpose.ts
@@ -6,15 +6,56 @@
 
 import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { isLowSurrogate, isHighSurrogate } from 'vs/base/common/strings';
 import { Range } from 'vs/editor/common/core/range';
+import { Position, IPosition } from 'vs/editor/common/core/position';
 import { ICommand } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { ITextModel } from 'vs/editor/common/model';
 
 class TransposeLettersAction extends EditorAction {
 
+	private positionLeftOf(start: IPosition, model: ITextModel): Position {
+		let column = start.column;
+		let lineNumber = start.lineNumber;
+
+		if (column > model.getLineMinColumn(lineNumber)) {
+			if (isLowSurrogate(model.getLineContent(lineNumber).charCodeAt(column - 2))) {
+				// character before column is a low surrogate
+				column = column - 2;
+			} else {
+				column = column - 1;
+			}
+		} else if (lineNumber > 1) {
+			lineNumber = lineNumber - 1;
+			column = model.getLineMaxColumn(lineNumber);
+		}
+
+		return new Position(lineNumber, column);
+	}
+
+	private positionRightOf(start: IPosition, model: ITextModel): Position {
+		let column = start.column;
+		let lineNumber = start.lineNumber;
+
+		if (column < model.getLineMaxColumn(lineNumber)) {
+			if (isHighSurrogate(model.getLineContent(lineNumber).charCodeAt(column - 1))) {
+				// character after column is a high surrogate
+				column = column + 2;
+			} else {
+				column = column + 1;
+			}
+		} else if (lineNumber < model.getLineCount()) {
+			lineNumber = lineNumber + 1;
+			column = 0;
+		}
+
+		return new Position(lineNumber, column);
+	}
+
 	constructor() {
 		super({
 			id: 'editor.action.transposeLetters',
@@ -36,30 +77,35 @@ class TransposeLettersAction extends EditorAction {
 		let commands: ICommand[] = [];
 		let selections = editor.getSelections();
 
-		for (let i = 0; i < selections.length; i++) {
-			let selection = selections[i];
+		for (let selection of selections) {
 			if (!selection.isEmpty()) {
 				continue;
 			}
+
 			let lineNumber = selection.startLineNumber;
 			let column = selection.startColumn;
-			if (column === 1) {
-				// at the beginning of line
-				continue;
-			}
-			let maxColumn = model.getLineMaxColumn(lineNumber);
-			if (column === maxColumn) {
-				// at the end of line
+
+			let lastColumn = model.getLineMaxColumn(lineNumber);
+
+			if (lineNumber === 1 && (column === 1 || (column === 2 && lastColumn === 2))) {
+				// at beginning of file, nothing to do
 				continue;
 			}
 
-			let lineContent = model.getLineContent(lineNumber);
-			let charToTheLeft = lineContent.charAt(column - 2);
-			let charToTheRight = lineContent.charAt(column - 1);
+			// handle special case: when at end of line, transpose left two chars
+			// otherwise, transpose left and right chars
+			let endPosition = (column === lastColumn) ?
+				selection.getPosition() :
+				this.positionRightOf(selection.getPosition(), model);
 
-			let replaceRange = new Range(lineNumber, column - 1, lineNumber, column + 1);
+			let middlePosition = this.positionLeftOf(endPosition, model);
+			let beginPosition = this.positionLeftOf(middlePosition, model);
 
-			commands.push(new ReplaceCommand(replaceRange, charToTheRight + charToTheLeft));
+			let leftChar = model.getValueInRange(Range.fromPositions(beginPosition, middlePosition));
+			let rightChar = model.getValueInRange(Range.fromPositions(middlePosition, endPosition));
+
+			let replaceRange = Range.fromPositions(beginPosition, endPosition);
+			commands.push(new ReplaceCommand(replaceRange, rightChar + leftChar));
 		}
 
 		if (commands.length > 0) {
diff --git a/src/vs/editor/contrib/quickFix/quickFix.ts b/src/vs/editor/contrib/codeAction/codeAction.ts
similarity index 59%
rename from src/vs/editor/contrib/quickFix/quickFix.ts
rename to src/vs/editor/contrib/codeAction/codeAction.ts
index 8e273057dc1..2a7e9fb9d30 100644
--- a/src/vs/editor/contrib/quickFix/quickFix.ts
+++ b/src/vs/editor/contrib/codeAction/codeAction.ts
@@ -2,46 +2,58 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import URI from 'vs/base/common/uri';
-import { ITextModel } from 'vs/editor/common/model';
-import { Range } from 'vs/editor/common/core/range';
-import { CodeActionProviderRegistry, CodeAction } from 'vs/editor/common/modes';
+import { isFalsyOrEmpty, mergeSort, flatten } from 'vs/base/common/arrays';
 import { asWinJsPromise } from 'vs/base/common/async';
+import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
+import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/errors';
-import { IModelService } from 'vs/editor/common/services/modelService';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
-import { isFalsyOrEmpty, mergeSort } from 'vs/base/common/arrays';
-import { CodeActionKind } from './codeActionTrigger';
+import { Range } from 'vs/editor/common/core/range';
+import { ITextModel } from 'vs/editor/common/model';
+import { CodeAction, CodeActionProviderRegistry } from 'vs/editor/common/modes';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { CodeActionFilter, CodeActionKind } from './codeActionTrigger';
 
-export function getCodeActions(model: ITextModel, range: Range, scope?: CodeActionKind): TPromise<CodeAction[]> {
+export function getCodeActions(model: ITextModel, range: Range, filter?: CodeActionFilter): TPromise<CodeAction[]> {
+	const codeActionContext = { only: filter && filter.kind ? filter.kind.value : undefined };
 
-	const allResults: CodeAction[] = [];
 	const promises = CodeActionProviderRegistry.all(model).map(support => {
-		return asWinJsPromise(token => support.provideCodeActions(model, range, { only: scope ? scope.value : undefined }, token)).then(result => {
-			if (Array.isArray(result)) {
-				for (const quickFix of result) {
-					if (quickFix) {
-						if (!scope || (quickFix.kind && scope.contains(quickFix.kind))) {
-							allResults.push(quickFix);
-						}
-					}
-				}
+		return asWinJsPromise(token => support.provideCodeActions(model, range, codeActionContext, token)).then(providedCodeActions => {
+			if (!Array.isArray(providedCodeActions)) {
+				return [];
 			}
-		}, err => {
+			return providedCodeActions.filter(action => isValidAction(filter, action));
+		}, (err): CodeAction[] => {
 			onUnexpectedExternalError(err);
+			return [];
 		});
 	});
 
-	return TPromise.join(promises).then(
-		() => mergeSort(allResults, codeActionsComparator)
-	);
+	return TPromise.join(promises)
+		.then(flatten)
+		.then(allCodeActions => mergeSort(allCodeActions, codeActionsComparator));
+}
+
+function isValidAction(filter: CodeActionFilter | undefined, action: CodeAction): boolean {
+	if (!action) {
+		return false;
+	}
+
+	// Filter out actions by kind
+	if (filter && filter.kind && (!action.kind || !filter.kind.contains(action.kind))) {
+		return false;
+	}
+
+	// Don't return source actions unless they are explicitly requested
+	if (action.kind && CodeActionKind.Source.contains(action.kind) && (!filter || !filter.includeSourceActions)) {
+		return false;
+	}
+
+	return true;
 }
 
 function codeActionsComparator(a: CodeAction, b: CodeAction): number {
-
 	const aHasDiags = !isFalsyOrEmpty(a.diagnostics);
 	const bHasDiags = !isFalsyOrEmpty(b.diagnostics);
 	if (aHasDiags) {
@@ -58,7 +70,6 @@ function codeActionsComparator(a: CodeAction, b: CodeAction): number {
 }
 
 registerLanguageCommand('_executeCodeActionProvider', function (accessor, args) {
-
 	const { resource, range } = args;
 	if (!(resource instanceof URI) || !Range.isIRange(range)) {
 		throw illegalArgument();
diff --git a/src/vs/editor/contrib/quickFix/quickFixCommands.ts b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
similarity index 56%
rename from src/vs/editor/contrib/quickFix/quickFixCommands.ts
rename to src/vs/editor/contrib/codeAction/codeActionCommands.ts
index 8f499e12d57..3083b047c8d 100644
--- a/src/vs/editor/contrib/quickFix/quickFixCommands.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionCommands.ts
@@ -2,30 +2,37 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import * as nls from 'vs/nls';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { optional } from 'vs/platform/instantiation/common/instantiation';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { EditorAction, EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { QuickFixContextMenu } from './quickFixWidget';
-import { LightBulbWidget } from './lightBulbWidget';
-import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel';
-import { CodeActionKind, CodeActionAutoApply } from './codeActionTrigger';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { CodeAction } from 'vs/editor/common/modes';
-import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
-import { IFileService } from 'vs/platform/files/common/files';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { MessageController } from 'vs/editor/contrib/message/messageController';
+import * as nls from 'vs/nls';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IFileService } from 'vs/platform/files/common/files';
+import { optional } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { CodeActionModel, CodeActionsComputeEvent, SUPPORTED_CODE_ACTIONS } from './codeActionModel';
+import { CodeActionAutoApply, CodeActionFilter, CodeActionKind } from './codeActionTrigger';
+import { CodeActionContextMenu } from './codeActionWidget';
+import { LightBulbWidget } from './lightBulbWidget';
+import { escapeRegExpCharacters } from 'vs/base/common/strings';
+
+function contextKeyForSupportedActions(kind: CodeActionKind) {
+	return ContextKeyExpr.regex(
+		SUPPORTED_CODE_ACTIONS.keys()[0],
+		new RegExp('(\\s|^)' + escapeRegExpCharacters(kind.value) + '\\b'));
+}
 
 export class QuickFixController implements IEditorContribution {
 
@@ -36,8 +43,8 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	private _editor: ICodeEditor;
-	private _model: QuickFixModel;
-	private _quickFixContextMenu: QuickFixContextMenu;
+	private _model: CodeActionModel;
+	private _codeActionContextMenu: CodeActionContextMenu;
 	private _lightBulbWidget: LightBulbWidget;
 	private _disposables: IDisposable[] = [];
 
@@ -51,16 +58,16 @@ export class QuickFixController implements IEditorContribution {
 		@optional(IFileService) private _fileService: IFileService
 	) {
 		this._editor = editor;
-		this._model = new QuickFixModel(this._editor, markerService);
-		this._quickFixContextMenu = new QuickFixContextMenu(editor, contextMenuService, action => this._onApplyCodeAction(action));
+		this._model = new CodeActionModel(this._editor, markerService, contextKeyService);
+		this._codeActionContextMenu = new CodeActionContextMenu(editor, contextMenuService, action => this._onApplyCodeAction(action));
 		this._lightBulbWidget = new LightBulbWidget(editor);
 
 		this._updateLightBulbTitle();
 
 		this._disposables.push(
-			this._quickFixContextMenu.onDidExecuteCodeAction(_ => this._model.trigger({ type: 'auto' })),
+			this._codeActionContextMenu.onDidExecuteCodeAction(_ => this._model.trigger({ type: 'auto', filter: {} })),
 			this._lightBulbWidget.onClick(this._handleLightBulbSelect, this),
-			this._model.onDidChangeFixes(e => this._onQuickFixEvent(e)),
+			this._model.onDidChangeFixes(e => this._onCodeActionsEvent(e)),
 			this._keybindingService.onDidUpdateKeybindings(this._updateLightBulbTitle, this)
 		);
 	}
@@ -70,28 +77,28 @@ export class QuickFixController implements IEditorContribution {
 		dispose(this._disposables);
 	}
 
-	private _onQuickFixEvent(e: QuickFixComputeEvent): void {
-		if (e && e.trigger.kind) {
+	private _onCodeActionsEvent(e: CodeActionsComputeEvent): void {
+		if (e && e.trigger.filter && e.trigger.filter.kind) {
 			// Triggered for specific scope
 			// Apply if we only have one action or requested autoApply, otherwise show menu
-			e.fixes.then(fixes => {
+			e.actions.then(fixes => {
 				if (e.trigger.autoApply === CodeActionAutoApply.First || (e.trigger.autoApply === CodeActionAutoApply.IfSingle && fixes.length === 1)) {
 					this._onApplyCodeAction(fixes[0]);
 				} else {
-					this._quickFixContextMenu.show(e.fixes, e.position);
+					this._codeActionContextMenu.show(e.actions, e.position);
 				}
 			});
 			return;
 		}
 
 		if (e && e.trigger.type === 'manual') {
-			this._quickFixContextMenu.show(e.fixes, e.position);
-		} else if (e && e.fixes) {
+			this._codeActionContextMenu.show(e.actions, e.position);
+		} else if (e && e.actions) {
 			// auto magically triggered
 			// * update an existing list of code actions
 			// * manage light bulb
-			if (this._quickFixContextMenu.isVisible) {
-				this._quickFixContextMenu.show(e.fixes, e.position);
+			if (this._codeActionContextMenu.isVisible) {
+				this._codeActionContextMenu.show(e.actions, e.position);
 			} else {
 				this._lightBulbWidget.model = e;
 			}
@@ -105,15 +112,11 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	private _handleLightBulbSelect(coords: { x: number, y: number }): void {
-		this._quickFixContextMenu.show(this._lightBulbWidget.model.fixes, coords);
+		this._codeActionContextMenu.show(this._lightBulbWidget.model.actions, coords);
 	}
 
-	public triggerFromEditorSelection(): void {
-		this._model.trigger({ type: 'manual' });
-	}
-
-	public triggerCodeActionFromEditorSelection(kind?: CodeActionKind, autoApply?: CodeActionAutoApply): void {
-		this._model.trigger({ type: 'manual', kind, autoApply });
+	public triggerFromEditorSelection(filter?: CodeActionFilter, autoApply?: CodeActionAutoApply): TPromise<CodeAction[] | undefined> {
+		return this._model.trigger({ type: 'manual', filter, autoApply });
 	}
 
 	private _updateLightBulbTitle(): void {
@@ -138,6 +141,25 @@ export class QuickFixController implements IEditorContribution {
 	}
 }
 
+function showCodeActionsForEditorSelection(
+	editor: ICodeEditor,
+	notAvailableMessage: string,
+	filter?: CodeActionFilter,
+	autoApply?: CodeActionAutoApply
+) {
+	const controller = QuickFixController.get(editor);
+	if (!controller) {
+		return;
+	}
+
+	const pos = editor.getPosition();
+	controller.triggerFromEditorSelection(filter, autoApply).then(codeActions => {
+		if (!codeActions || !codeActions.length) {
+			MessageController.get(editor).showMessage(notAvailableMessage, pos);
+		}
+	});
+}
+
 export class QuickFixAction extends EditorAction {
 
 	static readonly Id = 'editor.action.quickFix';
@@ -145,7 +167,7 @@ export class QuickFixAction extends EditorAction {
 	constructor() {
 		super({
 			id: QuickFixAction.Id,
-			label: nls.localize('quickfix.trigger.label', "Quick Fix"),
+			label: nls.localize('quickfix.trigger.label', "Quick Fix..."),
 			alias: 'Quick Fix',
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider),
 			kbOpts: {
@@ -156,10 +178,7 @@ export class QuickFixAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		let controller = QuickFixController.get(editor);
-		if (controller) {
-			controller.triggerFromEditorSelection();
-		}
+		return showCodeActionsForEditorSelection(editor, nls.localize('editor.action.quickFix.noneMessage', "No code actions available"));
 	}
 }
 
@@ -212,11 +231,8 @@ export class CodeActionCommand extends EditorCommand {
 	}
 
 	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, userArg: any) {
-		const controller = QuickFixController.get(editor);
-		if (controller) {
-			const args = CodeActionCommandArgs.fromUser(userArg);
-			controller.triggerCodeActionFromEditorSelection(args.kind, args.apply);
-		}
+		const args = CodeActionCommandArgs.fromUser(userArg);
+		return showCodeActionsForEditorSelection(editor, nls.localize('editor.action.quickFix.noneMessage', "No code actions available"), { kind: args.kind, includeSourceActions: true }, args.apply);
 	}
 }
 
@@ -228,26 +244,83 @@ export class RefactorAction extends EditorAction {
 	constructor() {
 		super({
 			id: RefactorAction.Id,
-			label: nls.localize('refactor.label', "Refactor"),
+			label: nls.localize('refactor.label', "Refactor..."),
 			alias: 'Refactor',
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider),
 			kbOpts: {
 				kbExpr: EditorContextKeys.editorTextFocus,
 				primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_R
+			},
+			menuOpts: {
+				group: '1_modification',
+				order: 2,
+				when: ContextKeyExpr.and(
+					EditorContextKeys.writable,
+					contextKeyForSupportedActions(CodeActionKind.Refactor)),
 			}
 		});
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		const controller = QuickFixController.get(editor);
-		if (controller) {
-			controller.triggerCodeActionFromEditorSelection(CodeActionKind.Refactor, CodeActionAutoApply.Never);
-		}
+		return showCodeActionsForEditorSelection(editor,
+			nls.localize('editor.action.refactor.noneMessage', "No refactorings available"),
+			{ kind: CodeActionKind.Refactor },
+			CodeActionAutoApply.Never);
 	}
 }
 
 
-registerEditorContribution(QuickFixController);
-registerEditorAction(QuickFixAction);
-registerEditorAction(RefactorAction);
-registerEditorCommand(new CodeActionCommand());
+export class SourceAction extends EditorAction {
+
+	static readonly Id = 'editor.action.sourceAction';
+
+	constructor() {
+		super({
+			id: SourceAction.Id,
+			label: nls.localize('source.label', "Source Action..."),
+			alias: 'Source Action',
+			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider),
+			menuOpts: {
+				group: '1_modification',
+				order: 2.1,
+				when: ContextKeyExpr.and(
+					EditorContextKeys.writable,
+					contextKeyForSupportedActions(CodeActionKind.Source)),
+			}
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		return showCodeActionsForEditorSelection(editor,
+			nls.localize('editor.action.source.noneMessage', "No source actions available"),
+			{ kind: CodeActionKind.Source, includeSourceActions: true },
+			CodeActionAutoApply.Never);
+	}
+}
+
+export class OrganizeImportsAction extends EditorAction {
+
+	static readonly Id = 'editor.action.organizeImports';
+
+	constructor() {
+		super({
+			id: OrganizeImportsAction.Id,
+			label: nls.localize('organizeImports.label', "Organize Imports"),
+			alias: 'Organize Imports',
+			precondition: ContextKeyExpr.and(
+				EditorContextKeys.writable,
+				contextKeyForSupportedActions(CodeActionKind.SourceOrganizeImports)),
+			kbOpts: {
+				kbExpr: EditorContextKeys.editorTextFocus,
+				primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_O
+			}
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		return showCodeActionsForEditorSelection(editor,
+			nls.localize('editor.action.organize.noneMessage', "No organize imports action available"),
+			{ kind: CodeActionKind.SourceOrganizeImports, includeSourceActions: true },
+			CodeActionAutoApply.IfSingle);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/editor/contrib/codeAction/codeActionContributions.ts b/src/vs/editor/contrib/codeAction/codeActionContributions.ts
new file mode 100644
index 00000000000..8653b935470
--- /dev/null
+++ b/src/vs/editor/contrib/codeAction/codeActionContributions.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerEditorAction, registerEditorCommand, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { SourceAction, QuickFixController, QuickFixAction, CodeActionCommand, RefactorAction, OrganizeImportsAction } from 'vs/editor/contrib/codeAction/codeActionCommands';
+
+
+registerEditorContribution(QuickFixController);
+registerEditorAction(QuickFixAction);
+registerEditorAction(RefactorAction);
+registerEditorAction(SourceAction);
+registerEditorAction(OrganizeImportsAction);
+registerEditorCommand(new CodeActionCommand());
diff --git a/src/vs/editor/contrib/quickFix/quickFixModel.ts b/src/vs/editor/contrib/codeAction/codeActionModel.ts
similarity index 66%
rename from src/vs/editor/contrib/quickFix/quickFixModel.ts
rename to src/vs/editor/contrib/codeAction/codeActionModel.ts
index 899b1d93da5..a369f31e28e 100644
--- a/src/vs/editor/contrib/quickFix/quickFixModel.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionModel.ts
@@ -2,29 +2,31 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
+import { Emitter, Event, debounceEvent } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
-import { CodeActionProviderRegistry, CodeAction } from 'vs/editor/common/modes';
-import { getCodeActions } from './quickFix';
+import { CodeAction, CodeActionProviderRegistry } from 'vs/editor/common/modes';
+import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { getCodeActions } from './codeAction';
 import { CodeActionTrigger } from './codeActionTrigger';
-import { Position } from 'vs/editor/common/core/position';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
-export class QuickFixOracle {
+export const SUPPORTED_CODE_ACTIONS = new RawContextKey<string>('supportedCodeAction', '');
+
+export class CodeActionOracle {
 
 	private _disposables: IDisposable[] = [];
 
 	constructor(
 		private _editor: ICodeEditor,
 		private _markerService: IMarkerService,
-		private _signalChange: (e: QuickFixComputeEvent) => any,
+		private _signalChange: (e: CodeActionsComputeEvent) => any,
 		delay: number = 250
 	) {
 		this._disposables.push(
@@ -37,12 +39,12 @@ export class QuickFixOracle {
 		this._disposables = dispose(this._disposables);
 	}
 
-	trigger(trigger: CodeActionTrigger): void {
+	trigger(trigger: CodeActionTrigger) {
 		let rangeOrSelection = this._getRangeOfMarker() || this._getRangeOfSelectionUnlessWhitespaceEnclosed();
 		if (!rangeOrSelection && trigger.type === 'manual') {
 			rangeOrSelection = this._editor.getSelection();
 		}
-		this._createEventAndSignalChange(trigger, rangeOrSelection);
+		return this._createEventAndSignalChange(trigger, rangeOrSelection);
 	}
 
 	private _onMarkerChanges(resources: URI[]): void {
@@ -99,51 +101,56 @@ export class QuickFixOracle {
 		return selection;
 	}
 
-	private _createEventAndSignalChange(trigger: CodeActionTrigger, rangeOrSelection: Range | Selection): void {
+	private _createEventAndSignalChange(trigger: CodeActionTrigger, rangeOrSelection: Range | Selection): TPromise<CodeAction[] | undefined> {
 		if (!rangeOrSelection) {
 			// cancel
 			this._signalChange({
 				trigger,
 				range: undefined,
 				position: undefined,
-				fixes: undefined,
+				actions: undefined,
 			});
+			return TPromise.as(undefined);
 		} else {
 			// actual
 			const model = this._editor.getModel();
 			const range = model.validateRange(rangeOrSelection);
 			const position = rangeOrSelection instanceof Selection ? rangeOrSelection.getPosition() : rangeOrSelection.getStartPosition();
-			const fixes = getCodeActions(model, range, trigger && trigger.kind);
+			const actions = getCodeActions(model, range, trigger && trigger.filter);
 
 			this._signalChange({
 				trigger,
 				range,
 				position,
-				fixes
+				actions
 			});
+			return actions;
 		}
 	}
 }
 
-export interface QuickFixComputeEvent {
+export interface CodeActionsComputeEvent {
 	trigger: CodeActionTrigger;
 	range: Range;
 	position: Position;
-	fixes: TPromise<CodeAction[]>;
+	actions: TPromise<CodeAction[]>;
 }
 
-export class QuickFixModel {
+export class CodeActionModel {
 
 	private _editor: ICodeEditor;
 	private _markerService: IMarkerService;
-	private _quickFixOracle: QuickFixOracle;
-	private _onDidChangeFixes = new Emitter<QuickFixComputeEvent>();
+	private _codeActionOracle: CodeActionOracle;
+	private _onDidChangeFixes = new Emitter<CodeActionsComputeEvent>();
 	private _disposables: IDisposable[] = [];
+	private readonly _supportedCodeActions: IContextKey<string>;
 
-	constructor(editor: ICodeEditor, markerService: IMarkerService) {
+	constructor(editor: ICodeEditor, markerService: IMarkerService, contextKeyService: IContextKeyService) {
 		this._editor = editor;
 		this._markerService = markerService;
 
+		this._supportedCodeActions = SUPPORTED_CODE_ACTIONS.bindTo(contextKeyService);
+
 		this._disposables.push(this._editor.onDidChangeModel(() => this._update()));
 		this._disposables.push(this._editor.onDidChangeModelLanguage(() => this._update()));
 		this._disposables.push(CodeActionProviderRegistry.onDidChange(this._update, this));
@@ -153,18 +160,18 @@ export class QuickFixModel {
 
 	dispose(): void {
 		this._disposables = dispose(this._disposables);
-		dispose(this._quickFixOracle);
+		dispose(this._codeActionOracle);
 	}
 
-	get onDidChangeFixes(): Event<QuickFixComputeEvent> {
+	get onDidChangeFixes(): Event<CodeActionsComputeEvent> {
 		return this._onDidChangeFixes.event;
 	}
 
 	private _update(): void {
 
-		if (this._quickFixOracle) {
-			this._quickFixOracle.dispose();
-			this._quickFixOracle = undefined;
+		if (this._codeActionOracle) {
+			this._codeActionOracle.dispose();
+			this._codeActionOracle = undefined;
 			this._onDidChangeFixes.fire(undefined);
 		}
 
@@ -172,14 +179,26 @@ export class QuickFixModel {
 			&& CodeActionProviderRegistry.has(this._editor.getModel())
 			&& !this._editor.getConfiguration().readOnly) {
 
-			this._quickFixOracle = new QuickFixOracle(this._editor, this._markerService, p => this._onDidChangeFixes.fire(p));
-			this._quickFixOracle.trigger({ type: 'auto' });
+			const supportedActions: string[] = [];
+			for (const provider of CodeActionProviderRegistry.all(this._editor.getModel())) {
+				if (Array.isArray(provider.providedCodeActionKinds)) {
+					supportedActions.push(...provider.providedCodeActionKinds);
+				}
+			}
+
+			this._supportedCodeActions.set(supportedActions.join(' '));
+
+			this._codeActionOracle = new CodeActionOracle(this._editor, this._markerService, p => this._onDidChangeFixes.fire(p));
+			this._codeActionOracle.trigger({ type: 'auto' });
+		} else {
+			this._supportedCodeActions.reset();
 		}
 	}
 
-	trigger(trigger: CodeActionTrigger): void {
-		if (this._quickFixOracle) {
-			this._quickFixOracle.trigger(trigger);
+	trigger(trigger: CodeActionTrigger): TPromise<CodeAction[] | undefined> {
+		if (this._codeActionOracle) {
+			return this._codeActionOracle.trigger(trigger);
 		}
+		return TPromise.as(undefined);
 	}
 }
diff --git a/src/vs/editor/contrib/quickFix/codeActionTrigger.ts b/src/vs/editor/contrib/codeAction/codeActionTrigger.ts
similarity index 69%
rename from src/vs/editor/contrib/quickFix/codeActionTrigger.ts
rename to src/vs/editor/contrib/codeAction/codeActionTrigger.ts
index a210e484446..4f3c53b5dc9 100644
--- a/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionTrigger.ts
@@ -10,6 +10,8 @@ export class CodeActionKind {
 
 	public static readonly Empty = new CodeActionKind('');
 	public static readonly Refactor = new CodeActionKind('refactor');
+	public static readonly Source = new CodeActionKind('source');
+	public static readonly SourceOrganizeImports = new CodeActionKind('source.organizeImports');
 
 	constructor(
 		public readonly value: string
@@ -26,8 +28,13 @@ export enum CodeActionAutoApply {
 	Never = 3
 }
 
+export interface CodeActionFilter {
+	readonly kind?: CodeActionKind;
+	readonly includeSourceActions?: boolean;
+}
+
 export interface CodeActionTrigger {
-	type: 'auto' | 'manual';
-	kind?: CodeActionKind;
-	autoApply?: CodeActionAutoApply;
+	readonly type: 'auto' | 'manual';
+	readonly filter?: CodeActionFilter;
+	readonly autoApply?: CodeActionAutoApply;
 }
\ No newline at end of file
diff --git a/src/vs/editor/contrib/quickFix/quickFixWidget.ts b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
similarity index 88%
rename from src/vs/editor/contrib/quickFix/quickFixWidget.ts
rename to src/vs/editor/contrib/codeAction/codeActionWidget.ts
index 1fd65fa824b..d65b389d1ca 100644
--- a/src/vs/editor/contrib/quickFix/quickFixWidget.ts
+++ b/src/vs/editor/contrib/codeAction/codeActionWidget.ts
@@ -3,20 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
-import { always } from 'vs/base/common/async';
 import { getDomNodePagePosition } from 'vs/base/browser/dom';
-import { Position } from 'vs/editor/common/core/position';
+import { Action } from 'vs/base/common/actions';
+import { always } from 'vs/base/common/async';
+import { canceled } from 'vs/base/common/errors';
+import { Emitter, Event } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Position } from 'vs/editor/common/core/position';
+import { ScrollType } from 'vs/editor/common/editorCommon';
 import { CodeAction } from 'vs/editor/common/modes';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { Action } from 'vs/base/common/actions';
-import { Event, Emitter } from 'vs/base/common/event';
-import { ScrollType } from 'vs/editor/common/editorCommon';
 
-export class QuickFixContextMenu {
+export class CodeActionContextMenu {
 
 	private _visible: boolean;
 	private _onDidExecuteCodeAction = new Emitter<void>();
@@ -39,6 +38,12 @@ export class QuickFixContextMenu {
 						() => this._onDidExecuteCodeAction.fire(undefined));
 				});
 			});
+		}).then(actions => {
+			if (!this._editor.getDomNode()) {
+				// cancel when editor went off-dom
+				return TPromise.wrapError<any>(canceled());
+			}
+			return actions;
 		});
 
 		this._contextMenuService.showContextMenu({
diff --git a/src/vs/editor/contrib/quickFix/lightBulbWidget.css b/src/vs/editor/contrib/codeAction/lightBulbWidget.css
similarity index 100%
rename from src/vs/editor/contrib/quickFix/lightBulbWidget.css
rename to src/vs/editor/contrib/codeAction/lightBulbWidget.css
diff --git a/src/vs/editor/contrib/quickFix/lightBulbWidget.ts b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
similarity index 91%
rename from src/vs/editor/contrib/quickFix/lightBulbWidget.ts
rename to src/vs/editor/contrib/codeAction/lightBulbWidget.ts
index 92bd859cdf9..07578f4a121 100644
--- a/src/vs/editor/contrib/quickFix/lightBulbWidget.ts
+++ b/src/vs/editor/contrib/codeAction/lightBulbWidget.ts
@@ -2,17 +2,16 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import 'vs/css!./lightBulbWidget';
-import { CancellationTokenSource } from 'vs/base/common/cancellation';
-import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger } from 'vs/base/browser/globalMouseMoveMonitor';
 import * as dom from 'vs/base/browser/dom';
-import { ICodeEditor, IContentWidget, IContentWidgetPosition, ContentWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { QuickFixComputeEvent } from './quickFixModel';
+import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger } from 'vs/base/browser/globalMouseMoveMonitor';
+import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import 'vs/css!./lightBulbWidget';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeActionsComputeEvent } from './codeActionModel';
 
 export class LightBulbWidget implements IDisposable, IContentWidget {
 
@@ -26,7 +25,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 	readonly onClick: Event<{ x: number, y: number }> = this._onClick.event;
 
 	private _position: IContentWidgetPosition;
-	private _model: QuickFixComputeEvent;
+	private _model: CodeActionsComputeEvent;
 	private _futureFixes = new CancellationTokenSource();
 
 	constructor(editor: ICodeEditor) {
@@ -100,7 +99,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		return this._position;
 	}
 
-	set model(value: QuickFixComputeEvent) {
+	set model(value: CodeActionsComputeEvent) {
 
 		if (this._position && (!value.position || this._position.position.lineNumber !== value.position.lineNumber)) {
 			// hide when getting a 'hide'-request or when currently
@@ -115,7 +114,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		const { token } = this._futureFixes;
 		this._model = value;
 
-		this._model.fixes.done(fixes => {
+		this._model.actions.done(fixes => {
 			if (!token.isCancellationRequested && fixes && fixes.length > 0) {
 				this._show();
 			} else {
@@ -126,7 +125,7 @@ export class LightBulbWidget implements IDisposable, IContentWidget {
 		});
 	}
 
-	get model(): QuickFixComputeEvent {
+	get model(): CodeActionsComputeEvent {
 		return this._model;
 	}
 
diff --git a/src/vs/editor/contrib/quickFix/lightbulb-dark.svg b/src/vs/editor/contrib/codeAction/lightbulb-dark.svg
similarity index 100%
rename from src/vs/editor/contrib/quickFix/lightbulb-dark.svg
rename to src/vs/editor/contrib/codeAction/lightbulb-dark.svg
diff --git a/src/vs/editor/contrib/quickFix/lightbulb.svg b/src/vs/editor/contrib/codeAction/lightbulb.svg
similarity index 100%
rename from src/vs/editor/contrib/quickFix/lightbulb.svg
rename to src/vs/editor/contrib/codeAction/lightbulb.svg
diff --git a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
similarity index 80%
rename from src/vs/editor/contrib/quickFix/test/quickFix.test.ts
rename to src/vs/editor/contrib/codeAction/test/codeAction.test.ts
index 9693fce61de..e4b9936405e 100644
--- a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/codeAction.test.ts
@@ -10,11 +10,11 @@ import { TextModel } from 'vs/editor/common/model/textModel';
 import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, ResourceTextEdit, CodeAction, CodeActionContext } from 'vs/editor/common/modes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Range } from 'vs/editor/common/core/range';
-import { getCodeActions } from 'vs/editor/contrib/quickFix/quickFix';
-import { CodeActionKind } from 'vs/editor/contrib/quickFix/codeActionTrigger';
+import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
 import { MarkerSeverity } from 'vs/platform/markers/common/markers';
 
-suite('QuickFix', () => {
+suite('CodeAction', () => {
 
 	let langId = new LanguageIdentifier('fooLang', 17);
 	let uri = URI.parse('untitled:path');
@@ -136,20 +136,20 @@ suite('QuickFix', () => {
 		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
 
 		{
-			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a'));
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a') });
 			assert.equal(actions.length, 2);
 			assert.strictEqual(actions[0].title, 'a');
 			assert.strictEqual(actions[1].title, 'a.b');
 		}
 
 		{
-			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a.b'));
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a.b') });
 			assert.equal(actions.length, 1);
 			assert.strictEqual(actions[0].title, 'a.b');
 		}
 
 		{
-			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a.b.c'));
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a.b.c') });
 			assert.equal(actions.length, 0);
 		}
 	});
@@ -165,8 +165,33 @@ suite('QuickFix', () => {
 
 		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
 
-		const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a'));
+		const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a') });
 		assert.equal(actions.length, 1);
 		assert.strictEqual(actions[0].title, 'a');
 	});
+
+	test('getCodeActions should not return source code action by default', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(): CodeAction[] {
+				return [
+					{ title: 'a', kind: CodeActionKind.Source.value },
+					{ title: 'b', kind: 'b' }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), {});
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: CodeActionKind.Source, includeSourceActions: true });
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'a');
+		}
+	});
 });
diff --git a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts b/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
similarity index 91%
rename from src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts
rename to src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
index a6c3b4663a7..3b41bb9f7b3 100644
--- a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts
+++ b/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
@@ -10,13 +10,13 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { QuickFixOracle } from 'vs/editor/contrib/quickFix/quickFixModel';
+import { CodeActionOracle } from 'vs/editor/contrib/codeAction/codeActionModel';
 import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Range } from 'vs/editor/common/core/range';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
-suite('QuickFix', () => {
+suite('CodeAction', () => {
 
 	const languageIdentifier = new LanguageIdentifier('foo-lang', 3);
 	let uri = URI.parse('untitled:path');
@@ -46,11 +46,11 @@ suite('QuickFix', () => {
 
 	test('Orcale -> marker added', done => {
 
-		const oracle = new QuickFixOracle(editor, markerService, e => {
+		const oracle = new CodeActionOracle(editor, markerService, e => {
 			assert.equal(e.trigger.type, 'auto');
-			assert.ok(e.fixes);
+			assert.ok(e.actions);
 
-			e.fixes.then(fixes => {
+			e.actions.then(fixes => {
 				oracle.dispose();
 				assert.equal(fixes.length, 1);
 				done();
@@ -82,10 +82,10 @@ suite('QuickFix', () => {
 
 		return new Promise((resolve, reject) => {
 
-			const oracle = new QuickFixOracle(editor, markerService, e => {
+			const oracle = new CodeActionOracle(editor, markerService, e => {
 				assert.equal(e.trigger.type, 'auto');
-				assert.ok(e.fixes);
-				e.fixes.then(fixes => {
+				assert.ok(e.actions);
+				e.actions.then(fixes => {
 					oracle.dispose();
 					assert.equal(fixes.length, 1);
 					resolve(undefined);
@@ -115,8 +115,8 @@ suite('QuickFix', () => {
 		}]);
 
 		let fixes: TPromise<any>[] = [];
-		let oracle = new QuickFixOracle(editor, markerService, e => {
-			fixes.push(e.fixes);
+		let oracle = new CodeActionOracle(editor, markerService, e => {
+			fixes.push(e.actions);
 		}, 10);
 
 		editor.setSelection({ startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 13 });
@@ -159,7 +159,7 @@ suite('QuickFix', () => {
 		// case 1 - drag selection over multiple lines -> range of enclosed marker, position or marker
 		await new Promise(resolve => {
 
-			let oracle = new QuickFixOracle(editor, markerService, e => {
+			let oracle = new CodeActionOracle(editor, markerService, e => {
 				assert.equal(e.trigger.type, 'auto');
 				assert.deepEqual(e.range, { startLineNumber: 3, startColumn: 1, endLineNumber: 3, endColumn: 4 });
 				assert.deepEqual(e.position, { lineNumber: 3, column: 1 });
diff --git a/src/vs/editor/contrib/codelens/codelens.ts b/src/vs/editor/contrib/codelens/codelens.ts
index 453b065969f..92821ec5ee6 100644
--- a/src/vs/editor/contrib/codelens/codelens.ts
+++ b/src/vs/editor/contrib/codelens/codelens.ts
@@ -14,6 +14,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { asWinJsPromise } from 'vs/base/common/async';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface ICodeLensData {
 	symbol: ICodeLensSymbol;
@@ -58,7 +59,7 @@ export function getCodeLensData(model: ITextModel): TPromise<ICodeLensData[]> {
 
 registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
 
-	const { resource } = args;
+	let { resource, itemResolveCount } = args;
 	if (!(resource instanceof URI)) {
 		throw illegalArgument();
 	}
@@ -68,5 +69,22 @@ registerLanguageCommand('_executeCodeLensProvider', function (accessor, args) {
 		throw illegalArgument();
 	}
 
-	return getCodeLensData(model).then(value => value.map(item => item.symbol));
+	const result: ICodeLensSymbol[] = [];
+	return getCodeLensData(model).then(value => {
+
+		let resolve: Thenable<any>[] = [];
+
+		for (const item of value) {
+			if (typeof itemResolveCount === 'undefined' || Boolean(item.symbol.command)) {
+				result.push(item.symbol);
+			} else if (itemResolveCount-- > 0) {
+				resolve.push(Promise.resolve(item.provider.resolveCodeLens(model, item.symbol, CancellationToken.None)).then(symbol => result.push(symbol)));
+			}
+		}
+
+		return Promise.all(resolve);
+
+	}).then(() => {
+		return result;
+	});
 });
diff --git a/src/vs/editor/contrib/codelens/codelensController.ts b/src/vs/editor/contrib/codelens/codelensController.ts
index f3e26373bc6..1c714b60884 100644
--- a/src/vs/editor/contrib/codelens/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/codelensController.ts
@@ -10,6 +10,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { Position } from 'vs/editor/common/core/position';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { CodeLensProviderRegistry, ICodeLensSymbol } from 'vs/editor/common/modes';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
@@ -218,8 +219,17 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 			}
 		}
 
-		const centeredRange = this._editor.getCenteredRangeInViewport();
-		const shouldRestoreCenteredRange = centeredRange && (groups.length !== this._lenses.length && this._editor.getScrollTop() !== 0);
+		let visiblePosition: Position = null;
+		let visiblePositionScrollDelta = 0;
+		if (this._editor.getScrollTop() !== 0) {
+			const visibleRanges = this._editor.getVisibleRanges();
+			if (visibleRanges.length > 0) {
+				visiblePosition = visibleRanges[0].getStartPosition();
+				const visiblePositionScrollTop = this._editor.getTopForPosition(visiblePosition.lineNumber, visiblePosition.column);
+				visiblePositionScrollDelta = this._editor.getScrollTop() - visiblePositionScrollTop;
+			}
+		}
+
 		this._editor.changeDecorations((changeAccessor) => {
 			this._editor.changeViewZones((accessor) => {
 
@@ -259,8 +269,10 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 				helper.commit(changeAccessor);
 			});
 		});
-		if (shouldRestoreCenteredRange) {
-			this._editor.revealRangeInCenter(centeredRange, editorCommon.ScrollType.Immediate);
+
+		if (visiblePosition) {
+			const visiblePositionScrollTop = this._editor.getTopForPosition(visiblePosition.lineNumber, visiblePosition.column);
+			this._editor.setScrollTop(visiblePositionScrollTop + visiblePositionScrollDelta);
 		}
 	}
 
diff --git a/src/vs/editor/contrib/colorPicker/color.ts b/src/vs/editor/contrib/colorPicker/color.ts
index d064e5e27f3..e3f8d687510 100644
--- a/src/vs/editor/contrib/colorPicker/color.ts
+++ b/src/vs/editor/contrib/colorPicker/color.ts
@@ -3,10 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import URI from 'vs/base/common/uri';
+
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ColorProviderRegistry, DocumentColorProvider, IColorInformation, IColorPresentation } from 'vs/editor/common/modes';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { ITextModel } from 'vs/editor/common/model';
+import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
+import { Range, IRange } from 'vs/editor/common/core/range';
+import { illegalArgument } from 'vs/base/common/errors';
+import { IModelService } from 'vs/editor/common/services/modelService';
+
 
 export interface IColorData {
 	colorInfo: IColorInformation;
@@ -30,3 +37,57 @@ export function getColors(model: ITextModel): TPromise<IColorData[]> {
 export function getColorPresentations(model: ITextModel, colorInfo: IColorInformation, provider: DocumentColorProvider): TPromise<IColorPresentation[]> {
 	return asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token));
 }
+
+registerLanguageCommand('_executeDocumentColorProvider', function (accessor, args) {
+
+	const { resource } = args;
+	if (!(resource instanceof URI)) {
+		throw illegalArgument();
+	}
+
+	const model = accessor.get(IModelService).getModel(resource);
+	if (!model) {
+		throw illegalArgument();
+	}
+
+	const rawCIs: { range: IRange, color: [number, number, number, number] }[] = [];
+	const providers = ColorProviderRegistry.ordered(model).reverse();
+	const promises = providers.map(provider => asWinJsPromise(token => provider.provideDocumentColors(model, token)).then(result => {
+		if (Array.isArray(result)) {
+			for (let ci of result) {
+				rawCIs.push({ range: ci.range, color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] });
+			}
+		}
+	}));
+
+	return TPromise.join(promises).then(() => rawCIs);
+});
+
+
+registerLanguageCommand('_executeColorPresentationProvider', function (accessor, args) {
+
+	const { resource, color, range } = args;
+	if (!(resource instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
+		throw illegalArgument();
+	}
+	const [red, green, blue, alpha] = color;
+
+	const model = accessor.get(IModelService).getModel(resource);
+	if (!model) {
+		throw illegalArgument();
+	}
+
+	const colorInfo = {
+		range,
+		color: { red, green, blue, alpha }
+	};
+
+	const presentations: IColorPresentation[] = [];
+	const providers = ColorProviderRegistry.ordered(model).reverse();
+	const promises = providers.map(provider => asWinJsPromise(token => provider.provideColorPresentations(model, colorInfo, token)).then(result => {
+		if (Array.isArray(result)) {
+			presentations.push(...result);
+		}
+	}));
+	return TPromise.join(promises).then(() => presentations);
+});
diff --git a/src/vs/editor/contrib/colorPicker/colorDetector.ts b/src/vs/editor/contrib/colorPicker/colorDetector.ts
index b839e90d207..97fbb7b8852 100644
--- a/src/vs/editor/contrib/colorPicker/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/colorDetector.ts
@@ -16,6 +16,7 @@ import { ColorProviderRegistry } from 'vs/editor/common/modes';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { getColors, IColorData } from 'vs/editor/contrib/colorPicker/color';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
 const MAX_DECORATORS = 500;
 
@@ -153,7 +154,7 @@ export class ColorDetector implements IEditorContribution {
 				endLineNumber: c.colorInfo.range.endLineNumber,
 				endColumn: c.colorInfo.range.endColumn
 			},
-			options: {}
+			options: ModelDecorationOptions.EMPTY
 		}));
 
 		this._decorationsIds = this._editor.deltaDecorations(this._decorationsIds, decorations);
diff --git a/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
index 2bd89430b41..5a8f2a463a7 100644
--- a/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
+++ b/src/vs/editor/contrib/colorPicker/colorPickerWidget.ts
@@ -13,7 +13,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import { GlobalMouseMoveMonitor, IStandardMouseMoveEventData, standardMouseMoveMerger } from 'vs/base/browser/globalMouseMoveMonitor';
 import { Color, RGBA, HSVA } from 'vs/base/common/color';
 import { editorHoverBackground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 
 const $ = dom.$;
 
@@ -23,7 +23,7 @@ export class ColorPickerHeader extends Disposable {
 	private pickedColorNode: HTMLElement;
 	private backgroundColor: Color;
 
-	constructor(container: HTMLElement, private model: ColorPickerModel) {
+	constructor(container: HTMLElement, private model: ColorPickerModel, themeService: IThemeService) {
 		super();
 
 		this.domNode = $('.colorpicker-header');
@@ -34,6 +34,7 @@ export class ColorPickerHeader extends Disposable {
 		const colorBox = dom.append(this.domNode, $('.original-color'));
 		colorBox.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor);
 
+		this.backgroundColor = themeService.getTheme().getColor(editorHoverBackground) || Color.white;
 		this._register(registerThemingParticipant((theme, collector) => {
 			this.backgroundColor = theme.getColor(editorHoverBackground) || Color.white;
 		}));
@@ -332,7 +333,7 @@ export class ColorPickerWidget extends Widget {
 
 	body: ColorPickerBody;
 
-	constructor(container: Node, private model: ColorPickerModel, private pixelRatio: number) {
+	constructor(container: Node, private model: ColorPickerModel, private pixelRatio: number, themeService: IThemeService) {
 		super();
 
 		this._register(onDidChangeZoomLevel(() => this.layout()));
@@ -340,7 +341,7 @@ export class ColorPickerWidget extends Widget {
 		const element = $('.colorpicker-widget');
 		container.appendChild(element);
 
-		const header = new ColorPickerHeader(element, this.model);
+		const header = new ColorPickerHeader(element, this.model, themeService);
 		this.body = new ColorPickerBody(element, this.model, this.pixelRatio);
 
 		this._register(header);
diff --git a/src/vs/editor/contrib/comment/blockCommentCommand.ts b/src/vs/editor/contrib/comment/blockCommentCommand.ts
index 3c8caf720d5..a2e51740ebd 100644
--- a/src/vs/editor/contrib/comment/blockCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/blockCommentCommand.ts
@@ -32,10 +32,24 @@ export class BlockCommentCommand implements editorCommon.ICommand {
 		if (offset + needleLength > haystackLength) {
 			return false;
 		}
+
 		for (let i = 0; i < needleLength; i++) {
-			if (haystack.charCodeAt(offset + i) !== needle.charCodeAt(i)) {
-				return false;
+			const codeA = haystack.charCodeAt(offset + i);
+			const codeB = needle.charCodeAt(i);
+
+			if (codeA === codeB) {
+				continue;
 			}
+			if (codeA >= CharCode.A && codeA <= CharCode.Z && codeA + 32 === codeB) {
+				// codeA is upper-case variant of codeB
+				continue;
+			}
+			if (codeB >= CharCode.A && codeB <= CharCode.Z && codeB + 32 === codeA) {
+				// codeB is upper-case variant of codeA
+				continue;
+			}
+
+			return false;
 		}
 		return true;
 	}
diff --git a/src/vs/editor/contrib/comment/lineCommentCommand.ts b/src/vs/editor/contrib/comment/lineCommentCommand.ts
index 4a31a0424b7..fd3c9a3912a 100644
--- a/src/vs/editor/contrib/comment/lineCommentCommand.ts
+++ b/src/vs/editor/contrib/comment/lineCommentCommand.ts
@@ -336,10 +336,10 @@ export class LineCommentCommand implements editorCommon.ICommand {
 		}
 
 		return new Selection(
-			result.startLineNumber,
-			result.startColumn + this._deltaColumn,
-			result.endLineNumber,
-			result.endColumn + this._deltaColumn
+			result.selectionStartLineNumber,
+			result.selectionStartColumn + this._deltaColumn,
+			result.positionLineNumber,
+			result.positionColumn + this._deltaColumn
 		);
 	}
 
diff --git a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
index e1e61fa2262..932e73bde2e 100644
--- a/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
+++ b/src/vs/editor/contrib/comment/test/lineCommentCommand.test.ts
@@ -45,6 +45,25 @@ suite('Editor Contrib - Line Comment Command', () => {
 		);
 	});
 
+	test('case insensitive', function () {
+		function testLineCommentCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
+			let mode = new CommentMode({ lineComment: 'rem' });
+			testCommand(lines, mode.getLanguageIdentifier(), selection, (sel) => new LineCommentCommand(sel, 4, Type.Toggle), expectedLines, expectedSelection);
+			mode.dispose();
+		}
+
+		testLineCommentCommand(
+			[
+				'REM some text'
+			],
+			new Selection(1, 1, 1, 1),
+			[
+				'some text'
+			],
+			new Selection(1, 1, 1, 1)
+		);
+	});
+
 	function createSimpleModel(lines: string[]): ISimpleModel {
 		return {
 			getLineContent: (lineNumber: number) => {
@@ -237,7 +256,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# some text',
 				'\t!@# some more text'
 			],
-			new Selection(1, 1, 2, 2)
+			new Selection(2, 2, 1, 1)
 		);
 	});
 
@@ -252,7 +271,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# some text',
 				'    !@# some more text'
 			],
-			new Selection(1, 1, 2, 2)
+			new Selection(2, 2, 1, 1)
 		);
 	});
 
@@ -271,7 +290,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'',
 				'\t!@# some more text'
 			],
-			new Selection(1, 1, 4, 2)
+			new Selection(4, 2, 1, 1)
 		);
 	});
 
@@ -288,7 +307,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t   ',
 				'\t\tsome more text'
 			],
-			new Selection(1, 1, 3, 2)
+			new Selection(3, 2, 1, 1)
 		);
 	});
 
@@ -305,7 +324,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'\t!@# ',
 				'\t\tsome more text'
 			],
-			new Selection(1, 1, 3, 1)
+			new Selection(3, 1, 1, 1)
 		);
 	});
 
@@ -350,7 +369,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'first!@#',
 				'\t!@# second line'
 			],
-			new Selection(2, 1, 2, 7)
+			new Selection(2, 7, 2, 1)
 		);
 	});
 
@@ -371,7 +390,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 1)
+			new Selection(2, 1, 1, 5)
 		);
 	});
 
@@ -392,7 +411,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 8)
+			new Selection(2, 8, 1, 5)
 		);
 	});
 
@@ -413,7 +432,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'!@# fourth line',
 				'fifth'
 			],
-			new Selection(3, 5, 4, 8)
+			new Selection(4, 8, 3, 5)
 		);
 	});
 
@@ -474,7 +493,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 2, 8)
+			new Selection(2, 8, 1, 5)
 		);
 
 		testLineCommentCommand(
@@ -493,7 +512,7 @@ suite('Editor Contrib - Line Comment Command', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 2, 3)
+			new Selection(2, 3, 1, 1)
 		);
 	});
 
@@ -588,6 +607,21 @@ suite('Editor Contrib - Line Comment Command', () => {
 			new Selection(1, 1, 8, 60)
 		);
 	});
+
+	test('issue #47004: Toggle comments shouldn\'t move cursor', () => {
+		testAddLineCommentCommand(
+			[
+				'    A line',
+				'    Another line'
+			],
+			new Selection(2, 7, 1, 1),
+			[
+				'    !@# A line',
+				'    !@# Another line'
+			],
+			new Selection(2, 11, 1, 1)
+		);
+	});
 });
 
 suite('Editor Contrib - Line Comment As Block Comment', () => {
@@ -636,7 +670,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 1, 6)
+			new Selection(1, 6, 1, 1)
 		);
 	});
 
@@ -678,7 +712,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 3, 2)
+			new Selection(3, 2, 1, 5)
 		);
 
 		testLineCommentCommand(
@@ -697,7 +731,7 @@ suite('Editor Contrib - Line Comment As Block Comment', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 1, 3, 11)
+			new Selection(3, 11, 1, 1)
 		);
 	});
 });
@@ -823,7 +857,7 @@ suite('Editor Contrib - Line Comment As Block Comment 2', () => {
 				'fourth line',
 				'\t\tfifth\t\t'
 			],
-			new Selection(5, 3, 5, 8)
+			new Selection(5, 8, 5, 3)
 		);
 
 		testLineCommentCommand(
@@ -842,7 +876,7 @@ suite('Editor Contrib - Line Comment As Block Comment 2', () => {
 				'fourth line',
 				'\t\tfifth\t\t'
 			],
-			new Selection(5, 3, 5, 8)
+			new Selection(5, 8, 5, 3)
 		);
 
 		testLineCommentCommand(
diff --git a/src/vs/editor/contrib/dnd/dnd.ts b/src/vs/editor/contrib/dnd/dnd.ts
index 6cc7e1aced4..25a6ccf4363 100644
--- a/src/vs/editor/contrib/dnd/dnd.ts
+++ b/src/vs/editor/contrib/dnd/dnd.ts
@@ -173,22 +173,17 @@ export class DragAndDropController implements editorCommon.IEditorContribution {
 	});
 
 	public showAt(position: Position): void {
-		this._editor.changeDecorations(changeAccessor => {
-			let newDecorations: IModelDeltaDecoration[] = [];
-			newDecorations.push({
-				range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
-				options: DragAndDropController._DECORATION_OPTIONS
-			});
+		let newDecorations: IModelDeltaDecoration[] = [{
+			range: new Range(position.lineNumber, position.column, position.lineNumber, position.column),
+			options: DragAndDropController._DECORATION_OPTIONS
+		}];
 
-			this._dndDecorationIds = changeAccessor.deltaDecorations(this._dndDecorationIds, newDecorations);
-		});
+		this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, newDecorations);
 		this._editor.revealPosition(position, editorCommon.ScrollType.Immediate);
 	}
 
 	private _removeDecoration(): void {
-		this._editor.changeDecorations(changeAccessor => {
-			changeAccessor.deltaDecorations(this._dndDecorationIds, []);
-		});
+		this._dndDecorationIds = this._editor.deltaDecorations(this._dndDecorationIds, []);
 	}
 
 	private _hitContent(target: IMouseTarget): boolean {
diff --git a/src/vs/editor/contrib/find/findController.ts b/src/vs/editor/contrib/find/findController.ts
index 1b01a612ecf..1150a26fac9 100644
--- a/src/vs/editor/contrib/find/findController.ts
+++ b/src/vs/editor/contrib/find/findController.ts
@@ -446,8 +446,8 @@ export class StartFindWithSelectionAction extends EditorAction {
 	constructor() {
 		super({
 			id: FIND_IDS.StartFindWithSelection,
-			label: nls.localize('startFindAction', "Find"),
-			alias: 'Find',
+			label: nls.localize('startFindWithSelectionAction', "Find With Selection"),
+			alias: 'Find With Selection',
 			precondition: null,
 			kbOpts: {
 				kbExpr: null,
diff --git a/src/vs/editor/contrib/find/findDecorations.ts b/src/vs/editor/contrib/find/findDecorations.ts
index 84ddb11b262..ff1c795d2e3 100644
--- a/src/vs/editor/contrib/find/findDecorations.ts
+++ b/src/vs/editor/contrib/find/findDecorations.ts
@@ -267,6 +267,7 @@ export class FindDecorations implements IDisposable {
 
 	private static readonly _CURRENT_FIND_MATCH_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 13,
 		className: 'currentFindMatch',
 		showIfCollapsed: true,
 		overviewRuler: {
diff --git a/src/vs/editor/contrib/find/findWidget.ts b/src/vs/editor/contrib/find/findWidget.ts
index a852de93cbc..83ff2daa50a 100644
--- a/src/vs/editor/contrib/find/findWidget.ts
+++ b/src/vs/editor/contrib/find/findWidget.ts
@@ -1066,48 +1066,50 @@ export class SimpleButton extends Widget {
 // theming
 
 registerThemingParticipant((theme, collector) => {
-	function addBackgroundColorRule(selector: string, color: Color): void {
+	const addBackgroundColorRule = (selector: string, color: Color): void => {
 		if (color) {
 			collector.addRule(`.monaco-editor ${selector} { background-color: ${color}; }`);
 		}
-	}
+	};
 
 	addBackgroundColorRule('.findMatch', theme.getColor(editorFindMatchHighlight));
 	addBackgroundColorRule('.currentFindMatch', theme.getColor(editorFindMatch));
 	addBackgroundColorRule('.findScope', theme.getColor(editorFindRangeHighlight));
 
-	let widgetBackground = theme.getColor(editorWidgetBackground);
+	const widgetBackground = theme.getColor(editorWidgetBackground);
 	addBackgroundColorRule('.find-widget', widgetBackground);
 
-	let widgetShadowColor = theme.getColor(widgetShadow);
+	const widgetShadowColor = theme.getColor(widgetShadow);
 	if (widgetShadowColor) {
 		collector.addRule(`.monaco-editor .find-widget { box-shadow: 0 2px 8px ${widgetShadowColor}; }`);
 	}
 
-	let findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
+	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
 	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-editor .findMatch { border: 1px dotted ${findMatchHighlightBorder}; -moz-box-sizing: border-box; box-sizing: border-box; }`);
-	}
-	let findMatchBorder = theme.getColor(editorFindMatchBorder);
-	if (findMatchBorder) {
-		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${findMatchBorder}; padding: 1px; -moz-box-sizing: border-box; box-sizing: border-box; }`);
-	}
-	let findRangeHighlightBorder = theme.getColor(editorFindRangeHighlightBorder);
-	if (findRangeHighlightBorder) {
-		collector.addRule(`.monaco-editor .findScope { border: 1px dashed ${findRangeHighlightBorder}; }`);
+		collector.addRule(`.monaco-editor .findMatch { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${findMatchHighlightBorder}; box-sizing: border-box; }`);
 	}
 
-	let hcBorder = theme.getColor(contrastBorder);
+	const findMatchBorder = theme.getColor(editorFindMatchBorder);
+	if (findMatchBorder) {
+		collector.addRule(`.monaco-editor .currentFindMatch { border: 2px solid ${findMatchBorder}; padding: 1px; box-sizing: border-box; }`);
+	}
+
+	const findRangeHighlightBorder = theme.getColor(editorFindRangeHighlightBorder);
+	if (findRangeHighlightBorder) {
+		collector.addRule(`.monaco-editor .findScope { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${findRangeHighlightBorder}; }`);
+	}
+
+	const hcBorder = theme.getColor(contrastBorder);
 	if (hcBorder) {
 		collector.addRule(`.monaco-editor .find-widget { border: 2px solid ${hcBorder}; }`);
 	}
 
-	let error = theme.getColor(errorForeground);
+	const error = theme.getColor(errorForeground);
 	if (error) {
 		collector.addRule(`.monaco-editor .find-widget.no-results .matchesCount { color: ${error}; }`);
 	}
 
-	let border = theme.getColor(editorWidgetBorder);
+	const border = theme.getColor(editorWidgetBorder);
 	if (border) {
 		collector.addRule(`.monaco-editor .find-widget .monaco-sash { background-color: ${border}; width: 3px !important; margin-left: -4px;}`);
 	}
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index b9c2f1131bf..4d54fef449f 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -2,10 +2,10 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-/// <amd-dependency path="vs/css!./folding" />
 
 'use strict';
 
+import 'vs/css!./folding';
 import * as nls from 'vs/nls';
 import * as types from 'vs/base/common/types';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
@@ -28,7 +28,7 @@ import { IRange } from 'vs/editor/common/core/range';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { IndentRangeProvider } from 'vs/editor/contrib/folding/indentRangeProvider';
 import { IPosition } from 'vs/editor/common/core/position';
-import { FoldingProviderRegistry, FoldingRangeType } from 'vs/editor/common/modes';
+import { FoldingRangeProviderRegistry, FoldingRangeKind } from 'vs/editor/common/modes';
 import { SyntaxRangeProvider } from './syntaxRangeProvider';
 import { CancellationToken } from 'vs/base/common/cancellation';
 
@@ -50,6 +50,7 @@ export class FoldingController implements IEditorContribution {
 	private editor: ICodeEditor;
 	private _isEnabled: boolean;
 	private _autoHideFoldingControls: boolean;
+	private _useFoldingProviders: boolean;
 
 	private foldingDecorationProvider: FoldingDecorationProvider;
 
@@ -72,6 +73,7 @@ export class FoldingController implements IEditorContribution {
 		this.editor = editor;
 		this._isEnabled = this.editor.getConfiguration().contribInfo.folding;
 		this._autoHideFoldingControls = this.editor.getConfiguration().contribInfo.showFoldingControls === 'mouseover';
+		this._useFoldingProviders = this.editor.getConfiguration().contribInfo.foldingStrategy !== 'indentation';
 
 		this.globalToDispose = [];
 		this.localToDispose = [];
@@ -80,7 +82,7 @@ export class FoldingController implements IEditorContribution {
 		this.foldingDecorationProvider.autoHideFoldingControls = this._autoHideFoldingControls;
 
 		this.globalToDispose.push(this.editor.onDidChangeModel(() => this.onModelChanged()));
-		this.globalToDispose.push(FoldingProviderRegistry.onDidChange(() => this.onModelChanged()));
+		this.globalToDispose.push(FoldingRangeProviderRegistry.onDidChange(() => this.onFoldingStrategyChanged()));
 
 		this.globalToDispose.push(this.editor.onDidChangeConfiguration((e: IConfigurationChangedEvent) => {
 			if (e.contribInfo) {
@@ -95,6 +97,11 @@ export class FoldingController implements IEditorContribution {
 					this.foldingDecorationProvider.autoHideFoldingControls = this._autoHideFoldingControls;
 					this.onModelContentChanged();
 				}
+				let oldUseFoldingProviders = this._useFoldingProviders;
+				this._useFoldingProviders = this.editor.getConfiguration().contribInfo.foldingStrategy !== 'indentation';
+				if (oldUseFoldingProviders !== this._useFoldingProviders) {
+					this.onFoldingStrategyChanged();
+				}
 			}
 		}));
 		this.globalToDispose.push({ dispose: () => dispose(this.localToDispose) });
@@ -190,11 +197,16 @@ export class FoldingController implements IEditorContribution {
 		this.onModelContentChanged();
 	}
 
+	private onFoldingStrategyChanged() {
+		this.rangeProvider = null;
+		this.onModelContentChanged();
+	}
+
 	private getRangeProvider(): RangeProvider {
 		if (!this.rangeProvider) {
-			let foldingProviders = FoldingProviderRegistry.ordered(this.foldingModel.textModel);
-			if (foldingProviders.length) {
-				this.rangeProvider = new SyntaxRangeProvider(foldingProviders);
+			if (this._useFoldingProviders) {
+				let foldingProviders = FoldingRangeProviderRegistry.ordered(this.foldingModel.textModel);
+				this.rangeProvider = foldingProviders.length ? new SyntaxRangeProvider(foldingProviders) : new IndentRangeProvider();
 			} else {
 				this.rangeProvider = new IndentRangeProvider();
 			}
@@ -572,7 +584,7 @@ class FoldAllBlockCommentsAction extends FoldingAction<void> {
 
 	invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor): void {
 		if (foldingModel.regions.hasTypes()) {
-			setCollapseStateForType(foldingModel, FoldingRangeType.Comment, true);
+			setCollapseStateForType(foldingModel, FoldingRangeKind.Comment.value, true);
 		} else {
 			let comments = LanguageConfigurationRegistry.getComments(editor.getModel().getLanguageIdentifier().id);
 			if (comments && comments.blockCommentStartToken) {
@@ -600,7 +612,7 @@ class FoldAllRegionsAction extends FoldingAction<void> {
 
 	invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor): void {
 		if (foldingModel.regions.hasTypes()) {
-			setCollapseStateForType(foldingModel, FoldingRangeType.Region, true);
+			setCollapseStateForType(foldingModel, FoldingRangeKind.Region.value, true);
 		} else {
 			let foldingRules = LanguageConfigurationRegistry.getFoldingRules(editor.getModel().getLanguageIdentifier().id);
 			if (foldingRules && foldingRules.markers && foldingRules.markers.start) {
@@ -628,7 +640,7 @@ class UnfoldAllRegionsAction extends FoldingAction<void> {
 
 	invoke(foldingController: FoldingController, foldingModel: FoldingModel, editor: ICodeEditor): void {
 		if (foldingModel.regions.hasTypes()) {
-			setCollapseStateForType(foldingModel, FoldingRangeType.Region, false);
+			setCollapseStateForType(foldingModel, FoldingRangeKind.Region.value, false);
 		} else {
 			let foldingRules = LanguageConfigurationRegistry.getFoldingRules(editor.getModel().getLanguageIdentifier().id);
 			if (foldingRules && foldingRules.markers && foldingRules.markers.start) {
diff --git a/src/vs/editor/contrib/folding/foldingDecorations.ts b/src/vs/editor/contrib/folding/foldingDecorations.ts
index fcc392cb184..17359b411fb 100644
--- a/src/vs/editor/contrib/folding/foldingDecorations.ts
+++ b/src/vs/editor/contrib/folding/foldingDecorations.ts
@@ -10,18 +10,18 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 export class FoldingDecorationProvider implements IDecorationProvider {
 
-	private COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		afterContentClassName: 'inline-folded',
 		linesDecorationsClassName: 'folding collapsed'
 	});
 
-	private EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		linesDecorationsClassName: 'folding'
 	});
 
-	private EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
+	private static EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
 		linesDecorationsClassName: 'folding alwaysShowFoldIcons'
 	});
@@ -33,11 +33,11 @@ export class FoldingDecorationProvider implements IDecorationProvider {
 
 	getDecorationOption(isCollapsed: boolean): ModelDecorationOptions {
 		if (isCollapsed) {
-			return this.COLLAPSED_VISUAL_DECORATION;
+			return FoldingDecorationProvider.COLLAPSED_VISUAL_DECORATION;
 		} else if (this.autoHideFoldingControls) {
-			return this.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;
+			return FoldingDecorationProvider.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;
 		} else {
-			return this.EXPANDED_VISUAL_DECORATION;
+			return FoldingDecorationProvider.EXPANDED_VISUAL_DECORATION;
 		}
 	}
 
diff --git a/src/vs/editor/contrib/folding/hiddenRangeModel.ts b/src/vs/editor/contrib/folding/hiddenRangeModel.ts
index 2ebd17b2acf..0caf73939a8 100644
--- a/src/vs/editor/contrib/folding/hiddenRangeModel.ts
+++ b/src/vs/editor/contrib/folding/hiddenRangeModel.ts
@@ -8,7 +8,7 @@ import { Range, IRange } from 'vs/editor/common/core/range';
 import { FoldingModel, CollapseMemento } from 'vs/editor/contrib/folding/foldingModel';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Selection } from 'vs/editor/common/core/selection';
-import { findFirst } from 'vs/base/common/arrays';
+import { findFirstInSorted } from 'vs/base/common/arrays';
 
 export class HiddenRangeModel {
 	private _foldingModel: FoldingModel;
@@ -149,7 +149,7 @@ function isInside(line: number, range: IRange) {
 	return line >= range.startLineNumber && line <= range.endLineNumber;
 }
 function findRange(ranges: IRange[], line: number): IRange {
-	let i = findFirst(ranges, r => line < r.startLineNumber) - 1;
+	let i = findFirstInSorted(ranges, r => line < r.startLineNumber) - 1;
 	if (i >= 0 && ranges[i].endLineNumber >= line) {
 		return ranges[i];
 	}
diff --git a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
index 7d5d7447929..eec4d8406c9 100644
--- a/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
+++ b/src/vs/editor/contrib/folding/syntaxRangeProvider.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { FoldingProvider, IFoldingRange, FoldingContext } from 'vs/editor/common/modes';
+import { FoldingRangeProvider, FoldingRange, FoldingContext } from 'vs/editor/common/modes';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
 import { toThenable } from 'vs/base/common/async';
 import { ITextModel } from 'vs/editor/common/model';
@@ -16,7 +16,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 
 const MAX_FOLDING_REGIONS_FOR_INDENT_LIMIT = 5000;
 
-export interface IFoldingRangeData extends IFoldingRange {
+export interface IFoldingRangeData extends FoldingRange {
 	rank: number;
 }
 
@@ -26,7 +26,7 @@ const foldingContext: FoldingContext = {
 
 export class SyntaxRangeProvider implements RangeProvider {
 
-	constructor(private providers: FoldingProvider[]) {
+	constructor(private providers: FoldingRangeProvider[]) {
 	}
 
 	compute(model: ITextModel, cancellationToken: CancellationToken): Thenable<FoldingRegions> {
@@ -41,23 +41,23 @@ export class SyntaxRangeProvider implements RangeProvider {
 
 }
 
-function collectSyntaxRanges(providers: FoldingProvider[], model: ITextModel, cancellationToken: CancellationToken): Thenable<IFoldingRangeData[] | null> {
+function collectSyntaxRanges(providers: FoldingRangeProvider[], model: ITextModel, cancellationToken: CancellationToken): Thenable<IFoldingRangeData[] | null> {
 	let promises = providers.map(provider => toThenable(provider.provideFoldingRanges(model, foldingContext, cancellationToken)));
-	return TPromise.join(promises).then(lists => {
+	return TPromise.join(promises).then(results => {
 		let rangeData: IFoldingRangeData[] = null;
 		if (cancellationToken.isCancellationRequested) {
 			return null;
 		}
-		for (let i = 0; i < lists.length; i++) {
-			let list = lists[i];
-			if (list && Array.isArray(list.ranges)) {
+		for (let i = 0; i < results.length; i++) {
+			let ranges = results[i];
+			if (Array.isArray(ranges)) {
 				if (!Array.isArray(rangeData)) {
 					rangeData = [];
 				}
 				let nLines = model.getLineCount();
-				for (let r of list.ranges) {
-					if (r.startLineNumber > 0 && r.endLineNumber > r.startLineNumber && r.endLineNumber <= nLines) {
-						rangeData.push({ startLineNumber: r.startLineNumber, endLineNumber: r.endLineNumber, rank: i, type: r.type });
+				for (let r of ranges) {
+					if (r.start > 0 && r.end > r.start && r.end <= nLines) {
+						rangeData.push({ start: r.start, end: r.end, rank: i, kind: r.kind });
 					}
 				}
 			}
@@ -145,7 +145,7 @@ export class RangesCollector {
 export function sanitizeRanges(rangeData: IFoldingRangeData[]): FoldingRegions {
 
 	let sorted = rangeData.sort((d1, d2) => {
-		let diff = d1.startLineNumber - d2.startLineNumber;
+		let diff = d1.start - d2.start;
 		if (diff === 0) {
 			diff = d1.rank - d2.rank;
 		}
@@ -158,20 +158,20 @@ export function sanitizeRanges(rangeData: IFoldingRangeData[]): FoldingRegions {
 	for (let entry of sorted) {
 		if (!top) {
 			top = entry;
-			collector.add(entry.startLineNumber, entry.endLineNumber, entry.type, previous.length);
+			collector.add(entry.start, entry.end, entry.kind && entry.kind.value, previous.length);
 		} else {
-			if (entry.startLineNumber > top.startLineNumber) {
-				if (entry.endLineNumber <= top.endLineNumber) {
+			if (entry.start > top.start) {
+				if (entry.end <= top.end) {
 					previous.push(top);
 					top = entry;
-					collector.add(entry.startLineNumber, entry.endLineNumber, entry.type, previous.length);
-				} else if (entry.startLineNumber > top.endLineNumber) {
+					collector.add(entry.start, entry.end, entry.kind && entry.kind.value, previous.length);
+				} else if (entry.start > top.end) {
 					do {
 						top = previous.pop();
-					} while (top && entry.startLineNumber > top.endLineNumber);
+					} while (top && entry.start > top.end);
 					previous.push(top);
 					top = entry;
-					collector.add(entry.startLineNumber, entry.endLineNumber, entry.type, previous.length);
+					collector.add(entry.start, entry.end, entry.kind && entry.kind.value, previous.length);
 				}
 			}
 		}
diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
index 3d448d4ae06..bc6ed0f89d9 100644
--- a/src/vs/editor/contrib/format/format.ts
+++ b/src/vs/editor/contrib/format/format.ts
@@ -38,14 +38,14 @@ export function getDocumentRangeFormattingEdits(model: ITextModel, range: Range,
 
 	let result: TextEdit[];
 	return sequence(providers.map(provider => {
-		if (isFalsyOrEmpty(result)) {
-			return () => {
-				return asWinJsPromise(token => provider.provideDocumentRangeFormattingEdits(model, range, options, token)).then(value => {
-					result = value;
-				}, onUnexpectedExternalError);
-			};
-		}
-		return undefined;
+		return () => {
+			if (!isFalsyOrEmpty(result)) {
+				return undefined;
+			}
+			return asWinJsPromise(token => provider.provideDocumentRangeFormattingEdits(model, range, options, token)).then(value => {
+				result = value;
+			}, onUnexpectedExternalError);
+		};
 	})).then(() => result);
 }
 
@@ -59,14 +59,14 @@ export function getDocumentFormattingEdits(model: ITextModel, options: Formattin
 
 	let result: TextEdit[];
 	return sequence(providers.map(provider => {
-		if (isFalsyOrEmpty(result)) {
-			return () => {
-				return asWinJsPromise(token => provider.provideDocumentFormattingEdits(model, options, token)).then(value => {
-					result = value;
-				}, onUnexpectedExternalError);
-			};
-		}
-		return undefined;
+		return () => {
+			if (!isFalsyOrEmpty(result)) {
+				return undefined;
+			}
+			return asWinJsPromise(token => provider.provideDocumentFormattingEdits(model, options, token)).then(value => {
+				result = value;
+			}, onUnexpectedExternalError);
+		};
 	})).then(() => result);
 }
 
diff --git a/src/vs/editor/contrib/format/formatActions.ts b/src/vs/editor/contrib/format/formatActions.ts
index b7801c7b2c2..1344aec8661 100644
--- a/src/vs/editor/contrib/format/formatActions.ts
+++ b/src/vs/editor/contrib/format/formatActions.ts
@@ -161,7 +161,7 @@ class FormatOnType implements editorCommon.IEditorContribution {
 				return;
 			}
 
-			EditOperationsCommand.execute(this.editor, edits, true);
+			EditOperationsCommand.executeAsCommand(this.editor, edits);
 			alertFormattingEdits(edits);
 
 		}, (err) => {
@@ -244,7 +244,7 @@ class FormatOnPaste implements editorCommon.IEditorContribution {
 			if (!state.validate(this.editor) || isFalsyOrEmpty(edits)) {
 				return;
 			}
-			EditOperationsCommand.execute(this.editor, edits, false);
+			EditOperationsCommand.execute(this.editor, edits);
 			alertFormattingEdits(edits);
 		});
 	}
@@ -280,12 +280,12 @@ export abstract class AbstractFormatAction extends EditorAction {
 				return;
 			}
 
-			EditOperationsCommand.execute(editor, edits, false);
+			EditOperationsCommand.execute(editor, edits);
 			alertFormattingEdits(edits);
 			editor.focus();
 		}, err => {
 			if (err instanceof Error && err.name === NoProviderError.Name) {
-				notificationService.info(nls.localize('no.provider', "There is no formatter for '{0}'-files installed.", editor.getModel().getLanguageIdentifier().language));
+				this._notifyNoProviderError(notificationService, editor.getModel().getLanguageIdentifier().language);
 			} else {
 				throw err;
 			}
@@ -293,6 +293,9 @@ export abstract class AbstractFormatAction extends EditorAction {
 	}
 
 	protected abstract _getFormattingEdits(editor: ICodeEditor): TPromise<ISingleEditOperation[]>;
+	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
+		notificationService.info(nls.localize('no.provider', "There is no formatter for '{0}'-files installed.", language));
+	}
 }
 
 export class FormatDocumentAction extends AbstractFormatAction {
@@ -322,6 +325,10 @@ export class FormatDocumentAction extends AbstractFormatAction {
 		const { tabSize, insertSpaces } = model.getOptions();
 		return getDocumentFormattingEdits(model, { tabSize, insertSpaces });
 	}
+
+	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
+		notificationService.info(nls.localize('no.documentprovider', "There is no document formatter for '{0}'-files installed.", language));
+	}
 }
 
 export class FormatSelectionAction extends AbstractFormatAction {
@@ -349,6 +356,10 @@ export class FormatSelectionAction extends AbstractFormatAction {
 		const { tabSize, insertSpaces } = model.getOptions();
 		return getDocumentRangeFormattingEdits(model, editor.getSelection(), { tabSize, insertSpaces });
 	}
+
+	protected _notifyNoProviderError(notificationService: INotificationService, language: string): void {
+		notificationService.info(nls.localize('no.selectionprovider', "There is no selection formatter for '{0}'-files installed.", language));
+	}
 }
 
 registerEditorContribution(FormatOnType);
diff --git a/src/vs/editor/contrib/format/formatCommand.ts b/src/vs/editor/contrib/format/formatCommand.ts
index 42f320e538f..5b38129e3ae 100644
--- a/src/vs/editor/contrib/format/formatCommand.ts
+++ b/src/vs/editor/contrib/format/formatCommand.ts
@@ -15,39 +15,60 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 
 export class EditOperationsCommand implements editorCommon.ICommand {
 
-	static execute(editor: ICodeEditor, edits: TextEdit[], asCommand: boolean) {
-		const cmd = new EditOperationsCommand(edits, editor.getSelection());
-		if (typeof cmd._newEol === 'number') {
-			editor.getModel().setEOL(cmd._newEol);
+	static _handleEolEdits(editor: ICodeEditor, edits: TextEdit[]): ISingleEditOperation[] {
+		let newEol: EndOfLineSequence = undefined;
+		let singleEdits: ISingleEditOperation[] = [];
+
+		for (let edit of edits) {
+			if (typeof edit.eol === 'number') {
+				newEol = edit.eol;
+			}
+			if (edit.range && typeof edit.text === 'string') {
+				singleEdits.push(edit);
+			}
 		}
+
+		if (typeof newEol === 'number') {
+			editor.getModel().setEOL(newEol);
+		}
+
+		return singleEdits;
+	}
+
+	static executeAsCommand(editor: ICodeEditor, _edits: TextEdit[]) {
+		let edits = this._handleEolEdits(editor, _edits);
+		const cmd = new EditOperationsCommand(edits, editor.getSelection());
 		editor.pushUndoStop();
-		if (!asCommand) {
-			editor.executeEdits('formatEditsCommand', cmd._edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
+		editor.executeCommand('formatEditsCommand', cmd);
+		editor.pushUndoStop();
+	}
+
+	static isFullModelReplaceEdit(editor: ICodeEditor, edit: ISingleEditOperation): boolean {
+		const model = editor.getModel();
+		const editRange = model.validateRange(edit.range);
+		const fullModelRange = model.getFullModelRange();
+		return fullModelRange.equalsRange(editRange);
+	}
+
+	static execute(editor: ICodeEditor, _edits: TextEdit[]) {
+		let edits = this._handleEolEdits(editor, _edits);
+		editor.pushUndoStop();
+		if (edits.length === 1 && EditOperationsCommand.isFullModelReplaceEdit(editor, edits[0])) {
+			// We use replace semantics and hope that markers stay put...
+			editor.executeEdits('formatEditsCommand', edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text)));
 		} else {
-			editor.executeCommand('formatEditsCommand', cmd);
+			editor.executeEdits('formatEditsCommand', edits.map(edit => EditOperation.replaceMove(Range.lift(edit.range), edit.text)));
 		}
 		editor.pushUndoStop();
 	}
 
-	private _edits: TextEdit[];
-	private _newEol: EndOfLineSequence;
-
+	private _edits: ISingleEditOperation[];
 	private _initialSelection: Selection;
 	private _selectionId: string;
 
-	constructor(edits: TextEdit[], initialSelection: Selection) {
+	constructor(edits: ISingleEditOperation[], initialSelection: Selection) {
 		this._initialSelection = initialSelection;
-		this._edits = [];
-		this._newEol = undefined;
-
-		for (let edit of edits) {
-			if (typeof edit.eol === 'number') {
-				this._newEol = edit.eol;
-			}
-			if (edit.range && typeof edit.text === 'string') {
-				this._edits.push(edit);
-			}
-		}
+		this._edits = edits;
 	}
 
 	public getEditOperations(model: ITextModel, builder: editorCommon.IEditOperationBuilder): void {
diff --git a/src/vs/editor/contrib/format/test/formatCommand.test.ts b/src/vs/editor/contrib/format/test/formatCommand.test.ts
index 5b1022fa070..0a9bbde4593 100644
--- a/src/vs/editor/contrib/format/test/formatCommand.test.ts
+++ b/src/vs/editor/contrib/format/test/formatCommand.test.ts
@@ -11,6 +11,7 @@ import { ISingleEditOperation } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { EditOperationsCommand } from 'vs/editor/contrib/format/formatCommand';
 import { testCommand } from 'vs/editor/test/browser/testCommand';
+import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 
 function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): ISingleEditOperation {
 	return {
@@ -310,4 +311,52 @@ suite('FormatCommand', () => {
 		);
 	});
 
+	test('issue #44870', () => {
+		const initialText = [
+			'[',
+			'    {},{',
+			'    }',
+			']',
+		];
+		withTestCodeEditor(initialText, {}, (editor) => {
+			editor.setSelection(new Selection(2, 8, 2, 8));
+			EditOperationsCommand.execute(editor, [
+				editOp(2, 8, 2, 8, ['', '    ']),
+				editOp(2, 9, 3, 5, ['']),
+			]);
+			assert.equal(editor.getValue(), [
+				'[',
+				'    {},',
+				'    {}',
+				']',
+			].join('\n'));
+			assert.deepEqual(editor.getSelection(), new Selection(3, 5, 3, 5));
+		});
+	});
+
+	test('issue #47382: full model replace moves cursor to end of file', () => {
+		const initialText = [
+			'just some',
+			'Text',
+			'...more text'
+		];
+		withTestCodeEditor(initialText, {}, (editor) => {
+			editor.setSelection(new Selection(2, 1, 2, 1));
+			EditOperationsCommand.execute(editor, [{
+				range: new Range(1, 1, 3, 13),
+				text: [
+					'just some',
+					'\tText',
+					'...more text'
+				].join('\n')
+			}]);
+			assert.equal(editor.getValue(), [
+				'just some',
+				'\tText',
+				'...more text'
+			].join('\n'));
+			assert.deepEqual(editor.getSelection(), new Selection(2, 1, 2, 1));
+		});
+	});
+
 });
diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts
index 06c17fa4a3a..e9aa3c4667d 100644
--- a/src/vs/editor/contrib/gotoError/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/gotoError.ts
@@ -17,7 +17,6 @@ import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { registerEditorAction, registerEditorContribution, ServicesAccessor, IActionOptions, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { } from 'vs/platform/theme/common/colorRegistry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -26,6 +25,7 @@ import { compare } from 'vs/base/common/strings';
 import { binarySearch } from 'vs/base/common/arrays';
 import { IEditorService } from 'vs/platform/editor/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { onUnexpectedError } from 'vs/base/common/errors';
 
 class MarkerModel {
 
@@ -233,11 +233,18 @@ class MarkerController implements editorCommon.IEditorContribution {
 		this._model = new MarkerModel(this._editor, markers);
 		this._markerService.onMarkerChanged(this._onMarkerChanged, this, this._disposeOnClose);
 
-		this._widget = new MarkerNavigationWidget(this._editor, this._themeService, this._editorService);
+		this._widget = new MarkerNavigationWidget(this._editor, this._themeService);
 		this._widgetVisible.set(true);
 
 		this._disposeOnClose.push(this._model);
 		this._disposeOnClose.push(this._widget);
+		this._disposeOnClose.push(this._widget.onDidSelectRelatedInformation(related => {
+			this._editorService.openEditor({
+				resource: related.resource,
+				options: { pinned: true, revealIfOpened: true, selection: Range.lift(related).collapseToStart() }
+			}).then(undefined, onUnexpectedError);
+			this.closeMarkersNavigation(false);
+		}));
 		this._disposeOnClose.push(this._editor.onDidChangeModel(() => this._cleanUp()));
 
 		this._disposeOnClose.push(this._model.onCurrentMarkerChanged(marker => {
@@ -261,9 +268,11 @@ class MarkerController implements editorCommon.IEditorContribution {
 		return this._model;
 	}
 
-	public closeMarkersNavigation(): void {
+	public closeMarkersNavigation(focusEditor: boolean = true): void {
 		this._cleanUp();
-		this._editor.focus();
+		if (focusEditor) {
+			this._editor.focus();
+		}
 	}
 
 	private _onMarkerChanged(changedResources: URI[]): void {
@@ -276,7 +285,7 @@ class MarkerController implements editorCommon.IEditorContribution {
 	private _getMarkers(): IMarker[] {
 		return this._markerService.read({
 			resource: this._editor.getModel().uri,
-			severities: MarkerSeverity.Error | MarkerSeverity.Warning
+			severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
 		});
 	}
 }
@@ -306,7 +315,7 @@ class MarkerNavigationAction extends EditorAction {
 		}
 
 		// try with the next/prev file
-		let markers = markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning }).sort(MarkerNavigationAction.compareMarker);
+		let markers = markerService.read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info }).sort(MarkerNavigationAction.compareMarker);
 		if (markers.length === 0) {
 			return undefined;
 		}
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
index 0e3ac5d116d..4166d476ab5 100644
--- a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -22,10 +22,9 @@ import { editorErrorForeground, editorErrorBorder, editorWarningForeground, edit
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ScrollType } from 'vs/editor/common/editorCommon';
-import { getBaseLabel } from 'vs/base/common/labels';
-import { IEditorService } from 'vs/platform/editor/common/editor';
-import { onUnexpectedError } from 'vs/base/common/errors';
+import { getBaseLabel, getPathLabel } from 'vs/base/common/labels';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { Event, Emitter } from 'vs/base/common/event';
 
 class MessageWidget {
 
@@ -39,7 +38,7 @@ class MessageWidget {
 	private readonly _relatedDiagnostics = new WeakMap<HTMLElement, IRelatedInformation>();
 	private readonly _disposables: IDisposable[] = [];
 
-	constructor(parent: HTMLElement, editor: ICodeEditor, editorService: IEditorService) {
+	constructor(parent: HTMLElement, editor: ICodeEditor, onRelatedInformation: (related: IRelatedInformation) => void, ) {
 		this._editor = editor;
 
 		const domNode = document.createElement('div');
@@ -56,10 +55,7 @@ class MessageWidget {
 			event.preventDefault();
 			const related = this._relatedDiagnostics.get(event.target);
 			if (related) {
-				editorService.openEditor({
-					resource: related.resource,
-					options: { pinned: true, revealIfOpened: true, selection: Range.lift(related).collapseToStart() }
-				}).then(undefined, onUnexpectedError);
+				onRelatedInformation(related);
 			}
 		}));
 
@@ -114,6 +110,7 @@ class MessageWidget {
 				let relatedResource = document.createElement('span');
 				dom.addClass(relatedResource, 'filename');
 				relatedResource.innerHTML = `${getBaseLabel(related.resource)}(${related.startLineNumber}, ${related.startColumn}): `;
+				relatedResource.title = getPathLabel(related.resource);
 				this._relatedDiagnostics.set(relatedResource, related);
 
 				let relatedMessage = document.createElement('span');
@@ -148,11 +145,13 @@ export class MarkerNavigationWidget extends ZoneWidget {
 	private _callOnDispose: IDisposable[] = [];
 	private _severity: MarkerSeverity;
 	private _backgroundColor: Color;
+	private _onDidSelectRelatedInformation = new Emitter<IRelatedInformation>();
+
+	readonly onDidSelectRelatedInformation: Event<IRelatedInformation> = this._onDidSelectRelatedInformation.event;
 
 	constructor(
 		editor: ICodeEditor,
-		private _themeService: IThemeService,
-		private _editorService: IEditorService
+		private _themeService: IThemeService
 	) {
 		super(editor, { showArrow: true, showFrame: true, isAccessible: true });
 		this._severity = MarkerSeverity.Warning;
@@ -208,7 +207,7 @@ export class MarkerNavigationWidget extends ZoneWidget {
 		this._title.className = 'block title';
 		this._container.appendChild(this._title);
 
-		this._message = new MessageWidget(this._container, this.editor, this._editorService);
+		this._message = new MessageWidget(this._container, this.editor, related => this._onDidSelectRelatedInformation.fire(related));
 		this._disposables.push(this._message);
 	}
 
diff --git a/src/vs/editor/contrib/hover/hover.ts b/src/vs/editor/contrib/hover/hover.ts
index abab5279934..a48e61cb54f 100644
--- a/src/vs/editor/contrib/hover/hover.ts
+++ b/src/vs/editor/contrib/hover/hover.ts
@@ -19,7 +19,7 @@ import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/brows
 import { ModesContentHoverWidget } from './modesContentHover';
 import { ModesGlyphHoverWidget } from './modesGlyphHover';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorHoverHighlight, editorHoverBackground, editorHoverBorder, textLinkForeground, textCodeBlockBackground } from 'vs/platform/theme/common/colorRegistry';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer';
@@ -57,7 +57,8 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 
 	constructor(editor: ICodeEditor,
 		@IOpenerService private readonly _openerService: IOpenerService,
-		@IModeService private readonly _modeService: IModeService
+		@IModeService private readonly _modeService: IModeService,
+		@IThemeService private readonly _themeService: IThemeService
 	) {
 		this._editor = editor;
 
@@ -159,7 +160,7 @@ export class ModesHoverController implements editorCommon.IEditorContribution {
 
 	private _createHoverWidget() {
 		const renderer = new MarkdownRenderer(this._editor, this._modeService, this._openerService);
-		this._contentWidget = new ModesContentHoverWidget(this._editor, renderer);
+		this._contentWidget = new ModesContentHoverWidget(this._editor, renderer, this._themeService);
 		this._glyphWidget = new ModesGlyphHoverWidget(this._editor, renderer);
 	}
 
@@ -189,7 +190,13 @@ class ShowHoverAction extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.showHover',
-			label: nls.localize('showHover', "Show Hover"),
+			label: nls.localize({
+				key: 'showHover',
+				comment: [
+					'Label for action that will trigger the showing of a hover in the editor.',
+					'This allows for users to show the hover without using the mouse.'
+				]
+			}, "Show Hover"),
 			alias: 'Show Hover',
 			precondition: null,
 			kbOpts: {
diff --git a/src/vs/editor/contrib/hover/modesContentHover.ts b/src/vs/editor/contrib/hover/modesContentHover.ts
index 186c999c232..36b6e611927 100644
--- a/src/vs/editor/contrib/hover/modesContentHover.ts
+++ b/src/vs/editor/contrib/hover/modesContentHover.ts
@@ -23,6 +23,7 @@ import { ColorDetector } from 'vs/editor/contrib/colorPicker/colorDetector';
 import { Color, RGBA } from 'vs/base/common/color';
 import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
 import { getColorPresentations } from 'vs/editor/contrib/colorPicker/color';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 const $ = dom.$;
 
 class ColorHover {
@@ -169,7 +170,11 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 	private renderDisposable: IDisposable = EmptyDisposable;
 	private toDispose: IDisposable[] = [];
 
-	constructor(editor: ICodeEditor, markdownRenderner: MarkdownRenderer) {
+	constructor(
+		editor: ICodeEditor,
+		markdownRenderner: MarkdownRenderer,
+		private readonly _themeService: IThemeService
+	) {
 		super(ModesContentHoverWidget.ID, editor);
 
 		this._computer = new ModesContentComputer(this._editor);
@@ -331,7 +336,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
 
 				// create blank olor picker model and widget first to ensure it's positioned correctly.
 				const model = new ColorPickerModel(color, [], 0);
-				const widget = new ColorPickerWidget(fragment, model, this._editor.getConfiguration().pixelRatio);
+				const widget = new ColorPickerWidget(fragment, model, this._editor.getConfiguration().pixelRatio, this._themeService);
 
 				getColorPresentations(editorModel, colorInfo, msg.provider).then(colorPresentations => {
 					model.colorPresentations = colorPresentations;
diff --git a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
index 0d8c406b5e7..18548f6eccc 100644
--- a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
@@ -10,7 +10,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
-import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { IInplaceReplaceSupportResult } from 'vs/editor/common/modes';
@@ -131,9 +130,7 @@ class InPlaceReplaceController implements IEditorContribution {
 			this.decorationRemover.cancel();
 			this.decorationRemover = TPromise.timeout(350);
 			this.decorationRemover.then(() => {
-				this.editor.changeDecorations((accessor: IModelDecorationsChangeAccessor) => {
-					this.decorationIds = accessor.deltaDecorations(this.decorationIds, []);
-				});
+				this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 			});
 		});
 	}
diff --git a/src/vs/editor/contrib/indentation/indentation.ts b/src/vs/editor/contrib/indentation/indentation.ts
index 859db38bb06..3ca805ebfad 100644
--- a/src/vs/editor/contrib/indentation/indentation.ts
+++ b/src/vs/editor/contrib/indentation/indentation.ts
@@ -586,18 +586,27 @@ function getIndentationEditOperations(model: ITextModel, builder: IEditOperation
 		spaces += ' ';
 	}
 
-	const content = model.getLinesContent();
-	for (let i = 0; i < content.length; i++) {
-		let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(i + 1);
+	let spacesRegExp = new RegExp(spaces, 'gi');
+
+	for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber <= lineCount; lineNumber++) {
+		let lastIndentationColumn = model.getLineFirstNonWhitespaceColumn(lineNumber);
 		if (lastIndentationColumn === 0) {
-			lastIndentationColumn = model.getLineMaxColumn(i + 1);
+			lastIndentationColumn = model.getLineMaxColumn(lineNumber);
 		}
 
-		const text = (tabsToSpaces ? content[i].substr(0, lastIndentationColumn).replace(/\t/ig, spaces) :
-			content[i].substr(0, lastIndentationColumn).replace(new RegExp(spaces, 'gi'), '\t')) +
-			content[i].substr(lastIndentationColumn);
+		if (lastIndentationColumn === 1) {
+			continue;
+		}
 
-		builder.addEditOperation(new Range(i + 1, 1, i + 1, model.getLineMaxColumn(i + 1)), text);
+		const originalIndentationRange = new Range(lineNumber, 1, lineNumber, lastIndentationColumn);
+		const originalIndentation = model.getValueInRange(originalIndentationRange);
+		const newIndentation = (
+			tabsToSpaces
+				? originalIndentation.replace(/\t/ig, spaces)
+				: originalIndentation.replace(spacesRegExp, '\t')
+		);
+
+		builder.addEditOperation(originalIndentationRange, newIndentation);
 	}
 }
 
diff --git a/src/vs/editor/contrib/indentation/test/indentation.test.ts b/src/vs/editor/contrib/indentation/test/indentation.test.ts
index 1f2e9ff1577..59ece7d34e7 100644
--- a/src/vs/editor/contrib/indentation/test/indentation.test.ts
+++ b/src/vs/editor/contrib/indentation/test/indentation.test.ts
@@ -57,7 +57,7 @@ suite('Editor Contrib - Indentation to Spaces', () => {
 				'fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5)
+			new Selection(1, 9, 1, 9)
 		);
 	});
 
@@ -79,7 +79,7 @@ suite('Editor Contrib - Indentation to Spaces', () => {
 				'   fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5)
+			new Selection(1, 7, 1, 7)
 		);
 	});
 
@@ -157,7 +157,7 @@ suite('Editor Contrib - Indentation to Tabs', () => {
 				'   fourth line',
 				'fifth'
 			],
-			new Selection(1, 5, 1, 5),
+			new Selection(1, 8, 1, 8),
 			2,
 			[
 				'\t\t\tfirst   ',
@@ -169,4 +169,18 @@ suite('Editor Contrib - Indentation to Tabs', () => {
 			new Selection(1, 5, 1, 5)
 		);
 	});
+
+	test('issue #45996', function () {
+		testIndentationToSpacesCommand(
+			[
+				'\tabc',
+			],
+			new Selection(1, 3, 1, 3),
+			4,
+			[
+				'    abc',
+			],
+			new Selection(1, 6, 1, 6)
+		);
+	});
 });
diff --git a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
index 6c3284eb35b..d7ed7bcbf60 100644
--- a/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
+++ b/src/vs/editor/contrib/linesOperations/test/linesOperations.test.ts
@@ -8,12 +8,12 @@ import * as assert from 'assert';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Position } from 'vs/editor/common/core/position';
 import { Handler } from 'vs/editor/common/editorCommon';
-import { ITextModel, DefaultEndOfLine } from 'vs/editor/common/model';
+import { ITextModel } from 'vs/editor/common/model';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { DeleteAllLeftAction, JoinLinesAction, TransposeAction, UpperCaseAction, LowerCaseAction, DeleteAllRightAction, InsertLineBeforeAction, InsertLineAfterAction, IndentLinesAction, SortLinesAscendingAction, SortLinesDescendingAction } from 'vs/editor/contrib/linesOperations/linesOperations';
 import { Cursor } from 'vs/editor/common/controller/cursor';
-import { TextModel } from 'vs/editor/common/model/textModel';
 import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
+import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
 
 suite('Editor Contrib - Line Operations', () => {
 	suite('SortLinesAscendingAction', () => {
@@ -746,17 +746,12 @@ suite('Editor Contrib - Line Operations', () => {
 
 	test('Bug 18276:[editor] Indentation broken when selection is empty', () => {
 
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'function baz() {'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			}
 		);
 
diff --git a/src/vs/editor/contrib/links/links.ts b/src/vs/editor/contrib/links/links.ts
index 61e679cb177..b9814039159 100644
--- a/src/vs/editor/contrib/links/links.ts
+++ b/src/vs/editor/contrib/links/links.ts
@@ -38,8 +38,17 @@ const HOVER_MESSAGE_COMMAND_META = new MarkdownString().appendText(
 		: nls.localize('links.command', "Ctrl + click to execute command")
 );
 
-const HOVER_MESSAGE_GENERAL_ALT = new MarkdownString().appendText(nls.localize('links.navigate.al', "Alt + click to follow link"));
-const HOVER_MESSAGE_COMMAND_ALT = new MarkdownString().appendText(nls.localize('links.command.al', "Alt + click to execute command"));
+const HOVER_MESSAGE_GENERAL_ALT = new MarkdownString().appendText(
+	platform.isMacintosh
+		? nls.localize('links.navigate.al.mac', "Option + click to follow link")
+		: nls.localize('links.navigate.al', "Alt + click to follow link")
+);
+
+const HOVER_MESSAGE_COMMAND_ALT = new MarkdownString().appendText(
+	platform.isMacintosh
+		? nls.localize('links.command.al.mac', "Option + click to execute command")
+		: nls.localize('links.command.al', "Alt + click to execute command")
+);
 
 const decoration = {
 	meta: ModelDecorationOptions.register({
@@ -242,32 +251,30 @@ class LinkDetector implements editorCommon.IEditorContribution {
 
 	private updateDecorations(links: Link[]): void {
 		const useMetaKey = (this.editor.getConfiguration().multiCursorModifier === 'altKey');
-		this.editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-			var oldDecorations: string[] = [];
-			let keys = Object.keys(this.currentOccurrences);
-			for (let i = 0, len = keys.length; i < len; i++) {
-				let decorationId = keys[i];
-				let occurance = this.currentOccurrences[decorationId];
-				oldDecorations.push(occurance.decorationId);
-			}
+		let oldDecorations: string[] = [];
+		let keys = Object.keys(this.currentOccurrences);
+		for (let i = 0, len = keys.length; i < len; i++) {
+			let decorationId = keys[i];
+			let occurance = this.currentOccurrences[decorationId];
+			oldDecorations.push(occurance.decorationId);
+		}
 
-			var newDecorations: IModelDeltaDecoration[] = [];
-			if (links) {
-				// Not sure why this is sometimes null
-				for (var i = 0; i < links.length; i++) {
-					newDecorations.push(LinkOccurrence.decoration(links[i], useMetaKey));
-				}
+		let newDecorations: IModelDeltaDecoration[] = [];
+		if (links) {
+			// Not sure why this is sometimes null
+			for (let i = 0; i < links.length; i++) {
+				newDecorations.push(LinkOccurrence.decoration(links[i], useMetaKey));
 			}
+		}
 
-			var decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations);
+		let decorations = this.editor.deltaDecorations(oldDecorations, newDecorations);
 
-			this.currentOccurrences = {};
-			this.activeLinkDecorationId = null;
-			for (let i = 0, len = decorations.length; i < len; i++) {
-				var occurance = new LinkOccurrence(links[i], decorations[i]);
-				this.currentOccurrences[occurance.decorationId] = occurance;
-			}
-		});
+		this.currentOccurrences = {};
+		this.activeLinkDecorationId = null;
+		for (let i = 0, len = decorations.length; i < len; i++) {
+			let occurance = new LinkOccurrence(links[i], decorations[i]);
+			this.currentOccurrences[occurance.decorationId] = occurance;
+		}
 	}
 
 	private _onEditorMouseMove(mouseEvent: ClickLinkMouseEvent, withKey?: ClickLinkKeyboardEvent): void {
diff --git a/src/vs/editor/contrib/message/messageController.ts b/src/vs/editor/contrib/message/messageController.ts
index 90982184a1c..e80d0f6b90c 100644
--- a/src/vs/editor/contrib/message/messageController.ts
+++ b/src/vs/editor/contrib/message/messageController.ts
@@ -6,9 +6,10 @@
 'use strict';
 
 import 'vs/css!./messageController';
+import * as nls from 'vs/nls';
 import { setDisposableTimeout } from 'vs/base/common/async';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { Range } from 'vs/editor/common/core/range';
 import * as editorCommon from 'vs/editor/common/editorCommon';
@@ -20,11 +21,11 @@ import { registerThemingParticipant, HIGH_CONTRAST } from 'vs/platform/theme/com
 import { inputValidationInfoBorder, inputValidationInfoBackground } from 'vs/platform/theme/common/colorRegistry';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
-export class MessageController implements editorCommon.IEditorContribution {
+export class MessageController extends Disposable implements editorCommon.IEditorContribution {
 
 	private static readonly _id = 'editor.contrib.messageController';
 
-	static CONTEXT_SNIPPET_MODE = new RawContextKey<boolean>('messageVisible', false);
+	static MESSAGE_VISIBLE = new RawContextKey<boolean>('messageVisible', false);
 
 	static get(editor: ICodeEditor): MessageController {
 		return editor.getContribution<MessageController>(MessageController._id);
@@ -43,11 +44,14 @@ export class MessageController implements editorCommon.IEditorContribution {
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
+		super();
 		this._editor = editor;
-		this._visible = MessageController.CONTEXT_SNIPPET_MODE.bindTo(contextKeyService);
+		this._visible = MessageController.MESSAGE_VISIBLE.bindTo(contextKeyService);
+		this._register(this._editor.onDidAttemptReadOnlyEdit(() => this._onDidAttemptReadOnlyEdit()));
 	}
 
 	dispose(): void {
+		super.dispose();
 		this._visible.reset();
 	}
 
@@ -96,6 +100,10 @@ export class MessageController implements editorCommon.IEditorContribution {
 		this._messageListeners = dispose(this._messageListeners);
 		this._messageListeners.push(MessageWidget.fadeOut(this._messageWidget));
 	}
+
+	private _onDidAttemptReadOnlyEdit(): void {
+		this.showMessage(nls.localize('editor.readonly', "Cannot edit in read-only editor"), this._editor.getPosition());
+	}
 }
 
 const MessageCommand = EditorCommand.bindToContribution<MessageController>(MessageController.get);
@@ -103,7 +111,7 @@ const MessageCommand = EditorCommand.bindToContribution<MessageController>(Messa
 
 registerEditorCommand(new MessageCommand({
 	id: 'leaveEditorMessage',
-	precondition: MessageController.CONTEXT_SNIPPET_MODE,
+	precondition: MessageController.MESSAGE_VISIBLE,
 	handler: c => c.closeMessage(),
 	kbOpts: {
 		weight: KeybindingsRegistry.WEIGHT.editorContrib(30),
diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts
index 6561c8b9ab6..f13b5d6167f 100644
--- a/src/vs/editor/contrib/multicursor/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/multicursor.ts
@@ -113,29 +113,25 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction {
 		});
 	}
 
-	private getCursorsForSelection(selection: Selection, editor: ICodeEditor): Selection[] {
+	private getCursorsForSelection(selection: Selection, model: ITextModel, result: Selection[]): void {
 		if (selection.isEmpty()) {
-			return [];
+			return;
 		}
 
-		let model = editor.getModel();
-		let newSelections: Selection[] = [];
 		for (let i = selection.startLineNumber; i < selection.endLineNumber; i++) {
 			let currentLineMaxColumn = model.getLineMaxColumn(i);
-			newSelections.push(new Selection(i, currentLineMaxColumn, i, currentLineMaxColumn));
+			result.push(new Selection(i, currentLineMaxColumn, i, currentLineMaxColumn));
 		}
 		if (selection.endColumn > 1) {
-			newSelections.push(new Selection(selection.endLineNumber, selection.endColumn, selection.endLineNumber, selection.endColumn));
+			result.push(new Selection(selection.endLineNumber, selection.endColumn, selection.endLineNumber, selection.endColumn));
 		}
-
-		return newSelections;
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
-		let selections = editor.getSelections();
-		let newSelections = selections
-			.map((selection) => this.getCursorsForSelection(selection, editor))
-			.reduce((prev, curr) => { return prev.concat(curr); });
+		const model = editor.getModel();
+		const selections = editor.getSelections();
+		let newSelections: Selection[] = [];
+		selections.forEach((sel) => this.getCursorsForSelection(sel, model, newSelections));
 
 		if (newSelections.length > 0) {
 			editor.setSelections(newSelections);
@@ -803,9 +799,7 @@ export class SelectionHighlighter extends Disposable implements IEditorContribut
 		this.state = state;
 
 		if (!this.state) {
-			if (this.decorations.length > 0) {
-				this.decorations = this.editor.deltaDecorations(this.decorations, []);
-			}
+			this.decorations = this.editor.deltaDecorations(this.decorations, []);
 			return;
 		}
 
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
index 0724631045a..2c874d77fd5 100644
--- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -50,6 +50,7 @@ export class ParameterHintsModel extends Disposable {
 	private triggerCharactersListeners: IDisposable[];
 	private active: boolean;
 	private throttledDelayer: RunOnceScheduler;
+	private provideSignatureHelpRequest?: TPromise<boolean, any>;
 
 	constructor(editor: ICodeEditor) {
 		super();
@@ -80,6 +81,11 @@ export class ParameterHintsModel extends Disposable {
 		if (!silent) {
 			this._onCancel.fire(void 0);
 		}
+
+		if (this.provideSignatureHelpRequest) {
+			this.provideSignatureHelpRequest.cancel();
+			this.provideSignatureHelpRequest = undefined;
+		}
 	}
 
 	trigger(delay = ParameterHintsModel.DELAY): void {
@@ -92,7 +98,11 @@ export class ParameterHintsModel extends Disposable {
 	}
 
 	private doTrigger(): void {
-		provideSignatureHelp(this.editor.getModel(), this.editor.getPosition())
+		if (this.provideSignatureHelpRequest) {
+			this.provideSignatureHelpRequest.cancel();
+		}
+
+		this.provideSignatureHelpRequest = provideSignatureHelp(this.editor.getModel(), this.editor.getPosition())
 			.then(null, onUnexpectedError)
 			.then(result => {
 				if (!result || !result.signatures || result.signatures.length === 0) {
diff --git a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
new file mode 100644
index 00000000000..4dce80655b2
--- /dev/null
+++ b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import URI from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { ITextModel } from 'vs/editor/common/model';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { SignatureHelp, SignatureHelpProvider, SignatureHelpProviderRegistry } from 'vs/editor/common/modes';
+import { MockScopeLocation, TestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { IStorageService, NullStorageService } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { ParameterHintsModel } from '../parameterHintsWidget';
+
+function createMockEditor(model: TextModel): TestCodeEditor {
+	const contextKeyService = new MockContextKeyService();
+	const telemetryService = NullTelemetryService;
+	const notificationService = new TestNotificationService();
+	const instantiationService = new InstantiationService(new ServiceCollection(
+		[IContextKeyService, contextKeyService],
+		[ITelemetryService, telemetryService],
+		[IStorageService, NullStorageService],
+		[INotificationService, TestNotificationService]
+	));
+
+	const editor = new TestCodeEditor(new MockScopeLocation(), {}, false, instantiationService, contextKeyService, notificationService);
+	editor.setModel(model);
+	return editor;
+}
+
+
+suite('ParameterHintsModel', () => {
+	let disposables: IDisposable[] = [];
+
+
+	setup(function () {
+		disposables = dispose(disposables);
+	});
+
+	test('Should cancel existing request when new request comes in', () => {
+		const textModel = TextModel.createFromString('abc def', undefined, undefined, URI.parse('test:somefile.ttt'));
+		disposables.push(textModel);
+
+		const editor = createMockEditor(textModel);
+		const hintsModel = new ParameterHintsModel(editor);
+
+		let didRequestCancellationOf = -1;
+		let invokeCount = 0;
+		const longRunningProvider = new class implements SignatureHelpProvider {
+			signatureHelpTriggerCharacters: string[] = [];
+
+			provideSignatureHelp(model: ITextModel, position: Position, token: CancellationToken): SignatureHelp | Thenable<SignatureHelp> {
+				const count = invokeCount++;
+				token.onCancellationRequested(() => { didRequestCancellationOf = count; });
+
+				// retrigger on first request
+				if (count === 0) {
+					hintsModel.trigger(0);
+				}
+
+				return new Promise<SignatureHelp>(resolve => {
+					setTimeout(() => {
+						resolve({
+							signatures: [{
+								label: '' + count,
+								parameters: []
+							}],
+							activeParameter: 0,
+							activeSignature: 0
+						});
+					}, 100);
+				});
+			}
+		};
+
+		disposables.push(SignatureHelpProviderRegistry.register({ scheme: 'test' }, longRunningProvider));
+
+		hintsModel.trigger(0);
+		assert.strictEqual(-1, didRequestCancellationOf);
+
+		return new Promise((resolve, reject) =>
+			hintsModel.onHint(e => {
+				try {
+					assert.strictEqual(0, didRequestCancellationOf);
+					assert.strictEqual('1', e.hints.signatures[0].label);
+					resolve();
+				} catch (e) {
+					reject(e);
+				}
+			}));
+	});
+});
diff --git a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
index 593f6b9e3fd..6c7a42c84aa 100644
--- a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
@@ -133,7 +133,7 @@ export abstract class PeekViewWidget extends ZoneWidget {
 
 		const actionsContainer = $('.peekview-actions').appendTo(this._headElement);
 		const actionBarOptions = this._getActionBarOptions();
-		this._actionbarWidget = new ActionBar(actionsContainer, actionBarOptions);
+		this._actionbarWidget = new ActionBar(actionsContainer.getHTMLElement(), actionBarOptions);
 		this._disposables.push(this._actionbarWidget);
 
 		this._actionbarWidget.push(new Action('peekview.close', nls.localize('label.close', "Close"), 'close-peekview-action', true, () => {
diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
index a8510002d8c..90169cab7f1 100644
--- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
+++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts
@@ -206,6 +206,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'goToNextReferenceFromEmbeddedEditor',
+	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	primary: KeyCode.F4,
+	when: PeekContext.inPeekEditor,
+	handler(accessor) {
+		withController(accessor, controller => {
+			controller.goToNextOrPreviousReference(true);
+		});
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'goToPreviousReference',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
@@ -218,6 +230,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'goToPreviousReferenceFromEmbeddedEditor',
+	weight: KeybindingsRegistry.WEIGHT.editorContrib(50),
+	primary: KeyMod.Shift | KeyCode.F4,
+	when: PeekContext.inPeekEditor,
+	handler(accessor) {
+		withController(accessor, controller => {
+			controller.goToNextOrPreviousReference(false);
+		});
+	}
+});
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'closeReferenceSearch',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50),
diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts
index a06529eecdf..51d82fbc443 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesController.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts
@@ -16,7 +16,6 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { ReferencesModel } from './referencesModel';
 import { ReferenceWidget, LayoutData } from './referencesWidget';
 import { Range } from 'vs/editor/common/core/range';
@@ -34,7 +33,7 @@ export interface RequestOptions {
 	onGoto?: (reference: Location) => TPromise<any>;
 }
 
-export class ReferencesController implements editorCommon.IEditorContribution {
+export abstract class ReferencesController implements editorCommon.IEditorContribution {
 
 	private static readonly ID = 'editor.contrib.referencesController';
 
@@ -52,6 +51,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 	}
 
 	public constructor(
+		private _defaultTreeKeyboardSupport: boolean,
 		editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorService private readonly _editorService: IEditorService,
@@ -103,7 +103,7 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 		}));
 		const storageKey = 'peekViewLayout';
 		const data = <LayoutData>JSON.parse(this._storageService.get(storageKey, undefined, '{}'));
-		this._widget = new ReferenceWidget(this._editor, data, this._textModelResolverService, this._contextService, this._themeService, this._instantiationService, this._environmentService);
+		this._widget = new ReferenceWidget(this._editor, this._defaultTreeKeyboardSupport, data, this._textModelResolverService, this._contextService, this._themeService, this._instantiationService, this._environmentService);
 		this._widget.setTitle(nls.localize('labelLoading', "Loading..."));
 		this._widget.show(range);
 		this._disposables.push(this._widget.onDidClose(() => {
@@ -155,16 +155,17 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 
 			// show widget
 			return this._widget.setModel(this._model).then(() => {
+				if (this._widget) { // might have been closed
+					// set title
+					this._widget.setMetaTitle(options.getMetaTitle(this._model));
 
-				// set title
-				this._widget.setMetaTitle(options.getMetaTitle(this._model));
-
-				// set 'best' selection
-				let uri = this._editor.getModel().uri;
-				let pos = new Position(range.startLineNumber, range.startColumn);
-				let selection = this._model.nearestReference(uri, pos);
-				if (selection) {
-					return this._widget.setSelection(selection);
+					// set 'best' selection
+					let uri = this._editor.getModel().uri;
+					let pos = new Position(range.startLineNumber, range.startColumn);
+					let selection = this._model.nearestReference(uri, pos);
+					if (selection) {
+						return this._widget.setSelection(selection);
+					}
 				}
 				return undefined;
 			});
@@ -175,13 +176,15 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 	}
 
 	public async goToNextOrPreviousReference(fwd: boolean) {
-		let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
-		let target = this._model.nextOrPreviousReference(source, fwd);
-		let editorFocus = this._editor.isFocused();
-		await this._widget.setSelection(target);
-		await this._gotoReference(target);
-		if (editorFocus) {
-			this._editor.focus();
+		if (this._model) { // can be called while still resolving...
+			let source = this._model.nearestReference(this._editor.getModel().uri, this._widget.position);
+			let target = this._model.nextOrPreviousReference(source, fwd);
+			let editorFocus = this._editor.isFocused();
+			await this._widget.setSelection(target);
+			await this._gotoReference(target);
+			if (editorFocus) {
+				this._editor.focus();
+			}
 		}
 	}
 
@@ -246,5 +249,3 @@ export class ReferencesController implements editorCommon.IEditorContribution {
 		}
 	}
 }
-
-registerEditorContribution(ReferencesController);
diff --git a/src/vs/editor/contrib/referenceSearch/referencesModel.ts b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
index 88880e33a97..81865714ad8 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesModel.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesModel.ts
@@ -261,7 +261,7 @@ export class ReferencesModel implements IDisposable {
 		let childCount = parent.children.length;
 		let groupCount = parent.parent.groups.length;
 
-		if (groupCount === 1 || next && idx + 1 < childCount || !next && idx > 1) {
+		if (groupCount === 1 || next && idx + 1 < childCount || !next && idx > 0) {
 			// cycling within one file
 			if (next) {
 				idx = (idx + 1) % childCount;
diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
index 5a1a4c97e27..3e98e35c67e 100644
--- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts
@@ -84,28 +84,25 @@ class DecorationsManager implements IDisposable {
 	private _addDecorations(reference: FileReferences): void {
 		this._callOnModelChange.push(this._editor.getModel().onDidChangeDecorations((event) => this._onDecorationChanged()));
 
-		this._editor.changeDecorations(accessor => {
+		const newDecorations: IModelDeltaDecoration[] = [];
+		const newDecorationsActualIndex: number[] = [];
 
-			const newDecorations: IModelDeltaDecoration[] = [];
-			const newDecorationsActualIndex: number[] = [];
-
-			for (let i = 0, len = reference.children.length; i < len; i++) {
-				let oneReference = reference.children[i];
-				if (this._decorationIgnoreSet.has(oneReference.id)) {
-					continue;
-				}
-				newDecorations.push({
-					range: oneReference.range,
-					options: DecorationsManager.DecorationOptions
-				});
-				newDecorationsActualIndex.push(i);
+		for (let i = 0, len = reference.children.length; i < len; i++) {
+			let oneReference = reference.children[i];
+			if (this._decorationIgnoreSet.has(oneReference.id)) {
+				continue;
 			}
+			newDecorations.push({
+				range: oneReference.range,
+				options: DecorationsManager.DecorationOptions
+			});
+			newDecorationsActualIndex.push(i);
+		}
 
-			const decorations = accessor.deltaDecorations([], newDecorations);
-			for (let i = 0; i < decorations.length; i++) {
-				this._decorations.set(decorations[i], reference.children[newDecorationsActualIndex[i]]);
-			}
-		});
+		const decorations = this._editor.deltaDecorations([], newDecorations);
+		for (let i = 0; i < decorations.length; i++) {
+			this._decorations.set(decorations[i], reference.children[newDecorationsActualIndex[i]]);
+		}
 	}
 
 	private _onDecorationChanged(): void {
@@ -143,21 +140,19 @@ class DecorationsManager implements IDisposable {
 			}
 		});
 
-		this._editor.changeDecorations((accessor) => {
-			for (let i = 0, len = toRemove.length; i < len; i++) {
-				this._decorations.delete(toRemove[i]);
-			}
-			accessor.deltaDecorations(toRemove, []);
-		});
+		for (let i = 0, len = toRemove.length; i < len; i++) {
+			this._decorations.delete(toRemove[i]);
+		}
+		this._editor.deltaDecorations(toRemove, []);
 	}
 
 	public removeDecorations(): void {
-		this._editor.changeDecorations(accessor => {
-			this._decorations.forEach((value, key) => {
-				accessor.removeDecoration(key);
-			});
-			this._decorations.clear();
+		let toRemove: string[] = [];
+		this._decorations.forEach((value, key) => {
+			toRemove.push(key);
 		});
+		this._editor.deltaDecorations(toRemove, []);
+		this._decorations.clear();
 	}
 }
 
@@ -533,6 +528,7 @@ export class ReferenceWidget extends PeekViewWidget {
 
 	constructor(
 		editor: ICodeEditor,
+		private _defaultTreeKeyboardSupport: boolean,
 		public layoutData: LayoutData,
 		private _textModelResolverService: ITextModelService,
 		private _contextService: IWorkspaceContextService,
@@ -635,7 +631,7 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		// tree
 		container.div({ 'class': 'ref-tree inline' }, (div: Builder) => {
-			var controller = this._instantiationService.createInstance(Controller, { clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
+			var controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
 			this._callOnDispose.push(controller);
 
 			var config = <tree.ITreeConfiguration>{
@@ -658,7 +654,7 @@ export class ReferenceWidget extends PeekViewWidget {
 			var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
 				if (element instanceof OneReference) {
 					if (kind === 'show') {
-						this._revealReference(element);
+						this._revealReference(element, false);
 					}
 					this._onDidSelectReference.fire({ element, kind, source: 'tree' });
 				}
@@ -710,7 +706,7 @@ export class ReferenceWidget extends PeekViewWidget {
 	}
 
 	public setSelection(selection: OneReference): TPromise<any> {
-		return this._revealReference(selection).then(() => {
+		return this._revealReference(selection, true).then(() => {
 
 			// show in tree
 			this._tree.setSelection([selection]);
@@ -780,7 +776,7 @@ export class ReferenceWidget extends PeekViewWidget {
 		return undefined;
 	}
 
-	private _revealReference(reference: OneReference): TPromise<void> {
+	private async _revealReference(reference: OneReference, revealParent: boolean): TPromise<void> {
 
 		// Update widget header
 		if (reference.uri.scheme !== Schemas.inMemory) {
@@ -791,6 +787,10 @@ export class ReferenceWidget extends PeekViewWidget {
 
 		const promise = this._textModelResolverService.createModelReference(reference.uri);
 
+		if (revealParent) {
+			await this._tree.reveal(reference.parent);
+		}
+
 		return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
 			const ref = values[0];
 
@@ -836,6 +836,7 @@ export const peekViewEditorGutterBackground = registerColor('peekViewEditorGutte
 
 export const peekViewResultsMatchHighlight = registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hc: null }, nls.localize('peekViewResultsMatchHighlight', 'Match highlight color in the peek view result list.'));
 export const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hc: null }, nls.localize('peekViewEditorMatchHighlight', 'Match highlight color in the peek view editor.'));
+export const peekViewEditorMatchHighlightBorder = registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hc: activeContrastBorder }, nls.localize('peekViewEditorMatchHighlightBorder', 'Match highlight border in the peek view editor.'));
 
 
 registerThemingParticipant((theme, collector) => {
@@ -847,10 +848,13 @@ registerThemingParticipant((theme, collector) => {
 	if (referenceHighlightColor) {
 		collector.addRule(`.monaco-editor .reference-zone-widget .preview .reference-decoration { background-color: ${referenceHighlightColor}; }`);
 	}
+	let referenceHighlightBorder = theme.getColor(peekViewEditorMatchHighlightBorder);
+	if (referenceHighlightBorder) {
+		collector.addRule(`.monaco-editor .reference-zone-widget .preview .reference-decoration { border: 2px solid ${referenceHighlightBorder}; box-sizing: border-box; }`);
+	}
 	let hcOutline = theme.getColor(activeContrastBorder);
 	if (hcOutline) {
 		collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .referenceMatch { border: 1px dotted ${hcOutline}; box-sizing: border-box; }`);
-		collector.addRule(`.monaco-editor .reference-zone-widget .preview .reference-decoration { border: 2px solid ${hcOutline}; box-sizing: border-box; }`);
 	}
 	let resultsBackground = theme.getColor(peekViewResultsBackground);
 	if (resultsBackground) {
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 70341d1b55e..803d4ac0b8c 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -23,7 +23,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { optional } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { asWinJsPromise } from 'vs/base/common/async';
-import { WorkspaceEdit, RenameProviderRegistry, RenameContext, RenameProvider } from 'vs/editor/common/modes';
+import { WorkspaceEdit, RenameProviderRegistry, RenameProvider, RenameLocation } from 'vs/editor/common/modes';
 import { Position } from 'vs/editor/common/core/position';
 import { alert } from 'vs/base/browser/ui/aria/aria';
 import { Range } from 'vs/editor/common/core/range';
@@ -47,29 +47,29 @@ class RenameSkeleton {
 		return this._provider.length > 0;
 	}
 
-	async resolveRenameInformation(): TPromise<RenameContext> {
+	async resolveRenameLocation(): TPromise<RenameLocation> {
 
 		let [provider] = this._provider;
-		let information: RenameContext;
+		let res: RenameLocation;
 
 		if (provider.resolveRenameLocation) {
-			information = await asWinJsPromise(token => provider.resolveRenameLocation(this.model, this.position, token));
+			res = await asWinJsPromise(token => provider.resolveRenameLocation(this.model, this.position, token));
 		}
 
-		if (!information) {
+		if (!res) {
 			let word = this.model.getWordAtPosition(this.position);
 			if (word) {
-				information = {
+				res = {
 					range: new Range(this.position.lineNumber, word.startColumn, this.position.lineNumber, word.endColumn),
 					text: word.word
 				};
 			}
 		}
 
-		return information;
+		return res;
 	}
 
-	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = []): TPromise<WorkspaceEdit> {
+	async provideRenameEdits(newName: string, i: number = 0, rejects: string[] = [], position: Position = this.position): TPromise<WorkspaceEdit> {
 
 		if (i >= this._provider.length) {
 			return {
@@ -134,27 +134,29 @@ class RenameController implements IEditorContribution {
 		const position = this.editor.getPosition();
 		const skeleton = new RenameSkeleton(this.editor.getModel(), position);
 
-		let context = await skeleton.resolveRenameInformation();
-		if (!context) {
+		let loc: RenameLocation;
+		try {
+			loc = await skeleton.resolveRenameLocation();
+		} catch (e) {
+			MessageController.get(this.editor).showMessage(e, position);
 			return undefined;
 		}
 
-		if (context.message) {
-			MessageController.get(this.editor).showMessage(context.message, position);
+		if (!loc) {
 			return undefined;
 		}
 
 		let selection = this.editor.getSelection();
 		let selectionStart = 0;
-		let selectionEnd = context.text.length;
+		let selectionEnd = loc.text.length;
 
-		if (!selection.isEmpty() && selection.startLineNumber === selection.endLineNumber) {
-			selectionStart = Math.max(0, selection.startColumn - context.range.startColumn);
-			selectionEnd = Math.min(context.range.endColumn, selection.endColumn) - context.range.startColumn;
+		if (!Range.isEmpty(selection) && !Range.spansMultipleLines(selection) && Range.containsRange(loc.range, selection)) {
+			selectionStart = Math.max(0, selection.startColumn - loc.range.startColumn);
+			selectionEnd = Math.min(loc.range.endColumn, selection.endColumn) - loc.range.startColumn;
 		}
 
 		this._renameInputVisible.set(true);
-		return this._renameInputField.getInput(Range.lift(context.range), context.text, selectionStart, selectionEnd).then(newNameOrFocusFlag => {
+		return this._renameInputField.getInput(loc.range, loc.text, selectionStart, selectionEnd).then(newNameOrFocusFlag => {
 			this._renameInputVisible.reset();
 
 			if (typeof newNameOrFocusFlag === 'boolean') {
@@ -169,7 +171,7 @@ class RenameController implements IEditorContribution {
 			const edit = new BulkEdit(this.editor, null, this._textModelResolverService, this._fileService);
 			const state = new EditorState(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll);
 
-			const renameOperation = skeleton.provideRenameEdits(newNameOrFocusFlag).then(result => {
+			const renameOperation = skeleton.provideRenameEdits(newNameOrFocusFlag, 0, [], Range.lift(loc.range).getStartPosition()).then(result => {
 				if (result.rejectReason) {
 					if (state.validate(this.editor)) {
 						MessageController.get(this.editor).showMessage(result.rejectReason, this.editor.getPosition());
@@ -185,7 +187,7 @@ class RenameController implements IEditorContribution {
 						this.editor.setSelection(selection);
 					}
 					// alert
-					alert(nls.localize('aria', "Successfully renamed '{0}' to '{1}'. Summary: {2}", context.text, newNameOrFocusFlag, edit.ariaMessage()));
+					alert(nls.localize('aria', "Successfully renamed '{0}' to '{1}'. Summary: {2}", loc.text, newNameOrFocusFlag, edit.ariaMessage()));
 				});
 
 			}, err => {
diff --git a/src/vs/editor/contrib/rename/renameInputField.ts b/src/vs/editor/contrib/rename/renameInputField.ts
index 76f4feab71a..e7f6c7df33a 100644
--- a/src/vs/editor/contrib/rename/renameInputField.ts
+++ b/src/vs/editor/contrib/rename/renameInputField.ts
@@ -9,7 +9,7 @@ import 'vs/css!./renameInputField';
 import { localize } from 'vs/nls';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Range } from 'vs/editor/common/core/range';
+import { Range, IRange } from 'vs/editor/common/core/range';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { inputBackground, inputBorder, inputForeground, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
@@ -123,7 +123,7 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 		}
 	}
 
-	public getInput(where: Range, value: string, selectionStart: number, selectionEnd: number): TPromise<string | boolean> {
+	public getInput(where: IRange, value: string, selectionStart: number, selectionEnd: number): TPromise<string | boolean> {
 
 		this._position = new Position(where.startLineNumber, where.startColumn);
 		this._inputField.value = value;
@@ -192,7 +192,7 @@ export default class RenameInputField implements IContentWidget, IDisposable {
 			this._inputField.setSelectionRange(
 				parseInt(this._inputField.getAttribute('selectionStart')),
 				parseInt(this._inputField.getAttribute('selectionEnd')));
-		}, 25);
+		}, 100);
 	}
 
 	private _hide(): void {
diff --git a/src/vs/editor/contrib/snippet/snippetController2.ts b/src/vs/editor/contrib/snippet/snippetController2.ts
index 9ec45c47c8f..83abd441a26 100644
--- a/src/vs/editor/contrib/snippet/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/snippetController2.ts
@@ -14,6 +14,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { showSimpleSuggestions } from 'vs/editor/contrib/suggest/suggest';
 import { ISuggestion } from 'vs/editor/common/modes';
 import { Selection } from 'vs/editor/common/core/selection';
+import { Range } from 'vs/editor/common/core/range';
 import { Choice } from 'vs/editor/contrib/snippet/snippetParser';
 import { repeat } from 'vs/base/common/strings';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -203,6 +204,13 @@ export class SnippetController2 implements IEditorContribution {
 		this._session.next();
 		this._updateState();
 	}
+
+	getSessionEnclosingRange(): Range {
+		if (this._session) {
+			return this._session.getEnclosingRange();
+		}
+		return undefined;
+	}
 }
 
 
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
index 218e5ec9fd5..31be6b2ba16 100644
--- a/src/vs/editor/contrib/snippet/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -50,7 +50,9 @@ export class OneSnippet {
 
 	dispose(): void {
 		if (this._placeholderDecorations) {
-			this._editor.changeDecorations(accessor => this._placeholderDecorations.forEach(handle => accessor.removeDecoration(handle)));
+			let toRemove: string[] = [];
+			this._placeholderDecorations.forEach(handle => toRemove.push(handle));
+			this._editor.deltaDecorations(toRemove, []);
 		}
 		this._placeholderGroups.length = 0;
 	}
@@ -224,6 +226,20 @@ export class OneSnippet {
 			this._placeholderGroups = groupBy(this._snippet.placeholders, Placeholder.compareByIndex);
 		});
 	}
+
+	public getEnclosingRange(): Range {
+		let result: Range;
+		const model = this._editor.getModel();
+		this._placeholderDecorations.forEach((decorationId) => {
+			const placeholderRange = model.getDecorationRange(decorationId);
+			if (!result) {
+				result = placeholderRange;
+			} else {
+				result = result.plusRange(placeholderRange);
+			}
+		});
+		return result;
+	}
 }
 
 export class SnippetSession {
@@ -365,13 +381,15 @@ export class SnippetSession {
 		const { edits, snippets } = SnippetSession.createEditsAndSnippets(this._editor, this._template, this._overwriteBefore, this._overwriteAfter, false);
 		this._snippets = snippets;
 
-		this._editor.setSelections(model.pushEditOperations(this._editor.getSelections(), edits, undoEdits => {
+		const selections = model.pushEditOperations(this._editor.getSelections(), edits, undoEdits => {
 			if (this._snippets[0].hasPlaceholder) {
 				return this._move(true);
 			} else {
 				return undoEdits.map(edit => Selection.fromPositions(edit.range.getEndPosition()));
 			}
-		}));
+		});
+		this._editor.setSelections(selections);
+		this._editor.revealRange(selections[0]);
 	}
 
 	merge(template: string, overwriteBefore: number = 0, overwriteAfter: number = 0): void {
@@ -506,4 +524,17 @@ export class SnippetSession {
 		// have any left, we don't have a selection anymore
 		return allPossibleSelections.size > 0;
 	}
+
+	public getEnclosingRange(): Range {
+		let result: Range;
+		for (const snippet of this._snippets) {
+			const snippetRange = snippet.getEnclosingRange();
+			if (!result) {
+				result = snippetRange;
+			} else {
+				result = result.plusRange(snippetRange);
+			}
+		}
+		return result;
+	}
 }
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
index fcc39c22299..8136074bc0f 100644
--- a/src/vs/editor/contrib/suggest/suggest.ts
+++ b/src/vs/editor/contrib/suggest/suggest.ts
@@ -210,13 +210,20 @@ registerDefaultLanguageCommand('_executeCompletionItemProvider', (model, positio
 		suggestions: []
 	};
 
+	let resolving: Thenable<any>[] = [];
+	let maxItemsToResolve = args['maxItemsToResolve'] || 0;
+
 	return provideSuggestionItems(model, position).then(items => {
-
-		for (const { container, suggestion } of items) {
-			result.incomplete = result.incomplete || container.incomplete;
-			result.suggestions.push(suggestion);
+		for (const item of items) {
+			if (resolving.length < maxItemsToResolve) {
+				resolving.push(item.resolve());
+			}
+			result.incomplete = result.incomplete || item.container.incomplete;
+			result.suggestions.push(item.suggestion);
 		}
-
+	}).then(() => {
+		return TPromise.join(resolving);
+	}).then(() => {
 		return result;
 	});
 });
diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts
index 6351ea04471..29c6afc906d 100644
--- a/src/vs/editor/contrib/suggest/suggestMemory.ts
+++ b/src/vs/editor/contrib/suggest/suggestMemory.ts
@@ -58,7 +58,7 @@ export class LRUMemory extends Memory {
 		this._cache.set(key, {
 			touch: this._seq++,
 			type: item.suggestion.type,
-			insertText: undefined
+			insertText: item.suggestion.insertText
 		});
 	}
 
@@ -66,18 +66,24 @@ export class LRUMemory extends Memory {
 		// in order of completions, select the first
 		// that has been used in the past
 		let { word } = model.getWordUntilPosition(pos);
+		if (word.length !== 0) {
+			return 0;
+		}
+
+		let lineSuffix = model.getLineContent(pos.lineNumber).substr(pos.column - 10, pos.column - 1);
+		if (/\s$/.test(lineSuffix)) {
+			return 0;
+		}
 
 		let res = 0;
 		let seq = -1;
-		if (word.length === 0) {
-			for (let i = 0; i < items.length; i++) {
-				const { suggestion } = items[i];
-				const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
-				const item = this._cache.get(key);
-				if (item && item.touch > seq && item.type === suggestion.type) {
-					seq = item.touch;
-					res = i;
-				}
+		for (let i = 0; i < items.length; i++) {
+			const { suggestion } = items[i];
+			const key = `${model.getLanguageIdentifier().language}/${suggestion.label}`;
+			const item = this._cache.get(key);
+			if (item && item.touch > seq && item.type === suggestion.type && item.insertText === suggestion.insertText) {
+				seq = item.touch;
+				res = i;
 			}
 		}
 		return res;
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 4b904459a48..2551ccfaee2 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -176,7 +176,6 @@ class Renderer implements IRenderer<ICompletionItem, ISuggestionTemplateData> {
 	}
 
 	disposeTemplate(templateData: ISuggestionTemplateData): void {
-		templateData.highlightedLabel.dispose();
 		templateData.disposables = dispose(templateData.disposables);
 	}
 }
@@ -439,7 +438,8 @@ export class SuggestWidget implements IContentWidget, IDelegate<ICompletionItem>
 		this.list = new List(this.listElement, this, [renderer], {
 			useShadows: false,
 			selectOnMouseDown: true,
-			focusOnMouseDown: false
+			focusOnMouseDown: false,
+			openController: { shouldOpen: () => false }
 		});
 
 		this.toDispose = [
diff --git a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
index 9d69016057f..4025fcd221e 100644
--- a/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestMemory.test.ts
@@ -21,7 +21,7 @@ suite('SuggestMemories', function () {
 
 	setup(function () {
 		pos = { lineNumber: 1, column: 1 };
-		buffer = TextModel.createFromString('This is some text');
+		buffer = TextModel.createFromString('This is some text.\nthis.\nfoo: ,');
 		items = [
 			createSuggestItem('foo', 0),
 			createSuggestItem('bar', 0)
@@ -39,7 +39,9 @@ suite('SuggestMemories', function () {
 		mem.memorize(buffer, pos, null);
 	});
 
-	test('ShyMemories', function () {
+	test('LRUMemory', function () {
+
+		pos = { lineNumber: 2, column: 6 };
 
 		const mem = new LRUMemory();
 		mem.memorize(buffer, pos, items[1]);
@@ -59,7 +61,19 @@ suite('SuggestMemories', function () {
 			createSuggestItem('new1', 0),
 			createSuggestItem('new2', 0)
 		]), 0);
+	});
 
+	test('intellisense is not showing top options first #43429', function () {
+		// ensure we don't memorize for whitespace prefixes
+
+		pos = { lineNumber: 2, column: 6 };
+		const mem = new LRUMemory();
+
+		mem.memorize(buffer, pos, items[1]);
+		assert.equal(mem.select(buffer, pos, items), 1);
+
+		assert.equal(mem.select(buffer, { lineNumber: 3, column: 5 }, items), 0); // foo: |,
+		assert.equal(mem.select(buffer, { lineNumber: 3, column: 6 }, items), 1); // foo: ,|
 	});
 
 	test('PrefixMemory', function () {
diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
index efaf16b11a9..c6e4aa184b2 100644
--- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
+++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts
@@ -31,17 +31,21 @@ import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { TokenizationResult2 } from 'vs/editor/common/core/token';
 import { NULL_STATE } from 'vs/editor/common/modes/nullMode';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 function createMockEditor(model: TextModel): TestCodeEditor {
 	const contextKeyService = new MockContextKeyService();
 	const telemetryService = NullTelemetryService;
+	const notificationService = new TestNotificationService();
 	const instantiationService = new InstantiationService(new ServiceCollection(
 		[IContextKeyService, contextKeyService],
 		[ITelemetryService, telemetryService],
-		[IStorageService, NullStorageService]
+		[IStorageService, NullStorageService],
+		[INotificationService, TestNotificationService]
 	));
 
-	const editor = new TestCodeEditor(new MockScopeLocation(), {}, false, instantiationService, contextKeyService);
+	const editor = new TestCodeEditor(new MockScopeLocation(), {}, false, instantiationService, contextKeyService, notificationService);
 	editor.setModel(model);
 	return editor;
 }
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
index 76dc078f02b..dd664d73fb7 100644
--- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -504,30 +504,34 @@ registerEditorAction(NextWordHighlightAction);
 registerEditorAction(PrevWordHighlightAction);
 
 registerThemingParticipant((theme, collector) => {
-	let selectionHighlight = theme.getColor(editorSelectionHighlight);
+	const selectionHighlight = theme.getColor(editorSelectionHighlight);
 	if (selectionHighlight) {
 		collector.addRule(`.monaco-editor .focused .selectionHighlight { background-color: ${selectionHighlight}; }`);
 		collector.addRule(`.monaco-editor .selectionHighlight { background-color: ${selectionHighlight.transparent(0.5)}; }`);
 	}
-	let wordHighlight = theme.getColor(editorWordHighlight);
+
+	const wordHighlight = theme.getColor(editorWordHighlight);
 	if (wordHighlight) {
 		collector.addRule(`.monaco-editor .wordHighlight { background-color: ${wordHighlight}; }`);
 	}
-	let wordHighlightStrong = theme.getColor(editorWordHighlightStrong);
+
+	const wordHighlightStrong = theme.getColor(editorWordHighlightStrong);
 	if (wordHighlightStrong) {
 		collector.addRule(`.monaco-editor .wordHighlightStrong { background-color: ${wordHighlightStrong}; }`);
 	}
-	let selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
+
+	const selectionHighlightBorder = theme.getColor(editorSelectionHighlightBorder);
 	if (selectionHighlightBorder) {
-		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px dotted ${selectionHighlightBorder}; box-sizing: border-box; }`);
-	}
-	let wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
-	if (wordHighlightBorder) {
-		collector.addRule(`.monaco-editor .wordHighlight { border: 1px dashed ${wordHighlightBorder}; box-sizing: border-box; }`);
-	}
-	let wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
-	if (wordHighlightStrongBorder) {
-		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px dashed ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+		collector.addRule(`.monaco-editor .selectionHighlight { border: 1px ${theme.type === 'hc' ? 'dotted' : 'solid'} ${selectionHighlightBorder}; box-sizing: border-box; }`);
 	}
 
+	const wordHighlightBorder = theme.getColor(editorWordHighlightBorder);
+	if (wordHighlightBorder) {
+		collector.addRule(`.monaco-editor .wordHighlight { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${wordHighlightBorder}; box-sizing: border-box; }`);
+	}
+
+	const wordHighlightStrongBorder = theme.getColor(editorWordHighlightStrongBorder);
+	if (wordHighlightStrongBorder) {
+		collector.addRule(`.monaco-editor .wordHighlightStrong { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${wordHighlightStrongBorder}; box-sizing: border-box; }`);
+	}
 });
diff --git a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
index aaea8d65c8c..bd34ee01bda 100644
--- a/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
+++ b/src/vs/editor/contrib/wordOperations/test/wordOperations.test.ts
@@ -141,7 +141,6 @@ suite('WordOperations', () => {
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + '.length + 1, '002');
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 '.length + 1, '003');
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '004');
-			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '005');
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '006');
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 '.length + 1, '007');
 			moveWordLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= '.length + 1, '008');
@@ -165,7 +164,6 @@ suite('WordOperations', () => {
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + '.length + 1, '002');
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 '.length + 1, '003');
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '004');
-			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '005');
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '006');
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 '.length + 1, '007');
 			moveWordStartLeft(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= '.length + 1, '008');
@@ -267,9 +265,7 @@ suite('WordOperations', () => {
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '007');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+='.length + 1, '008');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3'.length + 1, '009');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '010');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '011');
-			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '012');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3'.length + 1, '013');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 +'.length + 1, '014');
 			moveWordRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7'.length + 1, '015');
@@ -279,6 +275,31 @@ suite('WordOperations', () => {
 		});
 	});
 
+	test('issue #41199: moveWordRight', () => {
+		withTestCodeEditor([
+			'console.log(err)'
+		], {}, (editor, _) => {
+			editor.setPosition(new Position(1, 1));
+
+			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console'.length + 1, '001');
+			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log'.length + 1, '002');
+			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log(err'.length + 1, '003');
+			moveWordRight(editor); assert.equal(editor.getPosition().column, 'console.log(err)'.length + 1, '004');
+		});
+	});
+
+	test('issue #48046: Word selection doesn\'t work as usual', () => {
+		withTestCodeEditor([
+			'deep.object.property'
+		], {}, (editor, _) => {
+			editor.setPosition(new Position(1, 21));
+
+			moveWordLeft(editor); assert.equal(editor.getPosition().column, 'deep.object.'.length + 1, '001');
+			moveWordLeft(editor); assert.equal(editor.getPosition().column, 'deep.'.length + 1, '002');
+			moveWordLeft(editor); assert.equal(editor.getPosition().column, ''.length + 1, '003');
+		});
+	});
+
 	test('moveWordEndRight', () => {
 		withTestCodeEditor([
 			'   /* Just some   more   text a+= 3 +5-3 + 7 */  '
@@ -293,9 +314,7 @@ suite('WordOperations', () => {
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a'.length + 1, '007');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+='.length + 1, '008');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3'.length + 1, '009');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +'.length + 1, '010');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5'.length + 1, '011');
-			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-'.length + 1, '012');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3'.length + 1, '013');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 +'.length + 1, '014');
 			moveWordEndRight(editor); assert.equal(editor.getPosition().column, '   /* Just some   more   text a+= 3 +5-3 + 7'.length + 1, '015');
diff --git a/src/vs/editor/contrib/zoneWidget/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
index ed08e1974ed..784aac39e55 100644
--- a/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/zoneWidget.ts
@@ -210,6 +210,7 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 		}
 
 		this.editor.deltaDecorations(this._positionMarkerId, []);
+		this._positionMarkerId = [];
 	}
 
 	public create(): void {
@@ -280,10 +281,14 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 
 	public get position(): Position {
 		const [id] = this._positionMarkerId;
-		if (id) {
-			return this.editor.getModel().getDecorationRange(id).getStartPosition();
+		if (!id) {
+			return undefined;
 		}
-		return undefined;
+		const range = this.editor.getModel().getDecorationRange(id);
+		if (!range) {
+			return undefined;
+		}
+		return range.getStartPosition();
 	}
 
 	protected _isShowing: boolean = false;
diff --git a/src/vs/editor/editor.all.ts b/src/vs/editor/editor.all.ts
index d4f93d0a876..07cbf332285 100644
--- a/src/vs/editor/editor.all.ts
+++ b/src/vs/editor/editor.all.ts
@@ -32,7 +32,7 @@ import 'vs/editor/contrib/linesOperations/linesOperations';
 import 'vs/editor/contrib/links/links';
 import 'vs/editor/contrib/multicursor/multicursor';
 import 'vs/editor/contrib/parameterHints/parameterHints';
-import 'vs/editor/contrib/quickFix/quickFixCommands';
+import 'vs/editor/contrib/codeAction/codeActionContributions';
 import 'vs/editor/contrib/referenceSearch/referenceSearch';
 import 'vs/editor/contrib/rename/rename';
 import 'vs/editor/contrib/smartSelect/smartSelect';
diff --git a/src/vs/editor/editor.main.ts b/src/vs/editor/editor.main.ts
index 3f2c56b5d16..08fd5c92326 100644
--- a/src/vs/editor/editor.main.ts
+++ b/src/vs/editor/editor.main.ts
@@ -13,5 +13,6 @@ import 'vs/editor/standalone/browser/quickOpen/quickOutline';
 import 'vs/editor/standalone/browser/quickOpen/gotoLine';
 import 'vs/editor/standalone/browser/quickOpen/quickCommand';
 import 'vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast';
+import 'vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch';
 
 export * from 'vs/editor/editor.api';
diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts
index 83603e32539..61e3b448392 100644
--- a/src/vs/editor/standalone/browser/colorizer.ts
+++ b/src/vs/editor/standalone/browser/colorizer.ts
@@ -13,6 +13,7 @@ import { renderViewLine2 as renderViewLine, RenderLineInput } from 'vs/editor/co
 import { LineTokens, IViewLineTokens } from 'vs/editor/common/core/lineTokens';
 import * as strings from 'vs/base/common/strings';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
+import { ViewLineRenderingData } from 'vs/editor/common/viewModel/viewModel';
 
 export interface IColorizerOptions {
 	tabSize?: number;
@@ -93,11 +94,14 @@ export class Colorizer {
 		});
 	}
 
-	public static colorizeLine(line: string, mightContainRTL: boolean, tokens: IViewLineTokens, tabSize: number = 4): string {
+	public static colorizeLine(line: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean, tokens: IViewLineTokens, tabSize: number = 4): string {
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, mightContainNonBasicASCII);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, mightContainRTL);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			mightContainRTL,
+			isBasicASCII,
+			containsRTL,
 			0,
 			tokens,
 			[],
@@ -116,7 +120,7 @@ export class Colorizer {
 		model.forceTokenization(lineNumber);
 		let tokens = model.getLineTokens(lineNumber);
 		let inflatedTokens = tokens.inflate();
-		return this.colorizeLine(content, model.mightContainRTL(), inflatedTokens, tabSize);
+		return this.colorizeLine(content, model.mightContainNonBasicASCII(), model.mightContainRTL(), inflatedTokens, tabSize);
 	}
 }
 
@@ -143,10 +147,13 @@ function _fakeColorize(lines: string[], tabSize: number): string {
 		tokens[0] = line.length;
 		const lineTokens = new LineTokens(tokens, line);
 
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, /* check for basic ASCII */true);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			false,
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens,
 			[],
@@ -174,10 +181,13 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 		let tokenizeResult = tokenizationSupport.tokenize2(line, state, 0);
 		LineTokens.convertToEndOffset(tokenizeResult.tokens, line.length);
 		let lineTokens = new LineTokens(tokenizeResult.tokens, line);
+		const isBasicASCII = ViewLineRenderingData.isBasicASCII(line, /* check for basic ASCII */true);
+		const containsRTL = ViewLineRenderingData.containsRTL(line, isBasicASCII, /* check for RTL */true);
 		let renderResult = renderViewLine(new RenderLineInput(
 			false,
 			line,
-			true/* check for RTL */,
+			isBasicASCII,
+			containsRTL,
 			0,
 			lineTokens.inflate(),
 			[],
diff --git a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
index 8d1bce53f7b..8bd223b6a2f 100644
--- a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
@@ -14,7 +14,7 @@ import { registerEditorContribution, IActionOptions, EditorAction } from 'vs/edi
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Range } from 'vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { IModelDecorationsChangeAccessor, IModelDeltaDecoration } from 'vs/editor/common/model';
+import { IModelDeltaDecoration } from 'vs/editor/common/model';
 
 export interface IQuickOpenControllerOpts {
 	inputAriaLabel: string;
@@ -100,31 +100,27 @@ export class QuickOpenController implements editorCommon.IEditorContribution, ID
 	});
 
 	public decorateLine(range: Range, editor: ICodeEditor): void {
-		editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-			const oldDecorations: string[] = [];
-			if (this.rangeHighlightDecorationId) {
-				oldDecorations.push(this.rangeHighlightDecorationId);
-				this.rangeHighlightDecorationId = null;
+		const oldDecorations: string[] = [];
+		if (this.rangeHighlightDecorationId) {
+			oldDecorations.push(this.rangeHighlightDecorationId);
+			this.rangeHighlightDecorationId = null;
+		}
+
+		const newDecorations: IModelDeltaDecoration[] = [
+			{
+				range: range,
+				options: QuickOpenController._RANGE_HIGHLIGHT_DECORATION
 			}
+		];
 
-			const newDecorations: IModelDeltaDecoration[] = [
-				{
-					range: range,
-					options: QuickOpenController._RANGE_HIGHLIGHT_DECORATION
-				}
-			];
-
-			const decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations);
-			this.rangeHighlightDecorationId = decorations[0];
-		});
+		const decorations = editor.deltaDecorations(oldDecorations, newDecorations);
+		this.rangeHighlightDecorationId = decorations[0];
 	}
 
 	public clearDecorations(): void {
 		if (this.rangeHighlightDecorationId) {
-			this.editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => {
-				changeAccessor.deltaDecorations([this.rangeHighlightDecorationId], []);
-				this.rangeHighlightDecorationId = null;
-			});
+			this.editor.deltaDecorations([this.rangeHighlightDecorationId], []);
+			this.rangeHighlightDecorationId = null;
 		}
 	}
 }
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
index c8b3d511cd3..7eade63fcd7 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { $, Dimension } from 'vs/base/browser/builder';
 import { QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { QuickOpenWidget } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
 import { IAutoFocus } from 'vs/base/parts/quickopen/common/quickOpen';
@@ -13,6 +12,7 @@ import { attachQuickOpenStyler } from 'vs/platform/theme/common/styler';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { foreground } from 'vs/platform/theme/common/colorRegistry';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface IQuickOpenEditorWidgetOptions {
 	inputAriaLabel: string;
@@ -37,7 +37,7 @@ export class QuickOpenEditorWidget implements IOverlayWidget {
 	}
 
 	private create(onOk: () => void, onCancel: () => void, onType: (value: string) => void, configuration: IQuickOpenEditorWidgetOptions): void {
-		this.domNode = $().div().getHTMLElement();
+		this.domNode = document.createElement('div');
 
 		this.quickOpenWidget = new QuickOpenWidget(
 			this.domNode,
diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
index a4923404f39..a09d76a25d5 100644
--- a/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
+++ b/src/vs/editor/standalone/browser/quickOpen/quickOutline.ts
@@ -15,7 +15,7 @@ import { IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel } from 'vs/ba
 import { IAutoFocus, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { SymbolInformation, DocumentSymbolProviderRegistry, symbolKindToCssClass, IOutline } from 'vs/editor/common/modes';
+import { SymbolInformation, DocumentSymbolProviderRegistry, symbolKindToCssClass, IOutline, Location } from 'vs/editor/common/modes';
 import { BaseEditorQuickOpenAction, IDecorator } from './editorQuickOpen';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
 import { registerEditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
@@ -25,7 +25,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 let SCOPE_PREFIX = ':';
 
-class SymbolEntry extends QuickOpenEntryGroup {
+export class SymbolEntry extends QuickOpenEntryGroup {
 	private name: string;
 	private type: string;
 	private description: string;
@@ -167,6 +167,10 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 		});
 	}
 
+	private symbolEntry(name: string, type: string, description: string, location: Location, highlights: IHighlight[], editor: ICodeEditor, decorator: IDecorator): SymbolEntry {
+		return new SymbolEntry(name, type, description, Range.lift(location.range), highlights, editor, decorator);
+	}
+
 	private toQuickOpenEntries(editor: ICodeEditor, flattened: SymbolInformation[], searchValue: string): SymbolEntry[] {
 		const controller = this.getController(editor);
 
@@ -193,7 +197,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction {
 				}
 
 				// Add
-				results.push(new SymbolEntry(label, symbolKindToCssClass(element.kind), description, Range.lift(element.location.range), highlights, editor, controller));
+				results.push(this.symbolEntry(label, symbolKindToCssClass(element.kind), description, element.location, highlights, editor, controller));
 			}
 		}
 
diff --git a/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
new file mode 100644
index 00000000000..4886fd86e1b
--- /dev/null
+++ b/src/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IEditorService } from 'vs/platform/editor/common/editor';
+import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
+
+export class StandaloneReferencesController extends ReferencesController {
+
+	public constructor(
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorService editorService: IEditorService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@INotificationService notificationService: INotificationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IStorageService storageService: IStorageService,
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@optional(IEnvironmentService) environmentService: IEnvironmentService
+	) {
+		super(
+			true,
+			editor,
+			contextKeyService,
+			editorService,
+			textModelResolverService,
+			notificationService,
+			instantiationService,
+			contextService,
+			storageService,
+			themeService,
+			configurationService,
+			environmentService
+		);
+	}
+}
+
+registerEditorContribution(StandaloneReferencesController);
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
index 3a45cc198a9..a09429f1137 100644
--- a/src/vs/editor/standalone/browser/simpleServices.ts
+++ b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -38,7 +38,7 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { OS } from 'vs/base/common/platform';
 import { IRange } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
-import { INotificationService, INotification, INotificationHandle, NoOpNotification, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, INotificationHandle, NoOpNotification, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
 import { IPosition, Position as Pos } from 'vs/editor/common/core/position';
 
@@ -297,8 +297,8 @@ export class SimpleNotificationService implements INotificationService {
 		return SimpleNotificationService.NO_OP;
 	}
 
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
-		return TPromise.as(0);
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		return SimpleNotificationService.NO_OP;
 	}
 }
 
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 14e25fa01f9..53a9a83ed47 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -164,7 +164,8 @@ export class StandaloneCodeEditor extends CodeEditor implements IStandaloneCodeE
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService
 	) {
 		options = options || {};
 		options.ariaLabel = options.ariaLabel || nls.localize('editorViewAccessibleLabel', "Editor content");
@@ -173,7 +174,7 @@ export class StandaloneCodeEditor extends CodeEditor implements IStandaloneCodeE
 				? nls.localize('accessibilityHelpMessageIE', "Press Ctrl+F1 for Accessibility Options.")
 				: nls.localize('accessibilityHelpMessage', "Press Alt+F1 for Accessibility Options.")
 		);
-		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, themeService);
+		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService);
 
 		if (keybindingService instanceof StandaloneKeybindingService) {
 			this._standaloneKeybindingService = keybindingService;
@@ -295,7 +296,8 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextViewService contextViewService: IContextViewService,
-		@IStandaloneThemeService themeService: IStandaloneThemeService
+		@IStandaloneThemeService themeService: IStandaloneThemeService,
+		@INotificationService notificationService: INotificationService,
 	) {
 		options = options || {};
 		if (typeof options.theme === 'string') {
@@ -303,7 +305,7 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		}
 		let model: ITextModel = options.model;
 		delete options.model;
-		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService);
+		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, keybindingService, themeService, notificationService);
 
 		this._contextViewService = <IEditorContextViewService>contextViewService;
 		this._register(toDispose);
diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts
index 53493117eb5..f6fbf6ba71d 100644
--- a/src/vs/editor/standalone/browser/standaloneEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneEditor.ts
@@ -89,7 +89,8 @@ export function create(domElement: HTMLElement, options?: IEditorConstructionOpt
 			services.get(IContextKeyService),
 			services.get(IKeybindingService),
 			services.get(IContextViewService),
-			services.get(IStandaloneThemeService)
+			services.get(IStandaloneThemeService),
+			services.get(INotificationService)
 		);
 	});
 }
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index c0eec9275ac..eaa070aeda8 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -391,12 +391,11 @@ export function registerColorProvider(languageId: string, provider: modes.Docume
 }
 
 /**
- * Register a folding provider
+ * Register a folding range provider
  */
-/*export function registerFoldingProvider(languageId: string, provider: modes.FoldingProvider): IDisposable {
-	return modes.FoldingProviderRegistry.register(languageId, provider);
-}*/
-
+export function registerFoldingRangeProvider(languageId: string, provider: modes.FoldingRangeProvider): IDisposable {
+	return modes.FoldingRangeProviderRegistry.register(languageId, provider);
+}
 
 /**
  * Contains additional diagnostic information about the context in which
@@ -787,12 +786,14 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		registerOnTypeFormattingEditProvider: registerOnTypeFormattingEditProvider,
 		registerLinkProvider: registerLinkProvider,
 		registerColorProvider: registerColorProvider,
+		registerFoldingRangeProvider: registerFoldingRangeProvider,
 
 		// enums
 		DocumentHighlightKind: modes.DocumentHighlightKind,
 		CompletionItemKind: CompletionItemKind,
 		SymbolKind: modes.SymbolKind,
 		IndentAction: IndentAction,
-		SuggestTriggerKind: modes.SuggestTriggerKind
+		SuggestTriggerKind: modes.SuggestTriggerKind,
+		FoldingRangeKind: modes.FoldingRangeKind
 	};
 }
diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index c84ca2cf87d..b1086e42833 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -42,6 +42,7 @@ import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standal
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IListService, ListService } from 'vs/platform/list/browser/listService';
 
 export interface IEditorContextViewService extends IContextViewService {
 	dispose(): void;
@@ -180,6 +181,8 @@ export class DynamicStandaloneServices extends Disposable {
 
 		let contextKeyService = ensure(IContextKeyService, () => this._register(new ContextKeyService(configurationService)));
 
+		ensure(IListService, () => new ListService(contextKeyService));
+
 		let commandService = ensure(ICommandService, () => new StandaloneCommandService(this._instantiationService));
 
 		ensure(IKeybindingService, () => this._register(new StandaloneKeybindingService(contextKeyService, commandService, telemetryService, notificationService, domElement)));
diff --git a/src/vs/editor/standalone/common/themes.ts b/src/vs/editor/standalone/common/themes.ts
index 0a51ad13ed8..5ac8ffea7e7 100644
--- a/src/vs/editor/standalone/common/themes.ts
+++ b/src/vs/editor/standalone/common/themes.ts
@@ -7,7 +7,7 @@
 
 import { IStandaloneThemeData } from 'vs/editor/standalone/common/standaloneThemeService';
 import { editorBackground, editorForeground, editorSelectionHighlight, editorInactiveSelection } from 'vs/platform/theme/common/colorRegistry';
-import { editorIndentGuides } from 'vs/editor/common/view/editorColorRegistry';
+import { editorIndentGuides, editorActiveIndentGuides } from 'vs/editor/common/view/editorColorRegistry';
 
 /* -------------------------------- Begin vs theme -------------------------------- */
 export const vs: IStandaloneThemeData = {
@@ -74,6 +74,7 @@ export const vs: IStandaloneThemeData = {
 		[editorForeground]: '#000000',
 		[editorInactiveSelection]: '#E5EBF1',
 		[editorIndentGuides]: '#D3D3D3',
+		[editorActiveIndentGuides]: '#939393',
 		[editorSelectionHighlight]: '#ADD6FF4D'
 	}
 };
@@ -144,6 +145,7 @@ export const vs_dark: IStandaloneThemeData = {
 		[editorForeground]: '#D4D4D4',
 		[editorInactiveSelection]: '#3A3D41',
 		[editorIndentGuides]: '#404040',
+		[editorActiveIndentGuides]: '#707070',
 		[editorSelectionHighlight]: '#ADD6FF26'
 	}
 };
@@ -205,6 +207,7 @@ export const hc_black: IStandaloneThemeData = {
 		[editorBackground]: '#000000',
 		[editorForeground]: '#FFFFFF',
 		[editorIndentGuides]: '#FFFFFF',
+		[editorActiveIndentGuides]: '#FFFFFF',
 	}
 };
 /* -------------------------------- End hc-black theme -------------------------------- */
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 9c62c90a5f3..c7e109750ea 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -11,18 +11,22 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { Handler, ICommand, IEditOperationBuilder, ICursorStateComputerData } from 'vs/editor/common/editorCommon';
-import { EndOfLinePreference, DefaultEndOfLine, ITextModelCreationOptions, ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
+import { EndOfLinePreference, ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
 import { TextModel } from 'vs/editor/common/model/textModel';
 import { IndentAction, IndentationRule } from 'vs/editor/common/modes/languageConfiguration';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
-import { LanguageIdentifier } from 'vs/editor/common/modes';
+import { LanguageIdentifier, ITokenizationSupport, IState, TokenizationRegistry } from 'vs/editor/common/modes';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { CoreNavigationCommands, CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
-let H = Handler;
+import { NULL_STATE } from 'vs/editor/common/modes/nullMode';
+import { TokenizationResult2 } from 'vs/editor/common/core/token';
+import { createTextModel, IRelaxedTextModelCreationOptions } from 'vs/editor/test/common/editorTestUtils';
+
+const H = Handler;
 
 // --------- utils
 
@@ -146,7 +150,7 @@ suite('Editor Controller - Cursor', () => {
 			LINE4 + '\r\n' +
 			LINE5;
 
-		thisModel = TextModel.createFromString(text);
+		thisModel = createTextModel(text);
 		thisConfiguration = new TestConfiguration(null);
 		thisViewModel = new ViewModel(0, thisConfiguration, thisModel, null);
 
@@ -722,7 +726,7 @@ suite('Editor Controller - Cursor', () => {
 	});
 
 	test('issue #4905 - column select is biased to the right', () => {
-		const model = TextModel.createFromString([
+		const model = createTextModel([
 			'var gulp = require("gulp");',
 			'var path = require("path");',
 			'var rimraf = require("rimraf");',
@@ -758,7 +762,7 @@ suite('Editor Controller - Cursor', () => {
 	});
 
 	test('issue #20087: column select with mouse', () => {
-		const model = TextModel.createFromString([
+		const model = createTextModel([
 			'<property id="SomeThing" key="SomeKey" value="000"/>',
 			'<property id="SomeThing" key="SomeKey" value="000"/>',
 			'<property id="SomeThing" Key="SomeKey" value="000"/>',
@@ -820,7 +824,7 @@ suite('Editor Controller - Cursor', () => {
 	});
 
 	test('issue #20087: column select with keyboard', () => {
-		const model = TextModel.createFromString([
+		const model = createTextModel([
 			'<property id="SomeThing" key="SomeKey" value="000"/>',
 			'<property id="SomeThing" key="SomeKey" value="000"/>',
 			'<property id="SomeThing" Key="SomeKey" value="000"/>',
@@ -872,7 +876,7 @@ suite('Editor Controller - Cursor', () => {
 	});
 
 	test('column select with keyboard', () => {
-		const model = TextModel.createFromString([
+		const model = createTextModel([
 			'var gulp = require("gulp");',
 			'var path = require("path");',
 			'var rimraf = require("rimraf");',
@@ -1128,18 +1132,13 @@ class IndentRulesMode extends MockMode {
 suite('Editor Controller - Regression tests', () => {
 
 	test('issue Microsoft/monaco-editor#443: Indentation of a single row deletes selected text in some cases', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'Hello world!',
 				'another line'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
-				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: false
+				insertSpaces: false
 			},
 		);
 
@@ -1155,16 +1154,12 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('Bug 9121: Auto indent + undo + redo is funky', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				''
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
 				trimAutoWhitespace: false
 			},
 		);
@@ -1219,20 +1214,99 @@ suite('Editor Controller - Regression tests', () => {
 		model.dispose();
 	});
 
+	test('issue #47733: Undo mangles unicode characters', () => {
+		const languageId = new LanguageIdentifier('myMode', 3);
+		class MyMode extends MockMode {
+			constructor() {
+				super(languageId);
+				this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+					surroundingPairs: [{ open: '"', close: '"' }]
+				}));
+			}
+		}
+
+		const mode = new MyMode();
+		const model = createTextModel('\'👁\'', undefined, languageId);
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			editor.setSelection(new Selection(1, 1, 1, 2));
+
+			cursorCommand(cursor, H.Type, { text: '"' }, 'keyboard');
+			assert.equal(model.getValue(EndOfLinePreference.LF), '"\'"👁\'', 'assert1');
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getValue(EndOfLinePreference.LF), '\'👁\'', 'assert2');
+		});
+
+		model.dispose();
+		mode.dispose();
+	});
+
+	test('issue #46208: Allow empty selections in the undo/redo stack', () => {
+		let model = createTextModel('');
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			cursorCommand(cursor, H.Type, { text: 'Hello' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: ' ' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: 'world' }, 'keyboard');
+			cursorCommand(cursor, H.Type, { text: ' ' }, 'keyboard');
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			moveLeft(cursor);
+			moveRight(cursor);
+
+			model.pushEditOperations([], [EditOperation.replaceMove(new Range(1, 12, 1, 13), '')], () => []);
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), 'Hello');
+			assertCursor(cursor, new Position(1, 6));
+
+			cursorCommand(cursor, H.Undo, {});
+			assert.equal(model.getLineContent(1), '');
+			assertCursor(cursor, new Position(1, 1));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello');
+			assertCursor(cursor, new Position(1, 6));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world ');
+			assertCursor(cursor, new Position(1, 13));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+
+			cursorCommand(cursor, H.Redo, {});
+			assert.equal(model.getLineContent(1), 'Hello world');
+			assertCursor(cursor, new Position(1, 12));
+		});
+
+		model.dispose();
+	});
+
 	test('bug #16815:Shift+Tab doesn\'t go back to tabstop', () => {
 		let mode = new OnEnterMode(IndentAction.IndentOutdent);
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'     function baz() {'
 			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			},
+			undefined,
 			mode.getLanguageIdentifier()
 		);
 
@@ -1250,18 +1324,10 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('Bug #18293:[regression][editor] Can\'t outdent whitespace line', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'      '
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -1277,7 +1343,7 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('Bug #16657: [editor] Tab on empty line of zero indentation moves cursor to position (1,1)', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'function baz() {',
 				'\tfunction hello() { // something here',
@@ -1288,12 +1354,7 @@ suite('Editor Controller - Regression tests', () => {
 				''
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 		);
 
@@ -1353,8 +1414,7 @@ suite('Editor Controller - Regression tests', () => {
 			text: [
 				'hello'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, tabSize: 4, insertSpaces: true, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 3, false);
 			moveTo(cursor, 1, 5, true);
@@ -1371,20 +1431,12 @@ suite('Editor Controller - Regression tests', () => {
 
 	test('issue #1140: Backspace stops prematurely', () => {
 		let mode = new SurroundingMode();
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'function baz() {',
 				'  return 1;',
 				'};'
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				tabSize: 4,
-				insertSpaces: true,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			},
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -1492,21 +1544,61 @@ suite('Editor Controller - Regression tests', () => {
 		});
 	});
 
+	test('issue #46440: (1) Pasting a multi-line selection pastes entire selection into every insertion point', () => {
+		usingCursor({
+			text: [
+				'line1',
+				'line2',
+				'line3'
+			],
+		}, (model, cursor) => {
+			cursor.setSelections('test', [new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1), new Selection(3, 1, 3, 1)]);
+
+			cursorCommand(cursor, H.Paste, {
+				text: 'a\nb\nc',
+				pasteOnNewLine: false,
+				multicursorText: null
+			});
+
+			assert.equal(model.getValue(), [
+				'aline1',
+				'bline2',
+				'cline3'
+			].join('\n'));
+		});
+	});
+
+	test('issue #46440: (2) Pasting a multi-line selection pastes entire selection into every insertion point', () => {
+		usingCursor({
+			text: [
+				'line1',
+				'line2',
+				'line3'
+			],
+		}, (model, cursor) => {
+			cursor.setSelections('test', [new Selection(1, 1, 1, 1), new Selection(2, 1, 2, 1), new Selection(3, 1, 3, 1)]);
+
+			cursorCommand(cursor, H.Paste, {
+				text: 'a\nb\nc\n',
+				pasteOnNewLine: false,
+				multicursorText: null
+			});
+
+			assert.equal(model.getValue(), [
+				'aline1',
+				'bline2',
+				'cline3'
+			].join('\n'));
+		});
+	});
+
 	test('issue #3071: Investigate why undo stack gets corrupted', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'some lines',
 				'and more lines',
 				'just some text',
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -1558,8 +1650,7 @@ suite('Editor Controller - Regression tests', () => {
 				'and more lines',
 				'just some text',
 			],
-			languageIdentifier: null,
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: null
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 1, false);
 
@@ -1574,22 +1665,14 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('issue #3463: pressing tab adds spaces, but not as many as for a tab', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'function a() {',
 				'\tvar a = {',
 				'\t\tx: 3',
 				'\t};',
 				'}',
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -1602,18 +1685,13 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('issue #4312: trying to type a tab character over a sequence of spaces results in unexpected behaviour', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'var foo = 123;       // this is a comment',
 				'var bar = 4;       // another comment'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
 				insertSpaces: false,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
 			}
 		);
 
@@ -1707,7 +1785,7 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('issue #33788: Wrong cursor position when double click to select a word', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'Just some text'
 			].join('\n')
@@ -1724,6 +1802,21 @@ suite('Editor Controller - Regression tests', () => {
 		model.dispose();
 	});
 
+	test('issue #12887: Double-click highlighting separating white space', () => {
+		let model = createTextModel(
+			[
+				'abc def'
+			].join('\n')
+		);
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			CoreNavigationCommands.WordSelect.runCoreEditorCommand(cursor, { position: new Position(1, 5) });
+			assert.deepEqual(cursor.getSelection(), new Selection(1, 5, 1, 8));
+		});
+
+		model.dispose();
+	});
+
 	test('issue #9675: Undo/Redo adds a stop in between CHN Characters', () => {
 		usingCursor({
 			text: [
@@ -1863,7 +1956,7 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('issue #41573 - delete across multiple lines does not shrink the selection when word wraps', () => {
-		const model = TextModel.createFromString([
+		const model = createTextModel([
 			'Authorization: \'Bearer pHKRfCTFSnGxs6akKlb9ddIXcca0sIUSZJutPHYqz7vEeHdMTMh0SGN0IGU3a0n59DXjTLRsj5EJ2u33qLNIFi9fk5XF8pK39PndLYUZhPt4QvHGLScgSkK0L4gwzkzMloTQPpKhqiikiIOvyNNSpd2o8j29NnOmdTUOKi9DVt74PD2ohKxyOrWZ6oZprTkb3eKajcpnS0LABKfaw2rmv4\','
 		].join('\n'));
 		const config = new TestConfiguration({
@@ -1915,18 +2008,10 @@ suite('Editor Controller - Regression tests', () => {
 	});
 
 	test('issue #44805: Should not be able to undo in readonly editor', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				''
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
-				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { readOnly: true, model: model }, (editor, cursor) => {
@@ -1942,6 +2027,141 @@ suite('Editor Controller - Regression tests', () => {
 
 		model.dispose();
 	});
+
+	test('issue #46314: ViewModel is out of sync with Model!', () => {
+
+		const tokenizationSupport: ITokenizationSupport = {
+			getInitialState: () => NULL_STATE,
+			tokenize: undefined,
+			tokenize2: (line: string, state: IState): TokenizationResult2 => {
+				return new TokenizationResult2(null, state);
+			}
+		};
+
+		const LANGUAGE_ID = 'modelModeTest1';
+		const languageRegistration = TokenizationRegistry.register(LANGUAGE_ID, tokenizationSupport);
+		let model = createTextModel('Just text', undefined, new LanguageIdentifier(LANGUAGE_ID, 0));
+
+		withTestCodeEditor(null, { model: model }, (editor1, cursor1) => {
+			withTestCodeEditor(null, { model: model }, (editor2, cursor2) => {
+
+				editor1.onDidChangeCursorPosition(() => {
+					model.tokenizeIfCheap(1);
+				});
+
+				model.applyEdits([{ range: new Range(1, 1, 1, 1), text: '-' }]);
+			});
+		});
+
+		languageRegistration.dispose();
+		model.dispose();
+	});
+
+	test('issue #37967: problem replacing consecutive characters', () => {
+		let model = createTextModel(
+			[
+				'const a = "foo";',
+				'const b = ""'
+			].join('\n')
+		);
+
+		withTestCodeEditor(null, { multiCursorMergeOverlapping: false, model: model }, (editor, cursor) => {
+			editor.setSelections([
+				new Selection(1, 12, 1, 12),
+				new Selection(1, 16, 1, 16),
+				new Selection(2, 12, 2, 12),
+				new Selection(2, 13, 2, 13),
+			]);
+
+			CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
+
+			assertCursor(cursor, [
+				new Selection(1, 11, 1, 11),
+				new Selection(1, 14, 1, 14),
+				new Selection(2, 11, 2, 11),
+				new Selection(2, 11, 2, 11),
+			]);
+
+			cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
+
+			assert.equal(model.getLineContent(1), 'const a = \'foo\';');
+			assert.equal(model.getLineContent(2), 'const b = \'\'');
+		});
+
+		model.dispose();
+	});
+
+	test('issue #15761: Cursor doesn\'t move in a redo operation', () => {
+		let model = createTextModel(
+			[
+				'hello'
+			].join('\n')
+		);
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			editor.setSelections([
+				new Selection(1, 4, 1, 4)
+			]);
+
+			editor.executeEdits('test', [{
+				range: new Range(1, 1, 1, 1),
+				text: '*',
+				forceMoveMarkers: true
+			}]);
+			assertCursor(cursor, [
+				new Selection(1, 5, 1, 5),
+			]);
+
+			cursorCommand(cursor, H.Undo, null, 'keyboard');
+			assertCursor(cursor, [
+				new Selection(1, 4, 1, 4),
+			]);
+
+			cursorCommand(cursor, H.Redo, null, 'keyboard');
+			assertCursor(cursor, [
+				new Selection(1, 5, 1, 5),
+			]);
+		});
+
+		model.dispose();
+	});
+
+	test('issue #42783: API Calls with Undo Leave Cursor in Wrong Position', () => {
+		let model = createTextModel(
+			[
+				'ab'
+			].join('\n')
+		);
+
+		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
+			editor.setSelections([
+				new Selection(1, 1, 1, 1)
+			]);
+
+			editor.executeEdits('test', [{
+				range: new Range(1, 1, 1, 3),
+				text: ''
+			}]);
+			assertCursor(cursor, [
+				new Selection(1, 1, 1, 1),
+			]);
+
+			cursorCommand(cursor, H.Undo, null, 'keyboard');
+			assertCursor(cursor, [
+				new Selection(1, 1, 1, 1),
+			]);
+
+			editor.executeEdits('test', [{
+				range: new Range(1, 1, 1, 2),
+				text: ''
+			}]);
+			assertCursor(cursor, [
+				new Selection(1, 1, 1, 1),
+			]);
+		});
+
+		model.dispose();
+	});
 });
 
 suite('Editor Controller - Cursor Configuration', () => {
@@ -1954,8 +2174,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 				'    Third Line',
 				'',
 				'1'
-			],
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			]
 		}, (model, cursor) => {
 			CoreNavigationCommands.MoveTo.runCoreEditorCommand(cursor, { position: new Position(1, 21), source: 'keyboard' });
 			cursorCommand(cursor, H.Type, { text: '\n' }, 'keyboard');
@@ -1965,7 +2184,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('Cursor honors insertSpaces configuration on tab', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'    \tMy First Line\t ',
 				'My Second Line123',
@@ -1974,12 +2193,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 				'1'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
 				tabSize: 13,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
 			}
 		);
 
@@ -2048,8 +2262,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			text: [
 				'\thello'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 7, false);
 			assertCursor(cursor, new Selection(1, 7, 1, 7));
@@ -2066,8 +2279,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			text: [
 				'\thello'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 7, false);
 			assertCursor(cursor, new Selection(1, 7, 1, 7));
@@ -2084,8 +2296,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 			text: [
 				'\thell()'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 7, false);
 			assertCursor(cursor, new Selection(1, 7, 1, 7));
@@ -2102,11 +2313,6 @@ suite('Editor Controller - Cursor Configuration', () => {
 				'    some  line abc  '
 			],
 			modelOpts: {
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
 				trimAutoWhitespace: false
 			}
 		}, (model, cursor) => {
@@ -2129,15 +2335,7 @@ suite('Editor Controller - Cursor Configuration', () => {
 		usingCursor({
 			text: [
 				'    '
-			],
-			modelOpts: {
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			]
 		}, (model, cursor) => {
 			moveTo(cursor, 1, model.getLineContent(1).length + 1);
 			cursorCommand(cursor, H.Type, { text: '\n' }, 'keyboard');
@@ -2157,14 +2355,6 @@ suite('Editor Controller - Cursor Configuration', () => {
 			text: [
 				'function foo (params: string) {}'
 			],
-			modelOpts: {
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			},
 			languageIdentifier: mode.getLanguageIdentifier(),
 		}, (model, cursor) => {
 
@@ -2198,22 +2388,14 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('removeAutoWhitespace on: removes only whitespace the cursor added 2', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'    if (a) {',
 				'        ',
 				'',
 				'',
 				'    }'
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -2247,18 +2429,10 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('removeAutoWhitespace on: test 1', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'    some  line abc  '
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model }, (editor, cursor) => {
@@ -2312,20 +2486,12 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('UseTabStops is off', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'    x',
 				'        a    ',
 				'    '
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model, useTabStops: false }, (editor, cursor) => {
@@ -2339,20 +2505,12 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('Backspace removes whitespaces with tab size', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				' \t \t     x',
 				'        a    ',
 				'    '
-			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			}
+			].join('\n')
 		);
 
 		withTestCodeEditor(null, { model: model, useTabStops: true }, (editor, cursor) => {
@@ -2413,17 +2571,12 @@ suite('Editor Controller - Cursor Configuration', () => {
 	});
 
 	test('PR #5423: Auto indent + undo + redo is funky', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				''
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			}
 		);
 
@@ -2499,7 +2652,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\tif (true) {'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
+			modelOpts: { insertSpaces: false },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 12, false);
@@ -2523,7 +2676,6 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 2, 2, false);
@@ -2542,7 +2694,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t\t\treturn true'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
+			modelOpts: { insertSpaces: false },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 2, 15, false);
@@ -2562,7 +2714,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t\t\t\treturn true'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
+			modelOpts: { insertSpaces: false },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 2, 14, false);
@@ -2580,18 +2732,13 @@ suite('Editor Controller - Indentation Rules', () => {
 	});
 
 	test('Enter honors indentNextLinePattern 2', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'if (true)',
 				'\tif (true)'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -2620,7 +2767,6 @@ suite('Editor Controller - Indentation Rules', () => {
 				'}}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 13, false);
@@ -2641,7 +2787,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 4, 3, false);
 			moveTo(cursor, 4, 4, true);
@@ -2660,7 +2806,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\tif (true) {'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 2, 12, false);
 			moveTo(cursor, 2, 13, true);
@@ -2681,7 +2827,6 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\tif (true) {'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 12, false);
 			assertCursor(cursor, new Selection(1, 12, 1, 12));
@@ -2706,7 +2851,6 @@ suite('Editor Controller - Indentation Rules', () => {
 				'    if (true) {'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 12, false);
 			assertCursor(cursor, new Selection(1, 12, 1, 12));
@@ -2730,7 +2874,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'    if (true) {'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 1, 12, false);
 			assertCursor(cursor, new Selection(1, 12, 1, 12));
@@ -2758,7 +2902,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
+			modelOpts: { insertSpaces: false },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 5, 4, false);
@@ -2779,7 +2923,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 9, false);
 			assertCursor(cursor, new Selection(3, 9, 3, 9));
@@ -2799,7 +2943,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 3, false);
 			assertCursor(cursor, new Selection(3, 3, 3, 3));
@@ -2818,8 +2962,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'    return true;',
 				'  }a}'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 2, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 11, false);
 			assertCursor(cursor, new Selection(3, 11, 3, 11));
@@ -2839,7 +2982,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 2, false);
 			assertCursor(cursor, new Selection(3, 2, 3, 2));
@@ -2866,7 +3009,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t\t}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 4, false);
 			assertCursor(cursor, new Selection(3, 4, 3, 4));
@@ -2892,8 +3035,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'    return true;',
 				'}a}'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 2, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 2, false);
 			assertCursor(cursor, new Selection(3, 2, 3, 2));
@@ -2923,7 +3065,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'}a}'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 2, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { tabSize: 2 }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 3, false);
 			assertCursor(cursor, new Selection(3, 3, 3, 3));
@@ -2949,7 +3091,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				''
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: true, tabSize: 2, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { tabSize: 2 }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 5, false);
 			moveTo(cursor, 4, 3, true);
@@ -2970,12 +3112,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'}'
 			],
 			modelOpts: {
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			languageIdentifier: mode.getLanguageIdentifier(),
 		}, (model, cursor) => {
@@ -2998,12 +3135,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'}'
 			],
 			modelOpts: {
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			languageIdentifier: mode.getLanguageIdentifier(),
 		}, (model, cursor) => {
@@ -3027,7 +3159,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}',
 				'?>'
 			],
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 5, 3, false);
 			assertCursor(cursor, new Selection(5, 3, 5, 3));
@@ -3046,7 +3178,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'		return 5;',
 				'	'
 			],
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			modelOpts: { insertSpaces: false }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 2, false);
 			assertCursor(cursor, new Selection(3, 2, 3, 2));
@@ -3058,7 +3190,7 @@ suite('Editor Controller - Indentation Rules', () => {
 	});
 
 	test('bug #16543: Tab should indent to correct indentation spot immediately', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'function baz() {',
 				'\tfunction hello() { // something here',
@@ -3068,12 +3200,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'}'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -3091,7 +3218,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 
 	test('bug #2938 (1): When pressing Tab on white-space only lines, indent straight to the right spot (similar to empty lines)', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'\tfunction baz() {',
 				'\t\tfunction hello() { // something here',
@@ -3101,12 +3228,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -3124,7 +3246,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 
 	test('bug #2938 (2): When pressing Tab on white-space only lines, indent straight to the right spot (similar to empty lines)', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'\tfunction baz() {',
 				'\t\tfunction hello() { // something here',
@@ -3134,12 +3256,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -3156,7 +3273,7 @@ suite('Editor Controller - Indentation Rules', () => {
 	});
 
 	test('bug #2938 (3): When pressing Tab on white-space only lines, indent straight to the right spot (similar to empty lines)', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'\tfunction baz() {',
 				'\t\tfunction hello() { // something here',
@@ -3166,12 +3283,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -3188,7 +3300,7 @@ suite('Editor Controller - Indentation Rules', () => {
 	});
 
 	test('bug #2938 (4): When pressing Tab on white-space only lines, indent straight to the right spot (similar to empty lines)', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'\tfunction baz() {',
 				'\t\tfunction hello() { // something here',
@@ -3198,12 +3310,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t}'
 			].join('\n'),
 			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
 				insertSpaces: false,
-				tabSize: 4,
-				trimAutoWhitespace: true
 			},
 			mode.getLanguageIdentifier()
 		);
@@ -3221,7 +3328,7 @@ suite('Editor Controller - Indentation Rules', () => {
 
 	test('bug #31015: When pressing Tab on lines and Enter rules are avail, indent straight to the right spotTab', () => {
 		let mode = new OnEnterMode(IndentAction.Indent);
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'    if (a) {',
 				'        ',
@@ -3229,14 +3336,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'',
 				'    }'
 			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				insertSpaces: true,
-				tabSize: 4,
-				detectIndentation: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				trimAutoWhitespace: true
-			},
+			undefined,
 			mode.getLanguageIdentifier()
 		);
 
@@ -3259,21 +3359,14 @@ suite('Editor Controller - Indentation Rules', () => {
 			increaseIndentPattern: /^\s*((begin|class|def|else|elsif|ensure|for|if|module|rescue|unless|until|when|while)|(.*\sdo\b))\b[^\{;]*$/,
 			decreaseIndentPattern: /^\s*([}\]]([,)]?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)/
 		});
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'class Greeter',
 				'  def initialize(name)',
 				'    @name = name',
 				'    en'
 			].join('\n'),
-			{
-				isForSimpleWidget: false,
-				defaultEOL: DefaultEndOfLine.LF,
-				detectIndentation: false,
-				insertSpaces: true,
-				tabSize: 2,
-				trimAutoWhitespace: true
-			},
+			undefined,
 			rubyMode.getLanguageIdentifier()
 		);
 
@@ -3298,8 +3391,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t\tconsole.log()',
 				'\t}'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 5, 3, false);
 			assertCursor(cursor, new Selection(5, 3, 5, 3));
@@ -3320,8 +3412,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				') {',
 				'}'
 			],
-			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true }
+			languageIdentifier: mode.getLanguageIdentifier()
 		}, (model, cursor) => {
 			moveTo(cursor, 2, 3, false);
 			assertCursor(cursor, new Selection(2, 3, 2, 3));
@@ -3340,7 +3431,6 @@ suite('Editor Controller - Indentation Rules', () => {
 				'\t\t'
 			],
 			languageIdentifier: mode.getLanguageIdentifier(),
-			modelOpts: { isForSimpleWidget: false, insertSpaces: false, tabSize: 4, detectIndentation: false, defaultEOL: DefaultEndOfLine.LF, trimAutoWhitespace: true },
 			editorOpts: { autoIndent: true }
 		}, (model, cursor) => {
 			moveTo(cursor, 3, 3, false);
@@ -3399,7 +3489,7 @@ suite('Editor Controller - Indentation Rules', () => {
 		}
 
 		let mode = new JSMode();
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'class ItemCtrl {',
 				'    getPropertiesByItemId(id) {',
@@ -3459,7 +3549,7 @@ suite('Editor Controller - Indentation Rules', () => {
 		}
 
 		let mode = new CppMode();
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'int main() {',
 				'  return 0;',
@@ -3471,7 +3561,7 @@ suite('Editor Controller - Indentation Rules', () => {
 				'',
 				')',
 			].join('\n'),
-			{ isForSimpleWidget: false, insertSpaces: true, detectIndentation: false, tabSize: 2, trimAutoWhitespace: false, defaultEOL: DefaultEndOfLine.LF },
+			{ tabSize: 2 },
 			mode.getLanguageIdentifier()
 		);
 
@@ -3504,12 +3594,12 @@ suite('Editor Controller - Indentation Rules', () => {
 interface ICursorOpts {
 	text: string[];
 	languageIdentifier?: LanguageIdentifier;
-	modelOpts?: ITextModelCreationOptions;
+	modelOpts?: IRelaxedTextModelCreationOptions;
 	editorOpts?: IEditorOptions;
 }
 
 function usingCursor(opts: ICursorOpts, callback: (model: TextModel, cursor: Cursor) => void): void {
-	let model = TextModel.createFromString(opts.text.join('\n'), opts.modelOpts, opts.languageIdentifier);
+	let model = createTextModel(opts.text.join('\n'), opts.modelOpts, opts.languageIdentifier);
 	model.forceTokenization(model.getLineCount());
 	let config = new TestConfiguration(opts.editorOpts);
 	let viewModel = new ViewModel(0, config, model, null);
@@ -4071,7 +4161,7 @@ suite('autoClosingPairs', () => {
 
 	test('All cursors should do the same thing when deleting left', () => {
 		let mode = new AutoClosingMode();
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'var a = ()'
 			].join('\n'),
@@ -4095,7 +4185,7 @@ suite('autoClosingPairs', () => {
 	});
 
 	test('issue #7100: Mouse word selection is strange when non-word character is at the end of line', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'before.a',
 				'before',
@@ -4125,7 +4215,7 @@ suite('autoClosingPairs', () => {
 suite('Undo stops', () => {
 
 	test('there is an undo stop between typing and deleting left', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4154,7 +4244,7 @@ suite('Undo stops', () => {
 	});
 
 	test('there is an undo stop between typing and deleting right', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4183,7 +4273,7 @@ suite('Undo stops', () => {
 	});
 
 	test('there is an undo stop between deleting left and typing', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4217,7 +4307,7 @@ suite('Undo stops', () => {
 	});
 
 	test('there is an undo stop between deleting left and deleting right', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4255,7 +4345,7 @@ suite('Undo stops', () => {
 	});
 
 	test('there is an undo stop between deleting right and typing', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4286,7 +4376,7 @@ suite('Undo stops', () => {
 	});
 
 	test('there is an undo stop between deleting right and deleting left', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
@@ -4322,7 +4412,7 @@ suite('Undo stops', () => {
 	});
 
 	test('inserts undo stop when typing space', () => {
-		let model = TextModel.createFromString(
+		let model = createTextModel(
 			[
 				'A  line',
 				'Another line',
diff --git a/src/vs/editor/test/browser/controller/textAreaState.test.ts b/src/vs/editor/test/browser/controller/textAreaState.test.ts
index fce77b0211d..492ad210207 100644
--- a/src/vs/editor/test/browser/controller/textAreaState.test.ts
+++ b/src/vs/editor/test/browser/controller/textAreaState.test.ts
@@ -82,7 +82,7 @@ suite('TextAreaState', () => {
 		textArea._value = 'Hello world!';
 		textArea._selectionStart = 1;
 		textArea._selectionEnd = 12;
-		let actual = TextAreaState.EMPTY.readFromTextArea(textArea);
+		let actual = TextAreaState.readFromTextArea(textArea);
 
 		assertTextAreaState(actual, 'Hello world!', 1, 12);
 		assert.equal(actual.value, 'Hello world!');
@@ -124,7 +124,7 @@ suite('TextAreaState', () => {
 		textArea.dispose();
 	});
 
-	function testDeduceInput(prevState: TextAreaState, value: string, selectionStart: number, selectionEnd: number, expected: string, expectedCharReplaceCnt: number): void {
+	function testDeduceInput(prevState: TextAreaState, value: string, selectionStart: number, selectionEnd: number, couldBeEmojiInput: boolean, couldBeTypingAtOffset0: boolean, expected: string, expectedCharReplaceCnt: number): void {
 		prevState = prevState || TextAreaState.EMPTY;
 
 		let textArea = new MockTextAreaWrapper();
@@ -132,8 +132,8 @@ suite('TextAreaState', () => {
 		textArea._selectionStart = selectionStart;
 		textArea._selectionEnd = selectionEnd;
 
-		let newState = prevState.readFromTextArea(textArea);
-		let actual = TextAreaState.deduceInput(prevState, newState, true);
+		let newState = TextAreaState.readFromTextArea(textArea);
+		let actual = TextAreaState.deduceInput(prevState, newState, couldBeEmojiInput, couldBeTypingAtOffset0);
 
 		assert.equal(actual.text, expected);
 		assert.equal(actual.replaceCharCnt, expectedCharReplaceCnt);
@@ -154,7 +154,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'ｓ',
-			0, 1,
+			0, 1, true, false,
 			'ｓ', 0
 		);
 
@@ -164,7 +164,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('ｓ', 0, 1, null, null),
 			'せ',
-			0, 1,
+			0, 1, true, false,
 			'せ', 1
 		);
 
@@ -174,7 +174,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せ', 0, 1, null, null),
 			'せｎ',
-			0, 2,
+			0, 2, true, false,
 			'せｎ', 1
 		);
 
@@ -184,7 +184,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せｎ', 0, 2, null, null),
 			'せん',
-			0, 2,
+			0, 2, true, false,
 			'せん', 2
 		);
 
@@ -194,7 +194,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せん', 0, 2, null, null),
 			'せんｓ',
-			0, 3,
+			0, 3, true, false,
 			'せんｓ', 2
 		);
 
@@ -204,7 +204,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんｓ', 0, 3, null, null),
 			'せんせ',
-			0, 3,
+			0, 3, true, false,
 			'せんせ', 3
 		);
 
@@ -214,7 +214,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせ', 0, 3, null, null),
 			'せんせ',
-			0, 3,
+			0, 3, true, false,
 			'せんせ', 3
 		);
 
@@ -224,7 +224,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせ', 0, 3, null, null),
 			'せんせい',
-			0, 4,
+			0, 4, true, false,
 			'せんせい', 3
 		);
 
@@ -234,7 +234,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'せんせい',
-			4, 4,
+			4, 4, true, false,
 			'', 0
 		);
 	});
@@ -253,7 +253,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'せんせい',
-			0, 4,
+			0, 4, true, false,
 			'せんせい', 4
 		);
 
@@ -263,7 +263,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('せんせい', 0, 4, null, null),
 			'先生',
-			0, 2,
+			0, 2, true, false,
 			'先生', 4
 		);
 
@@ -273,7 +273,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('先生', 0, 2, null, null),
 			'先生',
-			2, 2,
+			2, 2, true, false,
 			'', 0
 		);
 	});
@@ -282,7 +282,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			null,
 			'a',
-			0, 1,
+			0, 1, true, false,
 			'a', 0
 		);
 	});
@@ -291,7 +291,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState(']\n', 1, 2, null, null),
 			']\n',
-			2, 2,
+			2, 2, true, false,
 			'\n', 0
 		);
 	});
@@ -300,7 +300,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			null,
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -309,7 +309,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'a',
-			0, 1,
+			0, 1, true, false,
 			'a', 0
 		);
 	});
@@ -318,7 +318,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -327,7 +327,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 12, null, null),
 			'H',
-			1, 1,
+			1, 1, true, false,
 			'H', 0
 		);
 	});
@@ -336,7 +336,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 12, 12, null, null),
 			'Hello world!a',
-			13, 13,
+			13, 13, true, false,
 			'a', 0
 		);
 	});
@@ -345,7 +345,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 0, null, null),
 			'aHello world!',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -354,7 +354,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 6, 11, null, null),
 			'Hello other!',
-			11, 11,
+			11, 11, true, false,
 			'other', 0
 		);
 	});
@@ -363,7 +363,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			TextAreaState.EMPTY,
 			'これは',
-			3, 3,
+			3, 3, true, false,
 			'これは', 0
 		);
 	});
@@ -372,7 +372,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 0, 0, null, null),
 			'Aello world!',
-			1, 1,
+			1, 1, true, false,
 			'A', 0
 		);
 	});
@@ -381,7 +381,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellö world!',
-			4, 5,
+			4, 5, true, false,
 			'ö', 0
 		);
 	});
@@ -390,7 +390,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellöö world!',
-			5, 5,
+			5, 5, true, false,
 			'öö', 1
 		);
 	});
@@ -399,7 +399,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Helöö world!',
-			5, 5,
+			5, 5, true, false,
 			'öö', 2
 		);
 	});
@@ -408,7 +408,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('Hello world!', 5, 5, null, null),
 			'Hellö world!',
-			5, 5,
+			5, 5, true, false,
 			'ö', 1
 		);
 	});
@@ -417,7 +417,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('a', 0, 1, null, null),
 			'a',
-			1, 1,
+			1, 1, true, false,
 			'a', 0
 		);
 	});
@@ -426,7 +426,7 @@ suite('TextAreaState', () => {
 		testDeduceInput(
 			new TextAreaState('x x', 0, 1, null, null),
 			'x x',
-			1, 1,
+			1, 1, true, false,
 			'x', 0
 		);
 	});
@@ -456,7 +456,7 @@ suite('TextAreaState', () => {
 				'some6  text',
 				'some7  text'
 			].join('\n'),
-			4, 4,
+			4, 4, true, false,
 			'📅', 0
 		);
 	});
@@ -470,7 +470,7 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'some💊1  text',
-			6, 6,
+			6, 6, true, false,
 			'💊', 0
 		);
 	});
@@ -484,7 +484,7 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'qwertyu\nasdfghj\nzxcvbnm🎈',
-			25, 25,
+			25, 25, true, false,
 			'🎈', 0
 		);
 	});
@@ -499,11 +499,25 @@ suite('TextAreaState', () => {
 				null, null
 			),
 			'some⌨️1  text',
-			6, 6,
+			6, 6, true, false,
 			'⌨️', 0
 		);
 	});
 
+	test('issue #42251: Minor issue, character swapped when typing', () => {
+		// Typing on OSX occurs at offset 0 after moving the window using the custom (non-native) titlebar.
+		testDeduceInput(
+			new TextAreaState(
+				'ab',
+				2, 2,
+				null, null
+			),
+			'cab',
+			1, 1, true, true,
+			'c', 0
+		);
+	});
+
 	suite('PagedScreenReaderStrategy', () => {
 
 		function testPagedScreenReaderStrategy(lines: string[], selection: Selection, expected: TextAreaState): void {
diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts
index 675277aed4d..0c0759e7a08 100644
--- a/src/vs/editor/test/browser/testCodeEditor.ts
+++ b/src/vs/editor/test/browser/testCodeEditor.ts
@@ -24,6 +24,8 @@ import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class TestCodeEditor extends CommonCodeEditor implements editorBrowser.ICodeEditor {
 
@@ -168,12 +170,14 @@ export function createTestCodeEditor(model: ITextModel): TestCodeEditor {
 function _createTestCodeEditor(options: TestCodeEditorCreationOptions): TestCodeEditor {
 
 	let contextKeyService = new MockContextKeyService();
+	let notificationService = new TestNotificationService();
 
 	let services = options.serviceCollection || new ServiceCollection();
 	services.set(IContextKeyService, contextKeyService);
+	services.set(INotificationService, notificationService);
 	let instantiationService = new InstantiationService(services);
 
-	let editor = new TestCodeEditor(new MockScopeLocation(), options, false, instantiationService, contextKeyService);
+	let editor = new TestCodeEditor(new MockScopeLocation(), options, false, instantiationService, contextKeyService, notificationService);
 	editor.setModel(options.model);
 	return editor;
 }
diff --git a/src/vs/editor/test/common/config/commonEditorConfig.test.ts b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
index 4d5da6aec32..ef16d492ef5 100644
--- a/src/vs/editor/test/common/config/commonEditorConfig.test.ts
+++ b/src/vs/editor/test/common/config/commonEditorConfig.test.ts
@@ -88,14 +88,14 @@ suite('Common Editor Config', () => {
 		let config = new TestWrappingConfiguration({
 			wordWrap: <any>true
 		});
-		assertWrapping(config, true, 81);
+		assertWrapping(config, true, 80);
 	});
 
 	test('wordWrap on', () => {
 		let config = new TestWrappingConfiguration({
 			wordWrap: 'on'
 		});
-		assertWrapping(config, true, 81);
+		assertWrapping(config, true, 80);
 	});
 
 	test('wordWrap on without minimap', () => {
@@ -105,7 +105,7 @@ suite('Common Editor Config', () => {
 				enabled: false
 			}
 		});
-		assertWrapping(config, true, 89);
+		assertWrapping(config, true, 88);
 	});
 
 	test('wordWrap on does not use wordWrapColumn', () => {
@@ -113,7 +113,7 @@ suite('Common Editor Config', () => {
 			wordWrap: 'on',
 			wordWrapColumn: 10
 		});
-		assertWrapping(config, true, 81);
+		assertWrapping(config, true, 80);
 	});
 
 	test('wordWrap off', () => {
diff --git a/src/vs/editor/test/common/diff/diffComputer.test.ts b/src/vs/editor/test/common/diff/diffComputer.test.ts
index 0d521de7eb8..dd513f43452 100644
--- a/src/vs/editor/test/common/diff/diffComputer.test.ts
+++ b/src/vs/editor/test/common/diff/diffComputer.test.ts
@@ -673,4 +673,23 @@ suite('Editor Diff - DiffComputer', () => {
 		];
 		assertDiff(original, modified, expected, true, false);
 	});
+
+	test('issue #43922', () => {
+		let original = [
+			' * `yarn [install]` -- Install project NPM dependencies. This is automatically done when you first create the project. You should only need to run this if you add dependencies in `package.json`.',
+		];
+		let modified = [
+			'  * `yarn` -- Install project NPM dependencies. You should only need to run this if you add dependencies in `package.json`.',
+		];
+		var expected = [
+			createLineChange(
+				1, 1, 1, 1,
+				[
+					createCharChange(1, 9, 1, 19, 0, 0, 0, 0),
+					createCharChange(1, 58, 1, 120, 0, 0, 0, 0),
+				]
+			)
+		];
+		assertDiff(original, modified, expected, true, false);
+	});
 });
diff --git a/src/vs/editor/test/common/editorTestUtils.ts b/src/vs/editor/test/common/editorTestUtils.ts
index cdc1b3f2aca..d2e8cb2072e 100644
--- a/src/vs/editor/test/common/editorTestUtils.ts
+++ b/src/vs/editor/test/common/editorTestUtils.ts
@@ -5,9 +5,37 @@
 'use strict';
 
 import { TextModel } from 'vs/editor/common/model/textModel';
+import { DefaultEndOfLine, ITextModelCreationOptions } from 'vs/editor/common/model';
+import { LanguageIdentifier } from 'vs/editor/common/modes';
+import URI from 'vs/base/common/uri';
 
 export function withEditorModel(text: string[], callback: (model: TextModel) => void): void {
 	var model = TextModel.createFromString(text.join('\n'));
 	callback(model);
 	model.dispose();
 }
+
+export interface IRelaxedTextModelCreationOptions {
+	tabSize?: number;
+	insertSpaces?: boolean;
+	detectIndentation?: boolean;
+	trimAutoWhitespace?: boolean;
+	defaultEOL?: DefaultEndOfLine;
+	isForSimpleWidget?: boolean;
+	largeFileSize?: number;
+	largeFileLineCount?: number;
+}
+
+export function createTextModel(text: string, _options: IRelaxedTextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS, languageIdentifier: LanguageIdentifier = null, uri: URI = null): TextModel {
+	const options: ITextModelCreationOptions = {
+		tabSize: (typeof _options.tabSize === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.tabSize : _options.tabSize),
+		insertSpaces: (typeof _options.insertSpaces === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.insertSpaces : _options.insertSpaces),
+		detectIndentation: (typeof _options.detectIndentation === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.detectIndentation : _options.detectIndentation),
+		trimAutoWhitespace: (typeof _options.trimAutoWhitespace === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.trimAutoWhitespace : _options.trimAutoWhitespace),
+		defaultEOL: (typeof _options.defaultEOL === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.defaultEOL : _options.defaultEOL),
+		isForSimpleWidget: (typeof _options.isForSimpleWidget === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.isForSimpleWidget : _options.isForSimpleWidget),
+		largeFileSize: (typeof _options.largeFileSize === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.largeFileSize : _options.largeFileSize),
+		largeFileLineCount: (typeof _options.largeFileLineCount === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.largeFileLineCount : _options.largeFileLineCount),
+	};
+	return TextModel.createFromString(text, options, languageIdentifier, uri);
+}
diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index f466e4d21c8..42f00825eac 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -4,9 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 export function doBenchmark<T>(id: string, ts: T[], fn: (t: T) => void) {
 	let columns: string[] = [id];
@@ -57,7 +55,7 @@ export class BenchmarkSuite {
 		for (let i = 0; i < this.benchmarks.length; i++) {
 			let benchmark = this.benchmarks[i];
 			let columns: string[] = [benchmark.name];
-			[new LinesTextBufferBuilder(), new PieceTreeTextBufferBuilder(), new ChunksTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
+			[new PieceTreeTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
 				let timeDiffTotal = 0.0;
 				for (let j = 0; j < this.iterations; j++) {
 					let factory = benchmark.buildBuffer(builder);
diff --git a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
index 41445a17df9..da57b7089d7 100644
--- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts
@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { ITextBufferBuilder } from 'vs/editor/common/model';
 import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
 import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
 
-let linesTextBufferBuilder = new LinesTextBufferBuilder();
 let pieceTreeTextBufferBuilder = new PieceTreeTextBufferBuilder();
 let chunks = [];
 
@@ -30,5 +28,5 @@ let modelBuildBenchmark = function (id: string, builders: ITextBufferBuilder[],
 console.log(`|model builder\t|line buffer\t|piece table\t|`);
 console.log('|---|---|---|');
 for (let i of [10, 100]) {
-	modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTreeTextBufferBuilder], i);
+	modelBuildBenchmark(`${i} random chunks`, [pieceTreeTextBufferBuilder], i);
 }
diff --git a/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts b/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts
deleted file mode 100644
index a6cc8f6f22d..00000000000
--- a/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { BufferPiece } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece';
-
-suite('BufferPiece', () => {
-	test('findLineStartBeforeOffset', () => {
-		let piece = new BufferPiece([
-			'Line1\r\n',
-			'l2\n',
-			'another\r',
-			'and\r\n',
-			'finally\n',
-			'last'
-		].join(''));
-
-		assert.equal(piece.length(), 35);
-		assert.deepEqual(piece.findLineStartBeforeOffset(0), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(1), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(2), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(3), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(4), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(5), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(6), -1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(7), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(8), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(9), 0);
-		assert.deepEqual(piece.findLineStartBeforeOffset(10), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(11), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(12), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(13), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(14), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(15), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(16), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(17), 1);
-		assert.deepEqual(piece.findLineStartBeforeOffset(18), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(19), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(20), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(21), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(22), 2);
-		assert.deepEqual(piece.findLineStartBeforeOffset(23), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(24), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(25), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(26), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(27), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(28), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(29), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(30), 3);
-		assert.deepEqual(piece.findLineStartBeforeOffset(31), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(32), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(33), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(34), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(35), 4);
-		assert.deepEqual(piece.findLineStartBeforeOffset(36), 4);
-	});
-});
diff --git a/src/vs/editor/test/common/model/editableTextModel.test.ts b/src/vs/editor/test/common/model/editableTextModel.test.ts
index b2ce9f1c5da..fa41d0d5f49 100644
--- a/src/vs/editor/test/common/model/editableTextModel.test.ts
+++ b/src/vs/editor/test/common/model/editableTextModel.test.ts
@@ -1069,4 +1069,26 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
 		model.dispose();
 		mirrorModel2.dispose();
 	});
+
+	test('issue #47733: Undo mangles unicode characters', () => {
+		let model = createEditableTextModelFromString('\'👁\'');
+
+		model.applyEdits([
+			{ range: new Range(1, 1, 1, 1), text: '"' },
+			{ range: new Range(1, 2, 1, 2), text: '"' },
+		]);
+
+		// assert.equal(model.getValue(EndOfLinePreference.LF), '"\'"👁\'');
+
+		assert.deepEqual(model.validateRange(new Range(1, 3, 1, 4)), new Range(1, 3, 1, 4));
+
+		// model.applyEdits([
+		// 	{ range: new Range(1, 1, 1, 2), text: null },
+		// 	{ range: new Range(1, 3, 1, 4), text: null },
+		// ]);
+
+		// assert.equal(model.getValue(EndOfLinePreference.LF), '\'👁\'');
+
+		model.dispose();
+	});
 });
diff --git a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
index 7f1fc466033..035ec1a9221 100644
--- a/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
+++ b/src/vs/editor/test/common/model/editableTextModelTestUtils.ts
@@ -31,8 +31,17 @@ export function testApplyEditsWithSyncedModels(original: string[], edits: IIdent
 		assert.deepEqual(model.getValue(EndOfLinePreference.LF), originalStr);
 
 		if (!inputEditsAreInvalid) {
+			const simplifyEdit = (edit: IIdentifiedSingleEditOperation) => {
+				return {
+					identifier: edit.identifier,
+					range: edit.range,
+					text: edit.text,
+					forceMoveMarkers: edit.forceMoveMarkers,
+					isAutoWhitespaceEdit: edit.isAutoWhitespaceEdit
+				};
+			};
 			// Assert the inverse of the inverse edits are the original edits
-			assert.deepEqual(inverseInverseEdits, edits);
+			assert.deepEqual(inverseInverseEdits.map(simplifyEdit), edits.map(simplifyEdit));
 		}
 
 		assertMirrorModels();
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
index 155bac69a70..3f14797774a 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBuffer.test.ts
@@ -7,9 +7,11 @@
 
 import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
-import { LinesTextBuffer, IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer';
+import { PieceTreeTextBuffer, IValidatedEditOperation } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
+import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import { DefaultEndOfLine } from 'vs/editor/common/model';
 
-suite('LinesTextBuffer._getInverseEdits', () => {
+suite('PieceTreeTextBuffer._getInverseEdits', () => {
 
 	function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, text: string[]): IValidatedEditOperation {
 		return {
@@ -29,7 +31,7 @@ suite('LinesTextBuffer._getInverseEdits', () => {
 	}
 
 	function assertInverseEdits(ops: IValidatedEditOperation[], expected: Range[]): void {
-		var actual = LinesTextBuffer._getInverseEditRanges(ops);
+		var actual = PieceTreeTextBuffer._getInverseEditRanges(ops);
 		assert.deepEqual(actual, expected);
 	}
 
@@ -260,7 +262,7 @@ suite('LinesTextBuffer._getInverseEdits', () => {
 	});
 });
 
-suite('LinesTextBuffer._toSingleEditOperation', () => {
+suite('PieceTreeTextBuffer._toSingleEditOperation', () => {
 
 	function editOp(startLineNumber: number, startColumn: number, endLineNumber: number, endColumn: number, rangeOffset: number, rangeLength: number, text: string[]): IValidatedEditOperation {
 		return {
@@ -276,13 +278,7 @@ suite('LinesTextBuffer._toSingleEditOperation', () => {
 	}
 
 	function testToSingleEditOperation(original: string[], edits: IValidatedEditOperation[], expected: IValidatedEditOperation): void {
-		const textBuffer = new LinesTextBuffer({
-			BOM: '',
-			EOL: '\n',
-			containsRTL: false,
-			isBasicASCII: true,
-			lines: original
-		});
+		const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(original.join('\n')).create(DefaultEndOfLine.LF);
 
 		const actual = textBuffer._toSingleEditOperation(edits);
 		assert.deepEqual(actual, expected);
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
index afae933900b..0291217b61d 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilder.test.ts
@@ -5,150 +5,69 @@
 'use strict';
 
 import * as assert from 'assert';
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
-import { ITextModelCreationOptions } from 'vs/editor/common/model';
-import { TextModel } from 'vs/editor/common/model/textModel';
+import { DefaultEndOfLine } from 'vs/editor/common/model';
+import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import * as strings from 'vs/base/common/strings';
-import { IRawTextSource } from 'vs/editor/common/model/linesTextBuffer/textSource';
+import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
-class RawTextSource {
-	public static fromString(rawText: string): IRawTextSource {
-		// Count the number of lines that end with \r\n
-		let carriageReturnCnt = 0;
-		let lastCarriageReturnIndex = -1;
-		while ((lastCarriageReturnIndex = rawText.indexOf('\r', lastCarriageReturnIndex + 1)) !== -1) {
-			carriageReturnCnt++;
-		}
+export function testTextBufferFactory(text: string, eol: string, mightContainNonBasicASCII: boolean, mightContainRTL: boolean): void {
+	const textBuffer = <PieceTreeTextBuffer>createTextBufferFactory(text).create(DefaultEndOfLine.LF);
 
-		const containsRTL = strings.containsRTL(rawText);
-		const isBasicASCII = (containsRTL ? false : strings.isBasicASCII(rawText));
-
-		// Split the text into lines
-		const lines = rawText.split(/\r\n|\r|\n/);
-
-		// Remove the BOM (if present)
-		let BOM = '';
-		if (strings.startsWithUTF8BOM(lines[0])) {
-			BOM = strings.UTF8_BOM_CHARACTER;
-			lines[0] = lines[0].substr(1);
-		}
-
-		return {
-			BOM: BOM,
-			lines: lines,
-			containsRTL: containsRTL,
-			isBasicASCII: isBasicASCII,
-			totalCRCount: carriageReturnCnt
-		};
-	}
-}
-
-export function testModelBuilder(chunks: string[], opts: ITextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS): void {
-	let expectedTextSource = RawTextSource.fromString(chunks.join(''));
-
-	let builder = new LinesTextBufferBuilder();
-	for (let i = 0, len = chunks.length; i < len; i++) {
-		builder.acceptChunk(chunks[i]);
-	}
-	let actual = builder.finish();
-
-	assert.deepEqual(actual.rawTextSource, expectedTextSource);
+	assert.equal(textBuffer.mightContainNonBasicASCII(), mightContainNonBasicASCII);
+	assert.equal(textBuffer.mightContainRTL(), mightContainRTL);
+	assert.equal(textBuffer.getEOL(), eol);
 }
 
 suite('ModelBuilder', () => {
 
-	test('no chunks', () => {
-		testModelBuilder([]);
+	test('t1', () => {
+		testTextBufferFactory('', '\n', false, false);
 	});
 
-	test('single empty chunk', () => {
-		testModelBuilder(['']);
+	test('t2', () => {
+		testTextBufferFactory('Hello world', '\n', false, false);
 	});
 
-	test('single line in one chunk', () => {
-		testModelBuilder(['Hello world']);
+	test('t3', () => {
+		testTextBufferFactory('Hello world\nHow are you?', '\n', false, false);
 	});
 
-	test('single line in multiple chunks', () => {
-		testModelBuilder(['Hello', ' ', 'world']);
-	});
-
-	test('two lines in single chunk', () => {
-		testModelBuilder(['Hello world\nHow are you?']);
-	});
-
-	test('two lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello worl', 'd\nHow are you?']);
-	});
-
-	test('two lines in multiple chunks 2', () => {
-		testModelBuilder(['Hello worl', 'd', '\n', 'H', 'ow are you?']);
-	});
-
-	test('two lines in multiple chunks 3', () => {
-		testModelBuilder(['Hello worl', 'd', '\nHow are you?']);
-	});
-
-	test('multiple lines in single chunks', () => {
-		testModelBuilder(['Hello world\nHow are you?\nIs everything good today?\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world\nHow are you', '?\nIs everything good today?\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world', '\nHow are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
-	});
-
-	test('multiple lines in multiple chunks 1', () => {
-		testModelBuilder(['Hello world\n', 'How are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
+	test('t4', () => {
+		testTextBufferFactory('Hello world\nHow are you?\nIs everything good today?\nDo you enjoy the weather?', '\n', false, false);
 	});
 
 	test('carriage return detection (1 \\r\\n 2 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\nIs everything good today?', '\nDo you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\nIs everything good today?\nDo you enjoy the weather?', '\n', false, false);
 	});
 
 	test('carriage return detection (2 \\r\\n 1 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\r\nIs everything good today?', '\nDo you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\r\nIs everything good today?\nDo you enjoy the weather?', '\r\n', false, false);
 	});
 
 	test('carriage return detection (3 \\r\\n 0 \\n)', () => {
-		testModelBuilder(['Hello world\r\n', 'How are you', '?\r\nIs everything good today?', '\r\nDo you enjoy the weather?']);
-	});
-
-	test('carriage return detection (isolated \\r)', () => {
-		testModelBuilder(['Hello world', '\r', '\n', 'How are you', '?', '\r', '\n', 'Is everything good today?', '\r', '\n', 'Do you enjoy the weather?']);
+		testTextBufferFactory('Hello world\r\nHow are you?\r\nIs everything good today?\r\nDo you enjoy the weather?', '\r\n', false, false);
 	});
 
 	test('BOM handling', () => {
-		testModelBuilder([strings.UTF8_BOM_CHARACTER + 'Hello world!']);
+		testTextBufferFactory(strings.UTF8_BOM_CHARACTER + 'Hello world!', '\n', false, false);
 	});
 
 	test('BOM handling', () => {
-		testModelBuilder([strings.UTF8_BOM_CHARACTER, 'Hello world!']);
-	});
-
-	test('RTL handling 1', () => {
-		testModelBuilder(['Hello world!', 'זוהי עובדה מבוססת שדעתו']);
+		testTextBufferFactory(strings.UTF8_BOM_CHARACTER + 'Hello world!', '\n', false, false);
 	});
 
 	test('RTL handling 2', () => {
-		testModelBuilder(['Hello world!זוהי עובדה מבוססת שדעתו']);
+		testTextBufferFactory('Hello world!זוהי עובדה מבוססת שדעתו', '\n', true, true);
 	});
 
 	test('RTL handling 3', () => {
-		testModelBuilder(['Hello world!זוהי \nעובדה מבוססת שדעתו']);
+		testTextBufferFactory('Hello world!זוהי \nעובדה מבוססת שדעתו', '\n', true, true);
 	});
 
 	test('ASCII handling 1', () => {
-		testModelBuilder(['Hello world!!\nHow do you do?']);
+		testTextBufferFactory('Hello world!!\nHow do you do?', '\n', false, false);
 	});
-	test('ASCII handling 1', () => {
-		testModelBuilder(['Hello world!!\nHow do you do?Züricha📚📚b']);
-	});
-
-	test('issue #32819: some special string cannot be displayed completely', () => {
-		testModelBuilder(['ＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡＡ123']);
+	test('ASCII handling 2', () => {
+		testTextBufferFactory('Hello world!!\nHow do you do?Züricha📚📚b', '\n', true, false);
 	});
 });
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts
deleted file mode 100644
index 8d7119d2077..00000000000
--- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import { testModelBuilder } from './linesTextBufferBuilder.test';
-import { getRandomInt, getRandomEOLSequence, getRandomString } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
-
-const GENERATE_TESTS = false;
-
-suite('ModelBuilder Auto Tests', () => {
-
-	test('auto1', () => {
-		testModelBuilder(['sarjniow', '\r', '\nbpb', 'ofb', '\njzldgxx', '\r\nkzwfjysng']);
-	});
-
-	test('auto2', () => {
-		testModelBuilder(['i', 'yyernubi\r\niimgn\n', 'ut\r']);
-	});
-
-});
-
-function generateRandomFile(): string {
-	let lineCount = getRandomInt(1, 10);
-	let mixedEOLSequence = getRandomInt(1, 2) === 1 ? true : false;
-	let fixedEOL = getRandomEOLSequence();
-	let lines: string[] = [];
-	for (let i = 0; i < lineCount; i++) {
-		if (i !== 0) {
-			if (mixedEOLSequence) {
-				lines.push(getRandomEOLSequence());
-			} else {
-				lines.push(fixedEOL);
-			}
-		}
-		lines.push(getRandomString(0, 10));
-
-	}
-	return lines.join('');
-}
-
-function generateRandomChunks(file: string): string[] {
-	let result: string[] = [];
-	let cnt = getRandomInt(1, 20);
-
-	let maxOffset = file.length;
-
-	while (cnt > 0 && maxOffset > 0) {
-
-		let offset = getRandomInt(0, maxOffset);
-		result.unshift(file.substring(offset, maxOffset));
-		// let length = getRandomInt(0, maxOffset - offset);
-		// let text = generateFile(true);
-
-		// result.push({
-		// 	offset: offset,
-		// 	length: length,
-		// 	text: text
-		// });
-
-		maxOffset = offset;
-		cnt--;
-	}
-	if (maxOffset !== 0) {
-		result.unshift(file.substring(0, maxOffset));
-	}
-	return result;
-}
-
-function testRandomFile(file: string): boolean {
-	let tests = getRandomInt(5, 10);
-	for (let i = 0; i < tests; i++) {
-		let chunks = generateRandomChunks(file);
-		try {
-			testModelBuilder(chunks);
-		} catch (err) {
-			console.log(err);
-			console.log(JSON.stringify(chunks));
-			return false;
-		}
-	}
-	return true;
-}
-
-if (GENERATE_TESTS) {
-	let number = 1;
-	while (true) {
-		console.log('------BEGIN NEW TEST: ' + number);
-
-		if (!testRandomFile(generateRandomFile())) {
-			break;
-		}
-
-		console.log('------END NEW TEST: ' + (number++));
-	}
-}
diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts
index 0c15f9753f5..b53ce735bfc 100644
--- a/src/vs/editor/test/common/model/model.test.ts
+++ b/src/vs/editor/test/common/model/model.test.ts
@@ -109,7 +109,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -128,7 +128,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -205,7 +205,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -224,7 +224,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -243,7 +243,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -263,7 +263,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -314,7 +314,7 @@ suite('Editor Model - Model', () => {
 		let e: ModelRawContentChangedEvent = null;
 		thisModel.onDidChangeRawContent((_e) => {
 			if (e !== null) {
-				assert.fail();
+				assert.fail('Unexpected assertion error');
 			}
 			e = _e;
 		});
@@ -328,6 +328,16 @@ suite('Editor Model - Model', () => {
 			false
 		));
 	});
+
+	test('issue #46342: Maintain edit operation order in applyEdits', () => {
+		let res = thisModel.applyEdits([
+			{ range: new Range(2, 1, 2, 1), text: 'a' },
+			{ range: new Range(1, 1, 1, 1), text: 'b' },
+		]);
+
+		assert.deepEqual(res[0].range, new Range(2, 1, 2, 2));
+		assert.deepEqual(res[1].range, new Range(1, 1, 1, 2));
+	});
 });
 
 
diff --git a/src/vs/editor/test/common/model/modelEditOperation.test.ts b/src/vs/editor/test/common/model/modelEditOperation.test.ts
index ac20a1b71d5..e249ec82363 100644
--- a/src/vs/editor/test/common/model/modelEditOperation.test.ts
+++ b/src/vs/editor/test/common/model/modelEditOperation.test.ts
@@ -68,7 +68,16 @@ suite('Editor Model - Model Edit Operation', () => {
 		assert.equal(model.getLineContent(4), LINE4);
 		assert.equal(model.getLineContent(5), LINE5);
 
-		assert.deepEqual(originalOp, editOp);
+		const simplifyEdit = (edit: IIdentifiedSingleEditOperation) => {
+			return {
+				identifier: edit.identifier,
+				range: edit.range,
+				text: edit.text,
+				forceMoveMarkers: edit.forceMoveMarkers,
+				isAutoWhitespaceEdit: edit.isAutoWhitespaceEdit
+			};
+		};
+		assert.deepEqual(originalOp.map(simplifyEdit), editOp.map(simplifyEdit));
 	}
 
 	test('Insert inline', () => {
diff --git a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
index e5b6970d888..089c17be083 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1445,11 +1445,44 @@ suite('centralized lineStarts with CRLF', () => {
 });
 
 suite('random is unsupervised', () => {
+	test('splitting large change buffer', function () {
+		let pieceTable = createTextBuffer([''], false);
+		let str = '';
+
+		pieceTable.insert(0, 'WUZ\nXVZY\n');
+		str = str.substring(0, 0) + 'WUZ\nXVZY\n' + str.substring(0);
+		pieceTable.insert(8, '\r\r\nZXUWVW');
+		str = str.substring(0, 8) + '\r\r\nZXUWVW' + str.substring(8);
+		pieceTable.delete(10, 7);
+		str = str.substring(0, 10) + str.substring(10 + 7);
+		pieceTable.delete(10, 1);
+		str = str.substring(0, 10) + str.substring(10 + 1);
+		pieceTable.insert(4, 'VX\r\r\nWZVZ');
+		str = str.substring(0, 4) + 'VX\r\r\nWZVZ' + str.substring(4);
+		pieceTable.delete(11, 3);
+		str = str.substring(0, 11) + str.substring(11 + 3);
+		pieceTable.delete(12, 4);
+		str = str.substring(0, 12) + str.substring(12 + 4);
+		pieceTable.delete(8, 0);
+		str = str.substring(0, 8) + str.substring(8 + 0);
+		pieceTable.delete(10, 2);
+		str = str.substring(0, 10) + str.substring(10 + 2);
+		pieceTable.insert(0, 'VZXXZYZX\r');
+		str = str.substring(0, 0) + 'VZXXZYZX\r' + str.substring(0);
+
+		assert.equal(pieceTable.getLinesRawContent(), str);
+
+		testLineStarts(str, pieceTable);
+		testLinesContent(str, pieceTable);
+		assertTreeInvariants(pieceTable);
+	});
+
 	test('random insert delete', function () {
 		this.timeout(500000);
 		let str = '';
 		let pieceTable = createTextBuffer([str], false);
 
+		// let output = '';
 		for (let i = 0; i < 1000; i++) {
 			if (Math.random() < 0.6) {
 				// insert
@@ -1457,6 +1490,8 @@ suite('random is unsupervised', () => {
 				let pos = randomInt(str.length + 1);
 				pieceTable.insert(pos, text);
 				str = str.substring(0, pos) + text + str.substring(pos);
+				// output += `pieceTable.insert(${pos}, '${text.replace(/\n/g, '\\n').replace(/\r/g, '\\r')}');\n`;
+				// output += `str = str.substring(0, ${pos}) + '${text.replace(/\n/g, '\\n').replace(/\r/g, '\\r')}' + str.substring(${pos});\n`;
 			} else {
 				// delete
 				let pos = randomInt(str.length);
@@ -1466,8 +1501,12 @@ suite('random is unsupervised', () => {
 				);
 				pieceTable.delete(pos, length);
 				str = str.substring(0, pos) + str.substring(pos + length);
+				// output += `pieceTable.delete(${pos}, ${length});\n`;
+				// output += `str = str.substring(0, ${pos}) + str.substring(${pos} + ${length});\n`
+
 			}
 		}
+		// console.log(output);
 
 		assert.equal(pieceTable.getLinesRawContent(), str);
 
@@ -1571,6 +1610,37 @@ suite('buffer api', () => {
 
 		assert(!a.equal(b));
 	});
+
+	test('getLineCharCode - issue #45735', () => {
+		let pieceTable = createTextBuffer(['LINE1\nline2']);
+		assert.equal(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
+		assert.equal(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
+		assert.equal(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
+		assert.equal(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
+		assert.equal(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
+		assert.equal(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
+		assert.equal(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
+		assert.equal(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
+		assert.equal(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
+		assert.equal(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
+		assert.equal(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
+	});
+
+
+	test('getLineCharCode - issue #47733', () => {
+		let pieceTable = createTextBuffer(['', 'LINE1\n', 'line2']);
+		assert.equal(pieceTable.getLineCharCode(1, 0), 'L'.charCodeAt(0), 'L');
+		assert.equal(pieceTable.getLineCharCode(1, 1), 'I'.charCodeAt(0), 'I');
+		assert.equal(pieceTable.getLineCharCode(1, 2), 'N'.charCodeAt(0), 'N');
+		assert.equal(pieceTable.getLineCharCode(1, 3), 'E'.charCodeAt(0), 'E');
+		assert.equal(pieceTable.getLineCharCode(1, 4), '1'.charCodeAt(0), '1');
+		assert.equal(pieceTable.getLineCharCode(1, 5), '\n'.charCodeAt(0), '\\n');
+		assert.equal(pieceTable.getLineCharCode(2, 0), 'l'.charCodeAt(0), 'l');
+		assert.equal(pieceTable.getLineCharCode(2, 1), 'i'.charCodeAt(0), 'i');
+		assert.equal(pieceTable.getLineCharCode(2, 2), 'n'.charCodeAt(0), 'n');
+		assert.equal(pieceTable.getLineCharCode(2, 3), 'e'.charCodeAt(0), 'e');
+		assert.equal(pieceTable.getLineCharCode(2, 4), '2'.charCodeAt(0), '2');
+	});
 });
 
 suite('search offset cache', () => {
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index 907e1460e72..e6d83dbe0ba 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -8,19 +8,16 @@ import * as assert from 'assert';
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
-import { DefaultEndOfLine } from 'vs/editor/common/model';
 import { UTF8_BOM_CHARACTER } from 'vs/base/common/strings';
+import { createTextModel } from 'vs/editor/test/common/editorTestUtils';
 
 function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: number, expectedInsertSpaces: boolean, expectedTabSize: number, text: string[], msg?: string): void {
-	var m = TextModel.createFromString(
+	var m = createTextModel(
 		text.join('\n'),
 		{
-			isForSimpleWidget: false,
 			tabSize: defaultTabSize,
 			insertSpaces: defaultInsertSpaces,
-			detectIndentation: true,
-			defaultEOL: DefaultEndOfLine.LF,
-			trimAutoWhitespace: true
+			detectIndentation: true
 		}
 	);
 	var r = m.getOptions();
@@ -706,14 +703,9 @@ suite('Editor Model - TextModel', () => {
 	});
 
 	test('normalizeIndentation 1', () => {
-		let model = TextModel.createFromString('',
+		let model = createTextModel('',
 			{
-				isForSimpleWidget: false,
-				detectIndentation: false,
-				tabSize: 4,
-				insertSpaces: false,
-				trimAutoWhitespace: true,
-				defaultEOL: DefaultEndOfLine.LF
+				insertSpaces: false
 			}
 		);
 
@@ -743,16 +735,7 @@ suite('Editor Model - TextModel', () => {
 	});
 
 	test('normalizeIndentation 2', () => {
-		let model = TextModel.createFromString('',
-			{
-				isForSimpleWidget: false,
-				detectIndentation: false,
-				tabSize: 4,
-				insertSpaces: true,
-				trimAutoWhitespace: true,
-				defaultEOL: DefaultEndOfLine.LF
-			}
-		);
+		let model = createTextModel('');
 
 		assert.equal(model.normalizeIndentation('\ta'), '    a');
 		assert.equal(model.normalizeIndentation('    a'), '    a');
diff --git a/src/vs/editor/test/common/model/textModelWithTokens.test.ts b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
index a9fae3df41a..be4d9452721 100644
--- a/src/vs/editor/test/common/model/textModelWithTokens.test.ts
+++ b/src/vs/editor/test/common/model/textModelWithTokens.test.ts
@@ -380,10 +380,39 @@ suite('TextModel.getLineIndentGuide', () => {
 			actual[line - 1] = [actualIndents[line - 1], model.getLineContent(line)];
 		}
 
-		// let expected = lines.map(l => l[0]);
-
 		assert.deepEqual(actual, lines);
 
+		// Also test getActiveIndentGuide
+		for (let lineNumber = 1; lineNumber <= model.getLineCount(); lineNumber++) {
+			let startLineNumber = lineNumber;
+			let endLineNumber = lineNumber;
+			let indent = actualIndents[lineNumber - 1];
+
+			if (indent !== 0) {
+				for (let i = lineNumber - 1; i >= 1; i--) {
+					const currIndent = actualIndents[i - 1];
+					if (currIndent >= indent) {
+						startLineNumber = i;
+					} else {
+						break;
+					}
+				}
+				for (let i = lineNumber + 1; i <= model.getLineCount(); i++) {
+					const currIndent = actualIndents[i - 1];
+					if (currIndent >= indent) {
+						endLineNumber = i;
+					} else {
+						break;
+					}
+				}
+			}
+
+			const expected = { startLineNumber, endLineNumber, indent };
+			const actual = model.getActiveIndentGuide(lineNumber);
+
+			assert.deepEqual(actual, expected, `line number ${lineNumber}`);
+		}
+
 		model.dispose();
 	}
 
diff --git a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
index 0a8b62e8a55..0d55c58d7c1 100644
--- a/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
+++ b/src/vs/editor/test/common/services/editorSimpleWorker.test.ts
@@ -168,4 +168,25 @@ suite('EditorSimpleWorker', () => {
 			assert.equal(suggestions[0].label, 'foobar');
 		});
 	});
+
+	test('get words via iterator, issue #46930', function () {
+
+		let model = worker.addModel([
+			'one line',	// 1
+			'two line',	// 2
+			'',
+			'past empty',
+			'single',
+			'',
+			'and now we are done'
+		]);
+
+		let words: string[] = [];
+
+		for (let iter = model.createWordIterator(/[a-z]+/img), e = iter.next(); !e.done; e = iter.next()) {
+			words.push(e.value);
+		}
+
+		assert.deepEqual(words, ['one', 'line', 'two', 'line', 'past', 'empty', 'single', 'and', 'now', 'we', 'are', 'done']);
+	});
 });
diff --git a/src/vs/editor/test/common/services/modelService.test.ts b/src/vs/editor/test/common/services/modelService.test.ts
index d6f7ab26ce4..fa75cbb9c4f 100644
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -93,7 +93,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(new Range(1, 1, 2, 1), 'This is line One\n')
+			EditOperation.replaceMove(new Range(1, 1, 2, 1), 'This is line One\n')
 		]);
 	});
 
@@ -147,7 +147,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(
+			EditOperation.replaceMove(
 				new Range(1, 1, 4, 1),
 				[
 					'This is line One',
@@ -182,7 +182,7 @@ suite('ModelService', () => {
 		const actual = ModelServiceImpl._computeEdits(model, textBuffer);
 
 		assert.deepEqual(actual, [
-			EditOperation.replace(new Range(3, 2, 3, 2), '\r\n')
+			EditOperation.replaceMove(new Range(3, 2, 3, 2), '\r\n')
 		]);
 	});
 
diff --git a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
index eddae34ccc2..8009ce8a0dd 100644
--- a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
+++ b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts
@@ -58,7 +58,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 99,
+				viewportColumn: 98,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -174,7 +174,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 89,
+				viewportColumn: 88,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -232,7 +232,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 89,
+				viewportColumn: 88,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -290,7 +290,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 89,
+				viewportColumn: 88,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -348,7 +348,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 84,
+				viewportColumn: 83,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -406,7 +406,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 84,
+				viewportColumn: 83,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -464,7 +464,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 83,
+				viewportColumn: 82,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -522,7 +522,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 172,
+				viewportColumn: 171,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -580,7 +580,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				renderMinimap: RenderMinimap.None,
 				minimapLeft: 0,
 				minimapWidth: 0,
-				viewportColumn: 170,
+				viewportColumn: 169,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -632,13 +632,13 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				decorationsHeight: 800,
 
 				contentLeft: 10,
-				contentWidth: 900,
+				contentWidth: 901,
 				contentHeight: 800,
 
 				renderMinimap: RenderMinimap.Small,
-				minimapLeft: 910,
-				minimapWidth: 90,
-				viewportColumn: 90,
+				minimapLeft: 911,
+				minimapWidth: 89,
+				viewportColumn: 89,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -690,13 +690,13 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				decorationsHeight: 800,
 
 				contentLeft: 10,
-				contentWidth: 900,
+				contentWidth: 901,
 				contentHeight: 800,
 
 				renderMinimap: RenderMinimap.Large,
-				minimapLeft: 910,
-				minimapWidth: 90,
-				viewportColumn: 90,
+				minimapLeft: 911,
+				minimapWidth: 89,
+				viewportColumn: 89,
 
 				verticalScrollbarWidth: 0,
 				horizontalScrollbarHeight: 0,
@@ -825,4 +825,63 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => {
 				}
 			});
 	});
+
+	test('issue #31312: When wrapping, leave 2px for the cursor', () => {
+		doTest({
+			outerWidth: 1201,
+			outerHeight: 422,
+			showGlyphMargin: true,
+			lineHeight: 30,
+			showLineNumbers: true,
+			lineNumbersMinChars: 3,
+			lineNumbersDigitCount: 1,
+			lineDecorationsWidth: 26,
+			typicalHalfwidthCharacterWidth: 12.04296875,
+			maxDigitWidth: 12.04296875,
+			verticalScrollbarWidth: 14,
+			horizontalScrollbarHeight: 10,
+			scrollbarArrowSize: 11,
+			verticalScrollbarHasArrows: false,
+			minimap: true,
+			minimapSide: 'right',
+			minimapRenderCharacters: true,
+			minimapMaxColumn: 120,
+			pixelRatio: 2
+		}, {
+				width: 1201,
+				height: 422,
+
+				glyphMarginLeft: 0,
+				glyphMarginWidth: 30,
+				glyphMarginHeight: 422,
+
+				lineNumbersLeft: 30,
+				lineNumbersWidth: 36,
+				lineNumbersHeight: 422,
+
+				decorationsLeft: 66,
+				decorationsWidth: 26,
+				decorationsHeight: 422,
+
+				contentLeft: 92,
+				contentWidth: 1026,
+				contentHeight: 422,
+
+				renderMinimap: RenderMinimap.Large,
+				minimapLeft: 1104,
+				minimapWidth: 83,
+				viewportColumn: 83,
+
+				verticalScrollbarWidth: 14,
+				horizontalScrollbarHeight: 10,
+
+				overviewRuler: {
+					top: 0,
+					width: 14,
+					height: 422,
+					right: 0
+				}
+			});
+
+	});
 });
diff --git a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
index b0214ecf8d9..550eb85bf20 100644
--- a/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
+++ b/src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
@@ -12,6 +12,7 @@ import { MetadataConsts } from 'vs/editor/common/modes';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { InlineDecorationType } from 'vs/editor/common/viewModel/viewModel';
 import { IViewLineTokens } from 'vs/editor/common/core/lineTokens';
+import * as strings from 'vs/base/common/strings';
 
 function createViewLineTokens(viewLineTokens: ViewLineToken[]): IViewLineTokens {
 	return new ViewLineTokens(viewLineTokens);
@@ -29,6 +30,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			strings.isBasicASCII(lineContent),
 			false,
 			0,
 			createViewLineTokens([new ViewLineToken(lineContent.length, 0)]),
@@ -75,6 +77,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens(parts),
@@ -111,6 +114,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			'Hello world!',
+			true,
 			false,
 			0,
 			createViewLineTokens([
@@ -212,6 +216,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -271,6 +276,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -330,6 +336,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			true,
 			false,
 			0,
 			lineParts,
@@ -366,6 +373,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			false,
 			true,
 			0,
 			lineParts,
@@ -393,6 +401,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let actual = renderViewLine(new RenderLineInput(
 				false,
 				lineText,
+				true,
 				false,
 				0,
 				lineParts,
@@ -490,6 +499,7 @@ suite('viewLineRenderer.renderLine', () => {
 			let actual = renderViewLine(new RenderLineInput(
 				false,
 				lineText,
+				true,
 				false,
 				0,
 				lineParts,
@@ -524,6 +534,7 @@ suite('viewLineRenderer.renderLine', () => {
 			false,
 			lineText,
 			false,
+			false,
 			0,
 			lineParts,
 			[],
@@ -535,11 +546,7 @@ suite('viewLineRenderer.renderLine', () => {
 			false
 		));
 		let expectedOutput = [
-			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
-			'<span class="mtk1">𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
+			'<span class="mtk1">a𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷𠮷</span>',
 		];
 		assert.equal(actual.html, '<span>' + expectedOutput.join('') + '</span>');
 	});
@@ -553,6 +560,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineText,
+			false,
 			true,
 			0,
 			lineParts,
@@ -596,6 +604,7 @@ suite('viewLineRenderer.renderLine', () => {
 		let _actual = renderViewLine(new RenderLineInput(
 			true,
 			lineText,
+			true,
 			false,
 			4,
 			lineParts,
@@ -676,6 +685,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			fontIsMonospace,
 			lineContent,
+			true,
 			false,
 			fauxIndentLength,
 			createViewLineTokens(tokens),
@@ -698,6 +708,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(21, 3)]),
@@ -726,6 +737,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([
@@ -990,6 +1002,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			'Hello world',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(11, 0)]),
@@ -1031,6 +1044,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(4, 3)]),
@@ -1060,6 +1074,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(4, 3)]),
@@ -1090,6 +1105,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(0, 3)]),
@@ -1117,6 +1133,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'  1. 🙏',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(7, 3)]),
 			[new LineDecoration(7, 8, 'inline-folded', InlineDecorationType.After)],
@@ -1143,6 +1160,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			'',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(0, 3)]),
@@ -1172,6 +1190,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 		let actual = renderViewLine(new RenderLineInput(
 			true,
 			'\t}',
+			true,
 			false,
 			0,
 			createViewLineTokens([createPart(2, 3)]),
@@ -1203,6 +1222,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(15, 3)]),
 			[],
@@ -1229,6 +1249,7 @@ suite('viewLineRenderer.renderLine 2', () => {
 			true,
 			'asd = "擦"\t\t#asd',
 			false,
+			false,
 			0,
 			createViewLineTokens([createPart(15, 3)]),
 			[],
@@ -1255,10 +1276,96 @@ suite('viewLineRenderer.renderLine 2', () => {
 		assert.deepEqual(actual.html, expected);
 	});
 
+	test('issue #22352: COMBINING ACUTE ACCENT (U+0301)', () => {
+
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			'12345689012345678901234568901234567890123456890abába',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(53, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
+
+		let expected = [
+			'<span>',
+			'<span class="mtk3">12345689012345678901234568901234567890123456890abába</span>',
+			'</span>'
+		].join('');
+
+		assert.deepEqual(actual.html, expected);
+	});
+
+	test('issue #22352: Partially Broken Complex Script Rendering of Tamil', () => {
+
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			' JoyShareல் பின்தொடர்ந்து, விடீயோ, ஜோக்குகள், அனிமேசன், நகைச்சுவை படங்கள் மற்றும் செய்திகளை பெறுவீர்',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(100, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
+
+		let expected = [
+			'<span>',
+			'<span class="mtk3">\u00a0JoyShareல்\u00a0பின்தொடர்ந்து,\u00a0விடீயோ,\u00a0ஜோக்குகள்,\u00a0அனிமேசன்,\u00a0நகைச்சுவை\u00a0படங்கள்\u00a0மற்றும்\u00a0செய்திகளை\u00a0பெறுவீர்</span>',
+			'</span>'
+		].join('');
+
+		let _expected = expected.split('').map(c => c.charCodeAt(0));
+		let _actual = actual.html.split('').map(c => c.charCodeAt(0));
+		assert.deepEqual(_actual, _expected);
+
+		assert.deepEqual(actual.html, expected);
+	});
+
+	test('issue #42700: Hindi characters are not being rendered properly', () => {
+
+		let actual = renderViewLine(new RenderLineInput(
+			true,
+			' वो ऐसा क्या है जो हमारे अंदर भी है और बाहर भी है। जिसकी वजह से हम सब हैं। जिसने इस सृष्टि की रचना की है।',
+			false,
+			false,
+			0,
+			createViewLineTokens([createPart(105, 3)]),
+			[],
+			4,
+			10,
+			10000,
+			'none',
+			false,
+			false
+		));
+
+		let expected = [
+			'<span>',
+			'<span class="mtk3">\u00a0वो\u00a0ऐसा\u00a0क्या\u00a0है\u00a0जो\u00a0हमारे\u00a0अंदर\u00a0भी\u00a0है\u00a0और\u00a0बाहर\u00a0भी\u00a0है।\u00a0जिसकी\u00a0वजह\u00a0से\u00a0हम\u00a0सब\u00a0हैं।\u00a0जिसने\u00a0इस\u00a0सृष्टि\u00a0की\u00a0रचना\u00a0की\u00a0है।</span>',
+			'</span>'
+		].join('');
+
+		assert.deepEqual(actual.html, expected);
+	});
+
 	function createTestGetColumnOfLinePartOffset(lineContent: string, tabSize: number, parts: ViewLineToken[], expectedPartLengths: number[]): (partIndex: number, partLength: number, offset: number, expected: number) => void {
 		let renderLineOutput = renderViewLine(new RenderLineInput(
 			false,
 			lineContent,
+			true,
 			false,
 			0,
 			createViewLineTokens(parts),
diff --git a/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts b/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
index e2c676defac..1ac0489684a 100644
--- a/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
+++ b/src/vs/editor/test/common/viewModel/splitLinesCollection.test.ts
@@ -780,6 +780,9 @@ function createModel(text: string): ISimpleModel {
 		getLineContent: (lineNumber: number) => {
 			return text;
 		},
+		getLineLength: (lineNumber: number) => {
+			return text.length;
+		},
 		getLineMinColumn: (lineNumber: number) => {
 			return 1;
 		},
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index e153cfedbaa..268571ebc7d 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -1193,6 +1193,11 @@ declare namespace monaco.editor {
 		 * Should the decoration expand to encompass a whole line.
 		 */
 		isWholeLine?: boolean;
+		/**
+		 * Specifies the stack order of a decoration.
+		 * A decoration with greater stack order is always in front of a decoration with a lower stack order.
+		 */
+		zIndex?: number;
 		/**
 		 * If set, render this decoration in the overview ruler.
 		 */
@@ -1215,6 +1220,10 @@ declare namespace monaco.editor {
 		 * to have a background color decoration.
 		 */
 		inlineClassName?: string;
+		/**
+		 * If there is an `inlineClassName` which affects letter spacing.
+		 */
+		inlineClassNameAffectsLetterSpacing?: boolean;
 		/**
 		 * If set, the decoration will be rendered before the text with this CSS class name.
 		 */
@@ -1483,6 +1492,10 @@ declare namespace monaco.editor {
 		 * Get the text for a certain line.
 		 */
 		getLineContent(lineNumber: number): string;
+		/**
+		 * Get the text length for a certain line.
+		 */
+		getLineLength(lineNumber: number): number;
 		/**
 		 * Get the text for all lines.
 		 */
@@ -1927,9 +1940,13 @@ declare namespace monaco.editor {
 	 * A (serializable) state of the view.
 	 */
 	export interface IViewState {
-		scrollTop: number;
-		scrollTopWithoutViewZones: number;
+		/** written by previous versions */
+		scrollTop?: number;
+		/** written by previous versions */
+		scrollTopWithoutViewZones?: number;
 		scrollLeft: number;
+		firstPosition: IPosition;
+		firstPositionDeltaTop: number;
 	}
 
 	/**
@@ -2187,6 +2204,10 @@ declare namespace monaco.editor {
 		 * The range that got replaced.
 		 */
 		readonly range: IRange;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		readonly rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
@@ -2684,6 +2705,11 @@ declare namespace monaco.editor {
 		 * Defaults to 'alt'
 		 */
 		multiCursorModifier?: 'ctrlCmd' | 'alt';
+		/**
+		 * Merge overlapping selections.
+		 * Defaults to true
+		 */
+		multiCursorMergeOverlapping?: boolean;
 		/**
 		 * Configure the editor's accessibility support.
 		 * Defaults to 'auto'. It is best to leave this to 'auto'.
@@ -2802,6 +2828,11 @@ declare namespace monaco.editor {
 		 * Defaults to true.
 		 */
 		folding?: boolean;
+		/**
+		 * Selects the folding strategy. 'auto' uses the strategies contributed for the current document, 'indentation' uses the indentation based folding strategy.
+		 * Defaults to 'auto'.
+		 */
+		foldingStrategy?: 'auto' | 'indentation';
 		/**
 		 * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter.
 		 * Defaults to 'mouseover'.
@@ -3081,6 +3112,7 @@ declare namespace monaco.editor {
 		readonly occurrencesHighlight: boolean;
 		readonly codeLens: boolean;
 		readonly folding: boolean;
+		readonly foldingStrategy: 'auto' | 'indentation';
 		readonly showFoldingControls: 'always' | 'mouseover';
 		readonly matchBrackets: boolean;
 		readonly find: InternalEditorFindOptions;
@@ -3099,6 +3131,7 @@ declare namespace monaco.editor {
 		readonly lineHeight: number;
 		readonly readOnly: boolean;
 		readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
+		readonly multiCursorMergeOverlapping: boolean;
 		readonly wordSeparators: string;
 		readonly autoClosingBrackets: boolean;
 		readonly autoIndent: boolean;
@@ -3236,6 +3269,7 @@ declare namespace monaco.editor {
 		readonly readOnly: boolean;
 		readonly accessibilitySupport: boolean;
 		readonly multiCursorModifier: boolean;
+		readonly multiCursorMergeOverlapping: boolean;
 		readonly wordSeparators: boolean;
 		readonly autoClosingBrackets: boolean;
 		readonly autoIndent: boolean;
@@ -3752,10 +3786,6 @@ declare namespace monaco.editor {
 		 * Get the layout info for the editor.
 		 */
 		getLayoutInfo(): EditorLayoutInfo;
-		/**
-		 * Returns the range that is currently centered in the view port.
-		 */
-		getCenteredRangeInViewport(): Range;
 		/**
 		 * Returns the ranges that are currently visible.
 		 * Does not account for horizontal scrolling.
@@ -4075,8 +4105,10 @@ declare namespace monaco.languages {
 	export function registerColorProvider(languageId: string, provider: DocumentColorProvider): IDisposable;
 
 	/**
-	 * Register a folding provider
+	 * Register a folding range provider
 	 */
+	export function registerFoldingRangeProvider(languageId: string, provider: FoldingRangeProvider): IDisposable;
+
 	/**
 	 * Contains additional diagnostic information about the context in which
 	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
@@ -4526,7 +4558,7 @@ declare namespace monaco.languages {
 		 * editor will use the range at the current position or the
 		 * current position itself.
 		 */
-		range: IRange;
+		range?: IRange;
 	}
 
 	/**
@@ -4970,6 +5002,60 @@ declare namespace monaco.languages {
 		provideColorPresentations(model: editor.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable<IColorPresentation[]>;
 	}
 
+	export interface FoldingContext {
+	}
+
+	/**
+	 * A provider of colors for editor models.
+	 */
+	export interface FoldingRangeProvider {
+		/**
+		 * Provides the color ranges for a specific model.
+		 */
+		provideFoldingRanges(model: editor.ITextModel, context: FoldingContext, token: CancellationToken): FoldingRange[] | Thenable<FoldingRange[]>;
+	}
+
+	export interface FoldingRange {
+		/**
+		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 */
+		start: number;
+		/**
+		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 */
+		end: number;
+		/**
+		 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
+		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
+		 * like 'Fold all comments'. See
+		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of standardized kinds.
+		 */
+		kind?: FoldingRangeKind;
+	}
+
+	export class FoldingRangeKind {
+		value: string;
+		/**
+		 * Kind for folding range representing a comment. The value of the kind is 'comment'.
+		 */
+		static readonly Comment: FoldingRangeKind;
+		/**
+		 * Kind for folding range representing a import. The value of the kind is 'imports'.
+		 */
+		static readonly Imports: FoldingRangeKind;
+		/**
+		 * Kind for folding range representing regions (for example marked by `#region`, `#endregion`).
+		 * The value of the kind is 'region'.
+		 */
+		static readonly Region: FoldingRangeKind;
+		/**
+		 * Creates a new [FoldingRangeKind](#FoldingRangeKind).
+		 *
+		 * @param value of the kind.
+		 */
+		constructor(value: string);
+	}
+
 	export interface ResourceFileEdit {
 		oldUri: Uri;
 		newUri: Uri;
@@ -4986,15 +5072,14 @@ declare namespace monaco.languages {
 		rejectReason?: string;
 	}
 
-	export interface RenameContext {
+	export interface RenameLocation {
 		range: IRange;
 		text: string;
-		message?: string;
 	}
 
 	export interface RenameProvider {
 		provideRenameEdits(model: editor.ITextModel, position: Position, newName: string, token: CancellationToken): WorkspaceEdit | Thenable<WorkspaceEdit>;
-		resolveRenameLocation?(model: editor.ITextModel, position: Position, token: CancellationToken): RenameContext | Thenable<RenameContext>;
+		resolveRenameLocation?(model: editor.ITextModel, position: Position, token: CancellationToken): RenameLocation | Thenable<RenameLocation>;
 	}
 
 	export interface Command {
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 0c02288e91a..b93c8334898 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -14,7 +14,6 @@ import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { domEvent } from 'vs/base/browser/event';
 import { Emitter } from 'vs/base/common/event';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { memoize } from 'vs/base/common/decorators';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { createCSSRule } from 'vs/base/browser/dom';
 import URI from 'vs/base/common/uri';
@@ -26,6 +25,7 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 
 	private _subscriptions: IDisposable[] = [];
 	private _isPressed: boolean;
+	private static instance: AlternativeKeyEmitter;
 
 	private constructor(contextMenuService: IContextMenuService) {
 		super();
@@ -49,9 +49,12 @@ class AlternativeKeyEmitter extends Emitter<boolean> {
 		this.fire(this._isPressed);
 	}
 
-	@memoize
 	static getInstance(contextMenuService: IContextMenuService) {
-		return new AlternativeKeyEmitter(contextMenuService);
+		if (!AlternativeKeyEmitter.instance) {
+			AlternativeKeyEmitter.instance = new AlternativeKeyEmitter(contextMenuService);
+		}
+
+		return AlternativeKeyEmitter.instance;
 	}
 
 	dispose() {
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index d125b035683..1ea711884b8 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -59,6 +59,7 @@ export class MenuId {
 	static readonly ViewTitle = new MenuId();
 	static readonly ViewItemContext = new MenuId();
 	static readonly TouchBarContext = new MenuId();
+	static readonly SearchContext = new MenuId();
 
 	readonly id: string = String(MenuId.ID++);
 }
diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 6671682407e..6aa47675ddb 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -12,7 +12,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
-import { StrictResourceMap } from 'vs/base/common/map';
+import { ResourceMap } from 'vs/base/common/map';
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
 
@@ -47,7 +47,7 @@ export interface IConfigurationChangeEvent {
 
 	// Following data is used for Extension host configuration event
 	changedConfiguration: IConfigurationModel;
-	changedConfigurationByResource: StrictResourceMap<IConfigurationModel>;
+	changedConfigurationByResource: ResourceMap<IConfigurationModel>;
 }
 
 export interface IConfigurationService {
@@ -112,6 +112,7 @@ export interface IConfigurationData {
 	user: IConfigurationModel;
 	workspace: IConfigurationModel;
 	folders: { [folder: string]: IConfigurationModel };
+	isComplete: boolean;
 }
 
 export function compare(from: IConfigurationModel, to: IConfigurationModel): { added: string[], removed: string[], updated: string[] } {
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
index deb168d32ac..9944e02325f 100644
--- a/src/vs/platform/configuration/common/configurationModels.ts
+++ b/src/vs/platform/configuration/common/configurationModels.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import * as json from 'vs/base/common/json';
-import { StrictResourceMap } from 'vs/base/common/map';
+import { ResourceMap } from 'vs/base/common/map';
 import * as arrays from 'vs/base/common/arrays';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
@@ -278,15 +278,15 @@ export class ConfigurationModelParser {
 export class Configuration {
 
 	private _workspaceConsolidatedConfiguration: ConfigurationModel = null;
-	private _foldersConsolidatedConfigurations: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>();
+	private _foldersConsolidatedConfigurations: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>();
 
 	constructor(
 		private _defaultConfiguration: ConfigurationModel,
 		private _userConfiguration: ConfigurationModel,
 		private _workspaceConfiguration: ConfigurationModel = new ConfigurationModel(),
-		private _folderConfigurations: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>(),
+		private _folderConfigurations: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>(),
 		private _memoryConfiguration: ConfigurationModel = new ConfigurationModel(),
-		private _memoryConfigurationByResource: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>(),
+		private _memoryConfigurationByResource: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>(),
 		private _freeze: boolean = true) {
 	}
 
@@ -394,7 +394,7 @@ export class Configuration {
 		return this._workspaceConfiguration;
 	}
 
-	protected get folders(): StrictResourceMap<ConfigurationModel> {
+	protected get folders(): ResourceMap<ConfigurationModel> {
 		return this._folderConfigurations;
 	}
 
@@ -479,7 +479,8 @@ export class Configuration {
 				const { contents, overrides, keys } = this._folderConfigurations.get(folder);
 				result[folder.toString()] = { contents, overrides, keys };
 				return result;
-			}, Object.create({}))
+			}, Object.create({})),
+			isComplete: true
 		};
 	}
 
@@ -533,7 +534,7 @@ export class ConfigurationChangeEvent extends AbstractConfigurationChangeEvent i
 
 	constructor(
 		private _changedConfiguration: ConfigurationModel = new ConfigurationModel(),
-		private _changedConfigurationByResource: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>()) {
+		private _changedConfigurationByResource: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>()) {
 		super();
 	}
 
@@ -541,7 +542,7 @@ export class ConfigurationChangeEvent extends AbstractConfigurationChangeEvent i
 		return this._changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
+	get changedConfigurationByResource(): ResourceMap<IConfigurationModel> {
 		return this._changedConfigurationByResource;
 	}
 
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index 1db8bcc8ff4..30d8205f48d 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -11,7 +11,6 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import * as types from 'vs/base/common/types';
 import * as strings from 'vs/base/common/strings';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { deepClone } from 'vs/base/common/objects';
 
 export const Extensions = {
 	Configuration: 'base.contributions.configuration'
@@ -63,13 +62,13 @@ export interface IConfigurationRegistry {
 }
 
 export enum ConfigurationScope {
-	WINDOW = 1,
-	RESOURCE
+	APPLICATION = 1,
+	WINDOW,
+	RESOURCE,
 }
 
 export interface IConfigurationPropertySchema extends IJSONSchema {
 	overridable?: boolean;
-	isExecutable?: boolean;
 	scope?: ConfigurationScope;
 	notMultiRootAdopted?: boolean;
 	included?: boolean;
@@ -93,8 +92,10 @@ export interface IDefaultConfigurationExtension {
 	defaults: { [key: string]: {} };
 }
 
-export const settingsSchema: IJSONSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
-export const resourceSettingsSchema: IJSONSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+export const allSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const applicationSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const windowSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
+export const resourceSettings: { properties: {}, patternProperties: {} } = { properties: {}, patternProperties: {} };
 
 export const editorConfigurationSchemaId = 'vscode://schemas/settings/editor';
 const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
@@ -239,10 +240,17 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			let properties = configuration.properties;
 			if (properties) {
 				for (let key in properties) {
-					settingsSchema.properties[key] = properties[key];
-					resourceSettingsSchema.properties[key] = deepClone(properties[key]);
-					if (properties[key].scope !== ConfigurationScope.RESOURCE) {
-						resourceSettingsSchema.properties[key].doNotSuggest = true;
+					allSettings.properties[key] = properties[key];
+					switch (properties[key].scope) {
+						case ConfigurationScope.APPLICATION:
+							applicationSettings.properties[key] = properties[key];
+							break;
+						case ConfigurationScope.WINDOW:
+							windowSettings.properties[key] = properties[key];
+							break;
+						case ConfigurationScope.RESOURCE:
+							resourceSettings.properties[key] = properties[key];
+							break;
 					}
 				}
 			}
@@ -262,7 +270,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	}
 
 	private updateOverridePropertyPatternKey(): void {
-		let patternProperties: IJSONSchema = settingsSchema.patternProperties[this.overridePropertyPattern];
+		let patternProperties: IJSONSchema = allSettings.patternProperties[this.overridePropertyPattern];
 		if (!patternProperties) {
 			patternProperties = {
 				type: 'object',
@@ -271,11 +279,18 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				$ref: editorConfigurationSchemaId
 			};
 		}
-		delete settingsSchema.patternProperties[this.overridePropertyPattern];
+
+		delete allSettings.patternProperties[this.overridePropertyPattern];
+		delete applicationSettings.patternProperties[this.overridePropertyPattern];
+		delete windowSettings.patternProperties[this.overridePropertyPattern];
+		delete resourceSettings.patternProperties[this.overridePropertyPattern];
+
 		this.computeOverridePropertyPattern();
 
-		settingsSchema.patternProperties[this.overridePropertyPattern] = patternProperties;
-		resourceSettingsSchema.patternProperties[this.overridePropertyPattern] = patternProperties;
+		allSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		applicationSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		windowSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
+		resourceSettings.patternProperties[this.overridePropertyPattern] = patternProperties;
 	}
 
 	private update(configuration: IConfigurationNode): void {
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
index dd73e1c1a28..4d272d3e30e 100644
--- a/src/vs/platform/contextkey/browser/contextKeyService.ts
+++ b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -7,7 +7,7 @@
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
-import { IContextKey, IContext, IContextKeyServiceTarget, IContextKeyService, SET_CONTEXT_COMMAND_ID, ContextKeyExpr, IContextKeyChangeEvent } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKey, IContext, IContextKeyServiceTarget, IContextKeyService, SET_CONTEXT_COMMAND_ID, ContextKeyExpr, IContextKeyChangeEvent, IReadableSet } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService, IConfigurationChangeEvent, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { Event, Emitter, debounceEvent } from 'vs/base/common/event';
 
@@ -179,7 +179,7 @@ export class ContextKeyChangeEvent implements IContextKeyChangeEvent {
 		this._keys = this._keys.concat(oneOrManyKeys);
 	}
 
-	affectsSome(keys: Set<string>): boolean {
+	affectsSome(keys: IReadableSet<string>): boolean {
 		for (const key of this._keys) {
 			if (keys.has(key)) {
 				return true;
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index 8bda07939ae..46891fc2898 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -554,8 +554,12 @@ export interface IContextKeyServiceTarget {
 
 export const IContextKeyService = createDecorator<IContextKeyService>('contextKeyService');
 
+export interface IReadableSet<T> {
+	has(value: T): boolean;
+}
+
 export interface IContextKeyChangeEvent {
-	affectsSome(keys: Set<string>): boolean;
+	affectsSome(keys: IReadableSet<string>): boolean;
 }
 
 export interface IContextKeyService {
diff --git a/src/vs/platform/driver/common/driver.ts b/src/vs/platform/driver/common/driver.ts
new file mode 100644
index 00000000000..b40326a162b
--- /dev/null
+++ b/src/vs/platform/driver/common/driver.ts
@@ -0,0 +1,287 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IChannel } from 'vs/base/parts/ipc/common/ipc';
+
+export const ID = 'driverService';
+export const IDriver = createDecorator<IDriver>(ID);
+
+// !! Do not remove the following START and END markers, they are parsed by the smoketest build
+
+//*START
+export interface IElement {
+	tagName: string;
+	className: string;
+	textContent: string;
+	attributes: { [name: string]: string; };
+	children: IElement[];
+}
+
+export interface IDriver {
+	_serviceBrand: any;
+
+	getWindowIds(): TPromise<number[]>;
+	capturePage(windowId: number): TPromise<string>;
+	reloadWindow(windowId: number): TPromise<void>;
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void>;
+	click(windowId: number, selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
+	doubleClick(windowId: number, selector: string): TPromise<void>;
+	move(windowId: number, selector: string): TPromise<void>;
+	setValue(windowId: number, selector: string, text: string): TPromise<void>;
+	paste(windowId: number, selector: string, text: string): TPromise<void>;
+	getTitle(windowId: number): TPromise<string>;
+	isActiveElement(windowId: number, selector: string): TPromise<boolean>;
+	getElements(windowId: number, selector: string, recursive?: boolean): TPromise<IElement[]>;
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void>;
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]>;
+}
+//*END
+
+export interface IDriverChannel extends IChannel {
+	call(command: 'getWindowIds'): TPromise<number[]>;
+	call(command: 'capturePage'): TPromise<string>;
+	call(command: 'reloadWindow', arg: number): TPromise<void>;
+	call(command: 'dispatchKeybinding', arg: [number, string]): TPromise<void>;
+	call(command: 'click', arg: [number, string, number | undefined, number | undefined]): TPromise<void>;
+	call(command: 'doubleClick', arg: [number, string]): TPromise<void>;
+	call(command: 'move', arg: [number, string]): TPromise<void>;
+	call(command: 'setValue', arg: [number, string, string]): TPromise<void>;
+	call(command: 'paste', arg: [number, string, string]): TPromise<void>;
+	call(command: 'getTitle', arg: [number]): TPromise<string>;
+	call(command: 'isActiveElement', arg: [number, string]): TPromise<boolean>;
+	call(command: 'getElements', arg: [number, string, boolean]): TPromise<IElement[]>;
+	call(command: 'typeInEditor', arg: [number, string, string]): TPromise<void>;
+	call(command: 'getTerminalBuffer', arg: [number, string]): TPromise<string[]>;
+	call(command: string, arg: any): TPromise<any>;
+}
+
+export class DriverChannel implements IDriverChannel {
+
+	constructor(private driver: IDriver) { }
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'getWindowIds': return this.driver.getWindowIds();
+			case 'capturePage': return this.driver.capturePage(arg);
+			case 'reloadWindow': return this.driver.reloadWindow(arg);
+			case 'dispatchKeybinding': return this.driver.dispatchKeybinding(arg[0], arg[1]);
+			case 'click': return this.driver.click(arg[0], arg[1], arg[2], arg[3]);
+			case 'doubleClick': return this.driver.doubleClick(arg[0], arg[1]);
+			case 'move': return this.driver.move(arg[0], arg[1]);
+			case 'setValue': return this.driver.setValue(arg[0], arg[1], arg[2]);
+			case 'paste': return this.driver.paste(arg[0], arg[1], arg[2]);
+			case 'getTitle': return this.driver.getTitle(arg[0]);
+			case 'isActiveElement': return this.driver.isActiveElement(arg[0], arg[1]);
+			case 'getElements': return this.driver.getElements(arg[0], arg[1], arg[2]);
+			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1], arg[2]);
+			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg[0], arg[1]);
+		}
+
+		return undefined;
+	}
+}
+
+export class DriverChannelClient implements IDriver {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IDriverChannel) { }
+
+	getWindowIds(): TPromise<number[]> {
+		return this.channel.call('getWindowIds');
+	}
+
+	capturePage(windowId: number): TPromise<string> {
+		return this.channel.call('capturePage', windowId);
+	}
+
+	reloadWindow(windowId: number): TPromise<void> {
+		return this.channel.call('reloadWindow', windowId);
+	}
+
+	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
+		return this.channel.call('dispatchKeybinding', [windowId, keybinding]);
+	}
+
+	click(windowId: number, selector: string, xoffset: number | undefined, yoffset: number | undefined): TPromise<void> {
+		return this.channel.call('click', [windowId, selector, xoffset, yoffset]);
+	}
+
+	doubleClick(windowId: number, selector: string): TPromise<void> {
+		return this.channel.call('doubleClick', [windowId, selector]);
+	}
+
+	move(windowId: number, selector: string): TPromise<void> {
+		return this.channel.call('move', [windowId, selector]);
+	}
+
+	setValue(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.channel.call('setValue', [windowId, selector, text]);
+	}
+
+	paste(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.channel.call('paste', [windowId, selector, text]);
+	}
+
+	getTitle(windowId: number): TPromise<string> {
+		return this.channel.call('getTitle', [windowId]);
+	}
+
+	isActiveElement(windowId: number, selector: string): TPromise<boolean> {
+		return this.channel.call('isActiveElement', [windowId, selector]);
+	}
+
+	getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
+		return this.channel.call('getElements', [windowId, selector, recursive]);
+	}
+
+	typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
+		return this.channel.call('typeInEditor', [windowId, selector, text]);
+	}
+
+	getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
+		return this.channel.call('getTerminalBuffer', [windowId, selector]);
+	}
+}
+
+export interface IWindowDriverRegistry {
+	registerWindowDriver(windowId: number): TPromise<void>;
+	reloadWindowDriver(windowId: number): TPromise<void>;
+}
+
+export interface IWindowDriverRegistryChannel extends IChannel {
+	call(command: 'registerWindowDriver', arg: number): TPromise<void>;
+	call(command: 'reloadWindowDriver', arg: number): TPromise<void>;
+	call(command: string, arg: any): TPromise<any>;
+}
+
+export class WindowDriverRegistryChannel implements IWindowDriverRegistryChannel {
+
+	constructor(private registry: IWindowDriverRegistry) { }
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'registerWindowDriver': return this.registry.registerWindowDriver(arg);
+			case 'reloadWindowDriver': return this.registry.reloadWindowDriver(arg);
+		}
+
+		return undefined;
+	}
+}
+
+export class WindowDriverRegistryChannelClient implements IWindowDriverRegistry {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWindowDriverRegistryChannel) { }
+
+	registerWindowDriver(windowId: number): TPromise<void> {
+		return this.channel.call('registerWindowDriver', windowId);
+	}
+
+	reloadWindowDriver(windowId: number): TPromise<void> {
+		return this.channel.call('reloadWindowDriver', windowId);
+	}
+}
+
+export interface IWindowDriver {
+	click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined): TPromise<void>;
+	doubleClick(selector: string): TPromise<void>;
+	move(selector: string): TPromise<void>;
+	setValue(selector: string, text: string): TPromise<void>;
+	paste(selector: string, text: string): TPromise<void>;
+	getTitle(): TPromise<string>;
+	isActiveElement(selector: string): TPromise<boolean>;
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]>;
+	typeInEditor(selector: string, text: string): TPromise<void>;
+	getTerminalBuffer(selector: string): TPromise<string[]>;
+}
+
+export interface IWindowDriverChannel extends IChannel {
+	call(command: 'click', arg: [string, number | undefined, number | undefined]): TPromise<void>;
+	call(command: 'doubleClick', arg: string): TPromise<void>;
+	call(command: 'move', arg: string): TPromise<void>;
+	call(command: 'setValue', arg: [string, string]): TPromise<void>;
+	call(command: 'paste', arg: [string, string]): TPromise<void>;
+	call(command: 'getTitle'): TPromise<string>;
+	call(command: 'isActiveElement', arg: string): TPromise<boolean>;
+	call(command: 'getElements', arg: [string, boolean]): TPromise<IElement[]>;
+	call(command: 'typeInEditor', arg: [string, string]): TPromise<void>;
+	call(command: 'getTerminalBuffer', arg: string): TPromise<string[]>;
+	call(command: string, arg: any): TPromise<any>;
+}
+
+export class WindowDriverChannel implements IWindowDriverChannel {
+
+	constructor(private driver: IWindowDriver) { }
+
+	call(command: string, arg?: any): TPromise<any> {
+		switch (command) {
+			case 'click': return this.driver.click(arg[0], arg[1], arg[2]);
+			case 'doubleClick': return this.driver.doubleClick(arg);
+			case 'move': return this.driver.move(arg);
+			case 'setValue': return this.driver.setValue(arg[0], arg[1]);
+			case 'paste': return this.driver.paste(arg[0], arg[1]);
+			case 'getTitle': return this.driver.getTitle();
+			case 'isActiveElement': return this.driver.isActiveElement(arg);
+			case 'getElements': return this.driver.getElements(arg[0], arg[1]);
+			case 'typeInEditor': return this.driver.typeInEditor(arg[0], arg[1]);
+			case 'getTerminalBuffer': return this.driver.getTerminalBuffer(arg);
+		}
+
+		return undefined;
+	}
+}
+
+export class WindowDriverChannelClient implements IWindowDriver {
+
+	_serviceBrand: any;
+
+	constructor(private channel: IWindowDriverChannel) { }
+
+	click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this.channel.call('click', [selector, xoffset, yoffset]);
+	}
+
+	doubleClick(selector: string): TPromise<void> {
+		return this.channel.call('doubleClick', selector);
+	}
+
+	move(selector: string): TPromise<void> {
+		return this.channel.call('move', selector);
+	}
+
+	setValue(selector: string, text: string): TPromise<void> {
+		return this.channel.call('setValue', [selector, text]);
+	}
+
+	paste(selector: string, text: string): TPromise<void> {
+		return this.channel.call('paste', [selector, text]);
+	}
+
+	getTitle(): TPromise<string> {
+		return this.channel.call('getTitle');
+	}
+
+	isActiveElement(selector: string): TPromise<boolean> {
+		return this.channel.call('isActiveElement', selector);
+	}
+
+	getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
+		return this.channel.call('getElements', [selector, recursive]);
+	}
+
+	typeInEditor(selector: string, text: string): TPromise<void> {
+		return this.channel.call('typeInEditor', [selector, text]);
+	}
+
+	getTerminalBuffer(selector: string): TPromise<string[]> {
+		return this.channel.call('getTerminalBuffer', selector);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
new file mode 100644
index 00000000000..60bce74b113
--- /dev/null
+++ b/src/vs/platform/driver/electron-browser/driver.ts
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+import { IWindowDriver, IElement, WindowDriverChannel, WindowDriverRegistryChannelClient } from 'vs/platform/driver/common/driver';
+import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { getTopLeftOffset, getClientArea } from 'vs/base/browser/dom';
+import * as electron from 'electron';
+
+function serializeElement(element: Element, recursive: boolean): IElement {
+	const attributes = Object.create(null);
+
+	for (let j = 0; j < element.attributes.length; j++) {
+		const attr = element.attributes.item(j);
+		attributes[attr.name] = attr.value;
+	}
+
+	const children = [];
+
+	if (recursive) {
+		for (let i = 0; i < element.children.length; i++) {
+			children.push(serializeElement(element.children.item(i), true));
+		}
+	}
+
+	return {
+		tagName: element.tagName,
+		className: element.className,
+		textContent: element.textContent || '',
+		attributes,
+		children
+	};
+}
+
+class WindowDriver implements IWindowDriver {
+
+	constructor() { }
+
+	async click(selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		return this._click(selector, 1, xoffset, yoffset);
+	}
+
+	doubleClick(selector: string): TPromise<void> {
+		return this._click(selector, 2);
+	}
+
+	private async _getElementXY(selector: string, xoffset?: number, yoffset?: number): TPromise<{ x: number; y: number; }> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error('Element not found');
+		}
+
+		const { left, top } = getTopLeftOffset(element as HTMLElement);
+		const { width, height } = getClientArea(element as HTMLElement);
+		let x: number, y: number;
+
+		if ((typeof xoffset === 'number') || (typeof yoffset === 'number')) {
+			x = left + xoffset;
+			y = top + yoffset;
+		} else {
+			x = left + (width / 2);
+			y = top + (height / 2);
+		}
+
+		x = Math.round(x);
+		y = Math.round(y);
+
+		return { x, y };
+	}
+
+	private async _click(selector: string, clickCount: number, xoffset?: number, yoffset?: number): TPromise<void> {
+		const { x, y } = await this._getElementXY(selector, xoffset, yoffset);
+		const webContents = electron.remote.getCurrentWebContents();
+		webContents.sendInputEvent({ type: 'mouseDown', x, y, button: 'left', clickCount } as any);
+		webContents.sendInputEvent({ type: 'mouseUp', x, y, button: 'left', clickCount } as any);
+
+		await TPromise.timeout(100);
+	}
+
+	async move(selector: string): TPromise<void> {
+		const { x, y } = await this._getElementXY(selector);
+		const webContents = electron.remote.getCurrentWebContents();
+		webContents.sendInputEvent({ type: 'mouseMove', x, y } as any);
+
+		await TPromise.timeout(100);
+	}
+
+	async setValue(selector: string, text: string): TPromise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error('Element not found');
+		}
+
+		const inputElement = element as HTMLInputElement;
+		inputElement.value = text;
+
+		const event = new Event('input', { bubbles: true, cancelable: true });
+		inputElement.dispatchEvent(event);
+	}
+
+	async paste(selector: string, text: string): TPromise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error('Element not found');
+		}
+
+		const inputElement = element as HTMLInputElement;
+		const clipboardData = new DataTransfer();
+		clipboardData.setData('text/plain', text);
+		const event = new ClipboardEvent('paste', { clipboardData } as any);
+
+		inputElement.dispatchEvent(event);
+	}
+
+	async getTitle(): TPromise<string> {
+		return document.title;
+	}
+
+	async isActiveElement(selector: string): TPromise<boolean> {
+		const element = document.querySelector(selector);
+		return element === document.activeElement;
+	}
+
+	async getElements(selector: string, recursive: boolean): TPromise<IElement[]> {
+		const query = document.querySelectorAll(selector);
+		const result: IElement[] = [];
+
+		for (let i = 0; i < query.length; i++) {
+			const element = query.item(i);
+			result.push(serializeElement(element, recursive));
+		}
+
+		return result;
+	}
+
+	async typeInEditor(selector: string, text: string): TPromise<void> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error('Editor not found: ' + selector);
+		}
+
+		const textarea = element as HTMLTextAreaElement;
+		const start = textarea.selectionStart;
+		const newStart = start + text.length;
+		const value = textarea.value;
+		const newValue = value.substr(0, start) + text + value.substr(start);
+
+		textarea.value = newValue;
+		textarea.setSelectionRange(newStart, newStart);
+
+		const event = new Event('input', { 'bubbles': true, 'cancelable': true });
+		textarea.dispatchEvent(event);
+	}
+
+	async getTerminalBuffer(selector: string): TPromise<string[]> {
+		const element = document.querySelector(selector);
+
+		if (!element) {
+			throw new Error('Terminal not found: ' + selector);
+		}
+
+		const xterm = (element as any).xterm;
+
+		if (!xterm) {
+			throw new Error('Xterm not found: ' + selector);
+		}
+
+		const lines: string[] = [];
+
+		for (let i = 0; i < xterm.buffer.lines.length; i++) {
+			lines.push(xterm.buffer.translateBufferLineToString(i, true));
+		}
+
+		return lines;
+	}
+}
+
+export async function registerWindowDriver(
+	client: IPCClient,
+	windowId: number,
+	instantiationService: IInstantiationService
+): TPromise<IDisposable> {
+	const windowDriver = instantiationService.createInstance(WindowDriver);
+	const windowDriverChannel = new WindowDriverChannel(windowDriver);
+	client.registerChannel('windowDriver', windowDriverChannel);
+
+	const windowDriverRegistryChannel = client.getChannel('windowDriverRegistry');
+	const windowDriverRegistry = new WindowDriverRegistryChannelClient(windowDriverRegistryChannel);
+
+	await windowDriverRegistry.registerWindowDriver(windowId);
+
+	const disposable = toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId));
+	return combinedDisposable([disposable, client]);
+}
\ No newline at end of file
diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts
new file mode 100644
index 00000000000..badeeab4a1f
--- /dev/null
+++ b/src/vs/platform/driver/electron-main/driver.ts
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDriver, DriverChannel, IElement, IWindowDriverChannel, WindowDriverChannelClient, IWindowDriverRegistry, WindowDriverRegistryChannel, IWindowDriver } from 'vs/platform/driver/common/driver';
+import { IWindowsMainService } from 'vs/platform/windows/electron-main/windows';
+import { serve as serveNet } from 'vs/base/parts/ipc/node/ipc.net';
+import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPCServer, IClientRouter } from 'vs/base/parts/ipc/common/ipc';
+import { SimpleKeybinding, KeyCode } from 'vs/base/common/keyCodes';
+import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+import { OS } from 'vs/base/common/platform';
+import { Emitter, toPromise } from 'vs/base/common/event';
+
+// TODO@joao: bad layering!
+import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
+import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { NativeImage } from 'electron';
+
+class WindowRouter implements IClientRouter {
+
+	constructor(private windowId: number) { }
+
+	route(command: string, arg: any): string {
+		return `window:${this.windowId}`;
+	}
+}
+
+function isSilentKeyCode(keyCode: KeyCode) {
+	return keyCode < KeyCode.KEY_0;
+}
+
+export class Driver implements IDriver, IWindowDriverRegistry {
+
+	_serviceBrand: any;
+
+	private registeredWindowIds = new Set<number>();
+	private reloadingWindowIds = new Set<number>();
+	private onDidReloadingChange = new Emitter<void>();
+
+	constructor(
+		private windowServer: IPCServer,
+		@IWindowsMainService private windowsService: IWindowsMainService
+	) { }
+
+	async registerWindowDriver(windowId: number): TPromise<void> {
+		this.registeredWindowIds.add(windowId);
+		this.reloadingWindowIds.delete(windowId);
+		this.onDidReloadingChange.fire();
+	}
+
+	async reloadWindowDriver(windowId: number): TPromise<void> {
+		this.reloadingWindowIds.add(windowId);
+	}
+
+	async getWindowIds(): TPromise<number[]> {
+		return this.windowsService.getWindows()
+			.map(w => w.id)
+			.filter(id => this.registeredWindowIds.has(id) && !this.reloadingWindowIds.has(id));
+	}
+
+	async capturePage(windowId: number): TPromise<string> {
+		await this.whenUnfrozen(windowId);
+
+		const window = this.windowsService.getWindowById(windowId);
+		const webContents = window.win.webContents;
+		const image = await new Promise<NativeImage>(c => webContents.capturePage(c));
+		const buffer = image.toPNG();
+
+		return buffer.toString('base64');
+	}
+
+	async reloadWindow(windowId: number): TPromise<void> {
+		await this.whenUnfrozen(windowId);
+
+		const window = this.windowsService.getWindowById(windowId);
+		this.reloadingWindowIds.add(windowId);
+		this.windowsService.reload(window);
+	}
+
+	async dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
+		await this.whenUnfrozen(windowId);
+
+		const [first, second] = KeybindingIO._readUserBinding(keybinding);
+
+		await this._dispatchKeybinding(windowId, first);
+
+		if (second) {
+			await this._dispatchKeybinding(windowId, second);
+		}
+	}
+
+	private async _dispatchKeybinding(windowId: number, keybinding: SimpleKeybinding | ScanCodeBinding): TPromise<void> {
+		if (keybinding instanceof ScanCodeBinding) {
+			throw new Error('ScanCodeBindings not supported');
+		}
+
+		const window = this.windowsService.getWindowById(windowId);
+		const webContents = window.win.webContents;
+		const noModifiedKeybinding = new SimpleKeybinding(false, false, false, false, keybinding.keyCode);
+		const resolvedKeybinding = new USLayoutResolvedKeybinding(noModifiedKeybinding, OS);
+		const keyCode = resolvedKeybinding.getElectronAccelerator();
+
+		const modifiers = [];
+
+		if (keybinding.ctrlKey) {
+			modifiers.push('ctrl');
+		}
+
+		if (keybinding.metaKey) {
+			modifiers.push('meta');
+		}
+
+		if (keybinding.shiftKey) {
+			modifiers.push('shift');
+		}
+
+		if (keybinding.altKey) {
+			modifiers.push('alt');
+		}
+
+		webContents.sendInputEvent({ type: 'keyDown', keyCode, modifiers } as any);
+
+		if (!isSilentKeyCode(keybinding.keyCode)) {
+			webContents.sendInputEvent({ type: 'char', keyCode, modifiers } as any);
+		}
+
+		webContents.sendInputEvent({ type: 'keyUp', keyCode, modifiers } as any);
+
+		await TPromise.timeout(100);
+	}
+
+	async click(windowId: number, selector: string, xoffset?: number, yoffset?: number): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.click(selector, xoffset, yoffset);
+	}
+
+	async doubleClick(windowId: number, selector: string): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.doubleClick(selector);
+	}
+
+	async move(windowId: number, selector: string): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.move(selector);
+	}
+
+	async setValue(windowId: number, selector: string, text: string): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.setValue(selector, text);
+	}
+
+	async paste(windowId: number, selector: string, text: string): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.paste(selector, text);
+	}
+
+	async getTitle(windowId: number): TPromise<string> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.getTitle();
+	}
+
+	async isActiveElement(windowId: number, selector: string): TPromise<boolean> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.isActiveElement(selector);
+	}
+
+	async getElements(windowId: number, selector: string, recursive: boolean): TPromise<IElement[]> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.getElements(selector, recursive);
+	}
+
+	async typeInEditor(windowId: number, selector: string, text: string): TPromise<void> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.typeInEditor(selector, text);
+	}
+
+	async getTerminalBuffer(windowId: number, selector: string): TPromise<string[]> {
+		const windowDriver = await this.getWindowDriver(windowId);
+		return windowDriver.getTerminalBuffer(selector);
+	}
+
+	private async getWindowDriver(windowId: number): TPromise<IWindowDriver> {
+		await this.whenUnfrozen(windowId);
+
+		const router = new WindowRouter(windowId);
+		const windowDriverChannel = this.windowServer.getChannel<IWindowDriverChannel>('windowDriver', router);
+		return new WindowDriverChannelClient(windowDriverChannel);
+	}
+
+	private async whenUnfrozen(windowId: number): TPromise<void> {
+		while (this.reloadingWindowIds.has(windowId)) {
+			await toPromise(this.onDidReloadingChange.event);
+		}
+	}
+}
+
+export async function serve(
+	windowServer: IPCServer,
+	handle: string,
+	instantiationService: IInstantiationService
+): TPromise<IDisposable> {
+	const driver = instantiationService.createInstance(Driver, windowServer);
+
+	const windowDriverRegistryChannel = new WindowDriverRegistryChannel(driver);
+	windowServer.registerChannel('windowDriverRegistry', windowDriverRegistryChannel);
+
+	const server = await serveNet(handle);
+	const channel = new DriverChannel(driver);
+	server.registerChannel('driver', channel);
+
+	return combinedDisposable([server, windowServer]);
+}
\ No newline at end of file
diff --git a/src/vs/platform/driver/node/driver.ts b/src/vs/platform/driver/node/driver.ts
new file mode 100644
index 00000000000..fb61d1d1fa6
--- /dev/null
+++ b/src/vs/platform/driver/node/driver.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDriver, DriverChannelClient } from 'vs/platform/driver/common/driver';
+import { connect as connectNet, Client } from 'vs/base/parts/ipc/node/ipc.net';
+
+export async function connect(handle: string): TPromise<{ client: Client, driver: IDriver }> {
+	const client = await connectNet(handle, 'driverClient');
+	const channel = client.getChannel('driver');
+	const driver = new DriverChannelClient(channel);
+	return { client, driver };
+}
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 5917f324e14..7b9d2d42259 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -57,6 +57,7 @@ export interface ParsedArgs {
 	'file-write'?: boolean;
 	'file-chmod'?: boolean;
 	'upload-logs'?: string;
+	'driver'?: string;
 }
 
 export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
@@ -130,4 +131,6 @@ export interface IEnvironmentService {
 	installSourcePath: string;
 	disableUpdates: boolean;
 	disableCrashReporter: boolean;
+
+	driverHandle: string;
 }
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index ed297cda684..7f14ec4ce06 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -29,7 +29,8 @@ const options: minimist.Opts = {
 		'enable-proposed-api',
 		'export-default-configuration',
 		'install-source',
-		'upload-logs'
+		'upload-logs',
+		'driver'
 	],
 	boolean: [
 		'help',
@@ -153,7 +154,7 @@ const extensionsHelp: { [name: string]: string; } = {
 	'--show-versions': localize('showVersions', "Show versions of installed extensions, when using --list-extension."),
 	'--install-extension (<extension-id> | <extension-vsix-path>)': localize('installExtension', "Installs an extension."),
 	'--uninstall-extension (<extension-id> | <extension-vsix-path>)': localize('uninstallExtension', "Uninstalls an extension."),
-	'--enable-proposed-api <extension-id>': localize('experimentalApis', "Enables proposed api features for an extension.")
+	'--enable-proposed-api <extension-id>': localize('experimentalApis', "Enables proposed API features for an extension.")
 };
 
 const troubleshootingHelp: { [name: string]: string; } = {
@@ -163,8 +164,8 @@ const troubleshootingHelp: { [name: string]: string; } = {
 	'-p, --performance': localize('performance', "Start with the 'Developer: Startup Performance' command enabled."),
 	'--prof-startup': localize('prof-startup', "Run CPU profiler during startup"),
 	'--disable-extensions': localize('disableExtensions', "Disable all installed extensions."),
-	'--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection uri."),
-	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."),
+	'--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection URI."),
+	'--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection URI."),
 	'--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."),
 	'--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."),
 	'--max-memory': localize('maxMemory', "Max memory size for a window (in Mbytes).")
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index cc1adabd5fd..cd875edaccd 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -170,6 +170,8 @@ export class EnvironmentService implements IEnvironmentService {
 	get disableUpdates(): boolean { return !!this._args['disable-updates']; }
 	get disableCrashReporter(): boolean { return !!this._args['disable-crash-reporter']; }
 
+	get driverHandle(): string { return this._args['driver']; }
+
 	constructor(private _args: ParsedArgs, private _execPath: string) {
 		if (!process.env['VSCODE_LOGS']) {
 			const key = toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '');
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 945ae66a841..28c6ce6805f 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -78,7 +78,13 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 	}
 
 	canChangeEnablement(extension: ILocalExtension): boolean {
-		return !this.environmentService.disableExtensions && !(extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length);
+		if (extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length) {
+			return false;
+		}
+		if (extension.type === LocalExtensionType.User && this.environmentService.disableExtensions) {
+			return false;
+		}
+		return true;
 	}
 
 	setEnablement(arg: ILocalExtension | IExtensionIdentifier, newState: EnablementState): TPromise<boolean> {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 128b7f6bca1..973f0262d75 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -117,6 +117,12 @@ export interface IExtensionManifest {
 	activationEvents?: string[];
 	extensionDependencies?: string[];
 	contributes?: IExtensionContributions;
+	repository?: {
+		url: string;
+	};
+	bugs?: {
+		url: string;
+	};
 }
 
 export interface IGalleryExtensionProperties {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index a1a00bc5cc6..7d1bd38ba36 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -69,9 +69,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		id: getGalleryExtensionIdFromLocal(extension),
 		name: extension.manifest.name,
 		galleryId: null,
-		publisherId: null,
-		publisherName: null,
-		publisherDisplayName: null,
+		publisherId: extension.metadata ? extension.metadata.publisherId : null,
+		publisherName: extension.manifest.publisher,
+		publisherDisplayName: extension.metadata ? extension.metadata.publisherDisplayName : null,
 		dependencies: extension.manifest.extensionDependencies && extension.manifest.extensionDependencies.length > 0
 	};
 }
@@ -82,9 +82,9 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
 		"id" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"name": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"galleryId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-		"publisherId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"publisherName": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-		"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+		"publisherId": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 		"dependencies": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 		"${include}": [
 			"${GalleryExtensionTelemetryData2}"
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index 694f98da3e4..92c29975c2b 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -18,7 +18,7 @@ import { IPager } from 'vs/base/common/paging';
 import { IRequestOptions, IRequestContext, download, asJson, asText } from 'vs/base/node/request';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
-import { isVersionValid } from 'vs/platform/extensions/node/extensionValidator';
+import { isEngineValid } from 'vs/platform/extensions/node/extensionValidator';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { readFile } from 'vs/base/node/pfs';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
@@ -520,7 +520,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	}
 
 	loadCompatibleVersion(extension: IGalleryExtension): TPromise<IGalleryExtension> {
-		if (extension.properties.engine && this.isEngineValid(extension.properties.engine)) {
+		if (extension.properties.engine && isEngineValid(extension.properties.engine)) {
 			return TPromise.wrap(extension);
 		}
 
@@ -682,7 +682,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			if (!engine) {
 				return null;
 			}
-			if (this.isEngineValid(engine)) {
+			if (isEngineValid(engine)) {
 				return TPromise.wrap(version);
 			}
 		}
@@ -703,7 +703,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			.then(manifest => {
 				const engine = manifest.engines.vscode;
 
-				if (!this.isEngineValid(engine)) {
+				if (!isEngineValid(engine)) {
 					return this.getLastValidExtensionVersionReccursively(extension, versions.slice(1));
 				}
 
@@ -713,11 +713,6 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			});
 	}
 
-	private isEngineValid(engine: string): boolean {
-		// TODO@joao: discuss with alex '*' doesn't seem to be a valid engine version
-		return engine === '*' || isVersionValid(pkg.version, engine);
-	}
-
 	private static hasExtensionByName(extensions: IGalleryExtension[], name: string): boolean {
 		for (const extension of extensions) {
 			if (`${extension.publisher}.${extension.name}` === name) {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 1eec2f7e57e..96e5006095a 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -12,7 +12,7 @@ import * as errors from 'vs/base/common/errors';
 import { assign } from 'vs/base/common/objects';
 import { toDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { flatten, distinct } from 'vs/base/common/arrays';
-import { extract, buffer } from 'vs/base/node/zip';
+import { extract, buffer, ExtractError } from 'vs/base/node/zip';
 import { TPromise } from 'vs/base/common/winjs.base';
 import {
 	IExtensionManagementService, IExtensionGalleryService, ILocalExtension,
@@ -22,7 +22,7 @@ import {
 	IExtensionIdentifier,
 	IReportedExtension
 } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet, getLocalExtensionId, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { localizeManifest } from '../common/extensionNls';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Limiter, always } from 'vs/base/common/async';
@@ -37,6 +37,8 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import Severity from 'vs/base/common/severity';
 import { ExtensionsLifecycle } from 'vs/platform/extensionManagement/node/extensionLifecycle';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { isEngineValid } from 'vs/platform/extensions/node/extensionValidator';
 
 const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
 const ERROR_SCANNING_SYS_EXTENSIONS = 'scanningSystem';
@@ -48,8 +50,9 @@ const INSTALL_ERROR_VALIDATING = 'validating';
 const INSTALL_ERROR_GALLERY = 'gallery';
 const INSTALL_ERROR_LOCAL = 'local';
 const INSTALL_ERROR_EXTRACTING = 'extracting';
+const INSTALL_ERROR_RENAMING = 'renaming';
 const INSTALL_ERROR_DELETING = 'deleting';
-const INSTALL_ERROR_UNKNOWN = 'unknown';
+const ERROR_UNKNOWN = 'unknown';
 
 export class ExtensionManagementError extends Error {
 	constructor(message: string, readonly code: string) {
@@ -108,6 +111,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private uninstalledFileLimiter: Limiter<void>;
 	private reportedExtensions: TPromise<IReportedExtension[]> | undefined;
 	private lastReportTimestamp = 0;
+	private readonly installationStartTime: Map<string, number> = new Map<string, number>();
 	private readonly installingExtensions: Map<string, TPromise<ILocalExtension>> = new Map<string, TPromise<ILocalExtension>>();
 	private readonly manifestCache: ExtensionsManifestCache;
 	private readonly extensionLifecycle: ExtensionsLifecycle;
@@ -128,7 +132,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IDialogService private dialogService: IDialogService,
 		@IExtensionGalleryService private galleryService: IExtensionGalleryService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
+		@ITelemetryService private telemetryService: ITelemetryService,
 	) {
 		super();
 		this.extensionsPath = environmentService.extensionsPath;
@@ -145,6 +150,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return validateLocalExtension(zipPath)
 			.then(manifest => {
 				const identifier = { id: getLocalExtensionIdFromManifest(manifest) };
+				if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode)) {
+					return TPromise.wrapError<ILocalExtension>(new Error(nls.localize('incompatible', "Unable to install Extension '{0}' as it is not compatible with Code '{1}'.", identifier.id, pkg.version)));
+				}
 				return this.removeIfExists(identifier.id)
 					.then(
 						() => this.checkOutdated(manifest)
@@ -205,7 +213,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 					return this.getDependenciesToInstall(local.manifest.extensionDependencies)
 						.then(dependenciesToInstall => this.downloadAndInstallExtensions(metadata ? dependenciesToInstall.filter(d => d.identifier.uuid !== metadata.id) : dependenciesToInstall))
 						.then(() => local, error => {
-							this.uninstallExtension(local);
+							this.setUninstalled(local);
 							return TPromise.wrapError(new Error(nls.localize('errorInstallingDependencies', "Error while installing dependencies. {0}", error instanceof Error ? error.message : error)));
 						});
 				}
@@ -241,7 +249,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return this.findGalleryExtension(extension)
 			.then(galleryExtension => {
 				if (galleryExtension) {
-					return this.uninstallExtension(extension)
+					return this.setUninstalled(extension)
 						.then(() => this.removeUninstalledExtension(extension)
 							.then(
 								() => this.installFromGallery(galleryExtension),
@@ -326,6 +334,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	private onInstallExtensions(extensions: IGalleryExtension[]): void {
 		for (const extension of extensions) {
 			this.logService.info('Installing extension:', extension.name);
+			this.installationStartTime.set(extension.identifier.id, new Date().getTime());
 			const id = getLocalExtensionIdFromGallery(extension, extension.version);
 			this._onInstallExtension.fire({ identifier: { id, uuid: extension.identifier.uuid }, gallery: extension });
 		}
@@ -340,10 +349,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				this.logService.info(`Extensions installed successfully:`, gallery.identifier.id);
 				this._onDidInstallExtension.fire({ identifier, gallery, local });
 			} else {
-				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : INSTALL_ERROR_UNKNOWN;
+				const errorCode = error && (<ExtensionManagementError>error).code ? (<ExtensionManagementError>error).code : ERROR_UNKNOWN;
 				this.logService.error(`Failed to install extension:`, gallery.identifier.id, error ? error.message : errorCode);
 				this._onDidInstallExtension.fire({ identifier, gallery, error: errorCode });
 			}
+			const startTime = this.installationStartTime.get(gallery.identifier.id);
+			this.reportTelemetry('extensionGallery:install', getGalleryExtensionTelemetryData(gallery), startTime ? new Date().getTime() - startTime : void 0, error);
+			this.installationStartTime.delete(gallery.identifier.id);
 		});
 		return errors.length ? TPromise.wrapError(this.joinErrors(errors)) : TPromise.as(null);
 	}
@@ -401,10 +413,13 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private extractAndInstall({ zipPath, id, metadata }: InstallableExtension): TPromise<ILocalExtension> {
-		const extractPath = path.join(this.extensionsPath, `.${id}`); // Extract to temp path
-		return this.extract(id, zipPath, extractPath, { sourcePath: 'extension', overwrite: true })
-			.then(() => this.completeInstall(id, extractPath))
-			.then(() => this.scanExtension(id, this.extensionsPath, LocalExtensionType.User))
+		const tempPath = path.join(this.extensionsPath, `.${id}`);
+		const extensionPath = path.join(this.extensionsPath, id);
+		return this.extractAndRename(id, zipPath, tempPath, extensionPath)
+			.then(() => {
+				this.logService.info('Installation completed.', id);
+				return this.scanExtension(id, this.extensionsPath, LocalExtensionType.User);
+			})
 			.then(local => {
 				if (metadata) {
 					local.metadata = metadata;
@@ -414,42 +429,45 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			});
 	}
 
-	private extract(id: string, zipPath: string, extractPath: string, options: any): TPromise<void> {
+	private extractAndRename(id: string, zipPath: string, extractPath: string, renamePath: string): TPromise<void> {
+		return this.extract(id, zipPath, extractPath)
+			.then(() => this.rename(id, extractPath, renamePath, Date.now() + (30 * 1000) /* Retry for 30 seconds */)
+				.then(
+					() => this.logService.info('Renamed to', renamePath),
+					e => {
+						this.logService.info('Rename failed. Deleting from extracted location', extractPath);
+						return always(pfs.rimraf(extractPath), () => null).then(() => TPromise.wrapError(e));
+					}));
+	}
+
+	private extract(id: string, zipPath: string, extractPath: string): TPromise<void> {
 		this.logService.trace(`Started extracting the extension from ${zipPath} to ${extractPath}`);
 		return pfs.rimraf(extractPath)
 			.then(
-				() => extract(zipPath, extractPath, options)
+				() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true })
 					.then(
 						() => this.logService.info(`Extracted extension to ${extractPath}:`, id),
 						e => always(pfs.rimraf(extractPath), () => null)
-							.then(() => TPromise.wrapError(new ExtensionManagementError(e.message, INSTALL_ERROR_EXTRACTING)))),
+							.then(() => TPromise.wrapError(new ExtensionManagementError(e.message, e instanceof ExtractError ? e.type : INSTALL_ERROR_EXTRACTING)))),
 				e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));
 	}
 
-	private completeInstall(id: string, extractPath: string): TPromise<void> {
-		return this.rename(id, extractPath, Date.now() + (5 * 1000) /* Retry for 5 seconds */)
-			.then(
-				() => this.logService.info('Installation compelted.', id),
-				e => {
-					this.logService.info('Deleting the extracted extension', id);
-					return always(pfs.rimraf(extractPath), () => null)
-						.then(() => TPromise.wrapError(e));
-				});
-	}
-
-	private rename(id: string, extractPath: string, retryUntil: number): TPromise<void> {
-		return pfs.rename(extractPath, path.join(this.extensionsPath, id))
-			.then(null, error =>
-				isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil
-					? this.rename(id, extractPath, retryUntil)
-					: TPromise.wrapError(error));
+	private rename(id: string, extractPath: string, renamePath: string, retryUntil: number): TPromise<void> {
+		return pfs.rename(extractPath, renamePath)
+			.then(null, error => {
+				if (isWindows && error && error.code === 'EPERM' && Date.now() < retryUntil) {
+					this.logService.info(`Failed renaming ${extractPath} to ${renamePath} with 'EPERM' error. Trying again...`);
+					return this.rename(id, extractPath, renamePath, retryUntil);
+				}
+				return TPromise.wrapError(new ExtensionManagementError(error.message || nls.localize('renameError', "Unknown error while renaming {0} to {1}", extractPath, renamePath), error.code || INSTALL_ERROR_RENAMING));
+			});
 	}
 
 	private rollback(extensions: IGalleryExtension[]): TPromise<void> {
 		return this.getInstalled(LocalExtensionType.User)
 			.then(installed =>
 				TPromise.join(installed.filter(local => extensions.some(galleryExtension => local.identifier.id === getLocalExtensionIdFromGallery(galleryExtension, galleryExtension.version))) // Only check id (pub.name-version) because we want to rollback the exact version
-					.map(local => this.uninstallExtension(local))))
+					.map(local => this.setUninstalled(local))))
 			.then(() => null, () => null);
 	}
 
@@ -520,7 +538,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(() => this.hasDependencies(extension, installed) ? this.promptForDependenciesAndUninstall(extension, installed, force) : this.promptAndUninstall(extension, installed, force))
 			.then(() => this.postUninstallExtension(extension),
 				error => {
-					this.postUninstallExtension(extension, INSTALL_ERROR_LOCAL);
+					this.postUninstallExtension(extension, new ExtensionManagementError(error instanceof Error ? error.message : error, INSTALL_ERROR_LOCAL));
 					return TPromise.wrapError(error);
 				});
 	}
@@ -640,7 +658,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 			.then(() => this.uninstallExtension(extension))
 			.then(() => this.postUninstallExtension(extension),
 				error => {
-					this.postUninstallExtension(extension, INSTALL_ERROR_LOCAL);
+					this.postUninstallExtension(extension, new ExtensionManagementError(error instanceof Error ? error.message : error, INSTALL_ERROR_LOCAL));
 					return TPromise.wrapError(error);
 				});
 	}
@@ -655,12 +673,14 @@ export class ExtensionManagementService extends Disposable implements IExtension
 	}
 
 	private uninstallExtension(local: ILocalExtension): TPromise<void> {
-		return this.setUninstalled(local.identifier.id);
+		// Set all versions of the extension as uninstalled
+		return this.scanUserExtensions(false)
+			.then(userExtensions => this.setUninstalled(...userExtensions.filter(u => areSameExtensions({ id: getGalleryExtensionIdFromLocal(u), uuid: u.identifier.uuid }, { id: getGalleryExtensionIdFromLocal(local), uuid: local.identifier.uuid }))));
 	}
 
-	private async postUninstallExtension(extension: ILocalExtension, error?: string): TPromise<void> {
+	private async postUninstallExtension(extension: ILocalExtension, error?: Error): TPromise<void> {
 		if (error) {
-			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error);
+			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error.message);
 		} else {
 			this.logService.info('Successfully uninstalled extension:', extension.identifier.id);
 			// only report if extension has a mapped gallery extension. UUID identifies the gallery extension.
@@ -668,7 +688,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				await this.galleryService.reportStatistic(extension.manifest.publisher, extension.manifest.name, extension.manifest.version, StatisticType.Uninstall);
 			}
 		}
-		this._onDidUninstallExtension.fire({ identifier: extension.identifier, error });
+		this.reportTelemetry('extensionGallery:uninstall', getLocalExtensionTelemetryData(extension), void 0, error);
+		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
+		this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: errorcode });
 	}
 
 	getInstalled(type: LocalExtensionType = null): TPromise<ILocalExtension[]> {
@@ -791,7 +813,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		});
 	}
 
-	private setUninstalled(...ids: string[]): TPromise<void> {
+	private setUninstalled(...extensions: ILocalExtension[]): TPromise<void> {
+		const ids = extensions.map(e => e.identifier.id);
 		return this.withUninstalledExtensions(uninstalled => assign(uninstalled, ids.reduce((result, id) => { result[id] = true; return result; }, {})));
 	}
 
@@ -845,6 +868,31 @@ export class ExtensionManagementService extends Disposable implements IExtension
 				return [];
 			});
 	}
+
+	private reportTelemetry(eventName: string, extensionData: any, duration: number, error?: Error): void {
+		const errorcode = error ? error instanceof ExtensionManagementError ? error.code : ERROR_UNKNOWN : void 0;
+		/* __GDPR__
+			"extensionGallery:install" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
+		/* __GDPR__
+			"extensionGallery:uninstall" : {
+				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+				"${include}": [
+					"${GalleryExtensionTelemetryData}"
+				]
+			}
+		*/
+		this.telemetryService.publicLog(eventName, assign(extensionData, { success: !error, duration, errorcode }));
+	}
 }
 
 export function getLocalExtensionIdFromGallery(extension: IGalleryExtension, version: string): string {
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index f4feeba2973..717a17dd3b0 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
@@ -6,7 +6,7 @@
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent, EnablementState, IExtensionContributions, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent, EnablementState, IExtensionContributions, ILocalExtension, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionEnablementService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Emitter } from 'vs/base/common/event';
@@ -324,6 +324,20 @@ suite('ExtensionEnablementService Test', () => {
 	test('test canChangeEnablement return false for language packs', () => {
 		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { localizations: [{ languageId: 'gr', translations: [{ id: 'vscode', path: 'path' }] }] })), false);
 	});
+
+	test('test canChangeEnablement return false when extensions are disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: true } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a')), false);
+	});
+
+	test('test canChangeEnablement return true for system extensions when extensions are disabled in environment', () => {
+		instantiationService.stub(IEnvironmentService, { disableExtensions: true } as IEnvironmentService);
+		testObject = new TestExtensionEnablementService(instantiationService);
+		const extension = aLocalExtension('pub.a');
+		extension.type = LocalExtensionType.System;
+		assert.equal(testObject.canChangeEnablement(extension), true);
+	});
 });
 
 function aLocalExtension(id: string, contributes?: IExtensionContributions): ILocalExtension {
@@ -334,6 +348,7 @@ function aLocalExtension(id: string, contributes?: IExtensionContributions): ILo
 			name,
 			publisher,
 			contributes
-		}
+		},
+		type: LocalExtensionType.User
 	});
 }
diff --git a/src/vs/platform/extensions/node/extensionValidator.ts b/src/vs/platform/extensions/node/extensionValidator.ts
index 607507a7c44..a500010b134 100644
--- a/src/vs/platform/extensions/node/extensionValidator.ts
+++ b/src/vs/platform/extensions/node/extensionValidator.ts
@@ -5,6 +5,7 @@
 'use strict';
 
 import * as nls from 'vs/nls';
+import pkg from 'vs/platform/node/package';
 
 export interface IParsedVersion {
 	hasCaret: boolean;
@@ -219,11 +220,16 @@ export function isValidExtensionVersion(version: string, extensionDesc: IReduced
 	return isVersionValid(version, extensionDesc.engines.vscode, notices);
 }
 
+export function isEngineValid(engine: string): boolean {
+	// TODO@joao: discuss with alex '*' doesn't seem to be a valid engine version
+	return engine === '*' || isVersionValid(pkg.version, engine);
+}
+
 export function isVersionValid(currentVersion: string, requestedVersion: string, notices: string[] = []): boolean {
 
 	let desiredVersion = normalizeVersion(parseVersion(requestedVersion));
 	if (!desiredVersion) {
-		notices.push(nls.localize('versionSyntax', "Could not parse `engines.vscode` value {0}. Please use, for example: ^0.10.0, ^1.2.3, ^0.11.0, ^0.10.x, etc.", requestedVersion));
+		notices.push(nls.localize('versionSyntax', "Could not parse `engines.vscode` value {0}. Please use, for example: ^1.22.0, ^1.22.x, etc.", requestedVersion));
 		return false;
 	}
 
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index f3f03d75732..e9f5c6e78d6 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -11,17 +11,25 @@ import * as glob from 'vs/base/common/glob';
 import { isLinux } from 'vs/base/common/platform';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Event } from 'vs/base/common/event';
-import { beginsWithIgnoreCase } from 'vs/base/common/strings';
-import { IProgress } from 'vs/platform/progress/common/progress';
+import { startsWithIgnoreCase } from 'vs/base/common/strings';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { isEqualOrParent, isEqual } from 'vs/base/common/resources';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 
 export const IFileService = createDecorator<IFileService>('fileService');
 
+export interface IResourceEncodings {
+	getWriteEncoding(resource: URI, preferredEncoding?: string): string;
+}
+
 export interface IFileService {
 	_serviceBrand: any;
 
+	/**
+	 * Helper to determine read/write encoding for resources.
+	 */
+	encoding: IResourceEncodings;
+
 	/**
 	 * Allows to listen for file changes. The event will fire for every file within the opened workspace
 	 * (if any) as well as all files that have been watched explicitly using the #watchFileChanges() API.
@@ -33,15 +41,20 @@ export interface IFileService {
 	 */
 	onAfterOperation: Event<FileOperationEvent>;
 
+	/**
+	 * An event that is fired when a file system provider is added or removed
+	 */
+	onDidChangeFileSystemProviderRegistrations: Event<IFileSystemProviderRegistrationEvent>;
+
 	/**
 	 * Registeres a file system provider for a certain scheme.
 	 */
-	registerProvider?(scheme: string, provider: IFileSystemProvider): IDisposable;
+	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable;
 
 	/**
 	 * Checks if this file service can handle the given resource.
 	 */
-	canHandleResource?(resource: URI): boolean;
+	canHandleResource(resource: URI): boolean;
 
 	/**
 	 * Resolve the properties of a file identified by the resource.
@@ -120,23 +133,12 @@ export interface IFileService {
 	 */
 	rename(resource: URI, newName: string): TPromise<IFileStat>;
 
-	/**
-	 * Creates a new empty file if the given path does not exist and otherwise
-	 * will set the mtime and atime of the file to the current date.
-	 */
-	touchFile(resource: URI): TPromise<IFileStat>;
-
 	/**
 	 * Deletes the provided file.  The optional useTrash parameter allows to
 	 * move the file to trash.
 	 */
 	del(resource: URI, useTrash?: boolean): TPromise<void>;
 
-	/**
-	 * Imports the file to the parent identified by the resource.
-	 */
-	importFile(source: URI, targetFolder: URI): TPromise<IImportResult>;
-
 	/**
 	 * Allows to start a watcher that reports file change events on the provided resource.
 	 */
@@ -147,59 +149,97 @@ export interface IFileService {
 	 */
 	unwatchFileChanges(resource: URI): void;
 
-	/**
-	 * Configures the file service with the provided options.
-	 */
-	updateOptions(options: object): void;
-
-	/**
-	 * Returns the preferred encoding to use for a given resource.
-	 */
-	getEncoding(resource: URI, preferredEncoding?: string): string;
-
 	/**
 	 * Frees up any resources occupied by this service.
 	 */
 	dispose(): void;
 }
 
-
-export enum FileType {
-	File = 0,
-	Dir = 1,
-	Symlink = 2
+export enum FileType2 {
+	File = 1,
+	Directory = 2,
+	SymbolicLink = 4,
 }
+
+export interface FileOptions {
+	/**
+	 * Create a file when it doesn't exists.
+	 */
+	create?: boolean;
+
+	/**
+	 * In combination with [`create`](FileOptions.create) but
+	 * the operation should fail when a file already exists.
+	 */
+	exclusive?: boolean;
+
+	/**
+	 * Open a file for reading.
+	 */
+	read?: boolean;
+
+	/**
+	 * Open a file for writing.
+	 */
+	write?: boolean;
+}
+
 export interface IStat {
-	id: number | string;
+	isFile: boolean;
+	isDirectory: boolean;
+	isSymbolicLink: boolean;
 	mtime: number;
 	size: number;
-	type: FileType;
+}
+
+export interface IWatchOptions {
+	recursive?: boolean;
+	exclude?: string[];
+}
+
+export enum FileSystemProviderCapabilities {
+	FileReadWrite = 1 << 1,
+	FileOpenReadWriteClose = 1 << 2,
+	FileFolderCopy = 1 << 3,
+
+	PathCaseSensitive = 1 << 10
 }
 
 export interface IFileSystemProvider {
 
-	onDidChange?: Event<IFileChange[]>;
+	readonly capabilities: FileSystemProviderCapabilities;
+
+	onDidChangeFile: Event<IFileChange[]>;
+	watch(resource: URI, opts: IWatchOptions): IDisposable;
 
-	// more...
-	//
-	utimes(resource: URI, mtime: number, atime: number): TPromise<IStat>;
 	stat(resource: URI): TPromise<IStat>;
-	read(resource: URI, offset: number, count: number, progress: IProgress<Uint8Array>): TPromise<number>;
-	write(resource: URI, content: Uint8Array): TPromise<void>;
-	move(from: URI, to: URI): TPromise<IStat>;
 	mkdir(resource: URI): TPromise<IStat>;
-	readdir(resource: URI): TPromise<[URI, IStat][]>;
-	rmdir(resource: URI): TPromise<void>;
-	unlink(resource: URI): TPromise<void>;
+	readdir(resource: URI): TPromise<[string, IStat][]>;
+	delete(resource: URI): TPromise<void>;
+
+	rename(from: URI, to: URI, opts: FileOptions): TPromise<IStat>;
+	copy?(from: URI, to: URI, opts: FileOptions): TPromise<IStat>;
+
+	readFile?(resource: URI, opts: FileOptions): TPromise<Uint8Array>;
+	writeFile?(resource: URI, content: Uint8Array, opts: FileOptions): TPromise<void>;
+
+	open?(resource: URI, opts: FileOptions): TPromise<number>;
+	close?(fd: number): TPromise<void>;
+	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
+	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
 }
 
+export interface IFileSystemProviderRegistrationEvent {
+	added: boolean;
+	scheme: string;
+	provider?: IFileSystemProvider;
+}
 
 export enum FileOperation {
 	CREATE,
 	DELETE,
 	MOVE,
-	COPY,
-	IMPORT
+	COPY
 }
 
 export class FileOperationEvent {
@@ -348,29 +388,12 @@ export function isParent(path: string, candidate: string, ignoreCase?: boolean):
 	}
 
 	if (ignoreCase) {
-		return beginsWithIgnoreCase(path, candidate);
+		return startsWithIgnoreCase(path, candidate);
 	}
 
 	return path.indexOf(candidate) === 0;
 }
 
-export function indexOf(path: string, candidate: string, ignoreCase?: boolean): number {
-	if (candidate.length > path.length) {
-		return -1;
-	}
-
-	if (path === candidate) {
-		return 0;
-	}
-
-	if (ignoreCase) {
-		path = path.toLowerCase();
-		candidate = candidate.toLowerCase();
-	}
-
-	return path.indexOf(candidate);
-}
-
 export interface IBaseStat {
 
 	/**
@@ -472,6 +495,14 @@ export interface ITextSnapshot {
 	read(): string;
 }
 
+export class StringSnapshot implements ITextSnapshot {
+	constructor(private _value: string) { }
+	read(): string {
+		let ret = this._value;
+		this._value = null;
+		return ret;
+	}
+}
 /**
  * Helper method to convert a snapshot into its full string form.
  */
@@ -510,9 +541,10 @@ export interface IResolveContentOptions {
 	acceptTextOnly?: boolean;
 
 	/**
-	 * The optional etag parameter allows to return a 304 (Not Modified) if the etag matches
-	 * with the remote resource. It is the task of the caller to makes sure to handle this
-	 * error case from the promise.
+	 * The optional etag parameter allows to return early from resolving the resource if
+	 * the contents on disk match the etag. This prevents accumulated reading of resources
+	 * that have been read already with the same etag.
+	 * It is the task of the caller to makes sure to handle this error case from the promise.
 	 */
 	etag?: string;
 
@@ -566,6 +598,11 @@ export interface IUpdateContentOptions {
 	 * The etag of the file. This can be used to prevent dirty writes.
 	 */
 	etag?: string;
+
+	/**
+	 * Run mkdirp before saving.
+	 */
+	mkdirp?: boolean;
 }
 
 export interface IResolveFileOptions {
@@ -582,11 +619,6 @@ export interface ICreateFileOptions {
 	overwrite?: boolean;
 }
 
-export interface IImportResult {
-	stat: IFileStat;
-	isNew: boolean;
-}
-
 export class FileOperationError extends Error {
 	constructor(message: string, public fileOperationResult: FileOperationResult, public options?: IResolveContentOptions & IUpdateContentOptions & ICreateFileOptions) {
 		super(message);
diff --git a/src/vs/platform/files/test/files.test.ts b/src/vs/platform/files/test/files.test.ts
index 305db3647cd..aba5148b53d 100644
--- a/src/vs/platform/files/test/files.test.ts
+++ b/src/vs/platform/files/test/files.test.ts
@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import { join, isEqual, isEqualOrParent } from 'vs/base/common/paths';
-import { FileChangeType, FileChangesEvent, isParent, indexOf } from 'vs/platform/files/common/files';
+import { FileChangeType, FileChangesEvent, isParent } from 'vs/platform/files/common/files';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 
 suite('Files', () => {
@@ -187,16 +187,4 @@ suite('Files', () => {
 			assert(!isEqualOrParent('foo/bar/test.ts', 'foo/BAR/test.', true));
 		}
 	});
-
-	test('indexOf (ignorecase)', function () {
-		assert.equal(indexOf('/some/path', '/some/path', true), 0);
-		assert.equal(indexOf('/some/path/more', '/some/path', true), 0);
-
-		assert.equal(indexOf('c:\\some\\path', 'c:\\some\\path', true), 0);
-		assert.equal(indexOf('c:\\some\\path\\more', 'c:\\some\\path', true), 0);
-
-		assert.equal(indexOf('/some/path', '/some/other/path', true), -1);
-
-		assert.equal(indexOf('/some/path', '/some/PATH', true), 0);
-	});
 });
\ No newline at end of file
diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts
index 34fd1e44a4f..5a45065e013 100644
--- a/src/vs/platform/integrity/node/integrityServiceImpl.ts
+++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts
@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IStorageData {
 	dontShowPrompt: boolean;
@@ -82,26 +82,24 @@ export class IntegrityServiceImpl implements IIntegrityService {
 	private _prompt(): void {
 		const storedData = this._storage.get();
 		if (storedData && storedData.dontShowPrompt && storedData.commit === product.commit) {
-			// Do not prompt
-			return;
+			return; // Do not prompt
 		}
 
-		const choices: PromptOption[] = [nls.localize('integrity.moreInformation', "More Information"), { label: nls.localize('integrity.dontShowAgain', "Don't Show Again") }];
-
-		this.notificationService.prompt(Severity.Warning, nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort), choices).then(choice => {
-			switch (choice) {
-				case 0 /* More Information */:
-					const uri = URI.parse(product.checksumFailMoreInfoUrl);
-					window.open(uri.toString(true));
-					break;
-				case 1 /* Do not show again */:
-					this._storage.set({
-						dontShowPrompt: true,
-						commit: product.commit
-					});
-					break;
-			}
-		});
+		this.notificationService.prompt(
+			Severity.Warning,
+			nls.localize('integrity.prompt', "Your {0} installation appears to be corrupt. Please reinstall.", product.nameShort),
+			[
+				{
+					label: nls.localize('integrity.moreInformation', "More Information"),
+					run: () => window.open(URI.parse(product.checksumFailMoreInfoUrl).toString(true))
+				},
+				{
+					label: nls.localize('integrity.dontShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this._storage.set({ dontShowPrompt: true, commit: product.commit })
+				}
+			]
+		);
 	}
 
 	public isPure(): Thenable<IntegrityTestResult> {
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index 8955b50b076..228bcdfefb1 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -11,6 +11,15 @@ import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensio
 
 export const IIssueService = createDecorator<IIssueService>('issueService');
 
+export interface WindowStyles {
+	backgroundColor: string;
+	color: string;
+}
+export interface WindowData {
+	styles: WindowStyles;
+	zoomLevel: number;
+}
+
 export enum IssueType {
 	Bug,
 	PerformanceIssue,
@@ -18,9 +27,7 @@ export enum IssueType {
 	SettingsSearchIssue
 }
 
-export interface IssueReporterStyles {
-	backgroundColor: string;
-	color: string;
+export interface IssueReporterStyles extends WindowStyles {
 	textLinkColor: string;
 	inputBackground: string;
 	inputForeground: string;
@@ -35,9 +42,8 @@ export interface IssueReporterStyles {
 	sliderActiveColor: string;
 }
 
-export interface IssueReporterData {
+export interface IssueReporterData extends WindowData {
 	styles: IssueReporterStyles;
-	zoomLevel: number;
 	enabledExtensions: ILocalExtension[];
 	issueType?: IssueType;
 }
@@ -58,7 +64,18 @@ export interface ISettingsSearchIssueReporterData extends IssueReporterData {
 export interface IssueReporterFeatures {
 }
 
+export interface ProcessExplorerStyles extends WindowStyles {
+	hoverBackground: string;
+	hoverForeground: string;
+	highlightForeground: string;
+}
+
+export interface ProcessExplorerData extends WindowData {
+	styles: ProcessExplorerStyles;
+}
+
 export interface IIssueService {
 	_serviceBrand: any;
 	openReporter(data: IssueReporterData): TPromise<void>;
+	openProcessExplorer(data: ProcessExplorerData): TPromise<void>;
 }
diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts
index 99d73534b5e..d804c6579fe 100644
--- a/src/vs/platform/issue/common/issueIpc.ts
+++ b/src/vs/platform/issue/common/issueIpc.ts
@@ -7,7 +7,7 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel } from 'vs/base/parts/ipc/common/ipc';
-import { IIssueService, IssueReporterData } from './issue';
+import { IIssueService, IssueReporterData, ProcessExplorerData } from './issue';
 
 export interface IIssueChannel extends IChannel {
 	call(command: 'openIssueReporter', arg: IssueReporterData): TPromise<void>;
@@ -23,6 +23,8 @@ export class IssueChannel implements IIssueChannel {
 		switch (command) {
 			case 'openIssueReporter':
 				return this.service.openReporter(arg);
+			case 'openProcessExplorer':
+				return this.service.openProcessExplorer(arg);
 		}
 		return undefined;
 	}
@@ -37,4 +39,8 @@ export class IssueChannelClient implements IIssueService {
 	openReporter(data: IssueReporterData): TPromise<void> {
 		return this.channel.call('openIssueReporter', data);
 	}
+
+	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
+		return this.channel.call('openProcessExplorer', data);
+	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index ce01cabbc9e..1d589bf8f16 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -9,12 +9,12 @@ import { TPromise, Promise } from 'vs/base/common/winjs.base';
 import { localize } from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import { parseArgs } from 'vs/platform/environment/node/argv';
-import { IIssueService, IssueReporterData, IssueReporterFeatures } from 'vs/platform/issue/common/issue';
+import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
 import { BrowserWindow, ipcMain, screen } from 'electron';
 import { ILaunchService } from 'vs/code/electron-main/launch';
 import { getPerformanceInfo, PerformanceInfo, getSystemInfo, SystemInfo } from 'vs/code/electron-main/diagnostics';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
 import { ILogService } from 'vs/platform/log/common/log';
 
 const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
@@ -22,13 +22,15 @@ const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
 export class IssueService implements IIssueService {
 	_serviceBrand: any;
 	_issueWindow: BrowserWindow;
-	_parentWindow: BrowserWindow;
+	_issueParentWindow: BrowserWindow;
+	_processExplorerWindow: BrowserWindow;
 
 	constructor(
 		private machineId: string,
+		private userEnv: IProcessEnvironment,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILaunchService private launchService: ILaunchService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
 	) { }
 
 	openReporter(data: IssueReporterData): TPromise<void> {
@@ -45,11 +47,11 @@ export class IssueService implements IIssueService {
 		});
 
 		ipcMain.on('workbenchCommand', (event, arg) => {
-			this._parentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
+			this._issueParentWindow.webContents.send('vscode:runAction', { id: arg, from: 'issueReporter' });
 		});
 
-		this._parentWindow = BrowserWindow.getFocusedWindow();
-		const position = this.getWindowPosition();
+		this._issueParentWindow = BrowserWindow.getFocusedWindow();
+		const position = this.getWindowPosition(this._issueParentWindow, 800, 900);
 		this._issueWindow = new BrowserWindow({
 			width: position.width,
 			height: position.height,
@@ -72,7 +74,54 @@ export class IssueService implements IIssueService {
 		return TPromise.as(null);
 	}
 
-	private getWindowPosition() {
+	openProcessExplorer(data: ProcessExplorerData): TPromise<void> {
+		// Create as singleton
+		if (!this._processExplorerWindow) {
+			const position = this.getWindowPosition(BrowserWindow.getFocusedWindow(), 800, 300);
+			this._processExplorerWindow = new BrowserWindow({
+				skipTaskbar: true,
+				resizable: true,
+				width: position.width,
+				height: position.height,
+				minWidth: 300,
+				minHeight: 200,
+				x: position.x,
+				y: position.y,
+				backgroundColor: data.styles.backgroundColor,
+				title: localize('processExplorer', "Process Explorer")
+			});
+
+			this._processExplorerWindow.setMenuBarVisibility(false);
+
+			const windowConfiguration = {
+				appRoot: this.environmentService.appRoot,
+				nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
+				windowId: this._processExplorerWindow.id,
+				userEnv: this.userEnv,
+				machineId: this.machineId,
+				data
+			};
+
+			const environment = parseArgs(process.argv);
+			const config = objects.assign(environment, windowConfiguration);
+			for (let key in config) {
+				if (config[key] === void 0 || config[key] === null || config[key] === '') {
+					delete config[key]; // only send over properties that have a true value
+				}
+			}
+
+			this._processExplorerWindow.loadURL(`${require.toUrl('vs/code/electron-browser/processExplorer/processExplorer.html')}?config=${encodeURIComponent(JSON.stringify(config))}`);
+
+			this._processExplorerWindow.on('close', () => this._processExplorerWindow = void 0);
+		}
+
+		// Focus
+		this._processExplorerWindow.focus();
+
+		return TPromise.as(null);
+	}
+
+	private getWindowPosition(parentWindow: BrowserWindow, defaultWidth: number, defaultHeight: number) {
 		// We want the new window to open on the same display that the parent is in
 		let displayToUse: Electron.Display;
 		const displays = screen.getAllDisplays();
@@ -92,8 +141,8 @@ export class IssueService implements IIssueService {
 			}
 
 			// if we have a last active window, use that display for the new window
-			if (!displayToUse && this._parentWindow) {
-				displayToUse = screen.getDisplayMatching(this._parentWindow.getBounds());
+			if (!displayToUse && parentWindow) {
+				displayToUse = screen.getDisplayMatching(parentWindow.getBounds());
 			}
 
 			// fallback to primary display or first display
@@ -103,8 +152,8 @@ export class IssueService implements IIssueService {
 		}
 
 		let state = {
-			width: 800,
-			height: 900,
+			width: defaultWidth,
+			height: defaultHeight,
 			x: undefined,
 			y: undefined
 		};
@@ -171,6 +220,7 @@ export class IssueService implements IIssueService {
 			nodeCachedDataDir: this.environmentService.nodeCachedDataDir,
 			windowId: this._issueWindow.id,
 			machineId: this.machineId,
+			userEnv: this.userEnv,
 			data,
 			features
 		};
diff --git a/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts b/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
index 78861625e1a..a0c923e8078 100644
--- a/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
+++ b/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.ts
@@ -21,8 +21,7 @@ export class USLayoutResolvedKeybinding extends ResolvedKeybinding {
 		super();
 		this._os = OS;
 		if (actual === null) {
-			this._firstPart = null;
-			this._chordPart = null;
+			throw new Error(`Invalid USLayoutResolvedKeybinding`);
 		} else if (actual.type === KeybindingType.Chord) {
 			this._firstPart = actual.firstPart;
 			this._chordPart = actual.chordPart;
diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
index 6c00827eac5..44ea5de8c5d 100644
--- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
+++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
@@ -19,7 +19,7 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { OS } from 'vs/base/common/platform';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
-import { INotificationService, NoOpNotification, INotification } from 'vs/platform/notification/common/notification';
+import { INotificationService, NoOpNotification, INotification, IPromptChoice } from 'vs/platform/notification/common/notification';
 
 function createContext(ctx: any) {
 	return {
@@ -139,8 +139,8 @@ suite('AbstractKeybindingService', () => {
 					showMessageCalls.push({ sev: Severity.Error, message });
 					return new NoOpNotification();
 				},
-				prompt: () => {
-					return TPromise.as(0);
+				prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void) {
+					throw new Error('not implemented');
 				}
 			};
 
diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
index 99c88c4fa06..8a44c7bd8db 100644
--- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
+++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
@@ -120,4 +120,8 @@ export class MockKeybindingService implements IKeybindingService {
 	public softDispatch(keybinding: IKeyboardEvent, target: IContextKeyServiceTarget): IResolveResult {
 		return null;
 	}
+
+	dispatchEvent(e: IKeyboardEvent, target: IContextKeyServiceTarget): boolean {
+		return false;
+	}
 }
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
index 5cc5c24c996..a2388d8fa49 100644
--- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
+++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts
@@ -14,7 +14,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { ICodeWindow } from 'vs/platform/windows/electron-main/windows';
 import { ReadyState } from 'vs/platform/windows/common/windows';
 import { handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
-import { isMacintosh } from 'vs/base/common/platform';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
 
 export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
 
@@ -389,6 +389,19 @@ export class LifecycleService implements ILifecycleService {
 		app.once('quit', () => {
 			if (!vetoed) {
 				this.stateService.setItem(LifecycleService.QUIT_FROM_RESTART_MARKER, true);
+
+				// Windows: we are about to restart and as such we need to restore the original
+				// current working directory we had on startup to get the exact same startup
+				// behaviour. As such, we briefly change back to the VSCODE_CWD and then when
+				// Code starts it will set it back to the installation directory again.
+				try {
+					if (isWindows) {
+						process.chdir(process.env['VSCODE_CWD']);
+					}
+				} catch (err) {
+					this.logService.error(err);
+				}
+
 				app.relaunch({ args });
 			}
 		});
diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts
index 84d7417db5e..5d579767204 100644
--- a/src/vs/platform/log/node/spdlogService.ts
+++ b/src/vs/platform/log/node/spdlogService.ts
@@ -7,13 +7,15 @@
 
 import * as path from 'path';
 import { ILogService, LogLevel, NullLogService, AbstractLogService } from 'vs/platform/log/common/log';
-import { RotatingLogger, setAsyncMode } from 'spdlog';
+import * as spdlog from 'spdlog';
 
 export function createSpdLogService(processName: string, logLevel: LogLevel, logsFolder: string): ILogService {
+	// Do not crash if spdlog cannot be loaded
 	try {
-		setAsyncMode(8192, 2000);
+		const _spdlog: typeof spdlog = require.__$__nodeRequire('spdlog');
+		_spdlog.setAsyncMode(8192, 2000);
 		const logfilePath = path.join(logsFolder, `${processName}.log`);
-		const logger = new RotatingLogger(processName, logfilePath, 1024 * 1024 * 5, 6);
+		const logger = new _spdlog.RotatingLogger(processName, logfilePath, 1024 * 1024 * 5, 6);
 		logger.setLevel(0);
 
 		return new SpdLogService(logger, logLevel);
@@ -28,7 +30,7 @@ class SpdLogService extends AbstractLogService implements ILogService {
 	_serviceBrand: any;
 
 	constructor(
-		private readonly logger: RotatingLogger,
+		private readonly logger: spdlog.RotatingLogger,
 		level: LogLevel = LogLevel.Error
 	) {
 		super();
diff --git a/src/vs/platform/notification/common/notification.ts b/src/vs/platform/notification/common/notification.ts
index 62b7e6751cd..4b1315c077f 100644
--- a/src/vs/platform/notification/common/notification.ts
+++ b/src/vs/platform/notification/common/notification.ts
@@ -7,10 +7,8 @@
 
 import BaseSeverity from 'vs/base/common/severity';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
 import { IAction } from 'vs/base/common/actions';
 import { Event, Emitter } from 'vs/base/common/event';
-import { TPromise } from 'vs/base/common/winjs.base';
 
 export import Severity = BaseSeverity;
 
@@ -90,12 +88,12 @@ export interface INotificationProgress {
 	done(): void;
 }
 
-export interface INotificationHandle extends IDisposable {
+export interface INotificationHandle {
 
 	/**
-	 * Will be fired once the notification is disposed.
+	 * Will be fired once the notification is closed.
 	 */
-	readonly onDidDispose: Event<void>;
+	readonly onDidClose: Event<void>;
 
 	/**
 	 * Allows to indicate progress on the notification even after the
@@ -119,28 +117,37 @@ export interface INotificationHandle extends IDisposable {
 	 * notification is already visible.
 	 */
 	updateActions(actions?: INotificationActions): void;
+
+	/**
+	 * Hide the notification and remove it from the notification center.
+	 */
+	close(): void;
 }
 
+export interface IPromptChoice {
 
-/**
- * Primary choices show up as buttons in the notification below the message.
- */
-export type PrimaryPromptChoice = string;
-
-/**
- * Secondary choices show up under the gear icon in the header of the notification.
- */
-export interface SecondaryPromptChoice {
+	/**
+	 * Label to show for the choice to the user.
+	 */
 	label: string;
 
 	/**
-	 * Wether to keep the notification open after the secondary choice was selected
+	 * Primary choices show up as buttons in the notification below the message.
+	 * Secondary choices show up under the gear icon in the header of the notification.
+	 */
+	isSecondary?: boolean;
+
+	/**
+	 * Wether to keep the notification open after the choice was selected
 	 * by the user. By default, will close the notification upon click.
 	 */
 	keepOpen?: boolean;
-}
 
-export type PromptOption = PrimaryPromptChoice | SecondaryPromptChoice;
+	/**
+	 * Triggered when the user selects the choice.
+	 */
+	run: () => void;
+}
 
 /**
  * A service to bring up notifications and non-modal prompts.
@@ -185,27 +192,29 @@ export interface INotificationService {
 	 * Shows a prompt in the notification area with the provided choices. The prompt
 	 * is non-modal. If you want to show a modal dialog instead, use `IDialogService`.
 	 *
-	 * @returns a promise that will resolve to the index of the choice that was picked.
-	 * The promise can be cancelled to hide the notification prompt.
+	 * @param onCancel will be called if the user closed the notification without picking
+	 * any of the provided choices.
+	 *
+	 * @returns a handle on the notification to e.g. hide it or update message, buttons, etc.
 	 */
-	prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number>;
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle;
 }
 
 export class NoOpNotification implements INotificationHandle {
 	readonly progress = new NoOpProgress();
 
-	private readonly _onDidDispose: Emitter<void> = new Emitter();
+	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	updateSeverity(severity: Severity): void { }
 	updateMessage(message: NotificationMessage): void { }
 	updateActions(actions?: INotificationActions): void { }
 
-	dispose(): void {
-		this._onDidDispose.dispose();
+	close(): void {
+		this._onDidClose.dispose();
 	}
 }
 
diff --git a/src/vs/platform/notification/test/common/testNotificationService.ts b/src/vs/platform/notification/test/common/testNotificationService.ts
new file mode 100644
index 00000000000..d2d4021d653
--- /dev/null
+++ b/src/vs/platform/notification/test/common/testNotificationService.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { INotificationService, INotificationHandle, NoOpNotification, Severity, INotification, IPromptChoice } from 'vs/platform/notification/common/notification';
+
+export class TestNotificationService implements INotificationService {
+
+	public _serviceBrand: any;
+
+	private static readonly NO_OP: INotificationHandle = new NoOpNotification();
+
+	public info(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Info, message });
+	}
+
+	public warn(message: string): INotificationHandle {
+		return this.notify({ severity: Severity.Warning, message });
+	}
+
+	public error(error: string | Error): INotificationHandle {
+		return this.notify({ severity: Severity.Error, message: error });
+	}
+
+	public notify(notification: INotification): INotificationHandle {
+		return TestNotificationService.NO_OP;
+	}
+
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		return TestNotificationService.NO_OP;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 69d8ce1d430..25fd7b3d97a 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -80,7 +80,7 @@ export interface IProgressOptions {
 
 export interface IProgressStep {
 	message?: string;
-	percentage?: number;
+	increment?: number;
 }
 
 export const IProgressService2 = createDecorator<IProgressService2>('progressService2');
diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
index 24975fa0e09..bb886241cf7 100644
--- a/src/vs/platform/quickOpen/common/quickOpen.ts
+++ b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -33,6 +33,7 @@ export interface IPickOpenEntry {
 	run?: (context: IEntryRunContext) => void;
 	action?: IAction;
 	payload?: any;
+	picked?: boolean;
 }
 
 export interface IPickOpenItem {
@@ -84,6 +85,11 @@ export interface IPickOptions {
 	 * a context key to set when this picker is active
 	 */
 	contextKey?: string;
+
+	/**
+	 * an optional flag to make this picker multi-select (honoured by extension API)
+	 */
+	canSelectMany?: boolean;
 }
 
 export interface IInputOptions {
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
new file mode 100644
index 00000000000..c5e05dc6cd4
--- /dev/null
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IPickOptions, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { CancellationToken } from 'vs/base/common/cancellation';
+
+export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
+
+export interface IQuickInputService {
+
+	_serviceBrand: any;
+
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options?: IPickOptions, token?: CancellationToken): TPromise<T[]>;
+}
diff --git a/src/vs/platform/telemetry/browser/errorTelemetry.ts b/src/vs/platform/telemetry/browser/errorTelemetry.ts
index abc5a96d207..ec06e2c07ee 100644
--- a/src/vs/platform/telemetry/browser/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/browser/errorTelemetry.ts
@@ -12,22 +12,37 @@ import { IDisposable, toDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as Errors from 'vs/base/common/errors';
 import { safeStringify } from 'vs/base/common/objects';
 
+/* __GDPR__FRAGMENT__
+	"ErrorEvent" : {
+		"stack": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" },
+		"message" : { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" },
+		"filename" : { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" },
+		"callstack": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+		"msg" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+		"file" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+		"line": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"column": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
+		"uncaught_error_name": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+		"uncaught_error_msg": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
+		"count": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+	}
+ */
 interface ErrorEvent {
-	stack: string;
-	message?: string;
-	filename?: string;
+	callstack: string;
+	msg?: string;
+	file?: string;
 	line?: number;
 	column?: number;
-	error?: { name: string; message: string; };
-
+	uncaught_error_name?: string;
+	uncaught_error_msg?: string;
 	count?: number;
 }
 
 namespace ErrorEvent {
 	export function compare(a: ErrorEvent, b: ErrorEvent) {
-		if (a.stack < b.stack) {
+		if (a.callstack < b.callstack) {
 			return -1;
-		} else if (a.stack > b.stack) {
+		} else if (a.callstack > b.callstack) {
 			return 1;
 		}
 		return 0;
@@ -89,32 +104,35 @@ export default class ErrorTelemetry {
 		}
 
 		// work around behavior in workerServer.ts that breaks up Error.stack
-		let stack = Array.isArray(err.stack) ? err.stack.join('\n') : err.stack;
-		let message = err.message ? err.message : safeStringify(err);
+		let callstack = Array.isArray(err.stack) ? err.stack.join('\n') : err.stack;
+		let msg = err.message ? err.message : safeStringify(err);
 
 		// errors without a stack are not useful telemetry
-		if (!stack) {
+		if (!callstack) {
 			return;
 		}
 
-		this._enqueue({ message, stack });
+		this._enqueue({ msg, callstack });
 	}
 
-	private _onUncaughtError(message: string, filename: string, line: number, column?: number, err?: any): void {
+	private _onUncaughtError(msg: string, file: string, line: number, column?: number, err?: any): void {
 
 		let data: ErrorEvent = {
-			stack: message,
-			message,
-			filename,
+			callstack: msg,
+			msg,
+			file,
 			line,
 			column
 		};
 
 		if (err) {
 			let { name, message, stack } = err;
-			data.error = { name, message };
+			data.uncaught_error_name = name;
+			if (message) {
+				data.uncaught_error_msg = message;
+			}
 			if (stack) {
-				data.stack = Array.isArray(err.stack)
+				data.callstack = Array.isArray(err.stack)
 					? err.stack = err.stack.join('\n')
 					: err.stack;
 			}
@@ -145,18 +163,10 @@ export default class ErrorTelemetry {
 		for (let error of this._buffer) {
 			/* __GDPR__
 			"UnhandledError" : {
-					"filename" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-					"message" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-					"name": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-					"stack": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-					"id": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-					"line": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-					"column": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-					"count": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth", "isMeasurement": true }
+					"${include}": [ "${ErrorEvent}" ]
 				}
 			*/
-			// __GDPR__TODO__ what's the complete set of properties?
-			this._telemetryService.publicLog('UnhandledError', error);
+			this._telemetryService.publicLog('UnhandledError', error, true);
 		}
 		this._buffer.length = 0;
 	}
diff --git a/src/vs/platform/telemetry/common/telemetry.ts b/src/vs/platform/telemetry/common/telemetry.ts
index ebfc8144e6e..41a1987e9c9 100644
--- a/src/vs/platform/telemetry/common/telemetry.ts
+++ b/src/vs/platform/telemetry/common/telemetry.ts
@@ -29,7 +29,7 @@ export interface ITelemetryService {
 	 * Sends a telemetry event that has been privacy approved.
 	 * Do not call this unless you have been given approval.
 	 */
-	publicLog(eventName: string, data?: ITelemetryData): TPromise<void>;
+	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): TPromise<void>;
 
 	getTelemetryInfo(): TPromise<ITelemetryInfo>;
 
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 6dc744d8d44..dba27cde4b1 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -37,7 +37,7 @@ export class TelemetryService implements ITelemetryService {
 	private _userOptIn: boolean;
 
 	private _disposables: IDisposable[] = [];
-	private _cleanupPatterns: [RegExp, string][] = [];
+	private _cleanupPatterns: RegExp[] = [];
 
 	constructor(
 		config: ITelemetryServiceConfig,
@@ -48,18 +48,11 @@ export class TelemetryService implements ITelemetryService {
 		this._piiPaths = config.piiPaths || [];
 		this._userOptIn = typeof config.userOptIn === 'undefined' ? true : config.userOptIn;
 
-		// static cleanup patterns for:
-		// #1 `file:///DANGEROUS/PATH/resources/app/Useful/Information`
-		// #2 // Any other file path that doesn't match the approved form above should be cleaned.
-		// #3 "Error: ENOENT; no such file or directory" is often followed with PII, clean it
-		this._cleanupPatterns.push(
-			[/file:\/\/\/.*?\/resources\/app\//gi, ''],
-			[/file:\/\/\/.*/gi, ''],
-			[/ENOENT: no such file or directory.*?\'([^\']+)\'/gi, 'ENOENT: no such file or directory']
-		);
+		// static cleanup pattern for: `file:///DANGEROUS/PATH/resources/app/Useful/Information`
+		this._cleanupPatterns = [/file:\/\/\/.*?\/resources\/app\//gi];
 
 		for (let piiPath of this._piiPaths) {
-			this._cleanupPatterns.push([new RegExp(escapeRegExpCharacters(piiPath), 'gi'), '']);
+			this._cleanupPatterns.push(new RegExp(escapeRegExpCharacters(piiPath), 'gi'));
 		}
 
 		if (this._configurationService) {
@@ -98,7 +91,7 @@ export class TelemetryService implements ITelemetryService {
 		this._disposables = dispose(this._disposables);
 	}
 
-	publicLog(eventName: string, data?: ITelemetryData): TPromise<any> {
+	publicLog(eventName: string, data?: ITelemetryData, anonymizeFilePaths?: boolean): TPromise<any> {
 		// don't send events when the user is optout
 		if (!this._userOptIn) {
 			return TPromise.as(undefined);
@@ -112,7 +105,7 @@ export class TelemetryService implements ITelemetryService {
 			// (last) remove all PII from data
 			data = cloneAndChange(data, value => {
 				if (typeof value === 'string') {
-					return this._cleanupInfo(value);
+					return this._cleanupInfo(value, anonymizeFilePaths);
 				}
 				return undefined;
 			});
@@ -125,15 +118,41 @@ export class TelemetryService implements ITelemetryService {
 		});
 	}
 
-	private _cleanupInfo(stack: string): string {
+	private _cleanupInfo(stack: string, anonymizeFilePaths?: boolean): string {
+		let updatedStack = stack;
 
-		// sanitize with configured cleanup patterns
-		for (let tuple of this._cleanupPatterns) {
-			let [regexp, replaceValue] = tuple;
-			stack = stack.replace(regexp, replaceValue);
+		if (anonymizeFilePaths) {
+			const cleanUpIndexes: [number, number][] = [];
+			for (let regexp of this._cleanupPatterns) {
+				while (true) {
+					const result = regexp.exec(stack);
+					if (!result) {
+						break;
+					}
+					cleanUpIndexes.push([result.index, regexp.lastIndex]);
+				}
+			}
+
+			const nodeModulesRegex = /^[\\\/]?(node_modules|node_modules\.asar)[\\\/]/;
+			const fileRegex = /(file:\/\/)?([a-zA-Z]:(\\\\|\\|\/)|(\\\\|\\|\/))?([\w-\._]+(\\\\|\\|\/))+[\w-\._]*/g;
+
+			while (true) {
+				const result = fileRegex.exec(stack);
+				if (!result) {
+					break;
+				}
+				// Anoynimize user file paths that do not need to be retained or cleaned up.
+				if (!nodeModulesRegex.test(result[0]) && cleanUpIndexes.every(([x, y]) => result.index < x || result.index >= y)) {
+					updatedStack = updatedStack.slice(0, result.index) + result[0].replace(/./g, 'a') + updatedStack.slice(fileRegex.lastIndex);
+				}
+			}
 		}
 
-		return stack;
+		// sanitize with configured cleanup patterns
+		for (let regexp of this._cleanupPatterns) {
+			updatedStack = updatedStack.replace(regexp, '');
+		}
+		return updatedStack;
 	}
 }
 
diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index 493d2692402..e997435d9c1 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -21,8 +21,6 @@ export function resolveCommonProperties(commit: string, version: string, machine
 	result['version'] = version;
 	// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
-	// __GDPR__COMMON__ "common.osVersion" : { "classification": "EndUserPseudonymizedInformation", "purpose": "FeatureInsight" }
-	result['common.osVersion'] = result['common.platformVersion']; // TODO: Drop this after the move to Nova
 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platform'] = Platform.Platform[Platform.platform];
 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
diff --git a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts b/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
index 2970c6b00bd..1c5e341b12b 100644
--- a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
@@ -48,7 +48,6 @@ suite('Telemetry - common properties', function () {
 
 				// assert.ok('common.version.shell' in first.data); // only when running on electron
 				// assert.ok('common.version.renderer' in first.data);
-				assert.ok('common.osVersion' in props, 'osVersion');
 				assert.ok('common.platformVersion' in props, 'platformVersion');
 				assert.ok('version' in props);
 				assert.equal(props['common.source'], 'my.install.source');
diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
index b29b0fff824..d0b935f401d 100644
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -50,6 +50,10 @@ class ErrorTestingSettings {
 	public noSuchFilePrefix: string;
 	public noSuchFileMessage: string;
 	public stack: string[];
+	public randomUserFile: string = 'a/path/that/doe_snt/con-tain/code/names.js';
+	public anonymizedRandomUserFile: string = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+	public nodeModulePathToRetain: string = 'node_modules/path/that/shouldbe/retained/names.js:14:15854';
+	public nodeModuleAsarPathToRetain: string = 'node_modules.asar/path/that/shouldbe/retained/names.js:14:12354';
 
 	constructor() {
 		this.personalInfo = 'DANGEROUS/PATH';
@@ -64,20 +68,20 @@ class ErrorTestingSettings {
 		this.noSuchFilePrefix = 'ENOENT: no such file or directory';
 		this.noSuchFileMessage = this.noSuchFilePrefix + ' \'' + this.personalInfo + '\'';
 
-		this.stack = ['at e._modelEvents (a/path/that/doesnt/contain/code/names.js:11:7309)',
-			'    at t.AllWorkers (a/path/that/doesnt/contain/code/names.js:6:8844)',
-			'    at e.(anonymous function) [as _modelEvents] (a/path/that/doesnt/contain/code/names.js:5:29552)',
-			'    at Function.<anonymous> (a/path/that/doesnt/contain/code/names.js:6:8272)',
-			'    at e.dispatch (a/path/that/doesnt/contain/code/names.js:5:26931)',
-			'    at e.request (a/path/that/doesnt/contain/code/names.js:14:1745)',
-			'    at t._handleMessage (another/path/that/doesnt/contain/code/names.js:14:17447)',
-			'    at t._onmessage (another/path/that/doesnt/contain/code/names.js:14:16976)',
-			'    at t.onmessage (another/path/that/doesnt/contain/code/names.js:14:15854)',
-			'    at DedicatedWorkerGlobalScope.self.onmessage',
-			this.dangerousPathWithImportantInfo,
-			this.dangerousPathWithoutImportantInfo,
-			this.missingModelMessage,
-			this.noSuchFileMessage];
+		this.stack = [`at e._modelEvents (${this.randomUserFile}:11:7309)`,
+		`    at t.AllWorkers (${this.randomUserFile}:6:8844)`,
+		`    at e.(anonymous function) [as _modelEvents] (${this.randomUserFile}:5:29552)`,
+		`    at Function.<anonymous> (${this.randomUserFile}:6:8272)`,
+		`    at e.dispatch (${this.randomUserFile}:5:26931)`,
+		`    at e.request (/${this.nodeModuleAsarPathToRetain})`,
+		`    at t._handleMessage (${this.nodeModuleAsarPathToRetain})`,
+		`    at t._onmessage (/${this.nodeModulePathToRetain})`,
+		`    at t.onmessage (${this.nodeModulePathToRetain})`,
+			`    at DedicatedWorkerGlobalScope.self.onmessage`,
+		this.dangerousPathWithImportantInfo,
+		this.dangerousPathWithoutImportantInfo,
+		this.missingModelMessage,
+		this.noSuchFileMessage];
 	}
 }
 
@@ -224,7 +228,7 @@ suite('TelemetryService', () => {
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 			assert.equal(testAppender.getEventsCount(), 1);
 			assert.equal(testAppender.events[0].eventName, 'UnhandledError');
-			assert.equal(testAppender.events[0].data.message, 'This is a test.');
+			assert.equal(testAppender.events[0].data.msg, 'This is a test.');
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -254,7 +258,7 @@ suite('TelemetryService', () => {
 	//
 	// 			assert.equal(testAppender.getEventsCount(), 1);
 	// 			assert.equal(testAppender.events[0].eventName, 'UnhandledError');
-	// 			assert.equal(testAppender.events[0].data.message,  'This should get logged');
+	// 			assert.equal(testAppender.events[0].data.msg,  'This should get logged');
 	//
 	// 			service.dispose();
 	// 		} finally {
@@ -279,11 +283,33 @@ suite('TelemetryService', () => {
 
 		assert.equal(testAppender.getEventsCount(), 1);
 		assert.equal(testAppender.events[0].eventName, 'UnhandledError');
-		assert.equal(testAppender.events[0].data.message, 'Error Message');
-		assert.equal(testAppender.events[0].data.filename, 'file.js');
+		assert.equal(testAppender.events[0].data.msg, 'Error Message');
+		assert.equal(testAppender.events[0].data.file, 'file.js');
 		assert.equal(testAppender.events[0].data.line, 2);
 		assert.equal(testAppender.events[0].data.column, 42);
-		assert.equal(testAppender.events[0].data.error.message, 'test');
+		assert.equal(testAppender.events[0].data.uncaught_error_msg, 'test');
+
+		errorTelemetry.dispose();
+		service.dispose();
+	}));
+
+	test('Error Telemetry removes PII from filename with spaces', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
+		window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		let personInfoWithSpaces = settings.personalInfo.slice(0, 2) + ' ' + settings.personalInfo.slice(2);
+		let dangerousFilenameError: any = new Error('dangerousFilename');
+		dangerousFilenameError.stack = settings.stack;
+		(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces) + '/test.js', 2, 42, dangerousFilenameError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.equal(errorStub.callCount, 1);
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces)), -1);
+		assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
 
 		errorTelemetry.dispose();
 		service.dispose();
@@ -303,7 +329,7 @@ suite('TelemetryService', () => {
 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
 		assert.equal(errorStub.callCount, 1);
-		assert.equal(testAppender.events[0].data.filename.indexOf(settings.dangerousPathWithImportantInfo), -1);
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
 
 		dangerousFilenameError = new Error('dangerousFilename');
 		dangerousFilenameError.stack = settings.stack;
@@ -311,8 +337,8 @@ suite('TelemetryService', () => {
 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
 		assert.equal(errorStub.callCount, 2);
-		assert.equal(testAppender.events[0].data.filename.indexOf(settings.dangerousPathWithImportantInfo), -1);
-		assert.equal(testAppender.events[0].data.filename, settings.importantInfo + '/test.js');
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
+		assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
 
 		errorTelemetry.dispose();
 		service.dispose();
@@ -332,13 +358,13 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(dangerousPathWithoutImportantInfoError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
 
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -363,12 +389,12 @@ suite('TelemetryService', () => {
 
 		assert.equal(errorStub.callCount, 1);
 		// Test that no file information remains, esp. personal info
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
 		service.dispose();
@@ -392,14 +418,14 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.notEqual(testAppender.events[0].data.message.indexOf(settings.importantInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -424,19 +450,75 @@ suite('TelemetryService', () => {
 
 		assert.equal(errorStub.callCount, 1);
 		// Test that important information remains but personal info does not
-		assert.notEqual(testAppender.events[0].data.message.indexOf(settings.importantInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
 		service.dispose();
 	}));
 
+	test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
+
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
+
+		try {
+			let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
+
+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
+			dangerousPathWithImportantInfoError.stack = settings.stack;
+
+
+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
+			errorTelemetry.dispose();
+			service.dispose();
+		}
+		finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
+	}));
+
+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
+		window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
+
+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
+		dangerousPathWithImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
+		assert.equal(errorStub.callCount, 1);
+
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
+		errorTelemetry.dispose();
+		service.dispose();
+	}));
+
+
 	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
 
 		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
@@ -455,14 +537,14 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.notEqual(testAppender.events[0].data.message.indexOf(settings.importantInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -487,14 +569,14 @@ suite('TelemetryService', () => {
 
 		assert.equal(errorStub.callCount, 1);
 		// Test that important information remains but personal info does not
-		assert.notEqual(testAppender.events[0].data.message.indexOf(settings.importantInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.importantInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
 		service.dispose();
@@ -519,14 +601,14 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(missingModelError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.notEqual(testAppender.events[0].data.message.indexOf(settings.missingModelPrefix), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.missingModelPrefix), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -551,14 +633,14 @@ suite('TelemetryService', () => {
 		assert.equal(errorStub.callCount, 1);
 		// Test that no file information remains, but this particular
 		// error message does (Received model events for missing model)
-		assert.notEqual(testAppender.events[0].data.message.indexOf(settings.missingModelPrefix), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.missingModelPrefix), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-		assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-		assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-		assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 		errorTelemetry.dispose();
 		service.dispose();
@@ -583,14 +665,14 @@ suite('TelemetryService', () => {
 			Errors.onUnexpectedError(noSuchFileError);
 			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
 
-			assert.notEqual(testAppender.events[0].data.message.indexOf(settings.noSuchFilePrefix), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.noSuchFilePrefix), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
@@ -620,14 +702,14 @@ suite('TelemetryService', () => {
 			// Test that no file information remains, but this particular
 			// error message does (ENOENT: no such file or directory)
 			Errors.onUnexpectedError(noSuchFileError);
-			assert.notEqual(testAppender.events[0].data.message.indexOf(settings.noSuchFilePrefix), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.message.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.noSuchFilePrefix), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.personalInfo), -1);
-			assert.equal(testAppender.events[0].data.stack.indexOf(settings.filePrefix), -1);
-			assert.notEqual(testAppender.events[0].data.stack.indexOf(settings.stack[4]), -1);
-			assert.equal(testAppender.events[0].data.stack.split('\n').length, settings.stack.length);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
 
 			errorTelemetry.dispose();
 			service.dispose();
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
index e8b4f832830..dcd84b72179 100644
--- a/src/vs/platform/theme/common/colorRegistry.ts
+++ b/src/vs/platform/theme/common/colorRegistry.ts
@@ -86,10 +86,14 @@ class ColorRegistry implements IColorRegistry {
 		this.colorsById = {};
 	}
 
-	public registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency = false): ColorIdentifier {
+	public registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency = false, deprecationMessage?: string): ColorIdentifier {
 		let colorContribution = { id, description, defaults, needsTransparency };
 		this.colorsById[id] = colorContribution;
-		this.colorSchema.properties[id] = { type: 'string', description, format: 'color-hex', default: '#ff0000' };
+		let propertySchema: IJSONSchema = { type: 'string', description, format: 'color-hex', default: '#ff0000' };
+		if (deprecationMessage) {
+			propertySchema.deprecationMessage = deprecationMessage;
+		}
+		this.colorSchema.properties[id] = propertySchema;
 		this.colorReferenceSchema.enum.push(id);
 		this.colorReferenceSchema.enumDescriptions.push(description);
 		return id;
@@ -134,8 +138,8 @@ class ColorRegistry implements IColorRegistry {
 const colorRegistry = new ColorRegistry();
 platform.Registry.add(Extensions.ColorContribution, colorRegistry);
 
-export function registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency?: boolean): ColorIdentifier {
-	return colorRegistry.registerColor(id, defaults, description, needsTransparency);
+export function registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency?: boolean, deprecationMessage?: string): ColorIdentifier {
+	return colorRegistry.registerColor(id, defaults, description, needsTransparency, deprecationMessage);
 }
 
 export function getColorRegistry(): IColorRegistry {
@@ -176,7 +180,7 @@ export const inputPlaceholderForeground = registerColor('input.placeholderForegr
 
 export const inputValidationInfoBackground = registerColor('inputValidation.infoBackground', { dark: '#063B49', light: '#D6ECF2', hc: Color.black }, nls.localize('inputValidationInfoBackground', "Input validation background color for information severity."));
 export const inputValidationInfoBorder = registerColor('inputValidation.infoBorder', { dark: '#007acc', light: '#007acc', hc: contrastBorder }, nls.localize('inputValidationInfoBorder', "Input validation border color for information severity."));
-export const inputValidationWarningBackground = registerColor('inputValidation.warningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for information warning."));
+export const inputValidationWarningBackground = registerColor('inputValidation.warningBackground', { dark: '#352A05', light: '#F6F5D2', hc: Color.black }, nls.localize('inputValidationWarningBackground', "Input validation background color for warning severity."));
 export const inputValidationWarningBorder = registerColor('inputValidation.warningBorder', { dark: '#B89500', light: '#B89500', hc: contrastBorder }, nls.localize('inputValidationWarningBorder', "Input validation border color for warning severity."));
 export const inputValidationErrorBackground = registerColor('inputValidation.errorBackground', { dark: '#5A1D1D', light: '#F2DEDE', hc: Color.black }, nls.localize('inputValidationErrorBackground', "Input validation background color for error severity."));
 export const inputValidationErrorBorder = registerColor('inputValidation.errorBorder', { dark: '#BE1100', light: '#BE1100', hc: contrastBorder }, nls.localize('inputValidationErrorBorder', "Input validation border color for error severity."));
@@ -193,7 +197,6 @@ export const listActiveSelectionForeground = registerColor('list.activeSelection
 export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#3F3F46', light: '#CCCEDB', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveFocusForeground = registerColor('list.inactiveFocusForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts
index afb14896d04..07dfd1d9551 100644
--- a/src/vs/platform/theme/common/styler.ts
+++ b/src/vs/platform/theme/common/styler.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusForeground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
+import { focusBorder, inputBackground, inputForeground, ColorIdentifier, selectForeground, selectBackground, selectListBackground, selectBorder, inputBorder, foreground, editorBackground, contrastBorder, inputActiveOptionBorder, listFocusBackground, listFocusForeground, listActiveSelectionBackground, listActiveSelectionForeground, listInactiveSelectionForeground, listInactiveSelectionBackground, listInactiveFocusBackground, listHoverBackground, listHoverForeground, listDropBackground, pickerGroupBorder, pickerGroupForeground, widgetShadow, inputValidationInfoBorder, inputValidationInfoBackground, inputValidationWarningBorder, inputValidationWarningBackground, inputValidationErrorBorder, inputValidationErrorBackground, activeContrastBorder, buttonForeground, buttonBackground, buttonHoverBackground, ColorFunction, lighten, badgeBackground, badgeForeground, progressBarBackground } from 'vs/platform/theme/common/colorRegistry';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
@@ -184,7 +184,6 @@ export function attachQuickOpenStyler(widget: IThemable, themeService: IThemeSer
 		listInactiveSelectionBackground: (style && style.listInactiveSelectionBackground) || listInactiveSelectionBackground,
 		listInactiveSelectionForeground: (style && style.listInactiveSelectionForeground) || listInactiveSelectionForeground,
 		listInactiveFocusBackground: (style && style.listInactiveFocusBackground) || listInactiveFocusBackground,
-		listInactiveFocusForeground: (style && style.listInactiveFocusForeground) || listInactiveFocusForeground,
 		listHoverBackground: (style && style.listHoverBackground) || listHoverBackground,
 		listHoverForeground: (style && style.listHoverForeground) || listHoverForeground,
 		listDropBackground: (style && style.listDropBackground) || listDropBackground,
@@ -204,7 +203,6 @@ export interface IListStyleOverrides extends IStyleOverrides {
 	listInactiveSelectionBackground?: ColorIdentifier;
 	listInactiveSelectionForeground?: ColorIdentifier;
 	listInactiveFocusBackground?: ColorIdentifier;
-	listInactiveFocusForeground?: ColorIdentifier;
 	listHoverBackground?: ColorIdentifier;
 	listHoverForeground?: ColorIdentifier;
 	listDropBackground?: ColorIdentifier;
@@ -228,7 +226,6 @@ export const defaultListStyles: IColorMapping = {
 	listInactiveSelectionBackground: listInactiveSelectionBackground,
 	listInactiveSelectionForeground: listInactiveSelectionForeground,
 	listInactiveFocusBackground: listInactiveFocusBackground,
-	listInactiveFocusForeground: listInactiveFocusForeground,
 	listHoverBackground: listHoverBackground,
 	listHoverForeground: listHoverForeground,
 	listDropBackground: listDropBackground,
diff --git a/src/vs/platform/update/node/update.config.contribution.ts b/src/vs/platform/update/node/update.config.contribution.ts
index 547952b04d0..755e519a36b 100644
--- a/src/vs/platform/update/node/update.config.contribution.ts
+++ b/src/vs/platform/update/node/update.config.contribution.ts
@@ -6,9 +6,8 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import product from 'vs/platform/node/product';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
@@ -21,11 +20,13 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': ['none', 'default'],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change.")
 		},
 		'update.enableWindowsBackgroundUpdates': {
 			'type': 'boolean',
-			'default': product.quality === 'insider',
+			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
 		}
 	}
diff --git a/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
new file mode 100644
index 00000000000..9f9c05762c9
--- /dev/null
+++ b/src/vs/platform/url/electron-browser/inactiveExtensionUrlHandler.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
+
+const FIVE_MINUTES = 5 * 60 * 1000;
+const THIRTY_SECONDS = 30 * 1000;
+
+function isExtensionId(value: string): boolean {
+	return /^[a-z0-9][a-z0-9\-]*\.[a-z0-9][a-z0-9\-]*$/i.test(value);
+}
+
+export const IInactiveExtensionUrlHandler = createDecorator<IInactiveExtensionUrlHandler>('inactiveExtensionUrlHandler');
+
+export interface IInactiveExtensionUrlHandler {
+	readonly _serviceBrand: any;
+	registerExtensionHandler(extensionId: string, handler: IURLHandler): void;
+	unregisterExtensionHandler(extensionId: string): void;
+}
+
+/**
+ * This class handles URLs which are directed towards inactive extensions.
+ * If a URL is directed towards an inactive extension, it buffers it,
+ * activates the extension and re-opens the URL once the extension registers
+ * a URL handler. If the extension never registers a URL handler, the urls
+ * will eventually be garbage collected.
+ */
+export class InactiveExtensionUrlHandler implements IInactiveExtensionUrlHandler, IURLHandler {
+
+	readonly _serviceBrand: any;
+
+	private extensionIds = new Set<string>();
+	private uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
+	private disposable: IDisposable;
+
+	constructor(
+		@IURLService urlService: IURLService,
+		@IExtensionService private extensionService: IExtensionService
+	) {
+		const interval = setInterval(() => this.garbageCollect(), THIRTY_SECONDS);
+
+		this.disposable = combinedDisposable([
+			urlService.registerHandler(this),
+			toDisposable(() => clearInterval(interval))
+		]);
+	}
+
+	handleURL(uri: URI): TPromise<boolean> {
+		if (!isExtensionId(uri.authority)) {
+			return TPromise.as(false);
+		}
+
+		const extensionId = uri.authority;
+
+		// let the ExtensionUrlHandler instance handle this
+		if (this.extensionIds.has(extensionId)) {
+			return TPromise.as(false);
+		}
+
+		// collect URI for eventual extension activation
+		const timestamp = new Date().getTime();
+		let uris = this.uriBuffer.get(extensionId);
+
+		if (!uris) {
+			uris = [];
+			this.uriBuffer.set(extensionId, uris);
+		}
+
+		uris.push({ timestamp, uri });
+
+		// activate the extension
+		return this.extensionService.activateByEvent(`onExternalUri:${extensionId}`)
+			.then(() => true);
+	}
+
+	registerExtensionHandler(extensionId: string, handler: IURLHandler): void {
+		this.extensionIds.add(extensionId);
+
+		const uris = this.uriBuffer.get(extensionId) || [];
+
+		for (const { uri } of uris) {
+			handler.handleURL(uri);
+		}
+
+		this.uriBuffer.delete(extensionId);
+	}
+
+	unregisterExtensionHandler(extensionId: string): void {
+		this.extensionIds.delete(extensionId);
+	}
+
+	// forget about all uris buffered more than 5 minutes ago
+	private garbageCollect(): void {
+		console.log('garbage collect');
+
+		const now = new Date().getTime();
+		const uriBuffer = new Map<string, { timestamp: number, uri: URI }[]>();
+
+		this.uriBuffer.forEach((uris, extensionId) => {
+			uris = uris.filter(({ timestamp }) => now - timestamp < FIVE_MINUTES);
+
+			if (uris.length > 0) {
+				uriBuffer.set(extensionId, uris);
+			}
+		});
+
+		this.uriBuffer = uriBuffer;
+	}
+
+	dispose(): void {
+		this.disposable.dispose();
+		this.extensionIds.clear();
+		this.uriBuffer.clear();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/url/electron-main/electronUrlListener.ts b/src/vs/platform/url/electron-main/electronUrlListener.ts
index 418e08c5b91..d228fdc23ef 100644
--- a/src/vs/platform/url/electron-main/electronUrlListener.ts
+++ b/src/vs/platform/url/electron-main/electronUrlListener.ts
@@ -32,7 +32,7 @@ export class ElectronURLListener {
 		@IURLService private urlService: IURLService,
 		@IWindowsMainService private windowsService: IWindowsMainService
 	) {
-		const globalBuffer = (global.getOpenUrls() || []) as string[];
+		const globalBuffer = ((<any>global).getOpenUrls() || []) as string[];
 		const rawBuffer = [
 			...(typeof initial === 'string' ? [initial] : initial),
 			...globalBuffer
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index 5c04d8c0640..5df0fccaa20 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -226,6 +226,7 @@ export interface IWindowSettings {
 	enableMenuBarMnemonics: boolean;
 	closeWhenEmpty: boolean;
 	smoothScrollingWorkaround: boolean;
+	clickThroughInactive: boolean;
 }
 
 export enum OpenContext {
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index a890f927ccf..93650ca4d4c 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -537,6 +537,20 @@ declare module 'vscode' {
 		kind?: TextEditorSelectionChangeKind;
 	}
 
+	/**
+	 * Represents an event describing the change in a [text editor's visible ranges](#TextEditor.visibleRanges).
+	 */
+	export interface TextEditorVisibleRangesChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the visible ranges have changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's visible ranges](#TextEditor.visibleRanges).
+		 */
+		visibleRanges: Range[];
+	}
+
 	/**
 	 * Represents an event describing the change in a [text editor's options](#TextEditor.options).
 	 */
@@ -879,6 +893,11 @@ declare module 'vscode' {
 		 */
 		color?: string | ThemeColor;
 
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		opacity?: string;
+
 		/**
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
@@ -1062,6 +1081,12 @@ declare module 'vscode' {
 		 */
 		selections: Selection[];
 
+		/**
+		 * The current visible ranges in the editor (vertically).
+		 * This accounts only for vertical scrolling, and not for horizontal scrolling.
+		 */
+		readonly visibleRanges: Range[];
+
 		/**
 		 * Text editor options.
 		 */
@@ -1502,12 +1527,20 @@ declare module 'vscode' {
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
-		description: string;
+		description?: string;
 
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
 		detail?: string;
+
+		/**
+		 * Optional flag indicating if this item is picked initially.
+		 * (Only honored when the picker allows multiple selections.)
+		 *
+		 * @see [QuickPickOptions.canPickMany](#QuickPickOptions.canPickMany)
+		 */
+		picked?: boolean;
 	}
 
 	/**
@@ -1534,6 +1567,11 @@ declare module 'vscode' {
 		 */
 		ignoreFocusOut?: boolean;
 
+		/**
+		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
+		 */
+		canPickMany?: boolean;
+
 		/**
 		 * An optional function that is invoked whenever an item is selected.
 		 */
@@ -1771,7 +1809,7 @@ declare module 'vscode' {
 	 * its resource, or a glob-pattern that is applied to the [path](#TextDocument.fileName).
 	 *
 	 * @sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
-	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**​/package.json' }`
+	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', scheme: 'untitled', pattern: '**​/package.json' }`
 	 */
 	export interface DocumentFilter {
 
@@ -1796,10 +1834,14 @@ declare module 'vscode' {
 	 * A language selector is the combination of one or many language identifiers
 	 * and [language filters](#DocumentFilter).
 	 *
-	 * @sample `let sel:DocumentSelector = 'typescript'`;
-	 * @sample `let sel:DocumentSelector = ['typescript', { language: 'json', pattern: '**​/tsconfig.json' }]`;
+	 * *Note* that a document selector that is just a language identifier selects *all*
+	 * documents, even those that are not saved on disk. Only use such selectors when
+	 * a feature works without further context, e.g without the need to resolve related
+	 * 'files'.
+	 *
+	 * @sample `let sel:DocumentSelector = { scheme: 'file', language: 'typescript' }`;
 	 */
-	export type DocumentSelector = string | DocumentFilter | (string | DocumentFilter)[];
+	export type DocumentSelector = DocumentFilter | string | Array<DocumentFilter | string>;
 
 	/**
 	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
@@ -1845,17 +1887,17 @@ declare module 'vscode' {
 		static readonly Empty: CodeActionKind;
 
 		/**
-		 * Base kind for quickfix actions.
+		 * Base kind for quickfix actions: `quickfix`
 		 */
 		static readonly QuickFix: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring actions.
+		 * Base kind for refactoring actions: `refactor`
 		 */
 		static readonly Refactor: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring extraction actions.
+		 * Base kind for refactoring extraction actions: `refactor.extract`
 		 *
 		 * Example extract actions:
 		 *
@@ -1868,7 +1910,7 @@ declare module 'vscode' {
 		static readonly RefactorExtract: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring inline actions.
+		 * Base kind for refactoring inline actions: `refactor.inline`
 		 *
 		 * Example inline actions:
 		 *
@@ -1880,7 +1922,7 @@ declare module 'vscode' {
 		static readonly RefactorInline: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring rewrite actions.
+		 * Base kind for refactoring rewrite actions: `refactor.rewrite`
 		 *
 		 * Example rewrite actions:
 		 *
@@ -1893,6 +1935,18 @@ declare module 'vscode' {
 		 */
 		static readonly RefactorRewrite: CodeActionKind;
 
+		/**
+		 * Base kind for source actions: `source`
+		 *
+		 * Source code actions apply to the entire file.
+		 */
+		static readonly Source: CodeActionKind;
+
+		/**
+		 * Base kind for an organize imports source action: `source.organizeImports`
+		 */
+		static readonly SourceOrganizeImports: CodeActionKind;
+
 		private constructor(value: string);
 
 		/**
@@ -1989,7 +2043,6 @@ declare module 'vscode' {
 	 * A code action can be any command that is [known](#commands.getCommands) to the system.
 	 */
 	export interface CodeActionProvider {
-
 		/**
 		 * Provide commands for the given document and range.
 		 *
@@ -2003,6 +2056,19 @@ declare module 'vscode' {
 		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
 	}
 
+	/**
+	 * Metadata about the type of code actions that a [CodeActionProvider](#CodeActionProvider) providers
+	 */
+	export interface CodeActionProviderMetadata {
+		/**
+		 * [CodeActionKinds](#CodeActionKind) that this provider may return.
+		 *
+		 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the provider
+		 * may list our every specific kind they provide, such as `CodeActionKind.Refactor.Extract.append('function`)`
+		 */
+		readonly providedCodeActionKinds?: ReadonlyArray<CodeActionKind>;
+	}
+
 	/**
 	 * A code lens represents a [command](#Command) that should be shown along with
 	 * source text, like the number of references, a way to run tests, etc.
@@ -2685,6 +2751,18 @@ declare module 'vscode' {
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit>;
+
+		/**
+		 * Optional function for resolving and validating a position *before* running rename. The result can
+		 * be a range or a range and a placeholder text. The placeholder text should be the identifier of the symbol
+		 * which is being renamed - when omitted the text in the returned range is used.
+		 *
+		 * @param document The document in which rename will be invoked.
+		 * @param position The position at which rename will be invoked.
+		 * @param token A cancellation token.
+		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
+		 */
+		resolveRenameLocation?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
 	}
 
 	/**
@@ -3311,6 +3389,90 @@ declare module 'vscode' {
 		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
 	}
 
+	export class FoldingRange {
+
+		/**
+		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 */
+		start: number;
+
+		/**
+		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 */
+		end: number;
+
+		/**
+		 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
+		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
+		 * like 'Fold all comments'. See
+		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of standardized kinds.
+		 */
+		kind?: FoldingRangeKind;
+
+		/**
+		 * Creates a new folding range.
+		 *
+		 * @param start The start line of the folded range.
+		 * @param end The end line of the folded range.
+		 * @param kind The kind of the folding range.
+		 */
+		constructor(start: number, end: number, kind?: FoldingRangeKind);
+	}
+
+	export class FoldingRangeKind {
+		/**
+		 * Kind for folding range representing a comment. The value of the kind is 'comment'.
+		 */
+		static readonly Comment: FoldingRangeKind;
+		/**
+		 * Kind for folding range representing a import. The value of the kind is 'imports'.
+		 */
+		static readonly Imports: FoldingRangeKind;
+		/**
+		 * Kind for folding range representing regions (for example a folding range marked by `#region` and `#endregion`).
+		 * The value of the kind is 'region'.
+		 */
+		static readonly Region: FoldingRangeKind;
+		/**
+		 * String value of the kind, e.g. `comment`.
+		 */
+		readonly value: string;
+		/**
+		 * Creates a new [FoldingRangeKind](#FoldingRangeKind).
+		 *
+		 * @param value of the kind.
+		 */
+		public constructor(value: string);
+	}
+
+
+	/**
+	 * Metadata about the kind of folding ranges that a [FoldingRangeProvider](#FoldingRangeProvider) providers uses.
+	 */
+	export interface FoldingRangeProviderMetadata {
+		/**
+		 * [FoldingRangeKind](#FoldingRangeKind) that this provider may return.
+		 */
+		readonly providedFoldingRangeKinds?: ReadonlyArray<FoldingRangeKind>;
+	}
+
+	/**
+	 * Folding context (for future use)
+	 */
+	export interface FoldingContext {
+	}
+
+	export interface FoldingRangeProvider {
+		/**
+		 * Returns a list of folding ranges or null and undefined if the provider
+		 * does not want to participate or was cancelled.
+		 * @param document The document in which the command was invoked.
+		 * @param context Additional context information (for future use)
+		 * @param token A cancellation token.
+		 */
+		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
+	}
+
 	/**
 	 * A tuple of two characters, like a pair of
 	 * opening and closing brackets.
@@ -3647,6 +3809,17 @@ declare module 'vscode' {
 		constructor(uri: Uri, rangeOrPosition: Range | Position);
 	}
 
+	/**
+	 * The event that is fired when diagnostics change.
+	 */
+	export interface DiagnosticChangeEvent {
+
+		/**
+		 * An array of resources for which diagnostics have changed.
+		 */
+		readonly uris: Uri[];
+	}
+
 	/**
 	 * Represents the severity of diagnostics.
 	 */
@@ -3716,29 +3889,29 @@ declare module 'vscode' {
 		 */
 		message: string;
 
-		/**
-		 * A human-readable string describing the source of this
-		 * diagnostic, e.g. 'typescript' or 'super lint'.
-		 */
-		source: string;
-
 		/**
 		 * The severity, default is [error](#DiagnosticSeverity.Error).
 		 */
 		severity: DiagnosticSeverity;
 
+		/**
+		 * A human-readable string describing the source of this
+		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 */
+		source?: string;
+
 		/**
 		 * A code or identifier for this diagnostics. Will not be surfaced
 		 * to the user, but should be used for later processing, e.g. when
 		 * providing [code actions](#CodeActionContext).
 		 */
-		code: string | number;
+		code?: string | number;
 
 		/**
 		 * An array of related diagnostic information, e.g. when symbol-names within
 		 * a scope collide all definitions can be marked via this property.
 		 */
-		relatedInformation: DiagnosticRelatedInformation[];
+		relatedInformation?: DiagnosticRelatedInformation[];
 
 		/**
 		 * Creates a new diagnostic object.
@@ -4005,7 +4178,8 @@ declare module 'vscode' {
 
 		/**
 		 * Report a progress update.
-		 * @param value A progress item, like a message or an updated percentage value
+		 * @param value A progress item, like a message and/or an
+		 * report on how much work finished
 		 */
 		report(value: T): void;
 	}
@@ -4646,6 +4820,175 @@ declare module 'vscode' {
 		resolveTask(task: Task, token?: CancellationToken): ProviderResult<Task>;
 	}
 
+	/**
+	 * Content settings for a webview.
+	 */
+	export interface WebviewOptions {
+		/**
+		 * Should scripts be enabled in the webview content?
+		 *
+		 * Defaults to false (scripts-disabled).
+		 */
+		readonly enableScripts?: boolean;
+
+		/**
+		 * Should command uris be enabled in webview content?
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableCommandUris?: boolean;
+
+		/**
+		 * Root paths from which the webview can load local (filesystem) resources using the `vscode-resource:` scheme.
+		 *
+		 * Default to the root folders of the current workspace plus the extension's install directory.
+		 *
+		 * Pass in an empty array to disallow access to any local resources.
+		 */
+		readonly localResourceRoots?: ReadonlyArray<Uri>;
+	}
+
+	/**
+	 * A webview displays html content, like an iframe.
+	 */
+	export interface Webview {
+		/**
+		 * Content settings for the webview.
+		 */
+		readonly options: WebviewOptions;
+
+		/**
+		 * Contents of the webview.
+		 *
+		 * Should be a complete html document.
+		 */
+		html: string;
+
+		/**
+		 * Fired when the webview content posts a message.
+		 */
+		readonly onDidReceiveMessage: Event<any>;
+
+		/**
+		 * Post a message to the webview content.
+		 *
+		 * Messages are only develivered if the webview is visible.
+		 *
+		 * @param message Body of the message.
+		 */
+		postMessage(message: any): Thenable<boolean>;
+	}
+
+	/**
+	 * Content settings for a webview panel.
+	 */
+	export interface WebviewPanelOptions {
+		/**
+		 * Should the find widget be enabled in the panel?
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableFindWidget?: boolean;
+
+		/**
+		 * Should the webview panel's content (iframe) be kept around even when the panel
+		 * is no longer visible?
+		 *
+		 * Normally the webview panel's html context is created when the panel becomes visible
+		 * and destroyed when it is is hidden. Extensions that have complex state
+		 * or UI can set the `retainContextWhenHidden` to make VS Code keep the webview
+		 * context around, even when the webview moves to a background tab. When
+		 * the panel becomes visible again, the context is automatically restored
+		 * in the exact same state it was in originally.
+		 *
+		 * `retainContextWhenHidden` has a high memory overhead and should only be used if
+		 * your panel's context cannot be quickly saved and restored.
+		 */
+		readonly retainContextWhenHidden?: boolean;
+	}
+
+	/**
+	 * A panel that contains a webview.
+	 */
+	interface WebviewPanel {
+		/**
+		 * Type of the webview panel, such as `'markdown.preview'`.
+		 */
+		readonly viewType: string;
+
+		/**
+		 * Title of the panel shown in UI.
+		 */
+		title: string;
+
+		/**
+		 * Webview belonging to the panel.
+		 */
+		readonly webview: Webview;
+
+		/**
+		 * Content settings for the webview panel.
+		 */
+		readonly options: WebviewPanelOptions;
+
+		/**
+		 * Editor position of the panel. This property is only set if the webview is in
+		 * one of the three editor view columns.
+		 *
+		 * @deprecated
+		 */
+		readonly viewColumn?: ViewColumn;
+
+		/**
+		 * Is the panel currently visible?
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Fired when the panel's view state changes.
+		 */
+		readonly onDidChangeViewState: Event<WebviewPanelOnDidChangeViewStateEvent>;
+
+		/**
+		 * Fired when the panel is disposed.
+		 *
+		 * This may be because the user closed the panel or because `.dispose()` was
+		 * called on it.
+		 *
+		 * Trying to use the panel after it has been disposed throws an exception.
+		 */
+		readonly onDidDispose: Event<void>;
+
+		/**
+		 * Show the webview panel in a given column.
+		 *
+		 * A webview panel may only show in a single column at a time. If it is already showing, this
+		 * method moves it to a new column.
+		 *
+		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
+		 */
+		reveal(viewColumn?: ViewColumn): void;
+
+		/**
+		 * Dispose of the webview panel.
+		 *
+		 * This closes the panel if it showing and disposes of the resources owned by the webview.
+		 * Webview panels are also disposed when the user closes the webview panel. Both cases
+		 * fire the `onDispose` event.
+		 */
+		dispose(): any;
+	}
+
+	/**
+	 * Event fired when a webview panel's view state changes.
+	 */
+	export interface WebviewPanelOnDidChangeViewStateEvent {
+		/**
+		 * Webview panel whose view state changed.
+		 */
+		readonly webviewPanel: WebviewPanel;
+	}
+
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -4830,6 +5173,11 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
 
+		/**
+		 * An [event](#Event) which fires when the selection in an editor has changed.
+		 */
+		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
+
 		/**
 		 * An [event](#Event) which fires when the options of an editor have changed.
 		 */
@@ -5036,6 +5384,16 @@ declare module 'vscode' {
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of strings, or a promise that resolves to an array of strings.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
@@ -5046,6 +5404,16 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of items, or a promise that resolves to an array of items.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
@@ -5103,6 +5471,18 @@ declare module 'vscode' {
 		 */
 		export function createOutputChannel(name: string): OutputChannel;
 
+		/**
+		 * Create and show a new webview panel.
+		 *
+		 * @param viewType Identifies the type of the webview panel.
+		 * @param title Title of the panel.
+		 * @param position Editor column to show the new panel in.
+		 * @param options Settings for the new panel.
+		 *
+		 * @return New webview panel.
+		 */
+		export function createWebviewPanel(viewType: string, title: string, position: ViewColumn, options: WebviewPanelOptions & WebviewOptions): WebviewPanel;
+
 		/**
 		 * Set a message to the status bar. This is a short hand for the more powerful
 		 * status bar [items](#window.createStatusBarItem).
@@ -5155,9 +5535,10 @@ declare module 'vscode' {
 		 * @param task A callback returning a promise. Progress state can be reported with
 		 * the provided [progress](#Progress)-object.
 		 *
-		 * To report discrete progress, use `percentage` to indicate how much work has been completed. Each call with
-		 * a `percentage` value will be summed up and reflected as overall progress until 100% is reached. Note that
-		 * currently only `ProgressLocation.Notification` is capable of showing discrete progress.
+		 * To report discrete progress, use `increment` to indicate how much work has been completed. Each call with
+		 * a `increment` value will be summed up and reflected as overall progress until 100% is reached (a value of
+		 * e.g. `10` accounts for `10%` of work done).
+		 * Note that currently only `ProgressLocation.Notification` is capable of showing discrete progress.
 		 *
 		 * To monitor if the operation has been cancelled by the user, use the provided [`CancellationToken`](#CancellationToken).
 		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
@@ -5165,7 +5546,7 @@ declare module 'vscode' {
 		 *
 		 * @return The thenable the task-callback returned.
 		 */
-		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; percentage?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
 
 		/**
 		 * Creates a status bar [item](#StatusBarItem).
@@ -5199,7 +5580,8 @@ declare module 'vscode' {
 		/**
 		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
 		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
-		 * To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
+		 *
+		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
 		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.
 		 * @param treeDataProvider A [TreeDataProvider](#TreeDataProvider) that provides tree data for the view
@@ -5450,6 +5832,10 @@ declare module 'vscode' {
 		 * The range that got replaced.
 		 */
 		range: Range;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
@@ -5979,6 +6365,29 @@ declare module 'vscode' {
 		 */
 		export function match(selector: DocumentSelector, document: TextDocument): number;
 
+		/**
+		 * An [event](#Event) which fires when the global set of diagnostics changes. This is
+		 * newly added and removed diagnostics.
+		 */
+		export const onDidChangeDiagnostics: Event<DiagnosticChangeEvent>;
+
+		/**
+		 * Get all diagnostics for a given resource. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @param resource A resource
+		 * @returns An arrary of [diagnostics](#Diagnostic) objects or an empty array.
+		 */
+		export function getDiagnostics(resource: Uri): Diagnostic[];
+
+		/**
+		 * Get all diagnostics. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @returns An array of uri-diagnostics tuples or an empty array.
+		 */
+		export function getDiagnostics(): [Uri, Diagnostic[]][];
+
 		/**
 		 * Create a diagnostics collection.
 		 *
@@ -6012,9 +6421,10 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A code action provider.
+		 * @param metadata Metadata about the kind of code actions the provider providers.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider): Disposable;
+		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider, metadata?: CodeActionProviderMetadata): Disposable;
 
 		/**
 		 * Register a code lens provider.
@@ -6230,6 +6640,20 @@ declare module 'vscode' {
 		 */
 		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
 
+		/**
+		 * Register a folding range provider.
+		 *
+		 * Multiple folding can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and the best-matching provider is used. Failure
+		 * of the selected provider will cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A folding range provider.
+		 * @param metadata Metadata about the kind of code actions the provider providers.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider, metadata?: FoldingRangeProviderMetadata): Disposable;
+
 		/**
 		 * Set a [language configuration](#LanguageConfiguration) for a language.
 		 *
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 28b6923f3fa..8c7906ceae9 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -11,172 +11,7 @@ declare module 'vscode' {
 		export function sampleFunction(): Thenable<any>;
 	}
 
-	//#region Joh: readable diagnostics
-
-	export interface DiagnosticChangeEvent {
-		uris: Uri[];
-	}
-
-	export namespace languages {
-
-		/**
-		 *
-		 */
-		export const onDidChangeDiagnostics: Event<DiagnosticChangeEvent>;
-
-		/**
-		 *
-		 */
-		export function getDiagnostics(resource: Uri): Diagnostic[];
-
-		/**
-		 *
-		 */
-		export function getDiagnostics(): [Uri, Diagnostic[]][];
-	}
-
-	//#endregion
-
-	//#region Aeschli: folding
-
-	export class FoldingRangeList {
-
-		/**
-		 * The folding ranges.
-		 */
-		ranges: FoldingRange[];
-
-		/**
-		 * Creates mew folding range list.
-		 *
-		 * @param ranges The folding ranges
-		 */
-		constructor(ranges: FoldingRange[]);
-	}
-
-
-	export class FoldingRange {
-
-		/**
-		 * The start line number (zero-based) of the range to fold. The hidden area starts after the last character of that line.
-		 */
-		startLine: number;
-
-		/**
-		 * The end line number (0-based) of the range to fold. The hidden area ends at the last character of that line.
-		 */
-		endLine: number;
-
-		/**
-		 * The actual color value for this color range.
-		 */
-		type?: FoldingRangeType | string;
-
-		/**
-		 * Creates a new folding range.
-		 *
-		 * @param startLineNumber The first line of the fold
-		 * @param type The last line of the fold
-		 */
-		constructor(startLineNumber: number, endLineNumber: number, type?: FoldingRangeType | string);
-	}
-
-	export enum FoldingRangeType {
-		/**
-		 * Folding range for a comment
-		 */
-		Comment = 'comment',
-		/**
-		 * Folding range for a imports or includes
-		 */
-		Imports = 'imports',
-		/**
-		 * Folding range for a region (e.g. `#region`)
-		 */
-		Region = 'region'
-	}
-
-	export namespace languages {
-
-		/**
-		 * Register a folding provider.
-		 *
-		 * Multiple folding can be registered for a language. In that case providers are sorted
-		 * by their [score](#languages.match) and the best-matching provider is used. Failure
-		 * of the selected provider will cause a failure of the whole operation.
-		 *
-		 * @param selector A selector that defines the documents this provider is applicable to.
-		 * @param provider A folding provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerFoldingProvider(selector: DocumentSelector, provider: FoldingProvider): Disposable;
-	}
-
-	export interface FoldingContext {
-		maxRanges?: number;
-	}
-
-	export interface FoldingProvider {
-		/**
-		 * Returns a list of folding ranges or null if the provider does not want to participate or was cancelled.
-		 */
-		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRangeList>;
-	}
-
-	//#endregion
-
-	//#region Joh: file system provider
-
-	// export enum FileErrorCodes {
-	// 	/**
-	// 	 * Not owner.
-	// 	 */
-	// 	EPERM = 1,
-	// 	/**
-	// 	 * No such file or directory.
-	// 	 */
-	// 	ENOENT = 2,
-	// 	/**
-	// 	 * I/O error.
-	// 	 */
-	// 	EIO = 5,
-	// 	/**
-	// 	 * Permission denied.
-	// 	 */
-	// 	EACCES = 13,
-	// 	/**
-	// 	 * File exists.
-	// 	 */
-	// 	EEXIST = 17,
-	// 	/**
-	// 	 * Not a directory.
-	// 	 */
-	// 	ENOTDIR = 20,
-	// 	/**
-	// 	 * Is a directory.
-	// 	 */
-	// 	EISDIR = 21,
-	// 	/**
-	// 	 *  File too large.
-	// 	 */
-	// 	EFBIG = 27,
-	// 	/**
-	// 	 * No space left on device.
-	// 	 */
-	// 	ENOSPC = 28,
-	// 	/**
-	// 	 * Directory is not empty.
-	// 	 */
-	// 	ENOTEMPTY = 66,
-	// 	/**
-	// 	 * Invalid file handle.
-	// 	 */
-	// 	ESTALE = 70,
-	// 	/**
-	// 	 * Illegal NFS file handle.
-	// 	 */
-	// 	EBADHANDLE = 10001,
-	// }
+	//#region Joh: file system provider (OLD)
 
 	export enum FileChangeType {
 		Updated = 0,
@@ -211,7 +46,7 @@ declare module 'vscode' {
 		readonly onDidChange?: Event<FileChange[]>;
 
 		// more...
-		//
+		// @deprecated - will go away
 		utimes(resource: Uri, mtime: number, atime: number): Thenable<FileStat>;
 
 		stat(resource: Uri): Thenable<FileStat>;
@@ -249,8 +84,177 @@ declare module 'vscode' {
 		// create(resource: Uri): Thenable<FileStat>;
 	}
 
+	export type DeprecatedFileChangeType = FileChangeType;
+	export type DeprecatedFileType = FileType;
+	export type DeprecatedFileChange = FileChange;
+	export type DeprecatedFileStat = FileStat;
+	export type DeprecatedFileSystemProvider = FileSystemProvider;
+
 	export namespace workspace {
-		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider): Disposable;
+		export function registerDeprecatedFileSystemProvider(scheme: string, provider: DeprecatedFileSystemProvider): Disposable;
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, newProvider?: FileSystemProvider2): Disposable;
+	}
+
+	//#endregion
+
+	//#region Joh: file system provider (new)
+
+	/**
+	 *
+	 */
+	export class FileSystemError extends Error {
+
+		static EntryExists(message?: string): FileSystemError;
+		static EntryNotFound(message?: string): FileSystemError;
+		static EntryNotADirectory(message?: string): FileSystemError;
+		static EntryIsADirectory(message?: string): FileSystemError;
+
+		constructor(message?: string);
+	}
+
+	export enum FileChangeType2 {
+		Changed = 1,
+		Created = 2,
+		Deleted = 3,
+	}
+
+	export interface FileChange2 {
+		type: FileChangeType2;
+		uri: Uri;
+	}
+
+	export interface FileStat2 {
+		isFile: boolean;
+		isDirectory: boolean;
+		isSymbolicLink: boolean;
+		mtime: number;
+		size: number;
+	}
+
+	/**
+	 *
+	 */
+	export interface FileOptions {
+
+		/**
+		 * Create a file when it doesn't exists
+		 */
+		create?: boolean;
+
+		/**
+		 * In combination with [`create`](FileOptions.create) but
+		 * the operation should fail when a file already exists.
+		 */
+		exclusive?: boolean;
+
+		/**
+		 * Open a file for reading.
+		 */
+		read?: boolean;
+
+		/**
+		 * Open a file for writing.
+		 */
+		write?: boolean;
+	}
+
+	/**
+	 *
+	 */
+	export interface FileSystemProvider2 {
+
+		_version: 9;
+
+		/**
+		 * An event to signal that a resource has been created, changed, or deleted. This
+		 * event should fire for resources that are being [watched](#FileSystemProvider2.watch)
+		 * by clients of this provider.
+		 */
+		readonly onDidChangeFile: Event<FileChange2[]>;
+
+		/**
+		 * Subscribe to events in the file or folder denoted by `uri`.
+		 * @param uri
+		 * @param options
+		 */
+		watch(uri: Uri, options: { recursive?: boolean; excludes?: string[] }): Disposable;
+
+		/**
+		 * Retrieve metadata about a file. Throw an [`EntryNotFound`](#FileError.EntryNotFound)-error
+		 * in case the file does not exist.
+		 *
+		 * @param uri The uri of the file to retrieve meta data about.
+		 * @param token A cancellation token.
+		 * @return The file metadata about the file.
+		 */
+		stat(uri: Uri, options: { /*future: followSymlinks*/ }, token: CancellationToken): FileStat2 | Thenable<FileStat2>;
+
+		/**
+		 * Retrieve the meta data of all entries of a [directory](#FileType2.Directory)
+		 *
+		 * @param uri The uri of the folder.
+		 * @param token A cancellation token.
+		 * @return A thenable that resolves to an array of tuples of file names and files stats.
+		 */
+		readDirectory(uri: Uri, options: { /*future: onlyType?*/ }, token: CancellationToken): [string, FileStat2][] | Thenable<[string, FileStat2][]>;
+
+		/**
+		 * Create a new directory. *Note* that new files are created via `write`-calls.
+		 *
+		 * @param uri The uri of the *new* folder.
+		 * @param token A cancellation token.
+		 */
+		createDirectory(uri: Uri, options: { /*future: permissions?*/ }, token: CancellationToken): FileStat2 | Thenable<FileStat2>;
+
+		/**
+		 * Read the entire contents of a file.
+		 *
+		 * @param uri The uri of the file.
+		 * @param token A cancellation token.
+		 * @return A thenable that resolves to an array of bytes.
+		 */
+		readFile(uri: Uri, options: FileOptions, token: CancellationToken): Uint8Array | Thenable<Uint8Array>;
+
+		/**
+		 * Write data to a file, replacing its entire contents.
+		 *
+		 * @param uri The uri of the file.
+		 * @param content The new content of the file.
+		 * @param token A cancellation token.
+		 */
+		writeFile(uri: Uri, content: Uint8Array, options: FileOptions, token: CancellationToken): void | Thenable<void>;
+
+		/**
+		 * Delete a file or folder from the underlying storage.
+		 *
+		 * @param uri The resource that is to be deleted
+		 * @param options Options bag for future use
+		 * @param token A cancellation token.
+		 */
+		delete(uri: Uri, options: { /*future: useTrash?, followSymlinks?*/ }, token: CancellationToken): void | Thenable<void>;
+
+		/**
+		 * Rename a file or folder.
+		 *
+		 * @param oldUri The existing file or folder.
+		 * @param newUri The target location.
+		 * @param token A cancellation token.
+		 */
+		rename(oldUri: Uri, newUri: Uri, options: FileOptions, token: CancellationToken): FileStat2 | Thenable<FileStat2>;
+
+		/**
+		 * Copy files or folders. Implementing this function is optional but it will speedup
+		 * the copy operation.
+		 *
+		 * @param uri The existing file or folder.
+		 * @param target The target location.
+		 * @param token A cancellation token.
+		 */
+		copy?(uri: Uri, target: Uri, options: FileOptions, token: CancellationToken): FileStat2 | Thenable<FileStat2>;
+	}
+
+	export namespace workspace {
+		export function registerFileSystemProvider2(scheme: string, provider: FileSystemProvider2, options: { isCaseSensitive?: boolean }): Disposable;
 	}
 
 	//#endregion
@@ -437,31 +441,6 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region Joh: rename context
-
-	export interface RenameContext {
-		range?: Range;
-		newName?: string;
-		message?: string;
-	}
-
-	export interface RenameProvider2 extends RenameProvider {
-
-		/**
-		 * Optional function for resolving and validating a position at which rename is
-		 * being carried out.
-		 *
-		 * @param document The document in which rename will be invoked.
-		 * @param position The position at which rename will be invoked.
-		 * @param token A cancellation token.
-		 * @return A `RenameContext` with more information. The lack of a result can signaled by returning `undefined` or `null`.
-		 */
-		resolveRenameLocation?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<RenameContext>;
-
-	}
-
-	//#endregion
-
 	//#region Joao: SCM validation
 
 	/**
@@ -512,179 +491,50 @@ declare module 'vscode' {
 
 	//#endregion
 
-	//#region Matt: WebView
+	//#region Matt: WebView Serializer
 
 	/**
-	 * Content settings for a webview.
+	 * Save and restore webview panels that have been persisted when vscode shuts down.
 	 */
-	export interface WebviewOptions {
+	interface WebviewPanelSerializer {
 		/**
-		 * Should scripts be enabled in the webview content?
+		 * Save a webview panel's `state`.
 		 *
-		 * Defaults to false (scripts-disabled).
-		 */
-		readonly enableScripts?: boolean;
-
-		/**
-		 * Should command uris be enabled in webview content?
+		 * Called before shutdown. Extensions have a 250ms timeframe to return a state. If serialization
+		 * takes longer than 250ms, the panel will not be serialized.
 		 *
-		 * Defaults to false.
-		 */
-		readonly enableCommandUris?: boolean;
-
-		/**
-		 * Should the find widget be enabled in the webview?
+		 * @param webviewPanel webview Panel to serialize. May or may not be visible.
 		 *
-		 * Defaults to false.
+		 * @returns JSON serializable state blob.
 		 */
-		readonly enableFindWidget?: boolean;
+		serializeWebviewPanel(webviewPanel: WebviewPanel): Thenable<any>;
 
 		/**
-		 * Should the webview's context be kept around even when the webview is no longer visible?
+		 * Restore a webview panel from its seriailzed `state`.
 		 *
-		 * Normally a webview's context is created when the webview becomes visible
-		 * and destroyed when the webview is hidden. Apps that have complex state
-		 * or UI can set the `retainContextWhenHidden` to make VS Code keep the webview
-		 * context around, even when the webview moves to a background tab. When
-		 * the webview becomes visible again, the context is automatically restored
-		 * in the exact same state it was in originally.
+		 * Called when a serialized webview first becomes visible.
 		 *
-		 * `retainContextWhenHidden` has a high memory overhead and should only be used if
-		 * your webview's context cannot be quickly saved and restored.
-		 */
-		readonly retainContextWhenHidden?: boolean;
-
-		/**
-		 * Root paths from which the webview can load local (filesystem) resources using the `vscode-resource:` scheme.
+		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel.
+		 * @param state Persisted state.
 		 *
-		 * Default to the root folders of the current workspace plus the extension's install directory.
-		 *
-		 * Pass in an empty array to disallow access to any local resources.
+		 * @return Thanble indicating that the webview has been fully restored.
 		 */
-		readonly localResourceRoots?: Uri[];
-	}
-
-	export interface WebViewOnDidChangeViewStateEvent {
-		readonly viewColumn: ViewColumn;
-		readonly active: boolean;
-	}
-
-	/**
-	 * A webview displays html content, like an iframe.
-	 */
-	export interface Webview {
-		/**
-		 * The type of the webview, such as `'markdownw.preview'`
-		 */
-		readonly viewType: string;
-
-		/**
-		 * Content settings for the webview.
-		 */
-		readonly options: WebviewOptions;
-
-		/**
-		 * Title of the webview shown in UI.
-		 */
-		title: string;
-
-		/**
-		 * Contents of the webview.
-		 *
-		 * Should be a complete html document.
-		 */
-		html: string;
-
-		/**
-		 * The column in which the webview is showing.
-		 */
-		readonly viewColumn?: ViewColumn;
-
-		/**
-		 * Fired when the webview content posts a message.
-		 */
-		readonly onDidReceiveMessage: Event<any>;
-
-		/**
-		 * Fired when the webview is disposed.
-		 */
-		readonly onDidDispose: Event<void>;
-
-		/**
-		 * Fired when the webview's view state changes.
-		 */
-		readonly onDidChangeViewState: Event<WebViewOnDidChangeViewStateEvent>;
-
-		/**
-		 * Post a message to the webview content.
-		 *
-		 * Messages are only develivered if the webview is visible.
-		 *
-		 * @param message Body of the message.
-		 */
-		postMessage(message: any): Thenable<boolean>;
-
-		/**
-		 * Shows the webview in a given column.
-		 *
-		 * A webview may only be in a single column at a time. If it is already showing, this
-		 * command moves it to a new column.
-		 */
-		reveal(viewColumn: ViewColumn): void;
-
-		/**
-		 * Dispose of the the webview.
-		 *
-		 * This closes the webview if it showing and disposes of the resources owned by the webview.
-		 * Webview are also disposed when the user closes the webview editor. Both cases fire `onDispose`
-		 * event. Trying to use the webview after it has been disposed throws an exception.
-		 */
-		dispose(): any;
+		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
 	}
 
 	namespace window {
 		/**
-		 * Create and show a new webview.
+		 * Registers a webview panel serializer.
 		 *
-		 * @param viewType Identifier the type of the webview.
-		 * @param title Title of the webview.
-		 * @param column Editor column to show the new webview in.
-		 * @param options Content settings for the webview.
+		 * Extensions that support reviving should have an `"onView:viewType"` activation method and
+		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given `viewType`.
+		 *
+		 * @param viewType Type of the webview panel that can be serialized.
+		 * @param reviver Webview serializer.
 		 */
-		export function createWebview(viewType: string, title: string, column: ViewColumn, options: WebviewOptions): Webview;
-	}
-
-	//#endregion
-
-	//#region Alex: TextEditor.visibleRange and related event
-
-	export interface TextEditor {
-		/**
-		 * The current visible ranges in the editor (vertically).
-		 * This accounts only for vertical scrolling, and not for horizontal scrolling.
-		 */
-		readonly visibleRanges: Range[];
-	}
-
-	/**
-	 * Represents an event describing the change in a [text editor's visible ranges](#TextEditor.visibleRanges).
-	 */
-	export interface TextEditorVisibleRangesChangeEvent {
-		/**
-		 * The [text editor](#TextEditor) for which the visible ranges have changed.
-		 */
-		textEditor: TextEditor;
-		/**
-		 * The new value for the [text editor's visible ranges](#TextEditor.visibleRanges).
-		 */
-		visibleRanges: Range[];
-	}
-
-	export namespace window {
-		/**
-		 * An [event](#Event) which fires when the selection in an editor has changed.
-		 */
-		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
+		export function registerWebviewPanelSerializer(viewType: string, reviver: WebviewPanelSerializer): Disposable;
 	}
 
 	//#endregion
@@ -694,12 +544,25 @@ declare module 'vscode' {
 	/**
 	 * An object representing an executed Task. It can be used
 	 * to terminate a task.
+	 *
+	 * This interface is not intended to be implemented.
 	 */
 	export interface TaskExecution {
+		/**
+		 * The task that got started.
+		 */
+		task: Task;
+
+		/**
+		 * Terminates the task execution.
+		 */
+		terminate(): void;
 	}
 
 	/**
 	 * An event signaling the start of a task execution.
+	 *
+	 * This interface is not intended to be implemented.
 	 */
 	interface TaskStartEvent {
 		/**
@@ -710,6 +573,8 @@ declare module 'vscode' {
 
 	/**
 	 * An event signaling the end of an executed task.
+	 *
+	 * This interface is not intended to be implemented.
 	 */
 	interface TaskEndEvent {
 		/**
@@ -718,14 +583,29 @@ declare module 'vscode' {
 		execution: TaskExecution;
 	}
 
+	export interface TaskFilter {
+		/**
+		 * The task version as used in the tasks.json file.
+		 * The string support the package.json semver notation.
+		 */
+		version?: string;
+
+		/**
+		 * The task type to return;
+		 */
+		type?: string;
+	}
+
 	export namespace workspace {
 
 		/**
-		 * Fetches all task available in the systems. This includes tasks
+		 * Fetches all task available in the systems. Thisweweb includes tasks
 		 * from `tasks.json` files as well as tasks from task providers
 		 * contributed through extensions.
+		 *
+		 * @param filter a filter to filter the return tasks.
 		 */
-		export function fetchTasks(): Thenable<Task[]>;
+		export function fetchTasks(filter?: TaskFilter): Thenable<Task[]>;
 
 		/**
 		 * Executes a task that is managed by VS Code. The returned
@@ -735,18 +615,18 @@ declare module 'vscode' {
 		 */
 		export function executeTask(task: Task): Thenable<TaskExecution>;
 
+		/**
+		 * The currently active task executions or an empty array.
+		 *
+		 * @readonly
+		 */
+		export let taskExecutions: TaskExecution[];
+
 		/**
 		 * Fires when a task starts.
 		 */
 		export const onDidStartTask: Event<TaskStartEvent>;
 
-		/**
-		 * Terminates a task that was previously started using `executeTask`
-		 *
-		 * @param task the task to terminate
-		 */
-		export function terminateTask(task: TaskExecution): void;
-
 		/**
 		 * Fires when a task ends.
 		 */
@@ -754,4 +634,39 @@ declare module 'vscode' {
 	}
 
 	//#endregion
+
+	//#region Terminal
+
+	export namespace window {
+		/**
+		 * The currently active terminals or an empty array.
+		 *
+		 * @readonly
+		 */
+		export let terminals: Terminal[];
+
+		/**
+		 * An [event](#Event) which fires when a terminal has been created, either through the
+		 * [createTerminal](#window.createTerminal) API or commands.
+		 */
+		export const onDidOpenTerminal: Event<Terminal>;
+	}
+
+	//#endregion
+
+	//#region URLs
+
+	export interface ExternalUriHandler {
+		handleExternalUri(uri: Uri): void;
+	}
+
+	export namespace window {
+
+		/**
+		 * Registers a protocol handler capable of handling system-wide URIs.
+		 */
+		export function registerExternalUriHandler(handler: ExternalUriHandler): Disposable;
+	}
+
+	//#endregion
 }
diff --git a/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts
new file mode 100644
index 00000000000..36a9e67cbb1
--- /dev/null
+++ b/src/vs/workbench/api/browser/viewsContainersExtensionPoint.ts
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { localize } from 'vs/nls';
+import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { ExtensionMessageCollector, ExtensionsRegistry, IExtensionPoint } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import { join } from 'vs/base/common/paths';
+import { createCSSRule } from 'vs/base/browser/dom';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { ViewletDescriptor, ViewletRegistry, Extensions as ViewletExtensions, ToggleViewletAction } from 'vs/workbench/browser/viewlet';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IExtensionService, IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { ViewLocation } from 'vs/workbench/common/views';
+import { PersistentViewsViewlet } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
+import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
+import { forEach } from 'vs/base/common/collections';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+
+
+export interface IUserFriendlyViewsContainerDescriptor {
+	id: string;
+	title: string;
+	icon: string;
+}
+
+const viewsContainerSchema: IJSONSchema = {
+	type: 'object',
+	properties: {
+		id: {
+			description: localize('vscode.extension.contributes.views.containers.id', "Unique id used to identify the container in which views can be contributed using 'views' contribution point"),
+			type: 'string'
+		},
+		label: {
+			description: localize('vscode.extension.contributes.views.containers.title', 'Human readable string used to render the container'),
+			type: 'string'
+		},
+		icon: {
+			description: localize('vscode.extension.contributes.views.containers.icon', 'Path to the container icon'),
+			type: 'string'
+		}
+	}
+};
+
+export const viewsContainerContribution: IJSONSchema = {
+	description: localize('vscode.extension.contributes.viewsContainer', 'Contributes views containers to the editor'),
+	type: 'object',
+	properties: {
+		'activitybar': {
+			description: localize('views.container.activitybar', "Contribute views containers to Activity Bar"),
+			type: 'array',
+			items: viewsContainerSchema
+		}
+	}
+};
+
+export const viewsContainersExtensionPoint: IExtensionPoint<{ [loc: string]: IUserFriendlyViewsContainerDescriptor[] }> = ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: IUserFriendlyViewsContainerDescriptor[] }>('viewsContainers', [], viewsContainerContribution);
+class ViewsContainersExtensionHandler implements IWorkbenchContribution {
+
+	constructor() {
+		this.handleViewsContainersExtensionPoint();
+	}
+
+	private handleViewsContainersExtensionPoint() {
+		viewsContainersExtensionPoint.setHandler((extensions) => {
+			for (let extension of extensions) {
+				const { value, collector } = extension;
+				if (!extension.description.enableProposedApi) {
+					collector.error(localize('proposed', "'{0}' contribution is only available when running out of dev or with the following command line switch: --enable-proposed-api {1}", 'viewsContainer', extension.description.id));
+					continue;
+				}
+				forEach(value, entry => {
+					if (!this.isValidViewsContainer(entry.value, collector)) {
+						return;
+					}
+					switch (entry.key) {
+						case 'activitybar':
+							this.contributeToActivitybar(entry.value, extension.description);
+							break;
+					}
+				});
+			}
+		});
+	}
+
+	private isValidViewsContainer(viewsContainersDescriptors: IUserFriendlyViewsContainerDescriptor[], collector: ExtensionMessageCollector): boolean {
+		if (!Array.isArray(viewsContainersDescriptors)) {
+			collector.error(localize('requirearray', "views containers must be an array"));
+			return false;
+		}
+
+		for (let descriptor of viewsContainersDescriptors) {
+			if (typeof descriptor.id !== 'string') {
+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'id'));
+				return false;
+			}
+			if (typeof descriptor.title !== 'string') {
+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'title'));
+				return false;
+			}
+			if (typeof descriptor.icon !== 'string') {
+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'icon'));
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private contributeToActivitybar(containers: IUserFriendlyViewsContainerDescriptor[], extension: IExtensionDescription) {
+		containers.forEach((descriptor, index) => {
+			const id = `workbench.view.extension.${descriptor.id}`;
+			const title = descriptor.title;
+			const cssClass = `extensionViewlet-${descriptor.id}`;
+			const location: ViewLocation = ViewLocation.register(id);
+
+			// Generate CSS to show the icon in the activity bar
+			const iconClass = `.monaco-workbench > .activitybar .monaco-action-bar .action-label.${cssClass}`;
+			const iconPath = join(extension.extensionFolderPath, descriptor.icon);
+			createCSSRule(iconClass, `-webkit-mask: url('${iconPath}') no-repeat 50% 50%; -webkit-mask-size: 22px;`);
+
+			// Register as viewlet
+			class CustomViewlet extends PersistentViewsViewlet {
+				constructor(
+					@IPartService partService: IPartService,
+					@ITelemetryService telemetryService: ITelemetryService,
+					@IWorkspaceContextService contextService: IWorkspaceContextService,
+					@IStorageService storageService: IStorageService,
+					@IWorkbenchEditorService editorService: IWorkbenchEditorService,
+					@IInstantiationService instantiationService: IInstantiationService,
+					@IContextKeyService contextKeyService: IContextKeyService,
+					@IThemeService themeService: IThemeService,
+					@IContextMenuService contextMenuService: IContextMenuService,
+					@IExtensionService extensionService: IExtensionService
+				) {
+					super(id, location, `${id}.state`, true, partService, telemetryService, storageService, instantiationService, themeService, contextService, contextKeyService, contextMenuService, extensionService);
+				}
+			}
+			const viewletDescriptor = new ViewletDescriptor(
+				CustomViewlet,
+				id,
+				title,
+				cssClass,
+				6 + index
+			);
+
+			Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(viewletDescriptor);
+
+			// Register Action to Open Viewlet
+			class OpenCustomViewletAction extends ToggleViewletAction {
+				constructor(
+					id: string, label: string,
+					@IViewletService viewletService: IViewletService,
+					@IWorkbenchEditorService editorService: IWorkbenchEditorService
+				) {
+					super(id, label, id, viewletService, editorService);
+				}
+			}
+			const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
+			registry.registerWorkbenchAction(
+				new SyncActionDescriptor(OpenCustomViewletAction, id, localize('showViewlet', "Show {0}", title)),
+				'View: Show {0}',
+				localize('view', "View")
+			);
+		});
+	}
+}
+
+const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
+workbenchRegistry.registerWorkbenchContribution(ViewsContainersExtensionHandler, LifecyclePhase.Starting);
\ No newline at end of file
diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index 41a9e24e370..2931cf6e8dd 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -12,11 +12,10 @@ import { ViewLocation, ViewsRegistry, ICustomViewDescriptor } from 'vs/workbench
 import { CustomTreeViewPanel } from 'vs/workbench/browser/parts/views/customViewPanel';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { coalesce, } from 'vs/base/common/arrays';
+import { viewsContainersExtensionPoint } from 'vs/workbench/api/browser/viewsContainersExtensionPoint';
 
 namespace schema {
 
-	// --views contribution point
-
 	export interface IUserFriendlyViewDescriptor {
 		id: string;
 		name: string;
@@ -70,20 +69,43 @@ namespace schema {
 		type: 'object',
 		properties: {
 			'explorer': {
-				description: localize('views.explorer', "Explorer View"),
+				description: localize('views.explorer', "Contributes views to Explorer container in the Activity bar"),
 				type: 'array',
-				items: viewDescriptor
+				items: viewDescriptor,
+				default: []
 			},
 			'debug': {
-				description: localize('views.debug', "Debug View"),
+				description: localize('views.debug', "Contributes views to Debug container in the Activity bar"),
 				type: 'array',
-				items: viewDescriptor
+				items: viewDescriptor,
+				default: []
+			},
+			'scm': {
+				description: localize('views.scm', "Contributes views to SCM container in the Activity bar"),
+				type: 'array',
+				items: viewDescriptor,
+				default: []
 			}
+		},
+		additionalProperties: {
+			description: localize('views.contributed', "Contributes views to contributed views container"),
+			type: 'array',
+			items: viewDescriptor,
+			default: []
 		}
 	};
 }
 
-ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyViewDescriptor[] }>('views', [], schema.viewsContribution)
+function getViewLocation(value: string): ViewLocation {
+	switch (value) {
+		case 'explorer': return ViewLocation.Explorer;
+		case 'debug': return ViewLocation.Debug;
+		case 'scm': return ViewLocation.SCM;
+		default: return ViewLocation.get(`workbench.view.extension.${value}`) || ViewLocation.Explorer;
+	}
+}
+
+ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyViewDescriptor[] }>('views', [viewsContainersExtensionPoint], schema.viewsContribution)
 	.setHandler((extensions) => {
 		for (let extension of extensions) {
 			const { value, collector } = extension;
@@ -93,12 +115,7 @@ ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyV
 					return;
 				}
 
-				const location = ViewLocation.getContributedViewLocation(entry.key);
-				if (!location) {
-					collector.warn(localize('locationId.invalid', "`{0}` is not a valid view location", entry.key));
-					return;
-				}
-
+				const location = getViewLocation(entry.key);
 				const registeredViews = ViewsRegistry.getViews(location);
 				const viewIds = [];
 				const viewDescriptors = coalesce(entry.value.map(item => {
@@ -129,4 +146,4 @@ ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyV
 				ViewsRegistry.registerViews(viewDescriptors);
 			});
 		}
-	});
+	});
\ No newline at end of file
diff --git a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
index 3418ddaf1a2..73eabaddf52 100644
--- a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
@@ -39,6 +39,7 @@ import './mainThreadOutputService';
 import './mainThreadProgress';
 import './mainThreadQuickOpen';
 import './mainThreadSCM';
+import './mainThreadSearch';
 import './mainThreadSaveParticipant';
 import './mainThreadStatusBar';
 import './mainThreadStorage';
@@ -48,6 +49,7 @@ import './mainThreadTerminalService';
 import './mainThreadTreeViews';
 import './mainThreadLogService';
 import './mainThreadWebview';
+import './mainThreadUrls';
 import './mainThreadWindow';
 import './mainThreadWorkspace';
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index 044af5fd345..893b8962517 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -6,7 +6,7 @@
 
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import uri from 'vs/base/common/uri';
-import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IBreakpointData, IAdapterExecutable, ITerminalSettings, IDebugAdapter, IDebugAdapterProvider } from 'vs/workbench/parts/debug/common/debug';
 import { TPromise } from 'vs/base/common/winjs.base';
 import {
 	ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext,
@@ -14,13 +14,20 @@ import {
 } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import severity from 'vs/base/common/severity';
+import { AbstractDebugAdapter, convertToVSCPaths, convertToDAPaths } from 'vs/workbench/parts/debug/node/debugAdapter';
+import * as paths from 'vs/base/common/paths';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+
 
 @extHostNamedCustomer(MainContext.MainThreadDebugService)
-export class MainThreadDebugService implements MainThreadDebugServiceShape {
+export class MainThreadDebugService implements MainThreadDebugServiceShape, IDebugAdapterProvider {
 
 	private _proxy: ExtHostDebugServiceShape;
 	private _toDispose: IDisposable[];
 	private _breakpointEventsActive: boolean;
+	private _debugAdapters: Map<number, ExtensionHostDebugAdapter>;
+	private _debugAdaptersHandleCounter = 1;
+
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -46,6 +53,26 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 				}
 			}
 		}));
+		this._debugAdapters = new Map<number, ExtensionHostDebugAdapter>();
+	}
+
+	public $registerDebugTypes(debugTypes: string[]) {
+		this._toDispose.push(this.debugService.getConfigurationManager().registerDebugAdapterProvider(debugTypes, this));
+	}
+
+	createDebugAdapter(debugType: string, adapterInfo): IDebugAdapter {
+		const handle = this._debugAdaptersHandleCounter++;
+		const da = new ExtensionHostDebugAdapter(handle, this._proxy, debugType, adapterInfo);
+		this._debugAdapters.set(handle, da);
+		return da;
+	}
+
+	substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
+		return this._proxy.$substituteVariables(folder.uri, config);
+	}
+
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+		return this._proxy.$runInTerminal(args, config);
 	}
 
 	public dispose(): void {
@@ -99,7 +126,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 						id: l.id,
 						enabled: l.enabled,
 						lineNumber: l.line + 1,
-						column: l.character > 0 ? l.character + 1 : 0,
+						column: l.character > 0 ? l.character + 1 : undefined, // a column value of 0 results in an omitted column attribute; see #46784
 						condition: l.condition,
 						hitCondition: l.hitCondition,
 						logMessage: l.logMessage
@@ -119,7 +146,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 		return void 0;
 	}
 
-	private convertToDto(bps: (IBreakpoint | IFunctionBreakpoint)[]): (ISourceBreakpointDto | IFunctionBreakpointDto)[] {
+	private convertToDto(bps: (ReadonlyArray<IBreakpoint | IFunctionBreakpoint>)): (ISourceBreakpointDto | IFunctionBreakpointDto)[] {
 		return bps.map(bp => {
 			if ('name' in bp) {
 				const fbp = <IFunctionBreakpoint>bp;
@@ -208,4 +235,62 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 		this.debugService.logToRepl(value, severity.Warning);
 		return TPromise.wrap<void>(undefined);
 	}
+
+	public $acceptDAMessage(handle: number, message: DebugProtocol.ProtocolMessage) {
+
+		convertToVSCPaths(message, source => {
+			if (typeof source.path === 'object') {
+				source.path = uri.revive(source.path).toString();
+			}
+		});
+
+		this._debugAdapters.get(handle).acceptMessage(message);
+	}
+
+	public $acceptDAError(handle: number, name: string, message: string, stack: string) {
+		this._debugAdapters.get(handle).fireError(handle, new Error(`${name}: ${message}\n${stack}`));
+	}
+
+	public $acceptDAExit(handle: number, code: number, signal: string) {
+		this._debugAdapters.get(handle).fireExit(handle, code, signal);
+	}
+}
+
+/**
+ * DebugAdapter that communicates via extension protocol with another debug adapter.
+ */
+class ExtensionHostDebugAdapter extends AbstractDebugAdapter {
+
+	constructor(private _handle: number, private _proxy: ExtHostDebugServiceShape, private _debugType: string, private _adapterExecutable: IAdapterExecutable | null) {
+		super();
+	}
+
+	public fireError(handle: number, err: Error) {
+		this._onError.fire(err);
+	}
+
+	public fireExit(handle: number, code: number, signal: string) {
+		this._onExit.fire(code);
+	}
+
+	public startSession(): TPromise<void> {
+		return this._proxy.$startDASession(this._handle, this._debugType, this._adapterExecutable);
+	}
+
+	public sendMessage(message: DebugProtocol.ProtocolMessage): void {
+
+		convertToDAPaths(message, source => {
+			if (paths.isAbsolute(source.path)) {
+				(<any>source).path = uri.file(source.path);
+			} else {
+				(<any>source).path = uri.parse(source.path);
+			}
+		});
+
+		this._proxy.$sendDAMessage(this._handle, message);
+	}
+
+	public stopSession(): TPromise<void> {
+		return this._proxy.$stopDASession(this._handle);
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
index a1ff2a2dd6c..6c283a0d98c 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
@@ -16,7 +16,7 @@ export class MainThreadErrors implements MainThreadErrorsShape {
 	}
 
 	$onUnexpectedError(err: any | SerializedError): void {
-		if (err.$isError) {
+		if (err && err.$isError) {
 			const { name, message, stack } = err;
 			err = new Error();
 			err.message = message;
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index df14909d35f..2f632a363e8 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -4,29 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI, { UriComponents } from 'vs/base/common/uri';
-import { TPromise, PPromise } from 'vs/base/common/winjs.base';
-import { ExtHostContext, MainContext, IExtHostContext, MainThreadFileSystemShape, ExtHostFileSystemShape, IFileChangeDto } from '../node/extHost.protocol';
-import { IFileService, IFileSystemProvider, IStat, IFileChange } from 'vs/platform/files/common/files';
+import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { FileOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions } from 'vs/platform/files/common/files';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
-import { IProgress } from 'vs/platform/progress/common/progress';
-import { ISearchResultProvider, ISearchQuery, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchService, ILineMatch } from 'vs/platform/search/common/search';
-import { values } from 'vs/base/common/map';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { ExtHostContext, ExtHostFileSystemShape, IExtHostContext, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../node/extHost.protocol';
 
 @extHostNamedCustomer(MainContext.MainThreadFileSystem)
 export class MainThreadFileSystem implements MainThreadFileSystemShape {
 
 	private readonly _proxy: ExtHostFileSystemShape;
 	private readonly _fileProvider = new Map<number, RemoteFileSystemProvider>();
-	private readonly _searchProvider = new Map<number, RemoteSearchProvider>();
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IFileService private readonly _fileService: IFileService,
-		@ISearchService private readonly _searchService: ISearchService
+		@IFileService private readonly _fileService: IFileService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostFileSystem);
 	}
@@ -36,64 +30,36 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape {
 		this._fileProvider.clear();
 	}
 
-	$registerFileSystemProvider(handle: number, scheme: string): void {
-		this._fileProvider.set(handle, new RemoteFileSystemProvider(this._fileService, scheme, handle, this._proxy));
-	}
-
-	$registerSearchProvider(handle: number, scheme: string): void {
-		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, scheme, handle, this._proxy));
+	$registerFileSystemProvider(handle: number, scheme: string, capabilities: FileSystemProviderCapabilities): void {
+		this._fileProvider.set(handle, new RemoteFileSystemProvider(this._fileService, scheme, capabilities, handle, this._proxy));
 	}
 
 	$unregisterProvider(handle: number): void {
 		dispose(this._fileProvider.get(handle));
 		this._fileProvider.delete(handle);
-
-		dispose(this._searchProvider.get(handle));
-		this._searchProvider.delete(handle);
 	}
 
 	$onFileSystemChange(handle: number, changes: IFileChangeDto[]): void {
 		this._fileProvider.get(handle).$onFileSystemChange(changes);
 	}
-
-	$reportFileChunk(handle: number, session: number, chunk: number[]): void {
-		this._fileProvider.get(handle).reportFileChunk(session, chunk);
-	}
-
-	// --- search
-
-	$handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void {
-		this._searchProvider.get(handle).handleFindMatch(session, data);
-	}
-}
-
-class FileReadOperation {
-
-	private static _idPool = 0;
-
-	constructor(
-		readonly progress: IProgress<Uint8Array>,
-		readonly id: number = ++FileReadOperation._idPool
-	) {
-		//
-	}
 }
 
 class RemoteFileSystemProvider implements IFileSystemProvider {
 
 	private readonly _onDidChange = new Emitter<IFileChange[]>();
 	private readonly _registrations: IDisposable[];
-	private readonly _reads = new Map<number, FileReadOperation>();
-
-	readonly onDidChange: Event<IFileChange[]> = this._onDidChange.event;
 
+	readonly onDidChangeFile: Event<IFileChange[]> = this._onDidChange.event;
+	readonly capabilities: FileSystemProviderCapabilities;
 
 	constructor(
 		fileService: IFileService,
 		scheme: string,
+		capabilities: FileSystemProviderCapabilities,
 		private readonly _handle: number,
 		private readonly _proxy: ExtHostFileSystemShape
 	) {
+		this.capabilities = capabilities;
 		this._registrations = [fileService.registerProvider(scheme, this)];
 	}
 
@@ -102,6 +68,16 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 		this._onDidChange.dispose();
 	}
 
+	watch(resource: URI, opts: IWatchOptions) {
+		const session = Math.random();
+		this._proxy.$watch(this._handle, session, resource, opts);
+		return {
+			dispose: () => {
+				this._proxy.$unwatch(this._handle, session);
+			}
+		};
+	}
+
 	$onFileSystemChange(changes: IFileChangeDto[]): void {
 		this._onDidChange.fire(changes.map(RemoteFileSystemProvider._createFileChange));
 	}
@@ -112,143 +88,42 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 
 	// --- forwarding calls
 
-	utimes(resource: URI, mtime: number, atime: number): TPromise<IStat, any> {
-		return this._proxy.$utimes(this._handle, resource, mtime, atime);
-	}
-	stat(resource: URI): TPromise<IStat, any> {
-		return this._proxy.$stat(this._handle, resource);
-	}
-	read(resource: URI, offset: number, count: number, progress: IProgress<Uint8Array>): TPromise<number, any> {
-		const read = new FileReadOperation(progress);
-		this._reads.set(read.id, read);
-		return this._proxy.$read(this._handle, read.id, offset, count, resource).then(value => {
-			this._reads.delete(read.id);
-			return value;
+	stat(resource: URI): TPromise<IStat> {
+		return this._proxy.$stat(this._handle, resource).then(undefined, err => {
+			throw err;
 		});
 	}
-	reportFileChunk(session: number, chunk: number[]): void {
-		this._reads.get(session).progress.report(Buffer.from(chunk));
+
+	readFile(resource: URI, opts: FileOptions): TPromise<Uint8Array, any> {
+		return this._proxy.$readFile(this._handle, resource, opts).then(encoded => {
+			return Buffer.from(encoded, 'base64');
+		});
 	}
-	write(resource: URI, content: Uint8Array): TPromise<void, any> {
-		return this._proxy.$write(this._handle, resource, [].slice.call(content));
+
+	writeFile(resource: URI, content: Uint8Array, opts: FileOptions): TPromise<void, any> {
+		let encoded = Buffer.isBuffer(content)
+			? content.toString('base64')
+			: Buffer.from(content.buffer, content.byteOffset, content.byteLength).toString('base64');
+		return this._proxy.$writeFile(this._handle, resource, encoded, opts);
 	}
-	unlink(resource: URI): TPromise<void, any> {
-		return this._proxy.$unlink(this._handle, resource);
-	}
-	move(resource: URI, target: URI): TPromise<IStat, any> {
-		return this._proxy.$move(this._handle, resource, target);
+
+	delete(resource: URI): TPromise<void, any> {
+		return this._proxy.$delete(this._handle, resource);
 	}
+
 	mkdir(resource: URI): TPromise<IStat, any> {
 		return this._proxy.$mkdir(this._handle, resource);
 	}
-	readdir(resource: URI): TPromise<[URI, IStat][], any> {
-		return this._proxy.$readdir(this._handle, resource).then(data => {
-			return data.map(tuple => <[URI, IStat]>[URI.revive(tuple[0]), tuple[1]]);
-		});
+
+	readdir(resource: URI): TPromise<[string, IStat][], any> {
+		return this._proxy.$readdir(this._handle, resource);
 	}
-	rmdir(resource: URI): TPromise<void, any> {
-		return this._proxy.$rmdir(this._handle, resource);
-	}
-}
-
-class SearchOperation {
-
-	private static _idPool = 0;
-
-	constructor(
-		readonly progress: (match: IFileMatch) => any,
-		readonly id: number = ++SearchOperation._idPool,
-		readonly matches = new Map<string, IFileMatch>()
-	) {
-		//
-	}
-
-	addMatch(resource: URI, match: ILineMatch): void {
-		if (!this.matches.has(resource.toString())) {
-			this.matches.set(resource.toString(), { resource, lineMatches: [] });
-		}
-		if (match) {
-			this.matches.get(resource.toString()).lineMatches.push(match);
-		}
-		this.progress(this.matches.get(resource.toString()));
-	}
-}
-
-class RemoteSearchProvider implements ISearchResultProvider {
-
-	private readonly _registrations: IDisposable[];
-	private readonly _searches = new Map<number, SearchOperation>();
-
-
-	constructor(
-		searchService: ISearchService,
-		private readonly _scheme: string,
-		private readonly _handle: number,
-		private readonly _proxy: ExtHostFileSystemShape
-	) {
-		this._registrations = [searchService.registerSearchResultProvider(this)];
-	}
-
-	dispose(): void {
-		dispose(this._registrations);
-	}
-
-	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
-
-		if (isFalsyOrEmpty(query.folderQueries)) {
-			return PPromise.as(undefined);
-		}
-
-		let includes = { ...query.includePattern };
-		let excludes = { ...query.excludePattern };
-
-		for (const folderQuery of query.folderQueries) {
-			if (folderQuery.folder.scheme === this._scheme) {
-				includes = { ...includes, ...folderQuery.includePattern };
-				excludes = { ...excludes, ...folderQuery.excludePattern };
-			}
-		}
-
-		let outer: TPromise;
-
-		return new PPromise((resolve, reject, report) => {
-
-			const search = new SearchOperation(report);
-			this._searches.set(search.id, search);
-
-			outer = query.type === QueryType.File
-				? this._proxy.$provideFileSearchResults(this._handle, search.id, query.filePattern)
-				: this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, { excludes: Object.keys(excludes), includes: Object.keys(includes) });
-
-			outer.then(() => {
-				this._searches.delete(search.id);
-				resolve(({ results: values(search.matches), stats: undefined }));
-			}, err => {
-				this._searches.delete(search.id);
-				reject(err);
-			});
-		}, () => {
-			if (outer) {
-				outer.cancel();
-			}
-		});
-	}
-
-	handleFindMatch(session: number, dataOrUri: UriComponents | [UriComponents, ILineMatch]): void {
-		if (!this._searches.has(session)) {
-			// ignore...
-			return;
-		}
-		let resource: URI;
-		let match: ILineMatch;
-
-		if (Array.isArray(dataOrUri)) {
-			resource = URI.revive(dataOrUri[0]);
-			match = dataOrUri[1];
-		} else {
-			resource = URI.revive(dataOrUri);
-		}
-
-		this._searches.get(session).addMatch(resource, match);
+
+	rename(resource: URI, target: URI, opts: FileOptions): TPromise<IStat, any> {
+		return this._proxy.$rename(this._handle, resource, target, opts);
+	}
+
+	copy(resource: URI, target: URI, opts: FileOptions): TPromise<IStat, any> {
+		return this._proxy.$copy(this._handle, resource, target, opts);
 	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index c4c01b90d41..34fb61eea6a 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -191,11 +191,12 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	// --- quick fix
 
-	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[]): void {
+	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[], providedCodeActionKinds?: string[]): void {
 		this._registrations[handle] = modes.CodeActionProviderRegistry.register(toLanguageSelector(selector), <modes.CodeActionProvider>{
 			provideCodeActions: (model: ITextModel, range: EditorRange, context: modes.CodeActionContext, token: CancellationToken): Thenable<modes.CodeAction[]> => {
 				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideCodeActions(handle, model.uri, range, context))).then(MainThreadLanguageFeatures._reviveCodeActionDto);
-			}
+			},
+			providedCodeActionKinds
 		});
 	}
 
@@ -257,7 +258,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 				return wireCancellationToken(token, this._proxy.$provideRenameEdits(handle, model.uri, position, newName)).then(reviveWorkspaceEditDto);
 			},
 			resolveRenameLocation: supportResolveLocation
-				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameContext> => wireCancellationToken(token, this._proxy.$resolveRenameLocation(handle, model.uri, position))
+				? (model: ITextModel, position: EditorPosition, token: CancellationToken): Thenable<modes.RenameLocation> => wireCancellationToken(token, this._proxy.$resolveRenameLocation(handle, model.uri, position))
 				: undefined
 		});
 	}
@@ -348,9 +349,9 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	// --- folding
 
-	$registerFoldingProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
+	$registerFoldingRangeProvider(handle: number, selector: ISerializedDocumentFilter[]): void {
 		const proxy = this._proxy;
-		this._registrations[handle] = modes.FoldingProviderRegistry.register(toLanguageSelector(selector), <modes.FoldingProvider>{
+		this._registrations[handle] = modes.FoldingRangeProviderRegistry.register(toLanguageSelector(selector), <modes.FoldingRangeProvider>{
 			provideFoldingRanges: (model, context, token) => {
 				return wireCancellationToken(token, proxy.$provideFoldingRanges(handle, model.uri, context));
 			}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
index 016ebbf355a..92ca4c3cb44 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
@@ -92,7 +92,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 			// if promise has not been resolved yet, now is the time to ensure a return value
 			// otherwise if already resolved it means the user clicked one of the buttons
-			once(messageHandle.onDidDispose)(() => {
+			once(messageHandle.onDidClose)(() => {
 				dispose(...primaryActions, ...secondaryActions);
 				resolve(undefined);
 			});
diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
index 7ac56ff2c63..c84d6a8e5f3 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -7,6 +7,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { IQuickOpenService, IPickOptions, IInputOptions } from 'vs/platform/quickOpen/common/quickOpen';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { InputBoxOptions } from 'vscode';
 import { ExtHostContext, MainThreadQuickOpenShape, ExtHostQuickOpenShape, MyQuickPickItems, MainContext, IExtHostContext } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -16,6 +17,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	private _proxy: ExtHostQuickOpenShape;
 	private _quickOpenService: IQuickOpenService;
+	private _quickInputService: IQuickInputService;
 	private _doSetItems: (items: MyQuickPickItems[]) => any;
 	private _doSetError: (error: Error) => any;
 	private _contents: TPromise<MyQuickPickItems[]>;
@@ -23,16 +25,18 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IQuickOpenService quickOpenService: IQuickOpenService
+		@IQuickOpenService quickOpenService: IQuickOpenService,
+		@IQuickInputService quickInputService: IQuickInputService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostQuickOpen);
 		this._quickOpenService = quickOpenService;
+		this._quickInputService = quickInputService;
 	}
 
 	public dispose(): void {
 	}
 
-	$show(options: IPickOptions): TPromise<number> {
+	$show(options: IPickOptions): TPromise<number | number[]> {
 
 		const myToken = ++this._token;
 
@@ -50,16 +54,29 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
-		return asWinJsPromise(token => this._quickOpenService.pick(this._contents, options, token)).then(item => {
-			if (item) {
-				return item.handle;
-			}
-			return undefined;
-		}, undefined, progress => {
-			if (progress) {
-				this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
-			}
-		});
+		if (options.canSelectMany) {
+			return asWinJsPromise(token => this._quickInputService.pick(this._contents, options, token)).then(items => {
+				if (items) {
+					return items.map(item => item.handle);
+				}
+				return undefined;
+			}, undefined, progress => {
+				if (progress) {
+					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
+				}
+			});
+		} else {
+			return asWinJsPromise(token => this._quickOpenService.pick(this._contents, options, token)).then(item => {
+				if (item) {
+					return item.handle;
+				}
+				return undefined;
+			}, undefined, progress => {
+				if (progress) {
+					this._proxy.$onItemSelected((<MyQuickPickItems>progress).handle);
+				}
+			});
+		}
 	}
 
 	$setItems(items: MyQuickPickItems[]): TPromise<any> {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 33b9c3e3239..c5c267edb8d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -29,6 +29,7 @@ import { localize } from 'vs/nls';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
 import { shouldSynchronizeModel } from 'vs/editor/common/services/modelService';
+import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
 
 export interface ISaveParticipantParticipant extends ISaveParticipant {
 	// progressMessage: string;
@@ -50,7 +51,7 @@ class TrimWhitespaceParticipant implements ISaveParticipantParticipant {
 	}
 
 	private doTrimTrailingWhitespace(model: ITextModel, isAutoSaved: boolean): void {
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const cursors: Position[] = [];
 
 		let editor = findEditor(model, this.codeEditorService);
@@ -60,6 +61,12 @@ class TrimWhitespaceParticipant implements ISaveParticipantParticipant {
 			prevSelection = editor.getSelections();
 			if (isAutoSaved) {
 				cursors.push(...prevSelection.map(s => new Position(s.positionLineNumber, s.positionColumn)));
+				const snippetsRange = SnippetController2.get(editor).getSessionEnclosingRange();
+				if (snippetsRange) {
+					for (let lineNumber = snippetsRange.startLineNumber; lineNumber <= snippetsRange.endLineNumber; lineNumber++) {
+						cursors.push(new Position(lineNumber, model.getLineMaxColumn(lineNumber)));
+					}
+				}
 			}
 		}
 
@@ -114,7 +121,7 @@ export class FinalNewLineParticipant implements ISaveParticipantParticipant {
 			return;
 		}
 
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const editor = findEditor(model, this.codeEditorService);
 		if (editor) {
 			prevSelection = editor.getSelections();
@@ -151,7 +158,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 			return;
 		}
 
-		let prevSelection: Selection[] = [new Selection(1, 1, 1, 1)];
+		let prevSelection: Selection[] = [];
 		const editor = findEditor(model, this.codeEditorService);
 		if (editor) {
 			prevSelection = editor.getSelections();
@@ -166,7 +173,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 			currentLineIsEmptyOrWhitespace = strings.lastNonWhitespaceIndex(currentLine) === -1;
 		}
 
-		const deletionRange = new Range(currentLineNumber + 1, 1, lineCount + 1, 1);
+		const deletionRange = model.validateRange(new Range(currentLineNumber + 1, 1, lineCount + 1, 1));
 		if (!deletionRange.isEmpty()) {
 			model.pushEditOperations(prevSelection, [EditOperation.delete(deletionRange)], edits => prevSelection);
 		}
@@ -225,7 +232,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 	}
 
 	private _editsWithEditor(editor: ICodeEditor, edits: ISingleEditOperation[]): void {
-		EditOperationsCommand.execute(editor, edits, false);
+		EditOperationsCommand.execute(editor, edits);
 	}
 
 	private _editWithModel(model: ITextModel, edits: ISingleEditOperation[]): void {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSearch.ts b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
new file mode 100644
index 00000000000..e83864d3a4a
--- /dev/null
+++ b/src/vs/workbench/api/electron-browser/mainThreadSearch.ts
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { values } from 'vs/base/common/map';
+import URI, { UriComponents } from 'vs/base/common/uri';
+import { PPromise, TPromise } from 'vs/base/common/winjs.base';
+import { IFileMatch, ILineMatch, ISearchComplete, ISearchProgressItem, ISearchQuery, ISearchResultProvider, ISearchService, QueryType } from 'vs/platform/search/common/search';
+import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { ExtHostContext, ExtHostSearchShape, IExtHostContext, MainContext, MainThreadSearchShape } from '../node/extHost.protocol';
+
+@extHostNamedCustomer(MainContext.MainThreadSearch)
+export class MainThreadSearch implements MainThreadSearchShape {
+
+	private readonly _proxy: ExtHostSearchShape;
+	private readonly _searchProvider = new Map<number, RemoteSearchProvider>();
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@ISearchService private readonly _searchService: ISearchService
+	) {
+		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSearch);
+	}
+
+	dispose(): void {
+		this._searchProvider.forEach(value => dispose());
+		this._searchProvider.clear();
+	}
+
+	$registerSearchProvider(handle: number, scheme: string): void {
+		this._searchProvider.set(handle, new RemoteSearchProvider(this._searchService, scheme, handle, this._proxy));
+	}
+
+	$unregisterProvider(handle: number): void {
+		dispose(this._searchProvider.get(handle));
+		this._searchProvider.delete(handle);
+	}
+
+	$handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void {
+		this._searchProvider.get(handle).handleFindMatch(session, data);
+	}
+}
+
+class SearchOperation {
+
+	private static _idPool = 0;
+
+	constructor(
+		readonly progress: (match: IFileMatch) => any,
+		readonly id: number = ++SearchOperation._idPool,
+		readonly matches = new Map<string, IFileMatch>()
+	) {
+		//
+	}
+
+	addMatch(resource: URI, match: ILineMatch): void {
+		if (!this.matches.has(resource.toString())) {
+			this.matches.set(resource.toString(), { resource, lineMatches: [] });
+		}
+		if (match) {
+			this.matches.get(resource.toString()).lineMatches.push(match);
+		}
+		this.progress(this.matches.get(resource.toString()));
+	}
+}
+
+class RemoteSearchProvider implements ISearchResultProvider {
+
+	private readonly _registrations: IDisposable[];
+	private readonly _searches = new Map<number, SearchOperation>();
+
+
+	constructor(
+		searchService: ISearchService,
+		private readonly _scheme: string,
+		private readonly _handle: number,
+		private readonly _proxy: ExtHostSearchShape
+	) {
+		this._registrations = [searchService.registerSearchResultProvider(this)];
+	}
+
+	dispose(): void {
+		dispose(this._registrations);
+	}
+
+	search(query: ISearchQuery): PPromise<ISearchComplete, ISearchProgressItem> {
+
+		if (isFalsyOrEmpty(query.folderQueries)) {
+			return PPromise.as(undefined);
+		}
+
+		let includes = { ...query.includePattern };
+		let excludes = { ...query.excludePattern };
+
+		for (const folderQuery of query.folderQueries) {
+			if (folderQuery.folder.scheme === this._scheme) {
+				includes = { ...includes, ...folderQuery.includePattern };
+				excludes = { ...excludes, ...folderQuery.excludePattern };
+			}
+		}
+
+		let outer: TPromise;
+
+		return new PPromise((resolve, reject, report) => {
+
+			const search = new SearchOperation(report);
+			this._searches.set(search.id, search);
+
+			outer = query.type === QueryType.File
+				? this._proxy.$provideFileSearchResults(this._handle, search.id, query.filePattern)
+				: this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, { excludes: Object.keys(excludes), includes: Object.keys(includes) });
+
+			outer.then(() => {
+				this._searches.delete(search.id);
+				resolve(({ results: values(search.matches), stats: undefined }));
+			}, err => {
+				this._searches.delete(search.id);
+				reject(err);
+			});
+		}, () => {
+			if (outer) {
+				outer.cancel();
+			}
+		});
+	}
+
+	handleFindMatch(session: number, dataOrUri: UriComponents | [UriComponents, ILineMatch]): void {
+		if (!this._searches.has(session)) {
+			// ignore...
+			return;
+		}
+		let resource: URI;
+		let match: ILineMatch;
+
+		if (Array.isArray(dataOrUri)) {
+			resource = URI.revive(dataOrUri[0]);
+			match = dataOrUri[1];
+		} else {
+			resource = URI.revive(dataOrUri);
+		}
+
+		this._searches.get(session).addMatch(resource, match);
+	}
+}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
index 03fa8d2b3b8..cd32296c9da 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts
@@ -17,29 +17,31 @@ import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspac
 
 import {
 	ContributedTask, ExtensionTaskSourceTransfer, TaskIdentifier, TaskExecution, Task, TaskEvent, TaskEventKind,
-	PresentationOptions, CommandOptions, CommandConfiguration, RuntimeType, CustomTask, TaskScope, TaskSource, TaskSourceKind, ExtensionTaskSource
+	PresentationOptions, CommandOptions, CommandConfiguration, RuntimeType, CustomTask, TaskScope, TaskSource, TaskSourceKind, ExtensionTaskSource, RevealKind, PanelKind
 } from 'vs/workbench/parts/tasks/common/tasks';
-import { ITaskService } from 'vs/workbench/parts/tasks/common/taskService';
+import { ITaskService, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService';
 
 
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext, IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 import {
 	TaskDefinitionDTO, TaskExecutionDTO, ProcessExecutionOptionsDTO, TaskPresentationOptionsDTO,
-	ProcessExecutionDTO, ShellExecutionDTO, ShellExecutionOptionsDTO, TaskDTO, TaskSourceDTO, TaskHandleDTO
+	ProcessExecutionDTO, ShellExecutionDTO, ShellExecutionOptionsDTO, TaskDTO, TaskSourceDTO, TaskHandleDTO, TaskFilterDTO
 } from 'vs/workbench/api/shared/tasks';
 
-export { TaskDTO, TaskHandleDTO, TaskExecutionDTO };
+export { TaskDTO, TaskHandleDTO, TaskExecutionDTO, TaskFilterDTO };
 
 namespace TaskExecutionDTO {
 	export function from(value: TaskExecution): TaskExecutionDTO {
 		return {
 			id: value.id,
+			task: TaskDTO.from(value.task)
 		};
 	}
 	export function to(value: TaskExecutionDTO, workspace: IWorkspaceContextService): TaskExecution {
 		return {
 			id: value.id,
+			task: TaskDTO.to(value.task, workspace)
 		};
 	}
 }
@@ -303,6 +305,8 @@ namespace TaskDTO {
 			return undefined;
 		}
 		command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
+		command.presentation = Objects.assign(command.presentation || {}, { echo: true, reveal: RevealKind.Always, focus: false, panel: PanelKind.Shared });
+
 		let source = TaskSourceDTO.to(task.source, workspace);
 
 		let label = nls.localize('task.label', '{0}: {1}', source.label, task.name);
@@ -326,6 +330,15 @@ namespace TaskDTO {
 	}
 }
 
+namespace TaskFilterDTO {
+	export function from(value: TaskFilter): TaskFilterDTO {
+		return value;
+	}
+	export function to(value: TaskFilterDTO): TaskFilter {
+		return value;
+	}
+}
+
 @extHostNamedCustomer(MainContext.MainThreadTask)
 export class MainThreadTask implements MainThreadTaskShape {
 
@@ -383,8 +396,8 @@ export class MainThreadTask implements MainThreadTaskShape {
 		return TPromise.wrap<void>(undefined);
 	}
 
-	public $executeTaskProvider(): TPromise<TaskDTO[]> {
-		return this._taskService.tasks().then((tasks) => {
+	public $fetchTasks(filter?: TaskFilterDTO): TPromise<TaskDTO[]> {
+		return this._taskService.tasks(TaskFilterDTO.to(filter)).then((tasks) => {
 			let result: TaskDTO[] = [];
 			for (let task of tasks) {
 				let item = TaskDTO.from(task);
@@ -403,7 +416,8 @@ export class MainThreadTask implements MainThreadTaskShape {
 				this._taskService.getTask(workspaceFolder, value.id, true).then((task: Task) => {
 					this._taskService.run(task);
 					let result: TaskExecutionDTO = {
-						id: value.id
+						id: value.id,
+						task: TaskDTO.from(task)
 					};
 					resolve(result);
 				}, (error) => {
@@ -413,19 +427,19 @@ export class MainThreadTask implements MainThreadTaskShape {
 				let task = TaskDTO.to(value, this._workspaceContextServer);
 				this._taskService.run(task);
 				let result: TaskExecutionDTO = {
-					id: task._id
+					id: task._id,
+					task: TaskDTO.from(task)
 				};
 				resolve(result);
 			}
 		});
 	}
 
-	public $terminateTask(value: TaskExecutionDTO): TPromise<void> {
-		let execution: TaskExecution = TaskExecutionDTO.to(value, this._workspaceContextServer);
+	public $terminateTask(id: string): TPromise<void> {
 		return new TPromise<void>((resolve, reject) => {
 			this._taskService.getActiveTasks().then((tasks) => {
 				for (let task of tasks) {
-					if (execution.id === task._id) {
+					if (id === task._id) {
 						this._taskService.terminate(task).then((value) => {
 							resolve(undefined);
 						}, (error) => {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
index ee934a107b5..434652bfaf6 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTerminalService.ts
@@ -5,25 +5,38 @@
 'use strict';
 
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ITerminalService, ITerminalInstance, IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
+import { ExtHostContext, ExtHostTerminalServiceShape, MainThreadTerminalServiceShape, MainContext, IExtHostContext, ShellLaunchConfigDto } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadTerminalService)
 export class MainThreadTerminalService implements MainThreadTerminalServiceShape {
 
 	private _proxy: ExtHostTerminalServiceShape;
-	private _toDispose: IDisposable[];
+	private _toDispose: IDisposable[] = [];
+	private _terminalProcesses: { [id: number]: ITerminalProcessExtHostProxy } = {};
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@ITerminalService private terminalService: ITerminalService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostTerminalService);
-		this._toDispose = [];
-		this._toDispose.push(terminalService.onInstanceDisposed((terminalInstance) => this._onTerminalDisposed(terminalInstance)));
-		this._toDispose.push(terminalService.onInstanceProcessIdReady((terminalInstance) => this._onTerminalProcessIdReady(terminalInstance)));
+		this._toDispose.push(terminalService.onInstanceCreated((terminalInstance) => {
+			// Delay this message so the TerminalInstance constructor has a chance to finish and
+			// return the ID normally to the extension host. The ID that is passed here will be used
+			// to register non-extension API terminals in the extension host.
+			setTimeout(() => this._onTerminalOpened(terminalInstance), 100);
+		}));
+		this._toDispose.push(terminalService.onInstanceDisposed(terminalInstance => this._onTerminalDisposed(terminalInstance)));
+		this._toDispose.push(terminalService.onInstanceProcessIdReady(terminalInstance => this._onTerminalProcessIdReady(terminalInstance)));
+		this._toDispose.push(terminalService.onInstanceRequestExtHostProcess(request => this._onTerminalRequestExtHostProcess(request)));
+
+		// Set initial ext host state
+		this.terminalService.terminalInstances.forEach(t => {
+			this._onTerminalOpened(t);
+			t.processReady.then(() => this._onTerminalProcessIdReady(t));
+		});
 	}
 
 	public dispose(): void {
@@ -43,7 +56,7 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			ignoreConfigurationCwd: true,
 			env
 		};
-		return TPromise.as(this.terminalService.createInstance(shellLaunchConfig).id);
+		return TPromise.as(this.terminalService.createTerminal(shellLaunchConfig).id);
 	}
 
 	public $show(terminalId: number, preserveFocus: boolean): void {
@@ -78,7 +91,43 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 		this._proxy.$acceptTerminalClosed(terminalInstance.id);
 	}
 
+	private _onTerminalOpened(terminalInstance: ITerminalInstance): void {
+		this._proxy.$acceptTerminalOpened(terminalInstance.id, terminalInstance.title);
+	}
+
 	private _onTerminalProcessIdReady(terminalInstance: ITerminalInstance): void {
 		this._proxy.$acceptTerminalProcessId(terminalInstance.id, terminalInstance.processId);
 	}
+
+	private _onTerminalRequestExtHostProcess(request: ITerminalProcessExtHostRequest): void {
+		this._terminalProcesses[request.proxy.terminalId] = request.proxy;
+		const shellLaunchConfigDto: ShellLaunchConfigDto = {
+			name: request.shellLaunchConfig.name,
+			executable: request.shellLaunchConfig.executable,
+			args: request.shellLaunchConfig.args,
+			cwd: request.shellLaunchConfig.cwd,
+			env: request.shellLaunchConfig.env
+		};
+		this._proxy.$createProcess(request.proxy.terminalId, shellLaunchConfigDto, request.cols, request.rows);
+		request.proxy.onInput(data => this._proxy.$acceptProcessInput(request.proxy.terminalId, data));
+		request.proxy.onResize((cols, rows) => this._proxy.$acceptProcessResize(request.proxy.terminalId, cols, rows));
+		request.proxy.onShutdown(() => this._proxy.$acceptProcessShutdown(request.proxy.terminalId));
+	}
+
+	public $sendProcessTitle(terminalId: number, title: string): void {
+		this._terminalProcesses[terminalId].emitTitle(title);
+	}
+
+	public $sendProcessData(terminalId: number, data: string): void {
+		this._terminalProcesses[terminalId].emitData(data);
+	}
+
+	public $sendProcessPid(terminalId: number, pid: number): void {
+		this._terminalProcesses[terminalId].emitPid(pid);
+	}
+
+	public $sendProcessExit(terminalId: number, exitCode: number): void {
+		this._terminalProcesses[terminalId].emitExit(exitCode);
+		delete this._terminalProcesses[terminalId];
+	}
 }
diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
index 65b4f04f3ac..828bd6e2e33 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts
@@ -31,7 +31,12 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie
 	$registerTreeViewDataProvider(treeViewId: string): void {
 		const dataProvider = this._register(new TreeViewDataProvider(treeViewId, this._proxy, this.notificationService));
 		this._dataProviders.set(treeViewId, dataProvider);
-		this.viewsService.getTreeViewer(treeViewId).dataProvider = dataProvider;
+		const treeViewer = this.viewsService.getTreeViewer(treeViewId);
+		if (treeViewer) {
+			treeViewer.dataProvider = dataProvider;
+		} else {
+			this.notificationService.error('No view is registered with id: ' + treeViewId);
+		}
 	}
 
 	$reveal(treeViewId: string, item: ITreeItem, parentChain: ITreeItem[], options?: { select?: boolean }): TPromise<void> {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
new file mode 100644
index 00000000000..1923e437eb1
--- /dev/null
+++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ExtHostContext, IExtHostContext, MainContext, MainThreadUrlsShape, ExtHostUrlsShape } from 'vs/workbench/api/node/extHost.protocol';
+import { extHostNamedCustomer } from './extHostCustomers';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IURLService, IURLHandler } from 'vs/platform/url/common/url';
+import URI from 'vs/base/common/uri';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { IInactiveExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler';
+
+class ExtensionUrlHandler implements IURLHandler {
+
+	constructor(
+		private readonly proxy: ExtHostUrlsShape,
+		private readonly handle: number,
+		readonly extensionId: string
+	) { }
+
+	handleURL(uri: URI): TPromise<boolean> {
+		if (uri.authority !== this.extensionId) {
+			return TPromise.as(false);
+		}
+
+		return this.proxy.$handleExternalUri(this.handle, uri).then(() => true);
+	}
+}
+
+@extHostNamedCustomer(MainContext.MainThreadUrls)
+export class MainThreadUrls implements MainThreadUrlsShape {
+
+	private readonly proxy: ExtHostUrlsShape;
+	private handlers = new Map<number, { extensionId: string, disposable: IDisposable }>();
+
+	constructor(
+		context: IExtHostContext,
+		@IURLService private urlService: IURLService,
+		@IInactiveExtensionUrlHandler private inactiveExtensionUrlHandler: IInactiveExtensionUrlHandler
+	) {
+		this.proxy = context.getProxy(ExtHostContext.ExtHostUrls);
+	}
+
+	$registerExternalUriHandler(handle: number, extensionId: string): TPromise<void> {
+		const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId);
+		const disposable = this.urlService.registerHandler(handler);
+
+		this.handlers.set(handle, { extensionId, disposable });
+		this.inactiveExtensionUrlHandler.registerExtensionHandler(extensionId, handler);
+
+		return TPromise.as(null);
+	}
+
+	$unregisterExternalUriHandler(handle: number): TPromise<void> {
+		const tuple = this.handlers.get(handle);
+
+		if (!tuple) {
+			return TPromise.as(null);
+		}
+
+		const { extensionId, disposable } = tuple;
+
+		this.inactiveExtensionUrlHandler.unregisterExtensionHandler(extensionId);
+		this.handlers.delete(handle);
+		disposable.dispose();
+
+		return TPromise.as(null);
+	}
+
+	dispose(): void {
+		this.handlers.forEach(({ disposable }) => disposable.dispose());
+		this.handlers.clear();
+	}
+}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
index aba0f0c1621..501549b3bbc 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts
@@ -2,106 +2,112 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+import { localize } from 'vs/nls';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import * as map from 'vs/base/common/map';
-import { MainThreadWebviewsShape, MainContext, IExtHostContext, ExtHostContext, ExtHostWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol';
-import { dispose, Disposable } from 'vs/base/common/lifecycle';
-import { extHostNamedCustomer } from './extHostCustomers';
-import { Position } from 'vs/platform/editor/common/editor';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import * as vscode from 'vscode';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import URI from 'vs/base/common/uri';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { Position } from 'vs/platform/editor/common/editor';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewPanelHandle } from 'vs/workbench/api/node/extHost.protocol';
 import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor';
-
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
+import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { extHostNamedCustomer } from './extHostCustomers';
 
 @extHostNamedCustomer(MainContext.MainThreadWebviews)
-export class MainThreadWebviews implements MainThreadWebviewsShape {
+export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviver {
+
+	private static readonly serializeTimeout = 500; // ms
+
+	private static readonly viewType = 'mainThreadWebview';
+
 	private static readonly standardSupportedLinkSchemes = ['http', 'https', 'mailto'];
 
-	private _toDispose: Disposable[] = [];
+	private static revivalPool = 0;
+
+	private _toDispose: IDisposable[] = [];
 
 	private readonly _proxy: ExtHostWebviewsShape;
-	private readonly _webviews = new Map<WebviewHandle, WebviewInput>();
+	private readonly _webviews = new Map<WebviewPanelHandle, WebviewEditorInput>();
+	private readonly _revivers = new Set<string>();
 
-	private _activeWebview: WebviewInput | undefined = undefined;
+	private _activeWebview: WebviewPanelHandle | undefined = undefined;
 
 	constructor(
 		context: IExtHostContext,
-		@IContextKeyService _contextKeyService: IContextKeyService,
-		@IPartService private readonly _partService: IPartService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorGroupService editorGroupService: IEditorGroupService,
+		@ILifecycleService lifecycleService: ILifecycleService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
-		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
-		@IOpenerService private readonly _openerService: IOpenerService
+		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService,
+		@IOpenerService private readonly _openerService: IOpenerService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+
 	) {
 		this._proxy = context.getProxy(ExtHostContext.ExtHostWebviews);
-		_editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose);
+		editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose);
+		editorGroupService.onEditorGroupMoved(this.onEditorGroupMoved, this, this._toDispose);
+
+		this._toDispose.push(_webviewService.registerReviver(MainThreadWebviews.viewType, this));
+
+		lifecycleService.onWillShutdown(e => {
+			e.veto(this._onWillShutdown());
+		}, this, this._toDispose);
 	}
 
 	dispose(): void {
 		this._toDispose = dispose(this._toDispose);
 	}
 
-	$createWebview(
-		handle: WebviewHandle,
+	$createWebviewPanel(
+		handle: WebviewPanelHandle,
 		viewType: string,
 		title: string,
 		column: Position,
-		options: vscode.WebviewOptions,
+		options: WebviewInputOptions,
 		extensionFolderPath: string
 	): void {
-		const webviewInput = new WebviewInput(title, options, '', {
-			onMessage: message => this._proxy.$onMessage(handle, message),
-			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
-			onDispose: () => {
-				this._proxy.$onDidDisposeWeview(handle).then(() => {
-					this._webviews.delete(handle);
-				});
-			},
-			onDidClickLink: (link, options) => this.onDidClickLink(link, options)
-		}, this._partService);
+		const webview = this._webviewService.createWebview(MainThreadWebviews.viewType, title, column, options, extensionFolderPath, this.createWebviewEventDelegate(handle));
+		webview.state = {
+			viewType: viewType,
+			state: undefined
+		};
 
-		this._webviews.set(handle, webviewInput);
-
-		this._editorService.openEditor(webviewInput, { pinned: true }, column);
+		this._webviews.set(handle, webview);
 	}
 
-	$disposeWebview(handle: WebviewHandle): void {
+	$disposeWebview(handle: WebviewPanelHandle): void {
 		const webview = this.getWebview(handle);
-		if (webview) {
-			this._editorService.closeEditor(webview.position, webview);
-		}
+		webview.dispose();
 	}
 
-	$setTitle(handle: WebviewHandle, value: string): void {
+	$setTitle(handle: WebviewPanelHandle, value: string): void {
 		const webview = this.getWebview(handle);
 		webview.setName(value);
 	}
 
-	$setHtml(handle: WebviewHandle, value: string): void {
+	$setHtml(handle: WebviewPanelHandle, value: string): void {
 		const webview = this.getWebview(handle);
-		webview.setHtml(value);
+		webview.html = value;
 	}
 
-	$reveal(handle: WebviewHandle, column: Position): void {
-		const webviewInput = this.getWebview(handle);
-		if (webviewInput.position === column) {
-			this._editorService.openEditor(webviewInput, { preserveFocus: true }, column);
-		} else {
-			this._editorGroupService.moveEditor(webviewInput, webviewInput.position, column, { preserveFocus: true });
-		}
+	$reveal(handle: WebviewPanelHandle, column: Position | undefined): void {
+		const webview = this.getWebview(handle);
+		this._webviewService.revealWebview(webview, column);
 	}
 
-	async $sendMessage(handle: WebviewHandle, message: any): Promise<boolean> {
-		const webviewInput = this.getWebview(handle);
+	async $postMessage(handle: WebviewPanelHandle, message: any): TPromise<boolean> {
+		const webview = this.getWebview(handle);
 		const editors = this._editorService.getVisibleEditors()
 			.filter(e => e instanceof WebviewEditor)
 			.map(e => e as WebviewEditor)
-			.filter(e => e.input.matches(webviewInput));
+			.filter(e => e.input.matches(webview));
 
 		for (const editor of editors) {
 			editor.sendMessage(message);
@@ -110,18 +116,87 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		return (editors.length > 0);
 	}
 
-	private getWebview(handle: number): WebviewInput {
-		const webviewInput = this._webviews.get(handle);
-		if (!webviewInput) {
+	$registerSerializer(viewType: string): void {
+		this._revivers.add(viewType);
+	}
+
+	$unregisterSerializer(viewType: string): void {
+		this._revivers.delete(viewType);
+	}
+
+	reviveWebview(webview: WebviewEditorInput): TPromise<void> {
+		const viewType = webview.state.viewType;
+		return this._extensionService.activateByEvent(`onView:${viewType}`).then(() => {
+			const handle = 'revival-' + MainThreadWebviews.revivalPool++;
+			this._webviews.set(handle, webview);
+			webview._events = this.createWebviewEventDelegate(handle);
+
+			return this._proxy.$deserializeWebviewPanel(handle, webview.state.viewType, webview.getTitle(), webview.state.state, webview.position, webview.options)
+				.then(undefined, () => {
+					webview.html = MainThreadWebviews.getDeserializationFailedContents(viewType);
+				});
+		});
+	}
+
+	canRevive(webview: WebviewEditorInput): boolean {
+		return this._revivers.has(webview.viewType) || webview.reviver !== null;
+	}
+
+	private _onWillShutdown(): TPromise<boolean> {
+		const toRevive: WebviewPanelHandle[] = [];
+		this._webviews.forEach((view, key) => {
+			if (this.canRevive(view)) {
+				toRevive.push(key);
+			}
+		});
+
+		const reviveResponses = toRevive.map(handle =>
+			TPromise.any([
+				this._proxy.$serializeWebviewPanel(handle).then(
+					state => ({ handle, state }),
+					() => ({ handle, state: null })),
+				TPromise.timeout(MainThreadWebviews.serializeTimeout).then(() => ({ handle, state: null }))
+			]).then(x => x.value));
+
+		return TPromise.join(reviveResponses).then(results => {
+			for (const result of results) {
+				const view = this._webviews.get(result.handle);
+				if (view) {
+					if (result.state) {
+						view.state.state = result.state;
+					} else {
+						view.state = null;
+					}
+				}
+			}
+			return false; // Don't veto shutdown
+		});
+	}
+
+	private createWebviewEventDelegate(handle: WebviewPanelHandle) {
+		return {
+			onDidClickLink: uri => this.onDidClickLink(handle, uri),
+			onMessage: message => this._proxy.$onMessage(handle, message),
+			onDispose: () => {
+				this._proxy.$onDidDisposeWebviewPanel(handle).then(() => {
+					this._webviews.delete(handle);
+				});
+			}
+		};
+	}
+
+	private getWebview(handle: WebviewPanelHandle): WebviewEditorInput {
+		const webview = this._webviews.get(handle);
+		if (!webview) {
 			throw new Error('Unknown webview handle:' + handle);
 		}
-		return webviewInput;
+		return webview;
 	}
 
 	private onEditorsChanged() {
 		const activeEditor = this._editorService.getActiveEditor();
-		let newActiveWebview: { input: WebviewInput, handle: WebviewHandle } | undefined = undefined;
-		if (activeEditor && activeEditor.input instanceof WebviewInput) {
+		let newActiveWebview: { input: WebviewEditorInput, handle: WebviewPanelHandle } | undefined = undefined;
+		if (activeEditor && activeEditor.input instanceof WebviewEditorInput) {
 			for (const handle of map.keys(this._webviews)) {
 				const input = this._webviews.get(handle);
 				if (input.matches(activeEditor.input)) {
@@ -131,27 +206,63 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 			}
 		}
 
+		if (newActiveWebview && newActiveWebview.handle === this._activeWebview) {
+			// No change
+			return;
+		}
+
+		// Broadcast view state update for currently active
+		if (typeof this._activeWebview !== 'undefined') {
+			const oldActiveWebview = this._webviews.get(this._activeWebview);
+			if (oldActiveWebview) {
+				this._proxy.$onDidChangeWebviewPanelViewState(this._activeWebview, false, oldActiveWebview.position);
+			}
+		}
+
+		// Then for newly active
 		if (newActiveWebview) {
-			if (!this._activeWebview || !newActiveWebview.input.matches(this._activeWebview)) {
-				this._proxy.$onDidChangeActiveWeview(newActiveWebview.handle);
-				this._activeWebview = newActiveWebview.input;
-			}
+			this._proxy.$onDidChangeWebviewPanelViewState(newActiveWebview.handle, true, activeEditor.position);
+			this._activeWebview = newActiveWebview.handle;
 		} else {
-			if (this._activeWebview) {
-				this._proxy.$onDidChangeActiveWeview(undefined);
-				this._activeWebview = undefined;
-			}
+			this._activeWebview = undefined;
 		}
 	}
 
-	private onDidClickLink(link: URI, options: vscode.WebviewOptions): void {
+	private onEditorGroupMoved(): void {
+		for (const workbenchEditor of this._editorService.getVisibleEditors()) {
+			if (!workbenchEditor.input) {
+				return;
+			}
+
+			this._webviews.forEach((input, handle) => {
+				if (workbenchEditor.input.matches(input) && input.position !== workbenchEditor.position) {
+					input.updatePosition(workbenchEditor.position);
+					this._proxy.$onDidChangeWebviewPanelViewState(handle, handle === this._activeWebview, workbenchEditor.position);
+				}
+			});
+		}
+	}
+	private onDidClickLink(handle: WebviewPanelHandle, link: URI): void {
 		if (!link) {
 			return;
 		}
 
-		const enableCommandUris = options.enableCommandUris;
+		const webview = this.getWebview(handle);
+		const enableCommandUris = webview.options.enableCommandUris;
 		if (MainThreadWebviews.standardSupportedLinkSchemes.indexOf(link.scheme) >= 0 || enableCommandUris && link.scheme === 'command') {
 			this._openerService.open(link);
 		}
 	}
+
+	private static getDeserializationFailedContents(viewType: string) {
+		return `<!DOCTYPE html>
+		<html>
+			<head>
+				<base href="https://code.visualstudio.com/raw/">
+				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src https: data:; media-src https:; script-src 'none'; style-src vscode-core-resource: https: 'unsafe-inline'; child-src 'none'; frame-src 'none';">
+			</head>
+			<body>${localize('errorMessage', "An error occurred while restoring view:{0}", viewType)}</body>
+		</html>`;
+	}
 }
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index a2a727aae7a..688f4f3460f 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -54,10 +54,11 @@ import { ExtHostFileSystem } from 'vs/workbench/api/node/extHostFileSystem';
 import { ExtHostDecorations } from 'vs/workbench/api/node/extHostDecorations';
 import { toGlobPattern, toLanguageSelector } from 'vs/workbench/api/node/extHostTypeConverters';
 import { ExtensionActivatedByAPI } from 'vs/workbench/api/node/extHostExtensionActivator';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { OverviewRulerLane } from 'vs/editor/common/model';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
 import { ExtHostWebviews } from 'vs/workbench/api/node/extHostWebview';
+import { ExtHostSearch } from './extHostSearch';
+import { ExtHostUrls } from './extHostUrls';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription): typeof vscode;
@@ -98,6 +99,7 @@ export function createApiFactory(
 	const extHostHeapService = rpcProtocol.set(ExtHostContext.ExtHostHeapService, new ExtHostHeapService());
 	const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, new ExtHostDecorations(rpcProtocol));
 	const extHostWebviews = rpcProtocol.set(ExtHostContext.ExtHostWebviews, new ExtHostWebviews(rpcProtocol));
+	const extHostUrls = rpcProtocol.set(ExtHostContext.ExtHostUrls, new ExtHostUrls(rpcProtocol));
 	const extHostDocumentsAndEditors = rpcProtocol.set(ExtHostContext.ExtHostDocumentsAndEditors, new ExtHostDocumentsAndEditors(rpcProtocol));
 	const extHostDocuments = rpcProtocol.set(ExtHostContext.ExtHostDocuments, new ExtHostDocuments(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostDocumentContentProviders = rpcProtocol.set(ExtHostContext.ExtHostDocumentContentProviders, new ExtHostDocumentContentProvider(rpcProtocol, extHostDocumentsAndEditors, extHostLogService));
@@ -106,15 +108,16 @@ export function createApiFactory(
 	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostHeapService, extHostLogService));
 	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands));
 	rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
-	const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace));
+	const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace, extensionService, extHostDocumentsAndEditors, extHostConfiguration));
 	rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);
 	const extHostDiagnostics = rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, new ExtHostDiagnostics(rpcProtocol));
-	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics));
+	const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics));
 	const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures));
 	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService());
 	const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, new ExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
-	const extHostTerminalService = rpcProtocol.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(rpcProtocol));
+	const extHostTerminalService = rpcProtocol.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(rpcProtocol, extHostConfiguration, extHostLogService));
 	const extHostSCM = rpcProtocol.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(rpcProtocol, extHostCommands, extHostLogService));
+	const extHostSearch = rpcProtocol.set(ExtHostContext.ExtHostSearch, new ExtHostSearch(rpcProtocol));
 	const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace));
 	const extHostWindow = rpcProtocol.set(ExtHostContext.ExtHostWindow, new ExtHostWindow(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
@@ -136,27 +139,30 @@ export function createApiFactory(
 
 	return function (extension: IExtensionDescription): typeof vscode {
 
-		if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
-			&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
-		) {
-			// fast lane -> proposed api is available to all extensions
-			// that are listed in product.json-files
-			extension.enableProposedApi = true;
-
-		} else if (extension.enableProposedApi && !extension.isBuiltin) {
-			if (
-				!initData.environment.enableProposedApiForAll &&
-				initData.environment.enableProposedApiFor.indexOf(extension.id) < 0
-			) {
-				extension.enableProposedApi = false;
-				console.error(`Extension '${extension.id} cannot use PROPOSED API (must started out of dev or enabled via --enable-proposed-api)`);
-
-			} else {
-				// proposed api is available when developing or when an extension was explicitly
-				// spelled out via a command line argument
-				console.warn(`Extension '${extension.id}' uses PROPOSED API which is subject to change and removal without notice.`);
+		// Check document selectors for being overly generic. Technically this isn't a problem but
+		// in practice many extensions say they support `fooLang` but need fs-access to do so. Those
+		// extension should specify then the `file`-scheme, e.g `{ scheme: 'fooLang', language: 'fooLang' }`
+		// We only inform once, it is not a warning because we just want to raise awareness and because
+		// we cannot say if the extension is doing it right or wrong...
+		let checkSelector = (function () {
+			let done = initData.environment.extensionDevelopmentPath !== extension.extensionFolderPath;
+			function inform(selector: vscode.DocumentSelector) {
+				console.info(`Extension '${extension.id}' uses a document selector without scheme. Learn more about this: https://go.microsoft.com/fwlink/?linkid=872305`);
+				done = true;
 			}
-		}
+			return function perform(selector: vscode.DocumentSelector): vscode.DocumentSelector {
+				if (!done) {
+					if (Array.isArray(selector)) {
+						selector.forEach(perform);
+					} else if (typeof selector === 'string') {
+						inform(selector);
+					} else if (typeof selector.scheme === 'undefined') {
+						inform(selector);
+					}
+				}
+				return selector;
+			};
+		})();
 
 		// namespace: commands
 		const commands: typeof vscode.commands = {
@@ -237,72 +243,72 @@ export function createApiFactory(
 				checkProposedApiEnabled(extension);
 				return extHostDiagnostics.onDidChangeDiagnostics;
 			},
-			getDiagnostics: <any>proposedApiFunction(extension, (resource?) => {
-				return extHostDiagnostics.getDiagnostics(resource);
-			}),
+			getDiagnostics: (resource?) => {
+				return <any>extHostDiagnostics.getDiagnostics(resource);
+			},
 			getLanguages(): TPromise<string[]> {
 				return extHostLanguages.getLanguages();
 			},
 			match(selector: vscode.DocumentSelector, document: vscode.TextDocument): number {
 				return score(toLanguageSelector(selector), document.uri, document.languageId, true);
 			},
-			registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerCodeActionProvider(selector, provider);
+			registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
+				return extHostLanguageFeatures.registerCodeActionProvider(checkSelector(selector), provider, metadata);
 			},
 			registerCodeLensProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerCodeLensProvider(selector, provider);
+				return extHostLanguageFeatures.registerCodeLensProvider(checkSelector(selector), provider);
 			},
 			registerDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.DefinitionProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDefinitionProvider(selector, provider);
+				return extHostLanguageFeatures.registerDefinitionProvider(checkSelector(selector), provider);
 			},
 			registerImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.ImplementationProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerImplementationProvider(selector, provider);
+				return extHostLanguageFeatures.registerImplementationProvider(checkSelector(selector), provider);
 			},
 			registerTypeDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.TypeDefinitionProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerTypeDefinitionProvider(selector, provider);
+				return extHostLanguageFeatures.registerTypeDefinitionProvider(checkSelector(selector), provider);
 			},
 			registerHoverProvider(selector: vscode.DocumentSelector, provider: vscode.HoverProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerHoverProvider(selector, provider, extension.id);
+				return extHostLanguageFeatures.registerHoverProvider(checkSelector(selector), provider, extension.id);
 			},
 			registerDocumentHighlightProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentHighlightProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentHighlightProvider(selector, provider);
+				return extHostLanguageFeatures.registerDocumentHighlightProvider(checkSelector(selector), provider);
 			},
 			registerReferenceProvider(selector: vscode.DocumentSelector, provider: vscode.ReferenceProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerReferenceProvider(selector, provider);
+				return extHostLanguageFeatures.registerReferenceProvider(checkSelector(selector), provider);
 			},
 			registerRenameProvider(selector: vscode.DocumentSelector, provider: vscode.RenameProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerRenameProvider(selector, provider, extension.enableProposedApi);
+				return extHostLanguageFeatures.registerRenameProvider(checkSelector(selector), provider, extension.enableProposedApi);
 			},
 			registerDocumentSymbolProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentSymbolProvider(selector, provider);
+				return extHostLanguageFeatures.registerDocumentSymbolProvider(checkSelector(selector), provider);
 			},
 			registerWorkspaceSymbolProvider(provider: vscode.WorkspaceSymbolProvider): vscode.Disposable {
 				return extHostLanguageFeatures.registerWorkspaceSymbolProvider(provider);
 			},
 			registerDocumentFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentFormattingEditProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentFormattingEditProvider(selector, provider);
+				return extHostLanguageFeatures.registerDocumentFormattingEditProvider(checkSelector(selector), provider);
 			},
 			registerDocumentRangeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentRangeFormattingEditProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentRangeFormattingEditProvider(selector, provider);
+				return extHostLanguageFeatures.registerDocumentRangeFormattingEditProvider(checkSelector(selector), provider);
 			},
 			registerOnTypeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacters: string[]): vscode.Disposable {
-				return extHostLanguageFeatures.registerOnTypeFormattingEditProvider(selector, provider, [firstTriggerCharacter].concat(moreTriggerCharacters));
+				return extHostLanguageFeatures.registerOnTypeFormattingEditProvider(checkSelector(selector), provider, [firstTriggerCharacter].concat(moreTriggerCharacters));
 			},
 			registerSignatureHelpProvider(selector: vscode.DocumentSelector, provider: vscode.SignatureHelpProvider, ...triggerCharacters: string[]): vscode.Disposable {
-				return extHostLanguageFeatures.registerSignatureHelpProvider(selector, provider, triggerCharacters);
+				return extHostLanguageFeatures.registerSignatureHelpProvider(checkSelector(selector), provider, triggerCharacters);
 			},
 			registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable {
-				return extHostLanguageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters);
+				return extHostLanguageFeatures.registerCompletionItemProvider(checkSelector(selector), provider, triggerCharacters);
 			},
 			registerDocumentLinkProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerDocumentLinkProvider(selector, provider);
+				return extHostLanguageFeatures.registerDocumentLinkProvider(checkSelector(selector), provider);
 			},
 			registerColorProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentColorProvider): vscode.Disposable {
-				return extHostLanguageFeatures.registerColorProvider(selector, provider);
+				return extHostLanguageFeatures.registerColorProvider(checkSelector(selector), provider);
+			},
+			registerFoldingRangeProvider(selector: vscode.DocumentSelector, provider: vscode.FoldingRangeProvider): vscode.Disposable {
+				return extHostLanguageFeatures.registerFoldingRangeProvider(checkSelector(selector), provider);
 			},
-			registerFoldingProvider: proposedApiFunction(extension, (selector: vscode.DocumentSelector, provider: vscode.FoldingProvider): vscode.Disposable => {
-				return extHostLanguageFeatures.registerFoldingProvider(selector, provider);
-			}),
 			setLanguageConfiguration: (language: string, configuration: vscode.LanguageConfiguration): vscode.Disposable => {
 				return extHostLanguageFeatures.setLanguageConfiguration(language, configuration);
 			}
@@ -316,6 +322,9 @@ export function createApiFactory(
 			get visibleTextEditors() {
 				return extHostEditors.getVisibleTextEditors();
 			},
+			get terminals() {
+				return proposedApiFunction(extension, extHostTerminalService.terminals);
+			},
 			showTextDocument(documentOrUri: vscode.TextDocument | vscode.Uri, columnOrOptions?: vscode.ViewColumn | vscode.TextDocumentShowOptions, preserveFocus?: boolean): TPromise<vscode.TextEditor> {
 				let documentPromise: TPromise<vscode.TextDocument>;
 				if (URI.isUri(documentOrUri)) {
@@ -342,15 +351,18 @@ export function createApiFactory(
 			onDidChangeTextEditorOptions(listener: (e: vscode.TextEditorOptionsChangeEvent) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) {
 				return extHostEditors.onDidChangeTextEditorOptions(listener, thisArgs, disposables);
 			},
-			onDidChangeTextEditorVisibleRanges: proposedApiFunction(extension, (listener: (e: vscode.TextEditorVisibleRangesChangeEvent) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => {
+			onDidChangeTextEditorVisibleRanges(listener: (e: vscode.TextEditorVisibleRangesChangeEvent) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) {
 				return extHostEditors.onDidChangeTextEditorVisibleRanges(listener, thisArgs, disposables);
-			}),
+			},
 			onDidChangeTextEditorViewColumn(listener, thisArg?, disposables?) {
 				return extHostEditors.onDidChangeTextEditorViewColumn(listener, thisArg, disposables);
 			},
 			onDidCloseTerminal(listener, thisArg?, disposables?) {
 				return extHostTerminalService.onDidCloseTerminal(listener, thisArg, disposables);
 			},
+			onDidOpenTerminal: proposedApiFunction(extension, (listener, thisArg?, disposables?) => {
+				return extHostTerminalService.onDidOpenTerminal(listener, thisArg, disposables);
+			}),
 			get state() {
 				return extHostWindow.state;
 			},
@@ -366,7 +378,7 @@ export function createApiFactory(
 			showErrorMessage(message, first, ...rest) {
 				return extHostMessageService.showMessage(extension, Severity.Error, message, first, rest);
 			},
-			showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken) {
+			showQuickPick(items: any, options: vscode.QuickPickOptions, token?: vscode.CancellationToken): any {
 				return extHostQuickOpen.showQuickPick(items, options, token);
 			},
 			showWorkspaceFolderPick(options: vscode.WorkspaceFolderPickOptions) {
@@ -397,6 +409,9 @@ export function createApiFactory(
 			createOutputChannel(name: string): vscode.OutputChannel {
 				return extHostOutputService.createOutputChannel(name);
 			},
+			createWebviewPanel(viewType: string, title: string, column: vscode.ViewColumn, options: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
+				return extHostWebviews.createWebview(viewType, title, column, options, extension.extensionFolderPath);
+			},
 			createTerminal(nameOrOptions: vscode.TerminalOptions | string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
 				if (typeof nameOrOptions === 'object') {
 					return extHostTerminalService.createTerminalFromOptions(<vscode.TerminalOptions>nameOrOptions);
@@ -416,8 +431,11 @@ export function createApiFactory(
 			registerDecorationProvider: proposedApiFunction(extension, (provider: vscode.DecorationProvider) => {
 				return extHostDecorations.registerDecorationProvider(provider, extension.id);
 			}),
-			createWebview: proposedApiFunction(extension, (viewType: string, title: string, column: vscode.ViewColumn, options: vscode.WebviewOptions) => {
-				return extHostWebviews.createWebview(viewType, title, column, options, extension.extensionFolderPath);
+			registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
+				return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
+			}),
+			registerExternalUriHandler: proposedApiFunction(extension, (handler: vscode.ExternalUriHandler) => {
+				return extHostUrls.registerExternalUriHandler(extension.id, handler);
 			})
 		};
 
@@ -517,26 +535,32 @@ export function createApiFactory(
 			registerTaskProvider: (type: string, provider: vscode.TaskProvider) => {
 				return extHostTask.registerTaskProvider(extension, provider);
 			},
-			fetchTasks: proposedApiFunction(extension, (): Thenable<vscode.Task[]> => {
-				return extHostTask.executeTaskProvider();
+			fetchTasks: proposedApiFunction(extension, (filter?: vscode.TaskFilter): Thenable<vscode.Task[]> => {
+				return extHostTask.fetchTasks(filter);
 			}),
 			executeTask: proposedApiFunction(extension, (task: vscode.Task): Thenable<vscode.TaskExecution> => {
 				return extHostTask.executeTask(extension, task);
 			}),
+			get taskExecutions(): vscode.TaskExecution[] {
+				return extHostTask.taskExecutions;
+			},
 			onDidStartTask: (listeners, thisArgs?, disposables?) => {
 				return extHostTask.onDidStartTask(listeners, thisArgs, disposables);
 			},
-			terminateTask: proposedApiFunction(extension, (task: vscode.TaskExecution): void => {
-				extHostTask.terminateTask(task);
-			}),
 			onDidEndTask: (listeners, thisArgs?, disposables?) => {
 				return extHostTask.onDidEndTask(listeners, thisArgs, disposables);
 			},
-			registerFileSystemProvider: proposedApiFunction(extension, (scheme, provider) => {
-				return extHostFileSystem.registerFileSystemProvider(scheme, provider);
+			registerFileSystemProvider: proposedApiFunction(extension, (scheme, provider, newProvider?) => {
+				return extHostFileSystem.registerFileSystemProvider(scheme, provider, newProvider);
+			}),
+			registerFileSystemProvider2: proposedApiFunction(extension, (scheme, provider, options) => {
+				return extHostFileSystem.registerFileSystemProvider2(scheme, provider, options);
+			}),
+			registerDeprecatedFileSystemProvider: proposedApiFunction(extension, (scheme, provider) => {
+				return extHostFileSystem.registerDeprecatedFileSystemProvider(scheme, provider);
 			}),
 			registerSearchProvider: proposedApiFunction(extension, (scheme, provider) => {
-				return extHostFileSystem.registerSearchProvider(scheme, provider);
+				return extHostSearch.registerSearchProvider(scheme, provider);
 			})
 		};
 
@@ -673,9 +697,12 @@ export function createApiFactory(
 
 			FileChangeType: extHostTypes.FileChangeType,
 			FileType: extHostTypes.FileType,
-			FoldingRangeList: extHostTypes.FoldingRangeList,
+			DeprecatedFileChangeType: extHostTypes.FileChangeType,
+			DeprecatedFileType: extHostTypes.FileType,
+			FileChangeType2: extHostTypes.FileChangeType2,
+			FileSystemError: extHostTypes.FileSystemError,
 			FoldingRange: extHostTypes.FoldingRange,
-			FoldingRangeType: extHostTypes.FoldingRangeType
+			FoldingRangeKind: extHostTypes.FoldingRangeKind
 		};
 	};
 }
@@ -704,7 +731,7 @@ class Extension<T> implements vscode.Extension<T> {
 	}
 
 	activate(): Thenable<T> {
-		return this._extensionService.activateById(this.id, new ExtensionActivatedByAPI(false)).then(() => this.exports);
+		return this._extensionService.activateByIdWithErrors(this.id, new ExtensionActivatedByAPI(false)).then(() => this.exports);
 	}
 }
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 6e33c3e8955..a31a36c4c7c 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -24,7 +24,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import * as modes from 'vs/editor/common/modes';
 
 import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
-import { IConfig, IAdapterExecutable } from 'vs/workbench/parts/debug/common/debug';
+import { IConfig, IAdapterExecutable, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
 
 import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -42,18 +42,16 @@ import { ITreeItem } from 'vs/workbench/common/views';
 import { ThemeColor } from 'vs/platform/theme/common/themeService';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { SerializedError } from 'vs/base/common/errors';
-import { IStat, FileChangeType } from 'vs/platform/files/common/files';
+import { IStat, FileChangeType, IWatchOptions, FileSystemProviderCapabilities, FileOptions } from 'vs/platform/files/common/files';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import { ILineMatch, IPatternInfo } from 'vs/platform/search/common/search';
 import { LogLevel } from 'vs/platform/log/common/log';
-import { TaskExecutionDTO, TaskDTO, TaskHandleDTO } from 'vs/workbench/api/shared/tasks';
+import { TaskExecutionDTO, TaskDTO, TaskHandleDTO, TaskFilterDTO } from 'vs/workbench/api/shared/tasks';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
-	enableProposedApiForAll: boolean;
-	enableProposedApiFor: string | string[];
 	appRoot: string;
 	appSettingsHome: string;
 	disableExtensions: boolean;
@@ -273,7 +271,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$registerHoverProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerDocumentHighlightProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerReferenceSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
-	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
+	$registerQuickFixSupport(handle: number, selector: ISerializedDocumentFilter[], supportedKinds?: string[]): void;
 	$registerDocumentFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerRangeFormattingSupport(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerOnTypeFormattingSupport(handle: number, selector: ISerializedDocumentFilter[], autoFormatTriggerCharacters: string[]): void;
@@ -283,7 +281,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$registerSignatureHelpProvider(handle: number, selector: ISerializedDocumentFilter[], triggerCharacter: string[]): void;
 	$registerDocumentLinkProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$registerDocumentColorProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
-	$registerFoldingProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
+	$registerFoldingRangeProvider(handle: number, selector: ISerializedDocumentFilter[]): void;
 	$setLanguageConfiguration(handle: number, languageId: string, configuration: ISerializedLanguageConfiguration): void;
 }
 
@@ -321,13 +319,18 @@ export interface MainThreadTerminalServiceShape extends IDisposable {
 	$hide(terminalId: number): void;
 	$sendText(terminalId: number, text: string, addNewLine: boolean): void;
 	$show(terminalId: number, preserveFocus: boolean): void;
+
+	$sendProcessTitle(terminalId: number, title: string): void;
+	$sendProcessData(terminalId: number, data: string): void;
+	$sendProcessPid(terminalId: number, pid: number): void;
+	$sendProcessExit(terminalId: number, exitCode: number): void;
 }
 
 export interface MyQuickPickItems extends IPickOpenEntry {
 	handle: number;
 }
 export interface MainThreadQuickOpenShape extends IDisposable {
-	$show(options: IPickOptions): TPromise<number>;
+	$show(options: IPickOptions): TPromise<number | number[]>;
 	$setItems(items: MyQuickPickItems[]): TPromise<any>;
 	$setError(error: Error): TPromise<any>;
 	$input(options: vscode.InputBoxOptions, validateInput: boolean): TPromise<string>;
@@ -347,21 +350,35 @@ export interface MainThreadTelemetryShape extends IDisposable {
 	$publicLog(eventName: string, data?: any): void;
 }
 
-export type WebviewHandle = number;
+export type WebviewPanelHandle = string;
 
 export interface MainThreadWebviewsShape extends IDisposable {
-	$createWebview(handle: WebviewHandle, viewType: string, title: string, column: EditorPosition, options: vscode.WebviewOptions, extensionFolderPath: string): void;
-	$disposeWebview(handle: WebviewHandle): void;
-	$reveal(handle: WebviewHandle, column: EditorPosition): void;
-	$setTitle(handle: WebviewHandle, value: string): void;
-	$setHtml(handle: WebviewHandle, value: string): void;
-	$sendMessage(handle: WebviewHandle, value: any): Thenable<boolean>;
+	$createWebviewPanel(handle: WebviewPanelHandle, viewType: string, title: string, column: EditorPosition, options: vscode.WebviewPanelOptions & vscode.WebviewOptions, extensionFolderPath: string): void;
+	$disposeWebview(handle: WebviewPanelHandle): void;
+	$reveal(handle: WebviewPanelHandle, column: EditorPosition | undefined): void;
+	$setTitle(handle: WebviewPanelHandle, value: string): void;
+	$setHtml(handle: WebviewPanelHandle, value: string): void;
+	$postMessage(handle: WebviewPanelHandle, value: any): Thenable<boolean>;
+
+	$registerSerializer(viewType: string): void;
+	$unregisterSerializer(viewType: string): void;
 }
+
 export interface ExtHostWebviewsShape {
-	$onMessage(handle: WebviewHandle, message: any): void;
-	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
-	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
-	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
+	$onMessage(handle: WebviewPanelHandle, message: any): void;
+	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, active: boolean, position: EditorPosition): void;
+	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Thenable<void>;
+	$deserializeWebviewPanel(newWebviewHandle: WebviewPanelHandle, viewType: string, title: string, state: any, position: EditorPosition, options: vscode.WebviewOptions): Thenable<void>;
+	$serializeWebviewPanel(webviewHandle: WebviewPanelHandle): Thenable<any>;
+}
+
+export interface MainThreadUrlsShape extends IDisposable {
+	$registerExternalUriHandler(handle: number, extensionId: string): TPromise<void>;
+	$unregisterExternalUriHandler(handle: number): TPromise<void>;
+}
+
+export interface ExtHostUrlsShape {
+	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void>;
 }
 
 export interface MainThreadWorkspaceShape extends IDisposable {
@@ -377,21 +394,22 @@ export interface IFileChangeDto {
 }
 
 export interface MainThreadFileSystemShape extends IDisposable {
-	$registerFileSystemProvider(handle: number, scheme: string): void;
+	$registerFileSystemProvider(handle: number, scheme: string, capabilities: FileSystemProviderCapabilities): void;
+	$unregisterProvider(handle: number): void;
+	$onFileSystemChange(handle: number, resource: IFileChangeDto[]): void;
+}
+
+export interface MainThreadSearchShape extends IDisposable {
 	$registerSearchProvider(handle: number, scheme: string): void;
 	$unregisterProvider(handle: number): void;
-
-	$onFileSystemChange(handle: number, resource: IFileChangeDto[]): void;
-	$reportFileChunk(handle: number, session: number, chunk: number[] | null): void;
-
 	$handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void;
 }
 
 export interface MainThreadTaskShape extends IDisposable {
 	$registerTaskProvider(handle: number): TPromise<void>;
-	$executeTaskProvider(): TPromise<TaskDTO[]>;
+	$fetchTasks(filter?: TaskFilterDTO): TPromise<TaskDTO[]>;
 	$executeTask(task: TaskHandleDTO | TaskDTO): TPromise<TaskExecutionDTO>;
-	$terminateTask(task: TaskExecutionDTO): TPromise<void>;
+	$terminateTask(id: string): TPromise<void>;
 	$unregisterTaskProvider(handle: number): TPromise<void>;
 }
 
@@ -459,6 +477,10 @@ export interface MainThreadSCMShape extends IDisposable {
 export type DebugSessionUUID = string;
 
 export interface MainThreadDebugServiceShape extends IDisposable {
+	$registerDebugTypes(debugTypes: string[]);
+	$acceptDAMessage(handle: number, message: DebugProtocol.ProtocolMessage);
+	$acceptDAError(handle: number, name: string, message: string, stack: string);
+	$acceptDAExit(handle: number, code: number, signal: string);
 	$registerDebugConfigurationProvider(type: string, hasProvideMethod: boolean, hasResolveMethod: boolean, hasDebugAdapterExecutable: boolean, handle: number): TPromise<any>;
 	$unregisterDebugConfigurationProvider(handle: number): TPromise<any>;
 	$startDebugging(folder: UriComponents | undefined, nameOrConfig: string | vscode.DebugConfiguration): TPromise<boolean>;
@@ -558,15 +580,19 @@ export interface ExtHostWorkspaceShape {
 }
 
 export interface ExtHostFileSystemShape {
-	$utimes(handle: number, resource: UriComponents, mtime: number, atime: number): TPromise<IStat>;
 	$stat(handle: number, resource: UriComponents): TPromise<IStat>;
-	$read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise<number>;
-	$write(handle: number, resource: UriComponents, content: number[]): TPromise<void>;
-	$unlink(handle: number, resource: UriComponents): TPromise<void>;
-	$move(handle: number, resource: UriComponents, target: UriComponents): TPromise<IStat>;
+	$readFile(handle: number, resource: UriComponents, opts: FileOptions): TPromise<string>;
+	$writeFile(handle: number, resource: UriComponents, base64Encoded: string, opts: FileOptions): TPromise<void>;
+	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOptions): TPromise<IStat>;
+	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOptions): TPromise<IStat>;
 	$mkdir(handle: number, resource: UriComponents): TPromise<IStat>;
-	$readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][]>;
-	$rmdir(handle: number, resource: UriComponents): TPromise<void>;
+	$readdir(handle: number, resource: UriComponents): TPromise<[string, IStat][]>;
+	$delete(handle: number, resource: UriComponents): TPromise<void>;
+	$watch(handle: number, session: number, resource: UriComponents, opts: IWatchOptions): void;
+	$unwatch(handle: number, session: number): void;
+}
+
+export interface ExtHostSearchShape {
 	$provideFileSearchResults(handle: number, session: number, query: string): TPromise<void>;
 	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, options: { includes: string[], excludes: string[] }): TPromise<void>;
 }
@@ -700,7 +726,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$resolveWorkspaceSymbol(handle: number, symbol: SymbolInformationDto): TPromise<SymbolInformationDto>;
 	$releaseWorkspaceSymbols(handle: number, id: number): void;
 	$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string): TPromise<WorkspaceEditDto>;
-	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.RenameContext>;
+	$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition): TPromise<modes.RenameLocation>;
 	$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext): TPromise<SuggestResultDto>;
 	$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion): TPromise<modes.ISuggestion>;
 	$releaseCompletionItems(handle: number, id: number): void;
@@ -709,7 +735,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$resolveDocumentLink(handle: number, link: modes.ILink): TPromise<modes.ILink>;
 	$provideDocumentColors(handle: number, resource: UriComponents): TPromise<IRawColorInfo[]>;
 	$provideColorPresentations(handle: number, resource: UriComponents, colorInfo: IRawColorInfo): TPromise<modes.IColorPresentation[]>;
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext): TPromise<modes.IFoldingRangeList>;
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: modes.FoldingContext): TPromise<modes.FoldingRange[]>;
 }
 
 export interface ExtHostQuickOpenShape {
@@ -717,9 +743,22 @@ export interface ExtHostQuickOpenShape {
 	$validateInput(input: string): TPromise<string>;
 }
 
+export interface ShellLaunchConfigDto {
+	name?: string;
+	executable?: string;
+	args?: string[] | string;
+	cwd?: string;
+	env?: { [key: string]: string };
+}
+
 export interface ExtHostTerminalServiceShape {
 	$acceptTerminalClosed(id: number): void;
+	$acceptTerminalOpened(id: number, name: string): void;
 	$acceptTerminalProcessId(id: number, processId: number): void;
+	$createProcess(id: number, shellLaunchConfig: ShellLaunchConfigDto, cols: number, rows: number): void;
+	$acceptProcessInput(id: number, data: string): void;
+	$acceptProcessResize(id: number, cols: number, rows: number): void;
+	$acceptProcessShutdown(id: number): void;
 }
 
 export interface ExtHostSCMShape {
@@ -777,6 +816,11 @@ export interface ISourceMultiBreakpointDto {
 }
 
 export interface ExtHostDebugServiceShape {
+	$substituteVariables(folder: UriComponents | undefined, config: IConfig): TPromise<IConfig>;
+	$runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void>;
+	$startDASession(handle: number, debugType: string, adapterExecutableInfo: IAdapterExecutable | null): TPromise<void>;
+	$stopDASession(handle: number): TPromise<void>;
+	$sendDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): TPromise<void>;
 	$resolveDebugConfiguration(handle: number, folder: UriComponents | undefined, debugConfiguration: IConfig): TPromise<IConfig>;
 	$provideDebugConfigurations(handle: number, folder: UriComponents | undefined): TPromise<IConfig[]>;
 	$debugAdapterExecutable(handle: number, folder: UriComponents | undefined): TPromise<IAdapterExecutable>;
@@ -838,10 +882,12 @@ export const MainContext = {
 	MainThreadTelemetry: createMainId<MainThreadTelemetryShape>('MainThreadTelemetry'),
 	MainThreadTerminalService: createMainId<MainThreadTerminalServiceShape>('MainThreadTerminalService'),
 	MainThreadWebviews: createMainId<MainThreadWebviewsShape>('MainThreadWebviews'),
+	MainThreadUrls: createMainId<MainThreadUrlsShape>('MainThreadUrls'),
 	MainThreadWorkspace: createMainId<MainThreadWorkspaceShape>('MainThreadWorkspace'),
 	MainThreadFileSystem: createMainId<MainThreadFileSystemShape>('MainThreadFileSystem'),
 	MainThreadExtensionService: createMainId<MainThreadExtensionServiceShape>('MainThreadExtensionService'),
 	MainThreadSCM: createMainId<MainThreadSCMShape>('MainThreadSCM'),
+	MainThreadSearch: createMainId<MainThreadSearchShape>('MainThreadSearch'),
 	MainThreadTask: createMainId<MainThreadTaskShape>('MainThreadTask'),
 	MainThreadWindow: createMainId<MainThreadWindowShape>('MainThreadWindow'),
 };
@@ -867,9 +913,11 @@ export const ExtHostContext = {
 	ExtHostLogService: createExtId<ExtHostLogServiceShape>('ExtHostLogService'),
 	ExtHostTerminalService: createExtId<ExtHostTerminalServiceShape>('ExtHostTerminalService'),
 	ExtHostSCM: createExtId<ExtHostSCMShape>('ExtHostSCM'),
+	ExtHostSearch: createExtId<ExtHostSearchShape>('ExtHostSearch'),
 	ExtHostTask: createExtId<ExtHostTaskShape>('ExtHostTask'),
 	ExtHostWorkspace: createExtId<ExtHostWorkspaceShape>('ExtHostWorkspace'),
 	ExtHostWindow: createExtId<ExtHostWindowShape>('ExtHostWindow'),
 	ExtHostWebviews: createExtId<ExtHostWebviewsShape>('ExtHostWebviews'),
+	ExtHostUrls: createExtId<ExtHostUrlsShape>('ExtHostUrls'),
 	ExtHostProgress: createMainId<ExtHostProgressShape>('ExtHostProgress')
 };
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index 3122072f43c..4fdd04533c5 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -10,6 +10,8 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import * as vscode from 'vscode';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import * as types from 'vs/workbench/api/node/extHostTypes';
+import { IRawColorInfo } from 'vs/workbench/api/node/extHost.protocol';
+
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
@@ -119,7 +121,8 @@ export class ExtHostApiCommands {
 			args: [
 				{ name: 'uri', description: 'Uri of a text document', constraint: URI },
 				{ name: 'position', description: 'Position in a text document', constraint: types.Position },
-				{ name: 'triggerCharacter', description: '(optional) Trigger completion when the user types the character, like `,` or `(`', constraint: value => value === void 0 || typeof value === 'string' }
+				{ name: 'triggerCharacter', description: '(optional) Trigger completion when the user types the character, like `,` or `(`', constraint: value => value === void 0 || typeof value === 'string' },
+				{ name: 'itemResolveCount', description: '(optional) Number of completions to resolve (too large numbers slow down completions)', constraint: value => value === void 0 || typeof value === 'number' }
 			],
 			returns: 'A promise that resolves to a CompletionList-instance.'
 		});
@@ -134,7 +137,8 @@ export class ExtHostApiCommands {
 		this._register('vscode.executeCodeLensProvider', this._executeCodeLensProvider, {
 			description: 'Execute CodeLens provider.',
 			args: [
-				{ name: 'uri', description: 'Uri of a text document', constraint: URI }
+				{ name: 'uri', description: 'Uri of a text document', constraint: URI },
+				{ name: 'itemResolveCount', description: '(optional) Number of lenses that should be resolved and returned. Will only retrun resolved lenses, will impact performance)', constraint: value => value === void 0 || typeof value === 'number' }
 			],
 			returns: 'A promise that resolves to an array of CodeLens-instances.'
 		});
@@ -177,7 +181,21 @@ export class ExtHostApiCommands {
 			args: [],
 			returns: 'An array of task handles'
 		});
-
+		this._register('vscode.executeDocumentColorProvider', this._executeDocumentColorProvider, {
+			description: 'Execute document color provider.',
+			args: [
+				{ name: 'uri', description: 'Uri of a text document', constraint: URI },
+			],
+			returns: 'A promise that resolves to an array of ColorInformation objects.'
+		});
+		this._register('vscode.executeColorPresentationProvider', this._executeColorPresentationProvider, {
+			description: 'Execute color presentation provider.',
+			args: [
+				{ name: 'color', description: 'The color to show and insert', constraint: types.Color },
+				{ name: 'context', description: 'Context object with uri and range' }
+			],
+			returns: 'A promise that resolves to an array of ColorPresentation objects.'
+		});
 		this._register('vscode.previewHtml', (uri: URI, position?: vscode.ViewColumn, label?: string, options?: any) => {
 			return this._commands.executeCommand('_workbench.previewHtml',
 				uri,
@@ -186,9 +204,9 @@ export class ExtHostApiCommands {
 				options);
 		}, {
 				description: `
-					Render the html of the resource in an editor view.
+					Render the HTML of the resource in an editor view.
 
-					See [working with the html preview](https://code.visualstudio.com/docs/extensionAPI/vscode-api-commands#working-with-the-html-preview) for more information about the html preview's intergration with the editor and for best practices for extension authors.
+					See [working with the HTML preview](https://code.visualstudio.com/docs/extensionAPI/vscode-api-commands#working-with-the-html-preview) for more information about the HTML preview's integration with the editor and for best practices for extension authors.
 				`,
 				args: [
 					{ name: 'uri', description: 'Uri of the resource to preview.', constraint: value => value instanceof URI || typeof value === 'string' },
@@ -376,11 +394,12 @@ export class ExtHostApiCommands {
 		});
 	}
 
-	private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string): Thenable<types.CompletionList> {
+	private _executeCompletionItemProvider(resource: URI, position: types.Position, triggerCharacter: string, maxItemsToResolve: number): Thenable<types.CompletionList> {
 		const args = {
 			resource,
 			position: position && typeConverters.fromPosition(position),
-			triggerCharacter
+			triggerCharacter,
+			maxItemsToResolve
 		};
 		return this._commands.executeCommand<modes.ISuggestResult>('_executeCompletionItemProvider', args).then(result => {
 			if (result) {
@@ -391,6 +410,32 @@ export class ExtHostApiCommands {
 		});
 	}
 
+	private _executeDocumentColorProvider(resource: URI): Thenable<types.ColorInformation[]> {
+		const args = {
+			resource
+		};
+		return this._commands.executeCommand<IRawColorInfo[]>('_executeDocumentColorProvider', args).then(result => {
+			if (result) {
+				return result.map(ci => ({ range: typeConverters.toRange(ci.range), color: typeConverters.Color.to(ci.color) }));
+			}
+			return [];
+		});
+	}
+
+	private _executeColorPresentationProvider(color: types.Color, context: { uri: URI, range: types.Range }): Thenable<types.ColorPresentation[]> {
+		const args = {
+			resource: context.uri,
+			color: typeConverters.Color.from(color),
+			range: typeConverters.fromRange(context.range),
+		};
+		return this._commands.executeCommand<modes.IColorPresentation[]>('_executeColorPresentationProvider', args).then(result => {
+			if (result) {
+				return result.map(typeConverters.ColorPresentation.to);
+			}
+			return [];
+		});
+	}
+
 	private _executeDocumentSymbolProvider(resource: URI): Thenable<types.SymbolInformation[]> {
 		const args = {
 			resource
@@ -428,8 +473,8 @@ export class ExtHostApiCommands {
 			}));
 	}
 
-	private _executeCodeLensProvider(resource: URI): Thenable<vscode.CodeLens[]> {
-		const args = { resource };
+	private _executeCodeLensProvider(resource: URI, itemResolveCount: number): Thenable<vscode.CodeLens[]> {
+		const args = { resource, itemResolveCount };
 		return this._commands.executeCommand<modes.ICodeLensSymbol[]>('_executeCodeLensProvider', args)
 			.then(tryMapWith(item => {
 				return new types.CodeLens(
@@ -475,7 +520,7 @@ export class ExtHostApiCommands {
 	}
 
 	private _executeTaskProvider(): Thenable<vscode.Task[]> {
-		return this._tasks.executeTaskProvider();
+		return this._tasks.fetchTasks();
 	}
 }
 
@@ -486,4 +531,4 @@ function tryMapWith<T, R>(f: (x: T) => R) {
 		}
 		return undefined;
 	};
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts
index 93b2d217d8e..aa831b81768 100644
--- a/src/vs/workbench/api/node/extHostConfiguration.ts
+++ b/src/vs/workbench/api/node/extHostConfiguration.ts
@@ -14,7 +14,7 @@ import { ConfigurationTarget as ExtHostConfigurationTarget } from './extHostType
 import { IConfigurationData, ConfigurationTarget, IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 import { Configuration, ConfigurationChangeEvent, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { WorkspaceConfigurationChangeEvent } from 'vs/workbench/services/configuration/common/configurationModels';
-import { StrictResourceMap } from 'vs/base/common/map';
+import { ResourceMap } from 'vs/base/common/map';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { isObject } from 'vs/base/common/types';
 
@@ -107,12 +107,16 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 						return isObject(target) ?
 							new Proxy(target, {
 								get: (target: any, property: string) => {
+									if (typeof property === 'string' && property.toLowerCase() === 'tojson') {
+										cloneTarget();
+										return () => clonedTarget;
+									}
 									if (clonedConfig) {
 										clonedTarget = clonedTarget ? clonedTarget : lookUp(clonedConfig, accessor);
 										return clonedTarget[property];
 									}
 									const result = target[property];
-									if (typeof property === 'string' && property.toLowerCase() !== 'tojson') {
+									if (typeof property === 'string') {
 										return cloneOnWriteProxy(result, `${accessor}.${property}`);
 									}
 									return result;
@@ -205,7 +209,7 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 
 	private _toConfigurationChangeEvent(data: IWorkspaceConfigurationChangeEventData): vscode.ConfigurationChangeEvent {
 		const changedConfiguration = new ConfigurationModel(data.changedConfiguration.contents, data.changedConfiguration.keys, data.changedConfiguration.overrides);
-		const changedConfigurationByResource: StrictResourceMap<ConfigurationModel> = new StrictResourceMap<ConfigurationModel>();
+		const changedConfigurationByResource: ResourceMap<ConfigurationModel> = new ResourceMap<ConfigurationModel>();
 		for (const key of Object.keys(data.changedConfigurationByResource)) {
 			const resource = URI.parse(key);
 			const model = data.changedConfigurationByResource[key];
@@ -221,11 +225,11 @@ export class ExtHostConfiguration implements ExtHostConfigurationShape {
 		const defaultConfiguration = ExtHostConfiguration.parseConfigurationModel(data.defaults);
 		const userConfiguration = ExtHostConfiguration.parseConfigurationModel(data.user);
 		const workspaceConfiguration = ExtHostConfiguration.parseConfigurationModel(data.workspace);
-		const folders: StrictResourceMap<ConfigurationModel> = Object.keys(data.folders).reduce((result, key) => {
+		const folders: ResourceMap<ConfigurationModel> = Object.keys(data.folders).reduce((result, key) => {
 			result.set(URI.parse(key), ExtHostConfiguration.parseConfigurationModel(data.folders[key]));
 			return result;
-		}, new StrictResourceMap<ConfigurationModel>());
-		return new Configuration(defaultConfiguration, userConfiguration, workspaceConfiguration, folders, new ConfigurationModel(), new StrictResourceMap<ConfigurationModel>(), false);
+		}, new ResourceMap<ConfigurationModel>());
+		return new Configuration(defaultConfiguration, userConfiguration, workspaceConfiguration, folders, new ConfigurationModel(), new ResourceMap<ConfigurationModel>(), false);
 	}
 
 	private static parseConfigurationModel(model: IConfigurationModel): ConfigurationModel {
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index 39e58cacd5f..b969522ba5e 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -4,6 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import * as paths from 'vs/base/common/paths';
+import { Schemas } from 'vs/base/common/network';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
 import { asWinJsPromise } from 'vs/base/common/async';
@@ -11,18 +14,24 @@ import {
 	MainContext, MainThreadDebugServiceShape, ExtHostDebugServiceShape, DebugSessionUUID,
 	IMainContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, IFunctionBreakpointDto
 } from 'vs/workbench/api/node/extHost.protocol';
-import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
-
 import * as vscode from 'vscode';
-import URI, { UriComponents } from 'vs/base/common/uri';
 import { Disposable, Position, Location, SourceBreakpoint, FunctionBreakpoint } from 'vs/workbench/api/node/extHostTypes';
 import { generateUuid } from 'vs/base/common/uuid';
+import { DebugAdapter, convertToVSCPaths, convertToDAPaths } from 'vs/workbench/parts/debug/node/debugAdapter';
+import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
+import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
+import { IAdapterExecutable, ITerminalSettings, IDebuggerContribution, IConfig } from 'vs/workbench/parts/debug/common/debug';
+import { getTerminalLauncher } from 'vs/workbench/parts/debug/node/terminals';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { VariableResolver } from 'vs/workbench/services/configurationResolver/node/variableResolver';
+import { IConfigurationResolverService } from '../../services/configurationResolver/common/configurationResolver';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { ExtHostConfiguration } from './extHostConfiguration';
 
 
 export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
-	private _workspace: ExtHostWorkspace;
-
 	private _handleCounter: number;
 	private _handlers: Map<number, vscode.DebugConfigurationProvider>;
 
@@ -52,10 +61,17 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
 	private readonly _onDidChangeBreakpoints: Emitter<vscode.BreakpointsChangeEvent>;
 
+	private _debugAdapters: Map<number, DebugAdapter>;
 
-	constructor(mainContext: IMainContext, workspace: ExtHostWorkspace) {
+	private _variableResolver: IConfigurationResolverService;
 
-		this._workspace = workspace;
+
+	constructor(mainContext: IMainContext,
+		private _workspace: ExtHostWorkspace,
+		private _extensionService: ExtHostExtensionService,
+		private _editorsService: ExtHostDocumentsAndEditors,
+		private _configurationService: ExtHostConfiguration
+	) {
 
 		this._handleCounter = 0;
 		this._handlers = new Map<number, vscode.DebugConfigurationProvider>();
@@ -77,6 +93,86 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 
 		this._breakpoints = new Map<string, vscode.Breakpoint>();
 		this._breakpointEventsActive = false;
+
+		this._debugAdapters = new Map<number, DebugAdapter>();
+
+		// register all debug extensions
+		const debugTypes: string[] = [];
+		for (const ed of this._extensionService.getAllExtensionDescriptions()) {
+			if (ed.contributes) {
+				const debuggers = <IDebuggerContribution[]>ed.contributes['debuggers'];
+				if (debuggers && debuggers.length > 0) {
+					for (const dbg of debuggers) {
+						// only debugger contributions with a "label" are considered a "main" debugger contribution
+						if (dbg.type && dbg.label) {
+							debugTypes.push(dbg.type);
+						}
+					}
+				}
+			}
+		}
+		if (debugTypes.length > 0) {
+			this._debugServiceProxy.$registerDebugTypes(debugTypes);
+		}
+	}
+
+	public $runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+		const terminalLauncher = getTerminalLauncher();
+		if (terminalLauncher) {
+			return terminalLauncher.runInTerminal(args, config);
+		}
+		return void 0;
+	}
+
+	public $substituteVariables(folderUri: UriComponents | undefined, config: IConfig): TPromise<IConfig> {
+		if (!this._variableResolver) {
+			this._variableResolver = new ExtHostVariableResolverService(this._workspace, this._editorsService, this._configurationService);
+		}
+		const folder = <IWorkspaceFolder>this.getFolder(folderUri);
+		return asWinJsPromise(token => DebugAdapter.substituteVariables(folder, config, this._variableResolver));
+	}
+
+	public $startDASession(handle: number, debugType: string, adpaterExecutable: IAdapterExecutable | null): TPromise<void> {
+		const mythis = this;
+
+		const da = new class extends DebugAdapter {
+
+			// DA -> VS Code
+			public acceptMessage(message: DebugProtocol.ProtocolMessage) {
+				convertToVSCPaths(message, source => {
+					if (paths.isAbsolute(source.path)) {
+						(<any>source).path = URI.file(source.path);
+					}
+				});
+				mythis._debugServiceProxy.$acceptDAMessage(handle, message);
+			}
+
+		}(debugType, adpaterExecutable, this._extensionService.getAllExtensionDescriptions());
+
+		this._debugAdapters.set(handle, da);
+		da.onError(err => this._debugServiceProxy.$acceptDAError(handle, err.name, err.message, err.stack));
+		da.onExit(code => this._debugServiceProxy.$acceptDAExit(handle, code, null));
+		return da.startSession();
+	}
+
+	public $sendDAMessage(handle: number, message: DebugProtocol.ProtocolMessage): TPromise<void> {
+		// VS Code -> DA
+		convertToDAPaths(message, source => {
+			if (typeof source.path === 'object') {
+				source.path = URI.revive(source.path).fsPath;
+			}
+		});
+		const da = this._debugAdapters.get(handle);
+		if (da) {
+			da.sendMessage(message);
+		}
+		return void 0;
+	}
+
+	public $stopDASession(handle: number): TPromise<void> {
+		const da = this._debugAdapters.get(handle);
+		this._debugAdapters.delete(handle);
+		return da ? da.stopSession() : void 0;
 	}
 
 	private startBreakpoints() {
@@ -429,3 +525,70 @@ export class ExtHostDebugConsole implements vscode.DebugConsole {
 		this.append(value + '\n');
 	}
 }
+
+export class ExtHostVariableResolverService implements IConfigurationResolverService {
+
+	_serviceBrand: any;
+	_variableResolver: VariableResolver;
+
+	constructor(workspace: ExtHostWorkspace, editors: ExtHostDocumentsAndEditors, configuration: ExtHostConfiguration) {
+		this._variableResolver = new VariableResolver({
+			getFolderUri: (folderName: string): URI => {
+				const folders = workspace.getWorkspaceFolders();
+				const found = folders.filter(f => f.name === folderName);
+				if (found && found.length > 0) {
+					return found[0].uri;
+				}
+				return undefined;
+			},
+			getWorkspaceFolderCount: (): number => {
+				return workspace.getWorkspaceFolders().length;
+			},
+			getConfigurationValue: (folderUri: URI, section: string) => {
+				return configuration.getConfiguration(undefined, folderUri).get<string>(section);
+			},
+			getExecPath: (): string | undefined => {
+				return undefined;	// does not exist in EH
+			},
+			getFilePath: (): string | undefined => {
+				const activeEditor = editors.activeEditor();
+				if (activeEditor) {
+					const resource = activeEditor.document.uri;
+					if (resource.scheme === Schemas.file) {
+						return paths.normalize(resource.fsPath, true);
+					}
+				}
+				return undefined;
+			},
+			getSelectedText: (): string | undefined => {
+				const activeEditor = editors.activeEditor();
+				if (activeEditor && !activeEditor.selection.isEmpty) {
+					return activeEditor.document.getText(activeEditor.selection);
+				}
+				return undefined;
+			},
+			getLineNumber: (): string => {
+				const activeEditor = editors.activeEditor();
+				if (activeEditor) {
+					return String(activeEditor.selection.end.line + 1);
+				}
+				return undefined;
+			}
+		}, process.env);
+	}
+
+	public resolve(root: IWorkspaceFolder, value: string): string;
+	public resolve(root: IWorkspaceFolder, value: string[]): string[];
+	public resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
+	public resolve(root: IWorkspaceFolder, value: any): any {
+		return this._variableResolver.resolveAny(root ? root.uri : undefined, value);
+	}
+
+	public resolveAny(root: IWorkspaceFolder, value: any): any {
+		return this._variableResolver.resolveAny(root ? root.uri : undefined, value);
+	}
+
+	resolveInteractiveVariables(configuration: any, interactiveVariablesMap: { [key: string]: string; }): TPromise<any, any> {
+		throw new Error('Method not implemented.');
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostDecorations.ts b/src/vs/workbench/api/node/extHostDecorations.ts
index 89987b137bb..77d9b441fc8 100644
--- a/src/vs/workbench/api/node/extHostDecorations.ts
+++ b/src/vs/workbench/api/node/extHostDecorations.ts
@@ -43,6 +43,10 @@ export class ExtHostDecorations implements ExtHostDecorationsShape {
 		return TPromise.join(requests.map(request => {
 			const { handle, uri, id } = request;
 			const provider = this._provider.get(handle);
+			if (!provider) {
+				// might have been unregistered in the meantime
+				return void 0;
+			}
 			return asWinJsPromise(token => provider.provideDecoration(URI.revive(uri), token)).then(data => {
 				result[id] = data && <DecorationData>[data.priority, data.bubble, data.title, data.abbreviation, data.color, data.source];
 			}, err => {
diff --git a/src/vs/workbench/api/node/extHostDiagnostics.ts b/src/vs/workbench/api/node/extHostDiagnostics.ts
index 342060762d7..60f96a01f2e 100644
--- a/src/vs/workbench/api/node/extHostDiagnostics.ts
+++ b/src/vs/workbench/api/node/extHostDiagnostics.ts
@@ -229,6 +229,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
 				}
 			}
 		}
+		Object.freeze(uris);
 		return { uris };
 	}
 
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
index 2be3ac6908d..d42afcf7ba0 100644
--- a/src/vs/workbench/api/node/extHostDocumentData.ts
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -68,8 +68,7 @@ export class ExtHostDocumentData extends MirrorTextModel {
 			this._document = {
 				get uri() { return data._uri; },
 				get fileName() { return data._uri.fsPath; },
-				// todo@remote
-				// documents from other fs-provider must not be untitled
+				// todo@remote -> https://github.com/Microsoft/vscode/issues/48269
 				get isUntitled() { return data._uri.scheme !== 'file'; },
 				get languageId() { return data._languageId; },
 				get version() { return data._versionId; },
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index 05cae8cfcb6..54e17e42f71 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -137,6 +137,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 			contentChanges: events.changes.map((change) => {
 				return {
 					range: TypeConverters.toRange(change.range),
+					rangeOffset: change.rangeOffset,
 					rangeLength: change.rangeLength,
 					text: change.text
 				};
diff --git a/src/vs/workbench/api/node/extHostExtensionActivator.ts b/src/vs/workbench/api/node/extHostExtensionActivator.ts
index e1979889222..c37e7b2dfe7 100644
--- a/src/vs/workbench/api/node/extHostExtensionActivator.ts
+++ b/src/vs/workbench/api/node/extHostExtensionActivator.ts
@@ -127,6 +127,7 @@ export class ExtensionActivationTimesBuilder {
 export class ActivatedExtension {
 
 	public readonly activationFailed: boolean;
+	public readonly activationFailedError: Error;
 	public readonly activationTimes: ExtensionActivationTimes;
 	public readonly module: IExtensionModule;
 	public readonly exports: IExtensionAPI;
@@ -134,12 +135,14 @@ export class ActivatedExtension {
 
 	constructor(
 		activationFailed: boolean,
+		activationFailedError: Error,
 		activationTimes: ExtensionActivationTimes,
 		module: IExtensionModule,
 		exports: IExtensionAPI,
 		subscriptions: IDisposable[]
 	) {
 		this.activationFailed = activationFailed;
+		this.activationFailedError = activationFailedError;
 		this.activationTimes = activationTimes;
 		this.module = module;
 		this.exports = exports;
@@ -149,13 +152,13 @@ export class ActivatedExtension {
 
 export class EmptyExtension extends ActivatedExtension {
 	constructor(activationTimes: ExtensionActivationTimes) {
-		super(false, activationTimes, { activate: undefined, deactivate: undefined }, undefined, []);
+		super(false, null, activationTimes, { activate: undefined, deactivate: undefined }, undefined, []);
 	}
 }
 
 export class FailedExtension extends ActivatedExtension {
-	constructor(activationTimes: ExtensionActivationTimes) {
-		super(true, activationTimes, { activate: undefined, deactivate: undefined }, undefined, []);
+	constructor(activationError: Error) {
+		super(true, activationError, ExtensionActivationTimes.NONE, { activate: undefined, deactivate: undefined }, undefined, []);
 	}
 }
 
@@ -244,7 +247,8 @@ export class ExtensionsActivator {
 			if (!depDesc) {
 				// Error condition 1: unknown dependency
 				this._host.showMessage(Severity.Error, nls.localize('unknownDep', "Extension '{1}' failed to activate. Reason: unknown dependency '{0}'.", depId, currentExtension.id));
-				this._activatedExtensions[currentExtension.id] = new FailedExtension(ExtensionActivationTimes.NONE);
+				const error = new Error(`Unknown dependency '${depId}'`);
+				this._activatedExtensions[currentExtension.id] = new FailedExtension(error);
 				return;
 			}
 
@@ -253,7 +257,9 @@ export class ExtensionsActivator {
 				if (dep.activationFailed) {
 					// Error condition 2: a dependency has already failed activation
 					this._host.showMessage(Severity.Error, nls.localize('failedDep1', "Extension '{1}' failed to activate. Reason: dependency '{0}' failed to activate.", depId, currentExtension.id));
-					this._activatedExtensions[currentExtension.id] = new FailedExtension(ExtensionActivationTimes.NONE);
+					const error = new Error(`Dependency ${depId} failed to activate`);
+					(<any>error).detail = dep.activationFailedError;
+					this._activatedExtensions[currentExtension.id] = new FailedExtension(error);
 					return;
 				}
 			} else {
@@ -286,7 +292,8 @@ export class ExtensionsActivator {
 			for (let i = 0, len = extensionDescriptions.length; i < len; i++) {
 				// Error condition 3: dependency loop
 				this._host.showMessage(Severity.Error, nls.localize('failedDep2', "Extension '{0}' failed to activate. Reason: more than 10 levels of dependencies (most likely a dependency loop).", extensionDescriptions[i].id));
-				this._activatedExtensions[extensionDescriptions[i].id] = new FailedExtension(ExtensionActivationTimes.NONE);
+				const error = new Error('More than 10 levels of dependencies (most likely a dependency loop)');
+				this._activatedExtensions[extensionDescriptions[i].id] = new FailedExtension(error);
 			}
 			return TPromise.as(void 0);
 		}
@@ -334,7 +341,7 @@ export class ExtensionsActivator {
 			console.error('Activating extension `' + extensionDescription.id + '` failed: ', err.message);
 			console.log('Here is the error stack: ', err.stack);
 			// Treat the extension as being empty
-			return new FailedExtension(ExtensionActivationTimes.NONE);
+			return new FailedExtension(err);
 		}).then((x: ActivatedExtension) => {
 			this._activatedExtensions[extensionDescription.id] = x;
 			delete this._activatingExtensions[extensionDescription.id];
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 8532e95c37e..8d3d62d08fb 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -208,6 +208,17 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		}
 	}
 
+	public activateByIdWithErrors(extensionId: string, reason: ExtensionActivationReason): TPromise<void> {
+		return this.activateById(extensionId, reason).then(() => {
+			const extension = this._activator.getActivatedExtension(extensionId);
+			if (extension.activationFailed) {
+				// activation failed => bubble up the error as the promise result
+				return TPromise.wrapError(extension.activationFailedError);
+			}
+			return void 0;
+		});
+	}
+
 	public getAllExtensionDescriptions(): IExtensionDescription[] {
 		return this._registry.getAllExtensionDescriptions();
 	}
@@ -371,7 +382,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		};
 
 		return this._callActivateOptional(logService, extensionId, extensionModule, context, activationTimesBuilder).then((extensionExports) => {
-			return new ActivatedExtension(false, activationTimesBuilder.build(), extensionModule, extensionExports, context.subscriptions);
+			return new ActivatedExtension(false, null, activationTimesBuilder.build(), extensionModule, extensionExports, context.subscriptions);
 		});
 	}
 
@@ -423,7 +434,7 @@ function getTelemetryActivationEvent(extensionDescription: IExtensionDescription
 		"TelemetryActivationEvent" : {
 			"id": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 			"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
-			"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+			"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"activationEvents": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		}
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index 00dfa69b6df..0a1264901fa 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -6,15 +6,17 @@
 
 import URI, { UriComponents } from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape } from './extHost.protocol';
+import { Event, mapEvent } from 'vs/base/common/event';
+import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape, IFileChangeDto } from './extHost.protocol';
 import * as vscode from 'vscode';
-import { IStat } from 'vs/platform/files/common/files';
+import * as files from 'vs/platform/files/common/files';
+import * as path from 'path';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { asWinJsPromise } from 'vs/base/common/async';
-import { IPatternInfo } from 'vs/platform/search/common/search';
 import { values } from 'vs/base/common/map';
-import { Range } from 'vs/workbench/api/node/extHostTypes';
+import { Range, FileType, FileChangeType, FileChangeType2 } from 'vs/workbench/api/node/extHostTypes';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
+import { Schemas } from 'vs/base/common/network';
 
 class FsLinkProvider implements vscode.DocumentLinkProvider {
 
@@ -55,111 +57,254 @@ class FsLinkProvider implements vscode.DocumentLinkProvider {
 	}
 }
 
+class FileSystemProviderShim implements vscode.FileSystemProvider2 {
+
+	_version: 9 = 9;
+
+	onDidChangeFile: vscode.Event<vscode.FileChange2[]>;
+
+	constructor(private readonly _delegate: vscode.DeprecatedFileSystemProvider) {
+		if (!this._delegate.onDidChange) {
+			this.onDidChangeFile = Event.None;
+		} else {
+			this.onDidChangeFile = mapEvent(this._delegate.onDidChange, old => old.map(FileSystemProviderShim._modernizeFileChange));
+		}
+	}
+
+	watch(uri: vscode.Uri, options: {}): vscode.Disposable {
+		// does nothing because in the old API there was no notion of
+		// watch and provider decide what file events to generate...
+		return { dispose() { } };
+	}
+
+	stat(resource: vscode.Uri): Thenable<vscode.FileStat2> {
+		return this._delegate.stat(resource).then(stat => FileSystemProviderShim._modernizeFileStat(stat));
+	}
+	rename(oldUri: vscode.Uri, newUri: vscode.Uri): Thenable<vscode.FileStat2> {
+		return this._delegate.move(oldUri, newUri).then(stat => FileSystemProviderShim._modernizeFileStat(stat));
+	}
+	readDirectory(resource: vscode.Uri): Thenable<[string, vscode.FileStat2][]> {
+		return this._delegate.readdir(resource).then(tuples => {
+			return tuples.map(tuple => <[string, vscode.FileStat2]>[path.posix.basename(tuple[0].path), FileSystemProviderShim._modernizeFileStat(tuple[1])]);
+		});
+	}
+
+	private static _modernizeFileStat(stat: vscode.DeprecatedFileStat): vscode.FileStat2 {
+		let { mtime, size, type } = stat;
+		let isFile = false;
+		let isDirectory = false;
+		let isSymbolicLink = false;
+
+		// no support for bitmask, effectively no support for symlinks
+		switch (type) {
+			case FileType.Dir:
+				isDirectory = true;
+				break;
+			case FileType.File:
+				isFile = true;
+				break;
+			case FileType.Symlink:
+				isSymbolicLink = true;
+				break;
+		}
+		return { mtime, size, isFile, isDirectory, isSymbolicLink };
+	}
+
+	private static _modernizeFileChange(e: vscode.DeprecatedFileChange): vscode.FileChange2 {
+		let { resource, type } = e;
+		let newType: vscode.FileChangeType2;
+		switch (type) {
+			case FileChangeType.Updated:
+				newType = FileChangeType2.Changed;
+				break;
+			case FileChangeType.Added:
+				newType = FileChangeType2.Created;
+				break;
+			case FileChangeType.Deleted:
+				newType = FileChangeType2.Deleted;
+				break;
+
+		}
+		return { uri: resource, type: newType };
+	}
+
+	// --- delete/create file or folder
+
+	delete(resource: vscode.Uri): Thenable<void> {
+		return this._delegate.stat(resource).then(stat => {
+			if (stat.type === FileType.Dir) {
+				return this._delegate.rmdir(resource);
+			} else {
+				return this._delegate.unlink(resource);
+			}
+		});
+	}
+	createDirectory(resource: vscode.Uri): Thenable<vscode.FileStat2> {
+		return this._delegate.mkdir(resource).then(stat => FileSystemProviderShim._modernizeFileStat(stat));
+	}
+
+	// --- read/write
+
+	readFile(resource: vscode.Uri): Thenable<Uint8Array> {
+		let chunks: Buffer[] = [];
+		return this._delegate.read(resource, 0, -1, {
+			report(data) {
+				chunks.push(Buffer.from(data));
+			}
+		}).then(() => {
+			return Buffer.concat(chunks);
+		});
+	}
+
+	writeFile(resource: vscode.Uri, content: Uint8Array, options: files.FileOptions): Thenable<void> {
+		return this._delegate.write(resource, content);
+	}
+}
+
 export class ExtHostFileSystem implements ExtHostFileSystemShape {
 
 	private readonly _proxy: MainThreadFileSystemShape;
-	private readonly _fsProvider = new Map<number, vscode.FileSystemProvider>();
-	private readonly _searchProvider = new Map<number, vscode.SearchProvider>();
 	private readonly _linkProvider = new FsLinkProvider();
+	private readonly _fsProvider = new Map<number, vscode.FileSystemProvider2>();
+	private readonly _usedSchemes = new Set<string>();
+	private readonly _watches = new Map<number, IDisposable>();
 
 	private _handlePool: number = 0;
 
 	constructor(mainContext: IMainContext, extHostLanguageFeatures: ExtHostLanguageFeatures) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadFileSystem);
+		this._usedSchemes.add(Schemas.file);
+		this._usedSchemes.add(Schemas.untitled);
+		this._usedSchemes.add(Schemas.vscode);
+		this._usedSchemes.add(Schemas.inMemory);
+		this._usedSchemes.add(Schemas.internal);
+		this._usedSchemes.add(Schemas.http);
+		this._usedSchemes.add(Schemas.https);
+		this._usedSchemes.add(Schemas.mailto);
+		this._usedSchemes.add(Schemas.data);
+
 		extHostLanguageFeatures.registerDocumentLinkProvider('*', this._linkProvider);
 	}
 
-	registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider) {
+	registerDeprecatedFileSystemProvider(scheme: string, provider: vscode.DeprecatedFileSystemProvider) {
+		return this.registerFileSystemProvider2(scheme, new FileSystemProviderShim(provider), { isCaseSensitive: false });
+	}
+
+	registerFileSystemProvider(scheme: string, provider: vscode.DeprecatedFileSystemProvider, newProvider: vscode.FileSystemProvider2) {
+		if (newProvider && newProvider._version === 9) {
+			return this.registerFileSystemProvider2(scheme, newProvider, { isCaseSensitive: false });
+		} else if (provider) {
+			return this.registerFileSystemProvider2(scheme, new FileSystemProviderShim(provider), { isCaseSensitive: false });
+		} else {
+			throw new Error('FAILED to register file system provider, the new provider does not meet the version-constraint and there is no old provider');
+		}
+	}
+
+	registerFileSystemProvider2(scheme: string, provider: vscode.FileSystemProvider2, options: { isCaseSensitive?: boolean }) {
+
+		if (this._usedSchemes.has(scheme)) {
+			throw new Error(`a provider for the scheme '${scheme}' is already registered`);
+		}
+
 		const handle = this._handlePool++;
 		this._linkProvider.add(scheme);
+		this._usedSchemes.add(scheme);
 		this._fsProvider.set(handle, provider);
-		this._proxy.$registerFileSystemProvider(handle, scheme);
-		let reg: IDisposable;
-		if (provider.onDidChange) {
-			reg = provider.onDidChange(event => this._proxy.$onFileSystemChange(handle, <any>event));
+
+		let capabilites = files.FileSystemProviderCapabilities.FileReadWrite;
+		if (options.isCaseSensitive) {
+			capabilites += files.FileSystemProviderCapabilities.PathCaseSensitive;
 		}
+		if (typeof provider.copy === 'function') {
+			capabilites += files.FileSystemProviderCapabilities.FileFolderCopy;
+		}
+
+		this._proxy.$registerFileSystemProvider(handle, scheme, capabilites);
+
+		const subscription = provider.onDidChangeFile(event => {
+			let mapped: IFileChangeDto[] = [];
+			for (const e of event) {
+				let { uri: resource, type } = e;
+				if (resource.scheme !== scheme) {
+					// dropping events for wrong scheme
+					continue;
+				}
+				let newType: files.FileChangeType;
+				switch (type) {
+					case FileChangeType2.Changed:
+						newType = files.FileChangeType.UPDATED;
+						break;
+					case FileChangeType2.Created:
+						newType = files.FileChangeType.ADDED;
+						break;
+					case FileChangeType2.Deleted:
+						newType = files.FileChangeType.DELETED;
+						break;
+				}
+				mapped.push({ resource, type: newType });
+			}
+			this._proxy.$onFileSystemChange(handle, mapped);
+		});
+
 		return {
 			dispose: () => {
-				if (reg) {
-					reg.dispose();
-				}
+				subscription.dispose();
 				this._linkProvider.delete(scheme);
+				this._usedSchemes.delete(scheme);
 				this._fsProvider.delete(handle);
 				this._proxy.$unregisterProvider(handle);
 			}
 		};
 	}
 
-	registerSearchProvider(scheme: string, provider: vscode.SearchProvider) {
-		const handle = this._handlePool++;
-		this._searchProvider.set(handle, provider);
-		this._proxy.$registerSearchProvider(handle, scheme);
-		return {
-			dispose: () => {
-				this._searchProvider.delete(handle);
-				this._proxy.$unregisterProvider(handle);
-			}
-		};
+	$stat(handle: number, resource: UriComponents): TPromise<files.IStat, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).stat(URI.revive(resource), {}, token));
 	}
 
-	$utimes(handle: number, resource: UriComponents, mtime: number, atime: number): TPromise<IStat, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).utimes(URI.revive(resource), mtime, atime));
+	$readdir(handle: number, resource: UriComponents): TPromise<[string, files.IStat][], any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).readDirectory(URI.revive(resource), {}, token));
 	}
-	$stat(handle: number, resource: UriComponents): TPromise<IStat, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).stat(URI.revive(resource)));
+
+	$readFile(handle: number, resource: UriComponents, opts: files.FileOptions): TPromise<string> {
+		return asWinJsPromise(token => {
+			return this._fsProvider.get(handle).readFile(URI.revive(resource), opts, token);
+		}).then(data => {
+			return Buffer.isBuffer(data) ? data.toString('base64') : Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString('base64');
+		});
 	}
-	$read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise<number> {
-		const progress = {
-			report: chunk => {
-				this._proxy.$reportFileChunk(handle, session, [].slice.call(chunk));
-			}
-		};
-		return asWinJsPromise(token => this._fsProvider.get(handle).read(URI.revive(resource), offset, count, progress));
+
+	$writeFile(handle: number, resource: UriComponents, base64Content: string, opts: files.FileOptions): TPromise<void, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).writeFile(URI.revive(resource), Buffer.from(base64Content, 'base64'), opts, token));
 	}
-	$write(handle: number, resource: UriComponents, content: number[]): TPromise<void, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).write(URI.revive(resource), Buffer.from(content)));
+
+	$delete(handle: number, resource: UriComponents): TPromise<void, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).delete(URI.revive(resource), {}, token));
 	}
-	$unlink(handle: number, resource: UriComponents): TPromise<void, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).unlink(URI.revive(resource)));
+
+	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOptions): TPromise<files.IStat, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).rename(URI.revive(oldUri), URI.revive(newUri), opts, token));
 	}
-	$move(handle: number, resource: UriComponents, target: UriComponents): TPromise<IStat, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).move(URI.revive(resource), URI.revive(target)));
+
+	$copy(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOptions): TPromise<files.IStat, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).copy(URI.revive(oldUri), URI.revive(newUri), opts, token));
 	}
-	$mkdir(handle: number, resource: UriComponents): TPromise<IStat, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).mkdir(URI.revive(resource)));
+
+	$mkdir(handle: number, resource: UriComponents): TPromise<files.IStat, any> {
+		return asWinJsPromise(token => this._fsProvider.get(handle).createDirectory(URI.revive(resource), {}, token));
 	}
-	$readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][], any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).readdir(URI.revive(resource)));
+
+	$watch(handle: number, session: number, resource: UriComponents, opts: files.IWatchOptions): void {
+		asWinJsPromise(token => {
+			let subscription = this._fsProvider.get(handle).watch(URI.revive(resource), opts);
+			this._watches.set(session, subscription);
+		});
 	}
-	$rmdir(handle: number, resource: UriComponents): TPromise<void, any> {
-		return asWinJsPromise(token => this._fsProvider.get(handle).rmdir(URI.revive(resource)));
-	}
-	$provideFileSearchResults(handle: number, session: number, query: string): TPromise<void> {
-		const provider = this._searchProvider.get(handle);
-		if (!provider.provideFileSearchResults) {
-			return TPromise.as(undefined);
+
+	$unwatch(handle: number, session: number): void {
+		let subscription = this._watches.get(session);
+		if (subscription) {
+			subscription.dispose();
+			this._watches.delete(session);
 		}
-		const progress = {
-			report: (uri) => {
-				this._proxy.$handleFindMatch(handle, session, uri);
-			}
-		};
-		return asWinJsPromise(token => provider.provideFileSearchResults(query, progress, token));
-	}
-	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, options: { includes: string[], excludes: string[] }): TPromise<void> {
-		const provider = this._searchProvider.get(handle);
-		if (!provider.provideTextSearchResults) {
-			return TPromise.as(undefined);
-		}
-		const progress = {
-			report: (data: vscode.TextSearchResult) => {
-				this._proxy.$handleFindMatch(handle, session, [data.uri, {
-					lineNumber: data.range.start.line,
-					preview: data.preview.leading + data.preview.matching + data.preview.trailing,
-					offsetAndLengths: [[data.preview.leading.length, data.preview.matching.length]]
-				}]);
-			}
-		};
-		return asWinJsPromise(token => provider.provideTextSearchResults(pattern, options, progress, token));
 	}
 }
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 25ae4ba089a..2d14359a8b1 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { mixin } from 'vs/base/common/objects';
 import * as vscode from 'vscode';
 import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
-import { Range, Disposable, CompletionList, SnippetString, Color, CodeActionKind } from 'vs/workbench/api/node/extHostTypes';
+import { Range, Disposable, CompletionList, SnippetString, CodeActionKind } from 'vs/workbench/api/node/extHostTypes';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
@@ -22,6 +22,7 @@ import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isObject } from 'vs/base/common/types';
 
 // --- adapter
 
@@ -466,14 +467,14 @@ class NavigateTypeAdapter {
 
 class RenameAdapter {
 
-	static supportsResolving(provider: vscode.RenameProvider2): boolean {
+	static supportsResolving(provider: vscode.RenameProvider): boolean {
 		return typeof provider.resolveRenameLocation === 'function';
 	}
 
 	private _documents: ExtHostDocuments;
-	private _provider: vscode.RenameProvider2;
+	private _provider: vscode.RenameProvider;
 
-	constructor(documents: ExtHostDocuments, provider: vscode.RenameProvider2) {
+	constructor(documents: ExtHostDocuments, provider: vscode.RenameProvider) {
 		this._documents = documents;
 		this._provider = provider;
 	}
@@ -506,7 +507,7 @@ class RenameAdapter {
 		});
 	}
 
-	resolveRenameLocation(resource: URI, position: IPosition): TPromise<modes.RenameContext> {
+	resolveRenameLocation(resource: URI, position: IPosition): TPromise<modes.RenameLocation> {
 		if (typeof this._provider.resolveRenameLocation !== 'function') {
 			return TPromise.as(undefined);
 		}
@@ -514,23 +515,32 @@ class RenameAdapter {
 		let doc = this._documents.getDocumentData(resource).document;
 		let pos = TypeConverters.toPosition(position);
 
-		return asWinJsPromise(token => this._provider.resolveRenameLocation(doc, pos, token)).then(context => {
-			if (!context) {
+		return asWinJsPromise(token => this._provider.resolveRenameLocation(doc, pos, token)).then(rangeOrLocation => {
+
+			let range: vscode.Range;
+			let text: string;
+			if (Range.isRange(rangeOrLocation)) {
+				range = rangeOrLocation;
+				text = doc.getText(rangeOrLocation);
+
+			} else if (isObject(rangeOrLocation)) {
+				range = rangeOrLocation.range;
+				text = rangeOrLocation.placeholder;
+			}
+
+			if (!range) {
 				return undefined;
 			}
-			if (context.range && (!context.range.isSingleLine || context.range.start.line !== pos.line)) {
-				console.warn('INVALID rename context, range must be single line and on the same line');
+
+			if (!range.contains(pos)) {
+				console.warn('INVALID rename location: range must contain position');
 				return undefined;
 			}
-			return <modes.RenameContext>{
-				range: TypeConverters.fromRange(context.range),
-				text: context.newName || doc.getText(context.range)
-			};
+			return { range: TypeConverters.fromRange(range), text };
 		});
 	}
 }
 
-
 class SuggestAdapter {
 
 	static supportsResolving(provider: vscode.CompletionItemProvider): boolean {
@@ -784,7 +794,7 @@ class ColorProviderAdapter {
 
 			const colorInfos: IRawColorInfo[] = colors.map(ci => {
 				return {
-					color: [ci.color.red, ci.color.green, ci.color.blue, ci.color.alpha] as [number, number, number, number],
+					color: TypeConverters.Color.from(ci.color),
 					range: TypeConverters.fromRange(ci.range)
 				};
 			});
@@ -796,7 +806,7 @@ class ColorProviderAdapter {
 	provideColorPresentations(resource: URI, raw: IRawColorInfo): TPromise<modes.IColorPresentation[]> {
 		const document = this._documents.getDocumentData(resource).document;
 		const range = TypeConverters.toRange(raw.range);
-		const color = new Color(raw.color[0], raw.color[1], raw.color[2], raw.color[3]);
+		const color = TypeConverters.Color.to(raw.color);
 		return asWinJsPromise(token => this._provider.provideColorPresentations(color, { document, range }, token)).then(value => {
 			return value.map(TypeConverters.ColorPresentation.from);
 		});
@@ -807,16 +817,16 @@ class FoldingProviderAdapter {
 
 	constructor(
 		private _documents: ExtHostDocuments,
-		private _provider: vscode.FoldingProvider
+		private _provider: vscode.FoldingRangeProvider
 	) { }
 
-	provideFoldingRanges(resource: URI, context: modes.FoldingContext): TPromise<modes.IFoldingRangeList> {
+	provideFoldingRanges(resource: URI, context: modes.FoldingContext): TPromise<modes.FoldingRange[]> {
 		const doc = this._documents.getDocumentData(resource).document;
-		return asWinJsPromise(token => this._provider.provideFoldingRanges(doc, context, token)).then(list => {
-			if (!Array.isArray(list.ranges)) {
+		return asWinJsPromise(token => this._provider.provideFoldingRanges(doc, context, token)).then(ranges => {
+			if (!Array.isArray(ranges)) {
 				return void 0;
 			}
-			return TypeConverters.FoldingRangeList.from(list);
+			return ranges.map(TypeConverters.FoldingRange.from);
 		});
 	}
 }
@@ -827,10 +837,15 @@ type Adapter = OutlineAdapter | CodeLensAdapter | DefinitionAdapter | HoverAdapt
 	| SuggestAdapter | SignatureHelpAdapter | LinkProviderAdapter | ImplementationAdapter | TypeDefinitionAdapter
 	| ColorProviderAdapter | FoldingProviderAdapter;
 
+export interface ISchemeTransformer {
+	transformOutgoing(scheme: string): string;
+}
+
 export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 
 	private static _handlePool: number = 0;
 
+	private readonly _schemeTransformer: ISchemeTransformer;
 	private _proxy: MainThreadLanguageFeaturesShape;
 	private _documents: ExtHostDocuments;
 	private _commands: ExtHostCommands;
@@ -840,11 +855,13 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 
 	constructor(
 		mainContext: IMainContext,
+		schemeTransformer: ISchemeTransformer,
 		documents: ExtHostDocuments,
 		commands: ExtHostCommands,
 		heapMonitor: ExtHostHeapService,
 		diagnostics: ExtHostDiagnostics
 	) {
+		this._schemeTransformer = schemeTransformer;
 		this._proxy = mainContext.getProxy(MainContext.MainThreadLanguageFeatures);
 		this._documents = documents;
 		this._commands = commands;
@@ -881,6 +898,9 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 	}
 
 	private _transformScheme(scheme: string): string {
+		if (this._schemeTransformer && typeof scheme === 'string') {
+			return this._schemeTransformer.transformOutgoing(scheme);
+		}
 		return scheme;
 	}
 
@@ -1017,9 +1037,9 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 
 	// --- quick fix
 
-	registerCodeActionProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider): vscode.Disposable {
+	registerCodeActionProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider, metadata?: vscode.CodeActionProviderMetadata): vscode.Disposable {
 		const handle = this._addNewAdapter(new CodeActionAdapter(this._documents, this._commands.converter, this._diagnostics, provider));
-		this._proxy.$registerQuickFixSupport(handle, this._transformDocumentSelector(selector));
+		this._proxy.$registerQuickFixSupport(handle, this._transformDocumentSelector(selector), metadata && metadata.providedCodeActionKinds ? metadata.providedCodeActionKinds.map(kind => kind.value) : undefined);
 		return this._createDisposable(handle);
 	}
 
@@ -1092,7 +1112,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._withAdapter(handle, RenameAdapter, adapter => adapter.provideRenameEdits(URI.revive(resource), position, newName));
 	}
 
-	$resolveRenameLocation(handle: number, resource: URI, position: IPosition): TPromise<modes.RenameContext> {
+	$resolveRenameLocation(handle: number, resource: URI, position: IPosition): TPromise<modes.RenameLocation> {
 		return this._withAdapter(handle, RenameAdapter, adapter => adapter.resolveRenameLocation(resource, position));
 	}
 
@@ -1158,13 +1178,13 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._withAdapter(handle, ColorProviderAdapter, adapter => adapter.provideColorPresentations(URI.revive(resource), colorInfo));
 	}
 
-	registerFoldingProvider(selector: vscode.DocumentSelector, provider: vscode.FoldingProvider): vscode.Disposable {
+	registerFoldingRangeProvider(selector: vscode.DocumentSelector, provider: vscode.FoldingRangeProvider): vscode.Disposable {
 		const handle = this._addNewAdapter(new FoldingProviderAdapter(this._documents, provider));
-		this._proxy.$registerFoldingProvider(handle, this._transformDocumentSelector(selector));
+		this._proxy.$registerFoldingRangeProvider(handle, this._transformDocumentSelector(selector));
 		return this._createDisposable(handle);
 	}
 
-	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext): TPromise<modes.IFoldingRangeList> {
+	$provideFoldingRanges(handle: number, resource: UriComponents, context: vscode.FoldingContext): TPromise<modes.FoldingRange[]> {
 		return this._withAdapter(handle, FoldingProviderAdapter, adapter => adapter.provideFoldingRanges(URI.revive(resource), context));
 	}
 
diff --git a/src/vs/workbench/api/node/extHostProgress.ts b/src/vs/workbench/api/node/extHostProgress.ts
index 07309949af0..a9f8427ef0a 100644
--- a/src/vs/workbench/api/node/extHostProgress.ts
+++ b/src/vs/workbench/api/node/extHostProgress.ts
@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Progress, ProgressOptions } from 'vscode';
+import { ProgressOptions } from 'vscode';
 import { MainThreadProgressShape, ExtHostProgressShape } from './extHost.protocol';
 import { ProgressLocation } from './extHostTypeConverters';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IProgressStep } from 'vs/platform/progress/common/progress';
+import { IProgressStep, Progress } from 'vs/platform/progress/common/progress';
 import { localize } from 'vs/nls';
 import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
+import { debounce } from 'vs/base/common/decorators';
 
 export class ExtHostProgress implements ExtHostProgressShape {
 
@@ -37,12 +38,6 @@ export class ExtHostProgress implements ExtHostProgressShape {
 			this._mapHandleToCancellationSource.set(handle, source);
 		}
 
-		const progress = {
-			report: (p: IProgressStep) => {
-				this._proxy.$progressReport(handle, p);
-			}
-		};
-
 		const progressEnd = (handle: number): void => {
 			this._proxy.$progressEnd(handle);
 			this._mapHandleToCancellationSource.delete(handle);
@@ -54,7 +49,7 @@ export class ExtHostProgress implements ExtHostProgressShape {
 		let p: Thenable<R>;
 
 		try {
-			p = task(progress, cancellable ? source.token : CancellationToken.None);
+			p = task(new ProgressCallback(this._proxy, handle), cancellable ? source.token : CancellationToken.None);
 		} catch (err) {
 			progressEnd(handle);
 			throw err;
@@ -73,3 +68,23 @@ export class ExtHostProgress implements ExtHostProgressShape {
 	}
 }
 
+function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
+	result.message = currentValue.message;
+	if (typeof currentValue.increment === 'number' && typeof result.message === 'number') {
+		result.increment += currentValue.increment;
+	} else if (typeof currentValue.increment === 'number') {
+		result.increment = currentValue.increment;
+	}
+	return result;
+}
+
+class ProgressCallback extends Progress<IProgressStep> {
+	constructor(private _proxy: MainThreadProgressShape, private _handle: number) {
+		super(p => this.throttledReport(p));
+	}
+
+	@debounce(100, (result: IProgressStep, currentValue: IProgressStep) => mergeProgress(result, currentValue), () => Object.create(null))
+	throttledReport(p: IProgressStep): void {
+		this._proxy.$progressReport(this._handle, p);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
index 2d32ed719fe..d2f5e8bbaec 100644
--- a/src/vs/workbench/api/node/extHostQuickOpen.ts
+++ b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -29,9 +29,10 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 		this._commands = commands;
 	}
 
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
 	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
-	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | undefined> {
+	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
 
 		// clear state from last invocation
 		this._onDidSelectItem = undefined;
@@ -43,7 +44,8 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			placeHolder: options && options.placeHolder,
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
-			ignoreFocusLost: options && options.ignoreFocusOut
+			ignoreFocusLost: options && options.ignoreFocusOut,
+			canSelectMany: options && options.canPickMany
 		});
 
 		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
@@ -60,6 +62,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 					let label: string;
 					let description: string;
 					let detail: string;
+					let picked: boolean;
 
 					if (typeof item === 'string') {
 						label = item;
@@ -67,12 +70,14 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 						label = item.label;
 						description = item.description;
 						detail = item.detail;
+						picked = item.picked;
 					}
 					pickItems.push({
 						label,
 						description,
 						handle,
-						detail
+						detail,
+						picked
 					});
 				}
 
@@ -89,6 +94,8 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 				return quickPickWidget.then(handle => {
 					if (typeof handle === 'number') {
 						return items[handle];
+					} else if (Array.isArray(handle)) {
+						return handle.map(h => items[h]);
 					}
 					return undefined;
 				});
@@ -98,7 +105,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 				return TPromise.wrapError(err);
 			});
 		});
-		return wireCancellationToken<Item>(token, promise, true);
+		return wireCancellationToken<Item | Item[]>(token, promise, true);
 	}
 
 	$onItemSelected(handle: number): void {
diff --git a/src/vs/workbench/api/node/extHostSearch.ts b/src/vs/workbench/api/node/extHostSearch.ts
new file mode 100644
index 00000000000..714e9bfe766
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostSearch.ts
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { asWinJsPromise } from 'vs/base/common/async';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IPatternInfo } from 'vs/platform/search/common/search';
+import * as vscode from 'vscode';
+import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
+
+export class ExtHostSearch implements ExtHostSearchShape {
+
+	private readonly _proxy: MainThreadSearchShape;
+	private readonly _searchProvider = new Map<number, vscode.SearchProvider>();
+	private _handlePool: number = 0;
+
+	constructor(mainContext: IMainContext) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadSearch);
+	}
+
+	registerSearchProvider(scheme: string, provider: vscode.SearchProvider) {
+		const handle = this._handlePool++;
+		this._searchProvider.set(handle, provider);
+		this._proxy.$registerSearchProvider(handle, scheme);
+		return {
+			dispose: () => {
+				this._searchProvider.delete(handle);
+				this._proxy.$unregisterProvider(handle);
+			}
+		};
+	}
+
+	$provideFileSearchResults(handle: number, session: number, query: string): TPromise<void> {
+		const provider = this._searchProvider.get(handle);
+		if (!provider.provideFileSearchResults) {
+			return TPromise.as(undefined);
+		}
+		const progress = {
+			report: (uri) => {
+				this._proxy.$handleFindMatch(handle, session, uri);
+			}
+		};
+		return asWinJsPromise(token => provider.provideFileSearchResults(query, progress, token));
+	}
+
+	$provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, options: { includes: string[], excludes: string[] }): TPromise<void> {
+		const provider = this._searchProvider.get(handle);
+		if (!provider.provideTextSearchResults) {
+			return TPromise.as(undefined);
+		}
+		const progress = {
+			report: (data: vscode.TextSearchResult) => {
+				this._proxy.$handleFindMatch(handle, session, [data.uri, {
+					lineNumber: data.range.start.line,
+					preview: data.preview.leading + data.preview.matching + data.preview.trailing,
+					offsetAndLengths: [[data.preview.leading.length, data.preview.matching.length]]
+				}]);
+			}
+		};
+		return asWinJsPromise(token => provider.provideTextSearchResults(pattern, options, progress, token));
+	}
+}
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 828b31b8c96..024ad5f56b0 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -21,7 +21,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 import * as vscode from 'vscode';
 import {
 	TaskDefinitionDTO, TaskExecutionDTO, TaskPresentationOptionsDTO, ProcessExecutionOptionsDTO, ProcessExecutionDTO,
-	ShellExecutionOptionsDTO, ShellExecutionDTO, TaskDTO, TaskHandleDTO
+	ShellExecutionOptionsDTO, ShellExecutionDTO, TaskDTO, TaskHandleDTO, TaskFilterDTO
 } from '../shared/tasks';
 
 export { TaskExecutionDTO };
@@ -613,6 +613,7 @@ namespace TaskDTO {
 		if (!execution || !definition || !scope) {
 			return undefined;
 		}
+		let group = (value.group as types.TaskGroup) ? (value.group as types.TaskGroup).id : undefined;
 		let result: TaskDTO = {
 			_id: (value as types.Task)._id,
 			definition,
@@ -624,7 +625,7 @@ namespace TaskDTO {
 			},
 			execution,
 			isBackground: value.isBackground,
-			group: (value.group as types.TaskGroup).id,
+			group: group,
 			presentationOptions: TaskPresentationOptionsDTO.from(value.presentationOptions),
 			problemMatchers: value.problemMatchers,
 			hasDefinedMatchers: (value as types.Task).hasDefinedMatchers
@@ -674,18 +675,40 @@ namespace TaskDTO {
 	}
 }
 
+namespace TaskFilterDTO {
+	export function from(value: vscode.TaskFilter): TaskFilterDTO {
+		return value;
+	}
+
+	export function to(value: TaskFilterDTO): vscode.TaskFilter {
+		if (!value) {
+			return undefined;
+		}
+		return Objects.assign(Object.create(null), value);
+	}
+}
+
 class TaskExecutionImpl implements vscode.TaskExecution {
-	constructor(readonly _id: string) {
+	constructor(readonly _id: string, private readonly _task: vscode.Task, private readonly _tasks: ExtHostTask) {
+	}
+
+	get task(): vscode.Task {
+		return this._task;
+	}
+
+	public terminate(): void {
+		this._tasks.terminateTask(this);
 	}
 }
 
 namespace TaskExecutionDTO {
-	export function to(value: TaskExecutionDTO): vscode.TaskExecution {
-		return new TaskExecutionImpl(value.id);
+	export function to(value: TaskExecutionDTO, tasks: ExtHostTask): vscode.TaskExecution {
+		return new TaskExecutionImpl(value.id, TaskDTO.to(value.task, tasks.extHostWorkspace), tasks);
 	}
 	export function from(value: vscode.TaskExecution): TaskExecutionDTO {
 		return {
-			id: (value as TaskExecutionImpl)._id
+			id: (value as TaskExecutionImpl)._id,
+			task: undefined
 		};
 	}
 }
@@ -701,6 +724,7 @@ export class ExtHostTask implements ExtHostTaskShape {
 	private _extHostWorkspace: ExtHostWorkspace;
 	private _handleCounter: number;
 	private _handlers: Map<number, HandlerData>;
+	private _taskExecutions: Map<string, TaskExecutionImpl>;
 
 	private readonly _onDidExecuteTask: Emitter<vscode.TaskStartEvent> = new Emitter<vscode.TaskStartEvent>();
 	private readonly _onDidTerminateTask: Emitter<vscode.TaskEndEvent> = new Emitter<vscode.TaskEndEvent>();
@@ -710,6 +734,11 @@ export class ExtHostTask implements ExtHostTaskShape {
 		this._extHostWorkspace = extHostWorkspace;
 		this._handleCounter = 0;
 		this._handlers = new Map<number, HandlerData>();
+		this._taskExecutions = new Map<string, TaskExecutionImpl>();
+	}
+
+	public get extHostWorkspace(): ExtHostWorkspace {
+		return this._extHostWorkspace;
 	}
 
 	public registerTaskProvider(extension: IExtensionDescription, provider: vscode.TaskProvider): vscode.Disposable {
@@ -725,8 +754,8 @@ export class ExtHostTask implements ExtHostTaskShape {
 		});
 	}
 
-	public executeTaskProvider(): Thenable<vscode.Task[]> {
-		return this._proxy.$executeTaskProvider().then((values) => {
+	public fetchTasks(filter?: vscode.TaskFilter): Thenable<vscode.Task[]> {
+		return this._proxy.$fetchTasks(TaskFilterDTO.from(filter)).then((values) => {
 			let result: vscode.Task[] = [];
 			for (let value of values) {
 				let task = TaskDTO.to(value, this._extHostWorkspace);
@@ -742,18 +771,28 @@ export class ExtHostTask implements ExtHostTaskShape {
 		let tTask = (task as types.Task);
 		// We have a preserved ID. So the task didn't change.
 		if (tTask._id !== void 0) {
-			return this._proxy.$executeTask(TaskHandleDTO.from(tTask)).then(value => TaskExecutionDTO.to(value));
+			return this._proxy.$executeTask(TaskHandleDTO.from(tTask)).then(value => this.getTaskExecution(value, task));
 		} else {
-			return this._proxy.$executeTask(TaskDTO.from(task, extension)).then(value => TaskExecutionDTO.to(value));
+			let dto = TaskDTO.from(task, extension);
+			if (dto === void 0) {
+				return Promise.reject(new Error('Task is not valid'));
+			}
+			return this._proxy.$executeTask(dto).then(value => this.getTaskExecution(value, task));
 		}
 	}
 
 	public $taskStarted(execution: TaskExecutionDTO): void {
 		this._onDidExecuteTask.fire({
-			execution: TaskExecutionDTO.to(execution)
+			execution: this.getTaskExecution(execution)
 		});
 	}
 
+	get taskExecutions(): vscode.TaskExecution[] {
+		let result: vscode.TaskExecution[] = [];
+		this._taskExecutions.forEach(value => result.push(value));
+		return result;
+	}
+
 	get onDidStartTask(): Event<vscode.TaskStartEvent> {
 		return this._onDidExecuteTask.event;
 	}
@@ -762,12 +801,14 @@ export class ExtHostTask implements ExtHostTaskShape {
 		if (!(execution instanceof TaskExecutionImpl)) {
 			throw new Error('No valid task execution provided');
 		}
-		return this._proxy.$terminateTask(TaskExecutionDTO.from(execution));
+		return this._proxy.$terminateTask((execution as TaskExecutionImpl)._id);
 	}
 
 	public $taskEnded(execution: TaskExecutionDTO): void {
+		const _execution = this.getTaskExecution(execution);
+		this._taskExecutions.delete(execution.id);
 		this._onDidTerminateTask.fire({
-			execution: TaskExecutionDTO.to(execution)
+			execution: _execution
 		});
 	}
 
@@ -792,4 +833,14 @@ export class ExtHostTask implements ExtHostTaskShape {
 	private nextHandle(): number {
 		return this._handleCounter++;
 	}
+
+	private getTaskExecution(execution: TaskExecutionDTO, task?: vscode.Task): TaskExecutionImpl {
+		let result: TaskExecutionImpl = this._taskExecutions.get(execution.id);
+		if (result) {
+			return result;
+		}
+		result = new TaskExecutionImpl(execution.id, task ? task : TaskDTO.to(execution.task, this._extHostWorkspace), this);
+		this._taskExecutions.set(execution.id, result);
+		return result;
+	}
 }
diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts
index 2a0f3081e2b..cb546c2e8d8 100644
--- a/src/vs/workbench/api/node/extHostTerminalService.ts
+++ b/src/vs/workbench/api/node/extHostTerminalService.ts
@@ -5,11 +5,18 @@
 'use strict';
 
 import * as vscode from 'vscode';
+import * as cp from 'child_process';
+import * as os from 'os';
+import * as platform from 'vs/base/common/platform';
+import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
+import Uri from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
-import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext } from './extHost.protocol';
+import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext, ShellLaunchConfigDto } from 'vs/workbench/api/node/extHost.protocol';
+import { IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class ExtHostTerminal implements vscode.Terminal {
-
 	private _name: string;
 	private _id: number;
 	private _proxy: MainThreadTerminalServiceShape;
@@ -20,21 +27,28 @@ export class ExtHostTerminal implements vscode.Terminal {
 
 	constructor(
 		proxy: MainThreadTerminalServiceShape,
-		name?: string,
+		name: string = '',
+		id?: number
+	) {
+		this._proxy = proxy;
+		this._name = name;
+		if (id) {
+			this._id = id;
+		}
+		this._queuedRequests = [];
+		this._pidPromise = new Promise<number>(c => {
+			this._pidPromiseComplete = c;
+		});
+	}
+
+	public create(
 		shellPath?: string,
 		shellArgs?: string[],
 		cwd?: string,
 		env?: { [key: string]: string },
 		waitOnExit?: boolean
-	) {
-		this._name = name;
-		this._queuedRequests = [];
-		this._proxy = proxy;
-		this._pidPromise = new Promise<number>(c => {
-			this._pidPromiseComplete = c;
-		});
-
-		this._proxy.$createTerminal(name, shellPath, shellArgs, cwd, env, waitOnExit).then((id) => {
+	): void {
+		this._proxy.$createTerminal(this._name, shellPath, shellArgs, cwd, env, waitOnExit).then((id) => {
 			this._id = id;
 			this._queuedRequests.forEach((r) => {
 				r.run(this._proxy, this._id);
@@ -44,12 +58,10 @@ export class ExtHostTerminal implements vscode.Terminal {
 	}
 
 	public get name(): string {
-		this._checkDisposed();
 		return this._name;
 	}
 
 	public get processId(): Thenable<number> {
-		this._checkDisposed();
 		return this._pidPromise;
 	}
 
@@ -76,8 +88,11 @@ export class ExtHostTerminal implements vscode.Terminal {
 	}
 
 	public _setProcessId(processId: number): void {
-		this._pidPromiseComplete(processId);
-		this._pidPromiseComplete = null;
+		// The event may fire 2 times when the panel is restored
+		if (this._pidPromiseComplete) {
+			this._pidPromiseComplete(processId);
+			this._pidPromiseComplete = null;
+		}
 	}
 
 	private _queueApiRequest(callback: (...args: any[]) => void, args: any[]) {
@@ -97,25 +112,34 @@ export class ExtHostTerminal implements vscode.Terminal {
 }
 
 export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
-
 	private readonly _onDidCloseTerminal: Emitter<vscode.Terminal>;
+	private readonly _onDidOpenTerminal: Emitter<vscode.Terminal>;
 	private _proxy: MainThreadTerminalServiceShape;
-	private _terminals: ExtHostTerminal[];
+	private _terminals: ExtHostTerminal[] = [];
+	private _terminalProcesses: { [id: number]: cp.ChildProcess } = {};
 
-	constructor(mainContext: IMainContext) {
+	public get terminals(): ExtHostTerminal[] { return this._terminals; }
+
+	constructor(
+		mainContext: IMainContext,
+		private _extHostConfiguration: ExtHostConfiguration,
+		private _logService: ILogService
+	) {
 		this._onDidCloseTerminal = new Emitter<vscode.Terminal>();
+		this._onDidOpenTerminal = new Emitter<vscode.Terminal>();
 		this._proxy = mainContext.getProxy(MainContext.MainThreadTerminalService);
-		this._terminals = [];
 	}
 
 	public createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
-		let terminal = new ExtHostTerminal(this._proxy, name, shellPath, shellArgs);
+		let terminal = new ExtHostTerminal(this._proxy, name);
+		terminal.create(shellPath, shellArgs);
 		this._terminals.push(terminal);
 		return terminal;
 	}
 
 	public createTerminalFromOptions(options: vscode.TerminalOptions): vscode.Terminal {
-		let terminal = new ExtHostTerminal(this._proxy, options.name, options.shellPath, options.shellArgs, options.cwd, options.env /*, options.waitOnExit*/);
+		let terminal = new ExtHostTerminal(this._proxy, options.name);
+		terminal.create(options.shellPath, options.shellArgs, options.cwd, options.env /*, options.waitOnExit*/);
 		this._terminals.push(terminal);
 		return terminal;
 	}
@@ -124,6 +148,10 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		return this._onDidCloseTerminal && this._onDidCloseTerminal.event;
 	}
 
+	public get onDidOpenTerminal(): Event<vscode.Terminal> {
+		return this._onDidOpenTerminal && this._onDidOpenTerminal.event;
+	}
+
 	public $acceptTerminalClosed(id: number): void {
 		let index = this._getTerminalIndexById(id);
 		if (index === null) {
@@ -134,6 +162,18 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		this._onDidCloseTerminal.fire(terminal);
 	}
 
+	public $acceptTerminalOpened(id: number, name: string): void {
+		let index = this._getTerminalIndexById(id);
+		if (index !== null) {
+			// The terminal has already been created (via createTerminal*), only fire the event
+			this._onDidOpenTerminal.fire(this.terminals[index]);
+			return;
+		}
+		let terminal = new ExtHostTerminal(this._proxy, name, id);
+		this._terminals.push(terminal);
+		this._onDidOpenTerminal.fire(terminal);
+	}
+
 	public $acceptTerminalProcessId(id: number, processId: number): void {
 		let terminal = this._getTerminalById(id);
 		if (terminal) {
@@ -141,6 +181,99 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 		}
 	}
 
+	public $createProcess(id: number, shellLaunchConfig: ShellLaunchConfigDto, cols: number, rows: number): void {
+		// TODO: This function duplicates a lot of TerminalProcessManager.createProcess, ideally
+		// they would be merged into a single implementation.
+
+		const terminalConfig = this._extHostConfiguration.getConfiguration('terminal.integrated');
+
+		const locale = terminalConfig.get('setLocaleVariables') ? platform.locale : undefined;
+		if (!shellLaunchConfig.executable) {
+			// TODO: This duplicates some of TerminalConfigHelper.mergeDefaultShellPathAndArgs and should be merged
+			// this._configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig);
+
+			const platformKey = platform.isWindows ? 'windows' : platform.isMacintosh ? 'osx' : 'linux';
+			const shellConfigValue: string = terminalConfig.get(`shell.${platformKey}`);
+			const shellArgsConfigValue: string = terminalConfig.get(`shellArgs.${platformKey}`);
+
+			shellLaunchConfig.executable = shellConfigValue;
+			shellLaunchConfig.args = shellArgsConfigValue;
+		}
+
+		// TODO: Base the cwd on the last active workspace root
+		// const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
+		// this.initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, lastActiveWorkspaceRootUri, this._configHelper);
+		const initialCwd = os.homedir();
+
+		// TODO: Pull in and resolve config settings
+		// // Resolve env vars from config and shell
+		// const lastActiveWorkspaceRoot = this._workspaceContextService.getWorkspaceFolder(lastActiveWorkspaceRootUri);
+		// const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
+		// const envFromConfig = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...this._configHelper.config.env[platformKey] }, lastActiveWorkspaceRoot);
+		// const envFromShell = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...shellLaunchConfig.env }, lastActiveWorkspaceRoot);
+		// shellLaunchConfig.env = envFromShell;
+
+		// Merge process env with the env from config
+		const parentEnv = { ...process.env };
+		// terminalEnvironment.mergeEnvironments(parentEnv, envFromConfig);
+
+		// Continue env initialization, merging in the env from the launch
+		// config and adding keys that are needed to create the process
+		const env = terminalEnvironment.createTerminalEnv(parentEnv, shellLaunchConfig, initialCwd, locale, cols, rows);
+		let cwd = Uri.parse(require.toUrl('../../parts/terminal/node')).fsPath;
+		const options = { env, cwd, execArgv: [] };
+
+		// Fork the process and listen for messages
+		this._logService.debug(`Terminal process launching on ext host`, options);
+		this._terminalProcesses[id] = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
+		this._terminalProcesses[id].on('message', (message: IMessageFromTerminalProcess) => {
+			switch (message.type) {
+				case 'pid': this._proxy.$sendProcessPid(id, <number>message.content); break;
+				case 'title': this._proxy.$sendProcessTitle(id, <string>message.content); break;
+				case 'data': this._proxy.$sendProcessData(id, <string>message.content); break;
+			}
+		});
+		this._terminalProcesses[id].on('exit', (exitCode) => this._onProcessExit(id, exitCode));
+	}
+
+	public $acceptProcessInput(id: number, data: string): void {
+		if (this._terminalProcesses[id].connected) {
+			this._terminalProcesses[id].send({ event: 'input', data });
+		}
+	}
+
+	public $acceptProcessResize(id: number, cols: number, rows: number): void {
+		if (this._terminalProcesses[id].connected) {
+			try {
+				this._terminalProcesses[id].send({ event: 'resize', cols, rows });
+			} catch (error) {
+				// We tried to write to a closed pipe / channel.
+				if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
+					throw (error);
+				}
+			}
+		}
+	}
+
+	public $acceptProcessShutdown(id: number): void {
+		if (this._terminalProcesses[id].connected) {
+			this._terminalProcesses[id].send({ event: 'shutdown' });
+		}
+	}
+
+	private _onProcessExit(id: number, exitCode: number): void {
+		// Remove listeners
+		const process = this._terminalProcesses[id];
+		process.removeAllListeners('message');
+		process.removeAllListeners('exit');
+
+		// Remove process reference
+		delete this._terminalProcesses[id];
+
+		// Send exit event to main side
+		this._proxy.$sendProcessExit(id, exitCode);
+	}
+
 	private _getTerminalById(id: number): ExtHostTerminal {
 		let index = this._getTerminalIndexById(id);
 		return index !== null ? this._terminals[index] : null;
@@ -149,6 +282,7 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 	private _getTerminalIndexById(id: number): number {
 		let index: number = null;
 		this._terminals.some((terminal, i) => {
+			// TODO: This shouldn't be cas
 			let thisId = (<any>terminal)._id;
 			if (thisId === id) {
 				index = i;
@@ -161,7 +295,6 @@ export class ExtHostTerminalService implements ExtHostTerminalServiceShape {
 }
 
 class ApiRequest {
-
 	private _callback: (...args: any[]) => void;
 	private _args: any[];
 
diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index b6ddcfa97a0..9cadef91101 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -152,7 +152,7 @@ class ExtHostTreeView<T> extends Disposable {
 
 	private resolveTreeNode(element: T, parent?: TreeNode): TPromise<TreeNode> {
 		return asWinJsPromise(() => this.dataProvider.getTreeItem(element))
-			.then(extTreeItem => this.createHandle(element, extTreeItem, parent))
+			.then(extTreeItem => this.createHandle(element, extTreeItem, parent, true))
 			.then(handle => this.getChildren(parent ? parent.item.handle : null)
 				.then(() => {
 					const cachedElement = this.getExtensionElement(handle);
@@ -303,7 +303,7 @@ class ExtHostTreeView<T> extends Disposable {
 		return item;
 	}
 
-	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent?: TreeNode): TreeItemHandle {
+	private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parent: TreeNode, first?: boolean): TreeItemHandle {
 		if (id) {
 			return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
 		}
@@ -316,7 +316,7 @@ class ExtHostTreeView<T> extends Disposable {
 
 		for (let counter = 0; counter <= childrenNodes.length; counter++) {
 			const handle = `${prefix}/${counter}:${elementId}`;
-			if (!this.elements.has(handle) || existingHandle === handle) {
+			if (first || !this.elements.has(handle) || existingHandle === handle) {
 				return handle;
 			}
 		}
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index bf5bf34612d..5c98f71fd82 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -83,7 +83,6 @@ export function fromPosition(position: types.Position): IPosition {
 	return { lineNumber: position.line + 1, column: position.character + 1 };
 }
 
-
 export function fromDiagnostic(value: vscode.Diagnostic): IMarkerData {
 	return {
 		...fromRange(value.range),
@@ -245,7 +244,7 @@ export const TextEdit = {
 			range: fromRange(edit.range)
 		};
 	},
-	to(edit: modes.TextEdit): vscode.TextEdit {
+	to(edit: modes.TextEdit): types.TextEdit {
 		let result = new types.TextEdit(toRange(edit.range), edit.text);
 		result.newEol = EndOfLine.to(edit.eol);
 		return result;
@@ -547,12 +546,15 @@ export namespace DocumentLink {
 }
 
 export namespace ColorPresentation {
-	export function to(colorPresentation: modes.IColorPresentation): vscode.ColorPresentation {
-		return {
-			label: colorPresentation.label,
-			textEdit: colorPresentation.textEdit ? TextEdit.to(colorPresentation.textEdit) : undefined,
-			additionalTextEdits: colorPresentation.additionalTextEdits ? colorPresentation.additionalTextEdits.map(value => TextEdit.to(value)) : undefined
-		};
+	export function to(colorPresentation: modes.IColorPresentation): types.ColorPresentation {
+		let cp = new types.ColorPresentation(colorPresentation.label);
+		if (colorPresentation.textEdit) {
+			cp.textEdit = TextEdit.to(colorPresentation.textEdit);
+		}
+		if (colorPresentation.additionalTextEdits) {
+			cp.additionalTextEdits = colorPresentation.additionalTextEdits.map(value => TextEdit.to(value));
+		}
+		return cp;
 	}
 
 	export function from(colorPresentation: vscode.ColorPresentation): modes.IColorPresentation {
@@ -564,6 +566,15 @@ export namespace ColorPresentation {
 	}
 }
 
+export namespace Color {
+	export function to(c: [number, number, number, number]): types.Color {
+		return new types.Color(c[0], c[1], c[2], c[3]);
+	}
+	export function from(color: types.Color): [number, number, number, number] {
+		return [color.red, color.green, color.blue, color.alpha];
+	}
+}
+
 export namespace TextDocumentSaveReason {
 
 	export function to(reason: SaveReason): vscode.TextDocumentSaveReason {
@@ -612,11 +623,9 @@ export namespace ProgressLocation {
 	}
 }
 
-export namespace FoldingRangeList {
-	export function from(rangeList: vscode.FoldingRangeList): modes.IFoldingRangeList {
-		return {
-			ranges: rangeList.ranges.map(r => ({ startLineNumber: r.startLine + 1, endLineNumber: r.endLine + 1, type: r.type }))
-		};
+export namespace FoldingRange {
+	export function from(r: vscode.FoldingRange): modes.FoldingRange {
+		return { start: r.start + 1, end: r.end + 1, kind: r.kind };
 	}
 }
 
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 07ced944343..f75c83dbe18 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -208,7 +208,7 @@ export class Position {
 
 export class Range {
 
-	static isRange(thing: any): thing is Range {
+	static isRange(thing: any): thing is vscode.Range {
 		if (thing instanceof Range) {
 			return true;
 		}
@@ -903,6 +903,8 @@ export class CodeActionKind {
 	public static readonly RefactorExtract = CodeActionKind.Refactor.append('extract');
 	public static readonly RefactorInline = CodeActionKind.Refactor.append('inline');
 	public static readonly RefactorRewrite = CodeActionKind.Refactor.append('rewrite');
+	public static readonly Source = CodeActionKind.Empty.append('source');
+	public static readonly SourceOrganizeImports = CodeActionKind.Source.append('organizeImports');
 
 	constructor(
 		public readonly value: string
@@ -1343,6 +1345,20 @@ export class ProcessExecution implements vscode.ProcessExecution {
 	set options(value: vscode.ProcessExecutionOptions) {
 		this._options = value;
 	}
+
+	public computeId(): string {
+		const hash = crypto.createHash('md5');
+		hash.update('process');
+		if (this._process !== void 0) {
+			hash.update(this._process);
+		}
+		if (this._args && this._args.length > 0) {
+			for (let arg of this._args) {
+				hash.update(arg);
+			}
+		}
+		return hash.digest('hex');
+	}
 }
 
 export class ShellExecution implements vscode.ShellExecution {
@@ -1411,6 +1427,23 @@ export class ShellExecution implements vscode.ShellExecution {
 	set options(value: vscode.ShellExecutionOptions) {
 		this._options = value;
 	}
+
+	public computeId(): string {
+		const hash = crypto.createHash('md5');
+		hash.update('shell');
+		if (this._commandLine !== void 0) {
+			hash.update(this._commandLine);
+		}
+		if (this._command !== void 0) {
+			hash.update(typeof this._command === 'string' ? this._command : this._command.value);
+		}
+		if (this._args && this._args.length > 0) {
+			for (let arg of this._args) {
+				hash.update(typeof arg === 'string' ? arg : arg.value);
+			}
+		}
+		return hash.digest('hex');
+	}
 }
 
 export enum ShellQuoting {
@@ -1485,7 +1518,24 @@ export class Task implements vscode.Task {
 	}
 
 	private clear(): void {
+		if (this.__id === void 0) {
+			return;
+		}
 		this.__id = undefined;
+		this._scope = undefined;
+		this._definitionKey = undefined;
+		this._definition = undefined;
+		if (this._execution instanceof ProcessExecution) {
+			this._definition = {
+				type: 'process',
+				id: this._execution.computeId()
+			};
+		} else if (this._execution instanceof ShellExecution) {
+			this._definition = {
+				type: 'shell',
+				id: this._execution.computeId()
+			};
+		}
 	}
 
 	get definition(): vscode.TaskDefinition {
@@ -1770,53 +1820,85 @@ export enum FileChangeType {
 	Deleted = 2
 }
 
+export enum FileChangeType2 {
+	Changed = 1,
+	Created = 2,
+	Deleted = 3,
+}
+
 export enum FileType {
 	File = 0,
 	Dir = 1,
 	Symlink = 2
 }
 
+export class FileSystemError extends Error {
+
+	static EntryExists(message?: string): FileSystemError {
+		return new FileSystemError(message, 'EntryExists', FileSystemError.EntryExists);
+	}
+	static EntryNotFound(message?: string): FileSystemError {
+		return new FileSystemError(message, 'EntryNotFound', FileSystemError.EntryNotFound);
+	}
+	static EntryNotADirectory(message?: string): FileSystemError {
+		return new FileSystemError(message, 'EntryNotADirectory', FileSystemError.EntryNotADirectory);
+	}
+	static EntryIsADirectory(message?: string): FileSystemError {
+		return new FileSystemError(message, 'EntryIsADirectory', FileSystemError.EntryIsADirectory);
+	}
+
+	constructor(message?: string, code?: string, hide?: Function) {
+		super(message);
+		this.name = code ? `${code} (FileSystemError)` : `FileSystemError`;
+
+		if (typeof Error.captureStackTrace === 'function' && typeof hide === 'function') {
+			// nice stack traces
+			Error.captureStackTrace(this, hide);
+		}
+	}
+}
+
 //#endregion
 
 //#region folding api
 
-export class FoldingRangeList {
-
-	ranges: FoldingRange[];
-
-	constructor(ranges: FoldingRange[]) {
-		this.ranges = ranges;
-	}
-}
-
 export class FoldingRange {
 
-	startLine: number;
+	start: number;
 
-	endLine: number;
+	end: number;
 
-	type?: FoldingRangeType | string;
+	kind?: FoldingRangeKind;
 
-	constructor(startLine: number, endLine: number, type?: FoldingRangeType | string) {
-		this.startLine = startLine;
-		this.endLine = endLine;
-		this.type = type;
+	constructor(start: number, end: number, kind?: FoldingRangeKind) {
+		this.start = start;
+		this.end = end;
+		this.kind = kind;
 	}
 }
 
-export enum FoldingRangeType {
+export class FoldingRangeKind {
 	/**
-	 * Folding range for a comment
+	 * Kind for folding range representing a comment. The value of the kind is 'comment'.
 	 */
-	Comment = 'comment',
+	static readonly Comment = new FoldingRangeKind('comment');
 	/**
-	 * Folding range for a imports or includes
+	 * Kind for folding range representing a import. The value of the kind is 'imports'.
 	 */
-	Imports = 'imports',
+	static readonly Imports = new FoldingRangeKind('imports');
 	/**
-	 * Folding range for a region (e.g. `#region`)
+	 * Kind for folding range representing regions (for example marked by `#region`, `#endregion`).
+	 * The value of the kind is 'region'.
 	 */
-	Region = 'region'
+	static readonly Region = new FoldingRangeKind('region');
+
+	/**
+	 * Creates a new [FoldingRangeKind](#FoldingRangeKind).
+	 *
+	 * @param value of the kind.
+	 */
+	public constructor(public value: string) {
+	}
 }
 
 //#endregion
diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts
new file mode 100644
index 00000000000..c4ba32abf0e
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostUrls.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { MainContext, IMainContext, ExtHostUrlsShape, MainThreadUrlsShape } from './extHost.protocol';
+import URI, { UriComponents } from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { toDisposable } from 'vs/base/common/lifecycle';
+
+export class ExtHostUrls implements ExtHostUrlsShape {
+
+	private static HandlePool = 0;
+	private readonly _proxy: MainThreadUrlsShape;
+
+	private handlers = new Map<number, vscode.ExternalUriHandler>();
+
+	constructor(
+		mainContext: IMainContext
+	) {
+		this._proxy = mainContext.getProxy(MainContext.MainThreadUrls);
+	}
+
+	registerExternalUriHandler(extensionId: string, handler: vscode.ExternalUriHandler): vscode.Disposable {
+		const handle = ExtHostUrls.HandlePool++;
+		this.handlers.set(handle, handler);
+		this._proxy.$registerExternalUriHandler(handle, extensionId);
+
+		return toDisposable(() => {
+			this.handlers.delete(handle);
+			this._proxy.$unregisterExternalUriHandler(handle);
+		});
+	}
+
+	$handleExternalUri(handle: number, uri: UriComponents): TPromise<void> {
+		const handler = this.handlers.get(handle);
+
+		if (!handler) {
+			return TPromise.as(null);
+		}
+
+		handler.handleExternalUri(URI.revive(uri));
+		return TPromise.as(null);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts
index 27f69d0ec1d..e91157377ab 100644
--- a/src/vs/workbench/api/node/extHostWebview.ts
+++ b/src/vs/workbench/api/node/extHostWebview.ts
@@ -3,73 +3,36 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainContext, MainThreadWebviewsShape, IMainContext, ExtHostWebviewsShape, WebviewHandle } from './extHost.protocol';
+import { MainContext, MainThreadWebviewsShape, IMainContext, ExtHostWebviewsShape, WebviewPanelHandle } from './extHost.protocol';
 import * as vscode from 'vscode';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 import { Position } from 'vs/platform/editor/common/editor';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Disposable } from './extHostTypes';
 
 export class ExtHostWebview implements vscode.Webview {
-
-	private readonly _viewType: string;
-	private _title: string;
+	private readonly _handle: WebviewPanelHandle;
+	private readonly _proxy: MainThreadWebviewsShape;
 	private _html: string;
 	private _options: vscode.WebviewOptions;
 	private _isDisposed: boolean = false;
-	private _viewColumn: vscode.ViewColumn;
-	private _active: boolean;
 
-	public readonly onMessageEmitter = new Emitter<any>();
-	public readonly onDidReceiveMessage: Event<any> = this.onMessageEmitter.event;
-
-	public readonly onDisposeEmitter = new Emitter<void>();
-	public readonly onDidDispose: Event<void> = this.onDisposeEmitter.event;
-
-	public readonly onDidChangeViewStateEmitter = new Emitter<vscode.WebViewOnDidChangeViewStateEvent>();
-	public readonly onDidChangeViewState: Event<vscode.WebViewOnDidChangeViewStateEvent> = this.onDidChangeViewStateEmitter.event;
+	readonly _onMessageEmitter = new Emitter<any>();
+	public readonly onDidReceiveMessage: Event<any> = this._onMessageEmitter.event;
 
 	constructor(
-		private readonly _handle: WebviewHandle,
-		private readonly _proxy: MainThreadWebviewsShape,
-		viewType: string,
-		viewColumn: vscode.ViewColumn,
+		handle: WebviewPanelHandle,
+		proxy: MainThreadWebviewsShape,
 		options: vscode.WebviewOptions
 	) {
-		this._viewType = viewType;
-		this._viewColumn = viewColumn;
+		this._handle = handle;
+		this._proxy = proxy;
 		this._options = options;
 	}
 
-	public dispose() {
-		if (this._isDisposed) {
-			return;
-		}
-
-		this._isDisposed = true;
-		this._proxy.$disposeWebview(this._handle);
-
-		this.onDisposeEmitter.dispose();
-		this.onMessageEmitter.dispose();
-		this.onDidChangeViewStateEmitter.dispose();
-	}
-
-	get viewType(): string {
-		this.assertNotDisposed();
-		return this._viewType;
-	}
-
-	get title(): string {
-		this.assertNotDisposed();
-		return this._title;
-	}
-
-	set title(value: string) {
-		this.assertNotDisposed();
-		if (this._title !== value) {
-			this._title = value;
-			this._proxy.$setTitle(this._handle, value);
-		}
+	dispose() {
+		this._onMessageEmitter.dispose();
 	}
 
 	get html(): string {
@@ -90,34 +53,127 @@ export class ExtHostWebview implements vscode.Webview {
 		return this._options;
 	}
 
+	public postMessage(message: any): Thenable<boolean> {
+		this.assertNotDisposed();
+		return this._proxy.$postMessage(this._handle, message);
+	}
+
+	private assertNotDisposed() {
+		if (this._isDisposed) {
+			throw new Error('Webview is disposed');
+		}
+	}
+}
+
+export class ExtHostWebviewPanel implements vscode.WebviewPanel {
+
+	private readonly _handle: WebviewPanelHandle;
+	private readonly _proxy: MainThreadWebviewsShape;
+	private readonly _viewType: string;
+	private _title: string;
+
+	private readonly _options: vscode.WebviewPanelOptions;
+	private readonly _webview: ExtHostWebview;
+	private _isDisposed: boolean = false;
+	private _viewColumn: vscode.ViewColumn;
+	private _visible: boolean = true;
+
+	readonly _onDisposeEmitter = new Emitter<void>();
+	public readonly onDidDispose: Event<void> = this._onDisposeEmitter.event;
+
+	readonly _onDidChangeViewStateEmitter = new Emitter<vscode.WebviewPanelOnDidChangeViewStateEvent>();
+	public readonly onDidChangeViewState: Event<vscode.WebviewPanelOnDidChangeViewStateEvent> = this._onDidChangeViewStateEmitter.event;
+
+
+	constructor(
+		handle: WebviewPanelHandle,
+		proxy: MainThreadWebviewsShape,
+		viewType: string,
+		title: string,
+		viewColumn: vscode.ViewColumn,
+		editorOptions: vscode.WebviewPanelOptions,
+		webview: ExtHostWebview
+	) {
+		this._handle = handle;
+		this._proxy = proxy;
+		this._viewType = viewType;
+		this._options = editorOptions;
+		this._viewColumn = viewColumn;
+		this._title = title;
+		this._webview = webview;
+	}
+
+	public dispose() {
+		if (this._isDisposed) {
+			return;
+		}
+
+		this._isDisposed = true;
+		this._onDisposeEmitter.fire();
+
+		this._proxy.$disposeWebview(this._handle);
+
+		this._webview.dispose();
+
+		this._onDisposeEmitter.dispose();
+		this._onDidChangeViewStateEmitter.dispose();
+	}
+
+	get webview() {
+		this.assertNotDisposed();
+		return this._webview;
+	}
+
+	get viewType(): string {
+		this.assertNotDisposed();
+		return this._viewType;
+	}
+
+	get title(): string {
+		this.assertNotDisposed();
+		return this._title;
+	}
+
+	set title(value: string) {
+		this.assertNotDisposed();
+		if (this._title !== value) {
+			this._title = value;
+			this._proxy.$setTitle(this._handle, value);
+		}
+	}
+
+	get options() {
+		return this._options;
+	}
+
 	get viewColumn(): vscode.ViewColumn {
 		this.assertNotDisposed();
 		return this._viewColumn;
 	}
 
-	get active(): boolean {
-		this.assertNotDisposed();
-		return this._active;
-	}
-
-	set viewColumn(value: vscode.ViewColumn) {
+	_setViewColumn(value: vscode.ViewColumn) {
 		this.assertNotDisposed();
 		this._viewColumn = value;
 	}
 
-	set active(value: boolean) {
+	get visible(): boolean {
 		this.assertNotDisposed();
-		this._active = value;
+		return this._visible;
+	}
+
+	_setVisible(value: boolean) {
+		this.assertNotDisposed();
+		this._visible = value;
 	}
 
 	public postMessage(message: any): Thenable<boolean> {
 		this.assertNotDisposed();
-		return this._proxy.$sendMessage(this._handle, message);
+		return this._proxy.$postMessage(this._handle, message);
 	}
 
-	public reveal(viewColumn: vscode.ViewColumn): void {
+	public reveal(viewColumn?: vscode.ViewColumn): void {
 		this.assertNotDisposed();
-		this._proxy.$reveal(this._handle, typeConverters.fromViewColumn(viewColumn));
+		this._proxy.$reveal(this._handle, viewColumn ? typeConverters.fromViewColumn(viewColumn) : undefined);
 	}
 
 	private assertNotDisposed() {
@@ -128,13 +184,12 @@ export class ExtHostWebview implements vscode.Webview {
 }
 
 export class ExtHostWebviews implements ExtHostWebviewsShape {
-	private static handlePool = 1;
+	private static webviewHandlePool = 1;
 
 	private readonly _proxy: MainThreadWebviewsShape;
 
-	private readonly _webviews = new Map<WebviewHandle, ExtHostWebview>();
-
-	private _activeWebview: ExtHostWebview | undefined;
+	private readonly _webviewPanels = new Map<WebviewPanelHandle, ExtHostWebviewPanel>();
+	private readonly _serializers = new Map<string, vscode.WebviewPanelSerializer>();
 
 	constructor(
 		mainContext: IMainContext
@@ -146,70 +201,99 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		viewType: string,
 		title: string,
 		viewColumn: vscode.ViewColumn,
-		options: vscode.WebviewOptions,
+		options: vscode.WebviewPanelOptions & vscode.WebviewOptions,
 		extensionFolderPath: string
-	): vscode.Webview {
-		const handle = ExtHostWebviews.handlePool++;
-		this._proxy.$createWebview(handle, viewType, title, typeConverters.fromViewColumn(viewColumn), options, extensionFolderPath);
+	): vscode.WebviewPanel {
+		const handle = ExtHostWebviews.webviewHandlePool++ + '';
+		this._proxy.$createWebviewPanel(handle, viewType, title, typeConverters.fromViewColumn(viewColumn), options, extensionFolderPath);
 
-		const webview = new ExtHostWebview(handle, this._proxy, viewType, viewColumn, options);
-		this._webviews.set(handle, webview);
-		return webview;
+		const webview = new ExtHostWebview(handle, this._proxy, options);
+		const panel = new ExtHostWebviewPanel(handle, this._proxy, viewType, title, viewColumn, options, webview);
+		this._webviewPanels.set(handle, panel);
+		return panel;
 	}
 
-	$onMessage(handle: WebviewHandle, message: any): void {
-		const webview = this.getWebview(handle);
-		if (webview) {
-			webview.onMessageEmitter.fire(message);
+	registerWebviewPanelSerializer(
+		viewType: string,
+		serializer: vscode.WebviewPanelSerializer
+	): vscode.Disposable {
+		if (this._serializers.has(viewType)) {
+			throw new Error(`Serializer for '${viewType}' already registered`);
+		}
+
+		this._serializers.set(viewType, serializer);
+		this._proxy.$registerSerializer(viewType);
+
+		return new Disposable(() => {
+			this._serializers.delete(viewType);
+			this._proxy.$unregisterSerializer(viewType);
+		});
+	}
+
+	$onMessage(handle: WebviewPanelHandle, message: any): void {
+		const panel = this.getWebviewPanel(handle);
+		if (panel) {
+			panel.webview._onMessageEmitter.fire(message);
 		}
 	}
 
-	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void {
-		if (handle) {
-			const webview = this.getWebview(handle);
-			if (webview) {
-				if (webview !== this._activeWebview) {
-					this._activeWebview = webview;
-					webview.active = true;
-					webview.onDidChangeViewStateEmitter.fire({ viewColumn: webview.viewColumn, active: true });
-				}
-			}
-		} else {
-			if (this._activeWebview) {
-				this._activeWebview.active = false;
-				this._activeWebview.onDidChangeViewStateEmitter.fire({ viewColumn: this._activeWebview.viewColumn, active: false });
-				this._activeWebview = undefined;
+	$onDidChangeWebviewPanelViewState(handle: WebviewPanelHandle, visible: boolean, position: Position): void {
+		const panel = this.getWebviewPanel(handle);
+		if (panel) {
+			const viewColumn = typeConverters.toViewColumn(position);
+			if (panel.visible !== visible || panel.viewColumn !== viewColumn) {
+				panel._setVisible(visible);
+				panel._setViewColumn(viewColumn);
+				panel._onDidChangeViewStateEmitter.fire({ webviewPanel: panel });
 			}
 		}
 	}
 
-	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void> {
-		const webview = this.getWebview(handle);
-		if (webview) {
-			webview.onDisposeEmitter.fire();
-			this._webviews.delete(handle);
-			if (this._activeWebview === webview) {
-				this._activeWebview = undefined;
-			}
+	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Thenable<void> {
+		const panel = this.getWebviewPanel(handle);
+		if (panel) {
+			panel.dispose();
+			this._webviewPanels.delete(handle);
 		}
 		return TPromise.as(void 0);
 	}
 
-	$onDidChangePosition(handle: WebviewHandle, newPosition: Position): void {
-		const webview = this.getWebview(handle);
-		if (webview) {
-			const newViewColumn = typeConverters.toViewColumn(newPosition);
-			if (webview.viewColumn !== newViewColumn) {
-				webview.viewColumn = newViewColumn;
-				webview.onDidChangeViewStateEmitter.fire({ viewColumn: newViewColumn, active: webview.active });
-			}
+	$deserializeWebviewPanel(
+		webviewHandle: WebviewPanelHandle,
+		viewType: string,
+		title: string,
+		state: any,
+		position: Position,
+		options: vscode.WebviewOptions & vscode.WebviewPanelOptions
+	): Thenable<void> {
+		const serializer = this._serializers.get(viewType);
+		if (!serializer) {
+			return TPromise.wrapError(new Error(`No serializer found for '${viewType}'`));
 		}
+
+		const webview = new ExtHostWebview(webviewHandle, this._proxy, options);
+		const revivedPanel = new ExtHostWebviewPanel(webviewHandle, this._proxy, viewType, title, typeConverters.toViewColumn(position), options, webview);
+		this._webviewPanels.set(webviewHandle, revivedPanel);
+		return serializer.deserializeWebviewPanel(revivedPanel, state);
 	}
 
-	private readonly _onDidChangeActiveWebview = new Emitter<ExtHostWebview | undefined>();
-	public readonly onDidChangeActiveWebview = this._onDidChangeActiveWebview.event;
+	$serializeWebviewPanel(
+		webviewHandle: WebviewPanelHandle
+	): Thenable<any> {
+		const panel = this.getWebviewPanel(webviewHandle);
+		if (!panel) {
+			return TPromise.as(undefined);
+		}
 
-	private getWebview(handle: WebviewHandle) {
-		return this._webviews.get(handle);
+		const serialzer = this._serializers.get(panel.viewType);
+		if (!serialzer) {
+			return TPromise.as(undefined);
+		}
+
+		return serialzer.serializeWebviewPanel(panel);
+	}
+
+	private getWebviewPanel(handle: WebviewPanelHandle): ExtHostWebviewPanel | undefined {
+		return this._webviewPanels.get(handle);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
index 88d2d8d3f25..7fd58a461ac 100644
--- a/src/vs/workbench/api/node/extHostWorkspace.ts
+++ b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -362,7 +362,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
 		if (token) {
 			token.onCancellationRequested(() => this._proxy.$cancelSearch(requestId));
 		}
-		return result.then(data => data.map(URI.revive));
+		return result.then(data => Array.isArray(data) ? data.map(URI.revive) : []);
 	}
 
 	saveAll(includeUntitled?: boolean): Thenable<boolean> {
diff --git a/src/vs/workbench/api/shared/tasks.ts b/src/vs/workbench/api/shared/tasks.ts
index cba95638cbc..7e070957c48 100644
--- a/src/vs/workbench/api/shared/tasks.ts
+++ b/src/vs/workbench/api/shared/tasks.ts
@@ -11,10 +11,6 @@ export interface TaskDefinitionDTO {
 	[name: string]: any;
 }
 
-export interface TaskExecutionDTO {
-	id: string;
-}
-
 export interface TaskPresentationOptionsDTO {
 	reveal?: number;
 	echo?: boolean;
@@ -85,4 +81,14 @@ export interface TaskDTO {
 	presentationOptions: TaskPresentationOptionsDTO;
 	problemMatchers: string[];
 	hasDefinedMatchers: boolean;
+}
+
+export interface TaskExecutionDTO {
+	id: string;
+	task: TaskDTO;
+}
+
+export interface TaskFilterDTO {
+	version?: string;
+	type?: string;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
index 0e85d241b4f..545f12395cf 100644
--- a/src/vs/workbench/browser/composite.ts
+++ b/src/vs/workbench/browser/composite.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Component } from 'vs/workbench/common/component';
@@ -14,8 +13,8 @@ import { IEditorControl } from 'vs/platform/editor/common/editor';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import * as DOM from 'vs/base/browser/dom';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { IFocusTracker, trackFocus, Dimension } from 'vs/base/browser/dom';
 
 /**
  * Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -31,11 +30,11 @@ export abstract class Composite extends Component implements IComposite {
 	private readonly _onTitleAreaUpdate: Emitter<void>;
 	private readonly _onDidFocus: Emitter<void>;
 
-	private _focusTracker?: DOM.IFocusTracker;
+	private _focusTracker?: IFocusTracker;
 	private _focusListenerDisposable?: IDisposable;
 
 	private visible: boolean;
-	private parent: Builder;
+	private parent: HTMLElement;
 
 	protected actionRunner: IActionRunner;
 
@@ -75,7 +74,7 @@ export abstract class Composite extends Component implements IComposite {
 	 * Note that DOM-dependent calculations should be performed from the setVisible()
 	 * call. Only then the composite will be part of the DOM.
 	 */
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		this.parent = parent;
 
 		return TPromise.as(null);
@@ -88,12 +87,12 @@ export abstract class Composite extends Component implements IComposite {
 	/**
 	 * Returns the container this composite is being build in.
 	 */
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.parent;
 	}
 
 	public get onDidFocus(): Event<any> {
-		this._focusTracker = DOM.trackFocus(this.getContainer().getHTMLElement());
+		this._focusTracker = trackFocus(this.getContainer());
 		this._focusListenerDisposable = this._focusTracker.onDidFocus(() => {
 			this._onDidFocus.fire();
 		});
@@ -243,6 +242,10 @@ export abstract class CompositeDescriptor<T extends Composite> {
 }
 
 export abstract class CompositeRegistry<T extends Composite> {
+
+	private readonly _onDidRegister: Emitter<CompositeDescriptor<T>> = new Emitter<CompositeDescriptor<T>>();
+	readonly onDidRegister: Event<CompositeDescriptor<T>> = this._onDidRegister.event;
+
 	private composites: CompositeDescriptor<T>[];
 
 	constructor() {
@@ -255,6 +258,7 @@ export abstract class CompositeRegistry<T extends Composite> {
 		}
 
 		this.composites.push(descriptor);
+		this._onDidRegister.fire(descriptor);
 	}
 
 	public getComposite(id: string): CompositeDescriptor<T> {
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 0699347dc75..e8dcb1d830b 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { Part } from 'vs/workbench/browser/part';
 import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
+import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IPartService, Position, ILayoutOptions, Parts } from 'vs/workbench/services/part/common/partService';
@@ -22,6 +22,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { memoize } from 'vs/base/common/decorators';
 import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/notificationsCenter';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
+import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom';
 
 const MIN_SIDEBAR_PART_WIDTH = 170;
 const DEFAULT_SIDEBAR_PART_WIDTH = 300;
@@ -58,8 +59,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	private static readonly sashYHeightSettingsKey = 'workbench.panel.height';
 	private static readonly panelSizeBeforeMaximizedKey = 'workbench.panel.sizeBeforeMaximized';
 
-	private parent: Builder;
-	private workbenchContainer: Builder;
+	private parent: HTMLElement;
+	private workbenchContainer: HTMLElement;
 	private titlebar: Part;
 	private activitybar: Part;
 	private editor: Part;
@@ -67,6 +68,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	private panel: Part;
 	private statusbar: Part;
 	private quickopen: QuickOpenController;
+	private quickInput: QuickInputService;
 	private notificationsCenter: NotificationsCenter;
 	private notificationsToasts: NotificationsToasts;
 	private toUnbind: IDisposable[];
@@ -86,8 +88,8 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 
 	// Take parts as an object bag since instatation service does not have typings for constructors with 9+ arguments
 	constructor(
-		parent: Builder,
-		workbenchContainer: Builder,
+		parent: HTMLElement,
+		workbenchContainer: HTMLElement,
 		parts: {
 			titlebar: Part,
 			activitybar: Part,
@@ -97,6 +99,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 			statusbar: Part
 		},
 		quickopen: QuickOpenController,
+		quickInput: QuickInputService,
 		notificationsCenter: NotificationsCenter,
 		notificationsToasts: NotificationsToasts,
 		@IStorageService private storageService: IStorageService,
@@ -116,21 +119,22 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.panel = parts.panel;
 		this.statusbar = parts.statusbar;
 		this.quickopen = quickopen;
+		this.quickInput = quickInput;
 		this.notificationsCenter = notificationsCenter;
 		this.notificationsToasts = notificationsToasts;
 		this.toUnbind = [];
 		this.panelSizeBeforeMaximized = this.storageService.getInteger(WorkbenchLayout.panelSizeBeforeMaximizedKey, StorageScope.GLOBAL, 0);
 		this.panelMaximized = false;
 
-		this.sashXOne = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashXOne = new Sash(this.workbenchContainer, this, {
 			baseSize: 5
 		});
 
-		this.sashXTwo = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashXTwo = new Sash(this.workbenchContainer, this, {
 			baseSize: 5
 		});
 
-		this.sashY = new Sash(this.workbenchContainer.getHTMLElement(), this, {
+		this.sashY = new Sash(this.workbenchContainer, this, {
 			baseSize: 4,
 			orientation: Orientation.HORIZONTAL
 		});
@@ -443,7 +447,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 	}
 
 	public layout(options?: ILayoutOptions): void {
-		this.workbenchSize = this.parent.getClientArea();
+		this.workbenchSize = getClientArea(this.parent);
 
 		const isActivityBarHidden = !this.partService.isVisible(Parts.ACTIVITYBAR_PART);
 		const isTitlebarHidden = !this.partService.isVisible(Parts.TITLEBAR_PART);
@@ -574,12 +578,11 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Workbench
-		this.workbenchContainer
-			.position(0, 0, 0, 0, 'relative')
-			.size(this.workbenchSize.width, this.workbenchSize.height);
+		position(this.workbenchContainer, 0, 0, 0, 0, 'relative');
+		size(this.workbenchContainer, this.workbenchSize.width, this.workbenchSize.height);
 
 		// Bug on Chrome: Sometimes Chrome wants to scroll the workbench container on layout changes. The fix is to reset scrolling in this case.
-		const workbenchContainer = this.workbenchContainer.getHTMLElement();
+		const workbenchContainer = this.workbenchContainer;
 		if (workbenchContainer.scrollTop > 0) {
 			workbenchContainer.scrollTop = 0;
 		}
@@ -588,69 +591,78 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		}
 
 		// Title Part
+		const titleContainer = this.titlebar.getContainer();
 		if (isTitlebarHidden) {
-			this.titlebar.getContainer().hide();
+			hide(titleContainer);
 		} else {
-			this.titlebar.getContainer().show();
+			show(titleContainer);
 		}
 
 		// Editor Part and Panel part
-		this.editor.getContainer().size(editorSize.width, editorSize.height);
-		this.panel.getContainer().size(panelDimension.width, panelDimension.height);
+		const editorContainer = this.editor.getContainer();
+		const panelContainer = this.panel.getContainer();
+		size(editorContainer, editorSize.width, editorSize.height);
+		size(panelContainer, panelDimension.width, panelDimension.height);
 
 		if (panelPosition === Position.BOTTOM) {
 			if (sidebarPosition === Position.LEFT) {
-				this.editor.getContainer().position(this.titlebarHeight, 0, this.statusbarHeight + panelDimension.height, sidebarSize.width + activityBarSize.width);
-				this.panel.getContainer().position(editorSize.height + this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
+				position(editorContainer, this.titlebarHeight, 0, this.statusbarHeight + panelDimension.height, sidebarSize.width + activityBarSize.width);
+				position(panelContainer, editorSize.height + this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
 			} else {
-				this.editor.getContainer().position(this.titlebarHeight, sidebarSize.width, this.statusbarHeight + panelDimension.height, 0);
-				this.panel.getContainer().position(editorSize.height + this.titlebarHeight, sidebarSize.width, this.statusbarHeight, 0);
+				position(editorContainer, this.titlebarHeight, sidebarSize.width, this.statusbarHeight + panelDimension.height, 0);
+				position(panelContainer, editorSize.height + this.titlebarHeight, sidebarSize.width, this.statusbarHeight, 0);
 			}
 		} else {
 			if (sidebarPosition === Position.LEFT) {
-				this.editor.getContainer().position(this.titlebarHeight, panelDimension.width, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
-				this.panel.getContainer().position(this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width + editorSize.width);
+				position(editorContainer, this.titlebarHeight, panelDimension.width, this.statusbarHeight, sidebarSize.width + activityBarSize.width);
+				position(panelContainer, this.titlebarHeight, 0, this.statusbarHeight, sidebarSize.width + activityBarSize.width + editorSize.width);
 			} else {
-				this.editor.getContainer().position(this.titlebarHeight, sidebarSize.width + activityBarSize.width + panelWidth, this.statusbarHeight, 0);
-				this.panel.getContainer().position(this.titlebarHeight, sidebarSize.width + activityBarSize.width, this.statusbarHeight, editorSize.width);
+				position(editorContainer, this.titlebarHeight, sidebarSize.width + activityBarSize.width + panelWidth, this.statusbarHeight, 0);
+				position(panelContainer, this.titlebarHeight, sidebarSize.width + activityBarSize.width, this.statusbarHeight, editorSize.width);
 			}
 		}
 
 		// Activity Bar Part
-		this.activitybar.getContainer().size(null, activityBarSize.height);
+		const activitybarContainer = this.activitybar.getContainer();
+		size(activitybarContainer, null, activityBarSize.height);
 		if (sidebarPosition === Position.LEFT) {
-			this.activitybar.getContainer().getHTMLElement().style.right = '';
-			this.activitybar.getContainer().position(this.titlebarHeight, null, 0, 0);
+			this.activitybar.getContainer().style.right = '';
+			position(activitybarContainer, this.titlebarHeight, null, 0, 0);
 		} else {
-			this.activitybar.getContainer().getHTMLElement().style.left = '';
-			this.activitybar.getContainer().position(this.titlebarHeight, 0, 0, null);
+			this.activitybar.getContainer().style.left = '';
+			position(activitybarContainer, this.titlebarHeight, 0, 0, null);
 		}
 		if (isActivityBarHidden) {
-			this.activitybar.getContainer().hide();
+			hide(activitybarContainer);
 		} else {
-			this.activitybar.getContainer().show();
+			show(activitybarContainer);
 		}
 
 		// Sidebar Part
-		this.sidebar.getContainer().size(sidebarSize.width, sidebarSize.height);
+		const sidebarContainer = this.sidebar.getContainer();
+		size(sidebarContainer, sidebarSize.width, sidebarSize.height);
 		const editorAndPanelWidth = editorSize.width + (panelPosition === Position.RIGHT ? panelWidth : 0);
 		if (sidebarPosition === Position.LEFT) {
-			this.sidebar.getContainer().position(this.titlebarHeight, editorAndPanelWidth, this.statusbarHeight, activityBarSize.width);
+			position(sidebarContainer, this.titlebarHeight, editorAndPanelWidth, this.statusbarHeight, activityBarSize.width);
 		} else {
-			this.sidebar.getContainer().position(this.titlebarHeight, activityBarSize.width, this.statusbarHeight, editorAndPanelWidth);
+			position(sidebarContainer, this.titlebarHeight, activityBarSize.width, this.statusbarHeight, editorAndPanelWidth);
 		}
 
 		// Statusbar Part
-		this.statusbar.getContainer().position(this.workbenchSize.height - this.statusbarHeight);
+		const statusbarContainer = this.statusbar.getContainer();
+		position(statusbarContainer, this.workbenchSize.height - this.statusbarHeight);
 		if (isStatusbarHidden) {
-			this.statusbar.getContainer().hide();
+			hide(statusbarContainer);
 		} else {
-			this.statusbar.getContainer().show();
+			show(statusbarContainer);
 		}
 
 		// Quick open
 		this.quickopen.layout(this.workbenchSize);
 
+		// Quick input
+		this.quickInput.layout(this.workbenchSize);
+
 		// Notifications
 		this.notificationsCenter.layout(this.workbenchSize);
 		this.notificationsToasts.layout(this.workbenchSize);
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
index a44f1f6c2e2..8b05f420b0b 100644
--- a/src/vs/workbench/browser/panel.ts
+++ b/src/vs/workbench/browser/panel.ts
@@ -95,7 +95,7 @@ export abstract class TogglePanelAction extends Action {
 		const activePanel = this.panelService.getActivePanel();
 		const activeElement = document.activeElement;
 
-		return activePanel && activeElement && DOM.isAncestor(activeElement, (<Panel>activePanel).getContainer().getHTMLElement());
+		return activePanel && activeElement && DOM.isAncestor(activeElement, (<Panel>activePanel).getContainer());
 	}
 }
 
diff --git a/src/vs/workbench/browser/part.ts b/src/vs/workbench/browser/part.ts
index 007441d57dc..8f147ff99bc 100644
--- a/src/vs/workbench/browser/part.ts
+++ b/src/vs/workbench/browser/part.ts
@@ -6,9 +6,9 @@
 'use strict';
 
 import 'vs/css!./media/part';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { Component } from 'vs/workbench/common/component';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
+import { Dimension, size } from 'vs/base/browser/dom';
 
 export interface IPartOptions {
 	hasTitle?: boolean;
@@ -20,9 +20,9 @@ export interface IPartOptions {
  * and mandatory content area to show content.
  */
 export abstract class Part extends Component {
-	private parent: Builder;
-	private titleArea: Builder;
-	private contentArea: Builder;
+	private parent: HTMLElement;
+	private titleArea: HTMLElement;
+	private contentArea: HTMLElement;
 	private partLayout: PartLayout;
 
 	constructor(
@@ -47,7 +47,7 @@ export abstract class Part extends Component {
 	 *
 	 * Called to create title and content area of the part.
 	 */
-	public create(parent: Builder): void {
+	public create(parent: HTMLElement): void {
 		this.parent = parent;
 		this.titleArea = this.createTitleArea(parent);
 		this.contentArea = this.createContentArea(parent);
@@ -60,35 +60,35 @@ export abstract class Part extends Component {
 	/**
 	 * Returns the overall part container.
 	 */
-	public getContainer(): Builder {
+	public getContainer(): HTMLElement {
 		return this.parent;
 	}
 
 	/**
 	 * Subclasses override to provide a title area implementation.
 	 */
-	protected createTitleArea(parent: Builder): Builder {
+	protected createTitleArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
 	/**
 	 * Returns the title area container.
 	 */
-	protected getTitleArea(): Builder {
+	protected getTitleArea(): HTMLElement {
 		return this.titleArea;
 	}
 
 	/**
 	 * Subclasses override to provide a content area implementation.
 	 */
-	protected createContentArea(parent: Builder): Builder {
+	protected createContentArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
 	/**
 	 * Returns the content area container.
 	 */
-	protected getContentArea(): Builder {
+	protected getContentArea(): HTMLElement {
 		return this.contentArea;
 	}
 
@@ -104,8 +104,7 @@ const TITLE_HEIGHT = 35;
 
 export class PartLayout {
 
-	constructor(container: Builder, private options: IPartOptions, titleArea: Builder, private contentArea: Builder) {
-	}
+	constructor(container: HTMLElement, private options: IPartOptions, titleArea: HTMLElement, private contentArea: HTMLElement) { }
 
 	public layout(dimension: Dimension): Dimension[] {
 		const { width, height } = dimension;
@@ -133,7 +132,7 @@ export class PartLayout {
 
 		// Content
 		if (this.contentArea) {
-			this.contentArea.size(contentSize.width, contentSize.height);
+			size(this.contentArea, contentSize.width, contentSize.height);
 		}
 
 		return sizes;
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 6a68273d4c7..d63f117ff44 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -9,7 +9,7 @@ import 'vs/css!./media/activitybarpart';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { illegalArgument } from 'vs/base/common/errors';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { Action } from 'vs/base/common/actions';
 import { ActionsOrientation, ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { GlobalActivityExtensions, IGlobalActivityRegistry } from 'vs/workbench/common/activity';
@@ -29,6 +29,9 @@ import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND,
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { CompositeBar } from 'vs/workbench/browser/parts/compositebar/compositeBar';
 import { ToggleCompositePinnedAction } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
+import { ViewLocation, ViewsRegistry } from 'vs/workbench/common/views';
+import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
+import { Dimension } from 'vs/base/browser/dom';
 
 export class ActivitybarPart extends Part {
 
@@ -61,6 +64,7 @@ export class ActivitybarPart extends Part {
 		super(id, { hasTitle: false }, themeService);
 
 		this.globalActivityIdToActions = Object.create(null);
+
 		this.compositeBar = this.instantiationService.createInstance(CompositeBar, {
 			icon: true,
 			storageId: ActivitybarPart.PINNED_VIEWLETS,
@@ -75,11 +79,17 @@ export class ActivitybarPart extends Part {
 			colors: ActivitybarPart.COLORS,
 			overflowActionSize: ActivitybarPart.ACTION_HEIGHT
 		});
+
 		this.registerListeners();
+		this.updateCompositebar();
 	}
 
 	private registerListeners(): void {
 
+		this.toUnbind.push(this.viewletService.onDidViewletRegister(() => this.updateCompositebar()));
+		this.toUnbind.push(ViewsRegistry.onViewsRegistered(() => this.updateCompositebar()));
+		this.toUnbind.push(ViewsRegistry.onViewsDeregistered(() => this.updateCompositebar()));
+
 		// Activate viewlet action on opening of a viewlet
 		this.toUnbind.push(this.viewletService.onDidViewletOpen(viewlet => this.compositeBar.activateComposite(viewlet.getId())));
 
@@ -88,7 +98,7 @@ export class ActivitybarPart extends Part {
 		this.toUnbind.push(this.compositeBar.onDidContextMenu(e => this.showContextMenu(e)));
 		this.toUnbind.push(this.viewletService.onDidViewletEnablementChange(({ id, enabled }) => {
 			if (enabled) {
-				this.compositeBar.addComposite(this.viewletService.getViewlet(id));
+				this.compositeBar.addComposite(this.viewletService.getViewlet(id), true);
 			} else {
 				this.compositeBar.removeComposite(id);
 			}
@@ -118,7 +128,7 @@ export class ActivitybarPart extends Part {
 		return toDisposable(() => action.setBadge(undefined));
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		const $el = $(parent);
 		const $result = $('.content').appendTo($el);
 
@@ -128,14 +138,14 @@ export class ActivitybarPart extends Part {
 		// Top Actionbar with action items for each viewlet action
 		this.createGlobalActivityActionBar($('.global-activity').appendTo($result).getHTMLElement());
 
-		return $result;
+		return $result.getHTMLElement();
 	}
 
 	public updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 		const background = this.getColor(ACTIVITY_BAR_BACKGROUND);
 		container.style('background-color', background);
 
@@ -153,7 +163,9 @@ export class ActivitybarPart extends Part {
 	private showContextMenu(e: MouseEvent): void {
 		const event = new StandardMouseEvent(e);
 
-		const actions: Action[] = this.viewletService.getViewlets().map(viewlet => this.instantiationService.createInstance(ToggleCompositePinnedAction, viewlet, this.compositeBar));
+		const actions: Action[] = this.viewletService.getViewlets()
+			.filter(viewlet => this.canShow(viewlet))
+			.map(viewlet => this.instantiationService.createInstance(ToggleCompositePinnedAction, viewlet, this.compositeBar));
 		actions.push(new Separator());
 		actions.push(this.instantiationService.createInstance(ToggleActivityBarVisibilityAction, ToggleActivityBarVisibilityAction.ID, nls.localize('hideActivitBar', "Hide Activity Bar")));
 
@@ -185,6 +197,26 @@ export class ActivitybarPart extends Part {
 		});
 	}
 
+	private updateCompositebar(): void {
+		const viewlets = this.viewletService.getViewlets();
+		for (const viewlet of viewlets) {
+			const canShow = this.canShow(viewlet);
+			if (canShow) {
+				this.compositeBar.addComposite(viewlet, false);
+			} else {
+				this.compositeBar.removeComposite(viewlet.id);
+			}
+		}
+	}
+
+	private canShow(viewlet: ViewletDescriptor): boolean {
+		const viewLocation = ViewLocation.get(viewlet.id);
+		if (viewLocation) {
+			return ViewsRegistry.getViews(viewLocation).length > 0;
+		}
+		return true;
+	}
+
 	public getPinned(): string[] {
 		return this.viewletService.getViewlets().map(v => v.id).filter(id => this.compositeBar.isPinned(id));
 	}
@@ -212,6 +244,11 @@ export class ActivitybarPart extends Part {
 		return sizes;
 	}
 
+	public shutdown(): void {
+		this.compositeBar.shutdown();
+		super.shutdown();
+	}
+
 	public dispose(): void {
 		if (this.compositeBar) {
 			this.compositeBar.dispose();
@@ -225,4 +262,4 @@ export class ActivitybarPart extends Part {
 
 		super.dispose();
 	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
index a209aeada4f..4111789e023 100644
--- a/src/vs/workbench/browser/parts/compositePart.ts
+++ b/src/vs/workbench/browser/parts/compositePart.ts
@@ -10,18 +10,16 @@ import * as nls from 'vs/nls';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as strings from 'vs/base/common/strings';
 import { Emitter } from 'vs/base/common/event';
 import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
-import * as DOM from 'vs/base/browser/dom';
-import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IActionItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { prepareActions } from 'vs/workbench/browser/actions';
-import { Action, IAction, IRunEvent } from 'vs/base/common/actions';
+import { Action, IAction } from 'vs/base/common/actions';
 import { Part, IPartOptions } from 'vs/workbench/browser/part';
 import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';
 import { IComposite } from 'vs/workbench/common/composite';
@@ -37,6 +35,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachProgressBarStyler } from 'vs/platform/theme/common/styler';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension } from 'vs/base/browser/dom';
 
 export interface ICompositeTitleLabel {
 
@@ -74,10 +73,10 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		private telemetryService: ITelemetryService,
 		protected contextMenuService: IContextMenuService,
 		protected partService: IPartService,
-		private keybindingService: IKeybindingService,
+		protected keybindingService: IKeybindingService,
 		protected instantiationService: IInstantiationService,
 		themeService: IThemeService,
-		private registry: CompositeRegistry<T>,
+		protected readonly registry: CompositeRegistry<T>,
 		private activeCompositeSettingsKey: string,
 		private defaultCompositeId: string,
 		private nameForTelemetry: string,
@@ -223,8 +222,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			compositeContainer = $().div({
 				'class': ['composite', this.compositeCSSClass],
 				id: composite.getId()
-			}, (div: Builder) => {
-				createCompositePromise = composite.create(div).then(() => {
+			}, div => {
+				createCompositePromise = composite.create(div.getHTMLElement()).then(() => {
 					composite.updateStyles();
 				});
 			});
@@ -279,7 +278,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			}
 
 			// Action Run Handling
-			this.telemetryActionsListener = this.toolBar.actionRunner.onDidRun((e: IRunEvent) => {
+			this.telemetryActionsListener = this.toolBar.actionRunner.onDidRun(e => {
 
 				// Check for Error
 				if (e.error && !errors.isPromiseCanceledError(e.error)) {
@@ -311,7 +310,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 					composite.layout(this.contentAreaSize);
 				}
 			});
-		}, (error: any) => this.onError(error));
+		}, error => this.onError(error));
 	}
 
 	protected onTitleAreaUpdate(compositeId: string): void {
@@ -391,7 +390,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			compositeContainer.hide();
 
 			// Clear any running Progress
-			this.progressBar.stop().getContainer().hide();
+			this.progressBar.stop().hide();
 
 			// Empty Actions
 			this.toolBar.setActions([])();
@@ -401,39 +400,37 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		});
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 
 		// Title Area Container
 		const titleArea = $(parent).div({
 			'class': ['composite', 'title']
 		});
 
-		$(titleArea).on(DOM.EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
-
 		// Left Title Label
-		this.titleLabel = this.createTitleLabel(titleArea);
+		this.titleLabel = this.createTitleLabel(titleArea.getHTMLElement());
 
 		// Right Actions Container
 		$(titleArea).div({
 			'class': 'title-actions'
-		}, (div) => {
+		}, div => {
 
 			// Toolbar
 			this.toolBar = new ToolBar(div.getHTMLElement(), this.contextMenuService, {
-				actionItemProvider: (action: Action) => this.actionItemProvider(action),
+				actionItemProvider: action => this.actionItemProvider(action as Action),
 				orientation: ActionsOrientation.HORIZONTAL,
-				getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id)
+				getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
 			});
 		});
 
-		return titleArea;
+		return titleArea.getHTMLElement();
 	}
 
-	protected createTitleLabel(parent: Builder): ICompositeTitleLabel {
+	protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel {
 		let titleLabel: Builder;
 		$(parent).div({
 			'class': 'title-label'
-		}, (div) => {
+		}, div => {
 			titleLabel = div.span();
 		});
 
@@ -456,27 +453,8 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		this.titleLabel.updateStyles();
 	}
 
-	private onTitleAreaContextMenu(event: StandardMouseEvent): void {
-		if (this.activeComposite) {
-			const contextMenuActions = this.getTitleAreaContextMenuActions();
-			if (contextMenuActions.length) {
-				const anchor: { x: number, y: number } = { x: event.posx, y: event.posy };
-				this.contextMenuService.showContextMenu({
-					getAnchor: () => anchor,
-					getActions: () => TPromise.as(contextMenuActions),
-					getActionItem: (action: Action) => this.actionItemProvider(action),
-					actionRunner: this.activeComposite.getActionRunner(),
-					getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id)
-				});
-			}
-		}
-	}
+	protected actionItemProvider(action: Action): IActionItem {
 
-	protected getTitleAreaContextMenuActions(): IAction[] {
-		return this.activeComposite ? this.activeComposite.getContextMenuActions() : [];
-	}
-
-	private actionItemProvider(action: Action): IActionItem {
 		// Check Active Composite
 		if (this.activeComposite) {
 			return this.activeComposite.getActionItem(action);
@@ -485,14 +463,14 @@ export abstract class CompositePart<T extends Composite> extends Part {
 		return undefined;
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		return $(parent).div({
 			'class': 'content'
-		}, (div: Builder) => {
-			this.progressBar = new ProgressBar(div);
+		}, div => {
+			this.progressBar = new ProgressBar(div.getHTMLElement());
 			this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
-			this.progressBar.getContainer().hide();
-		});
+			this.progressBar.hide();
+		}).getHTMLElement();
 	}
 
 	private onError(error: any): void {
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 08dc54643ee..ac68fe3ff8e 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -8,9 +8,7 @@
 import * as nls from 'vs/nls';
 import { Action } from 'vs/base/common/actions';
 import { illegalArgument } from 'vs/base/common/errors';
-import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
-import { Dimension } from 'vs/base/browser/builder';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -19,6 +17,7 @@ import { ActionBar, IActionItem, ActionsOrientation } from 'vs/base/browser/ui/a
 import { Event, Emitter } from 'vs/base/common/event';
 import { CompositeActionItem, CompositeOverflowActivityAction, ICompositeActivity, CompositeOverflowActivityActionItem, ActivityAction, ICompositeBar, ICompositeBarColors } from 'vs/workbench/browser/parts/compositebar/compositeBarActions';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Dimension, $, addDisposableListener, EventType, EventHelper } from 'vs/base/browser/dom';
 
 export interface ICompositeBarOptions {
 	icon: boolean;
@@ -35,6 +34,11 @@ export interface ICompositeBarOptions {
 	hidePart: () => TPromise<any>;
 }
 
+interface CompositeState {
+	id: string;
+	pinned: boolean;
+}
+
 export class CompositeBar implements ICompositeBar {
 
 	private readonly _onDidContextMenu: Emitter<MouseEvent>;
@@ -51,6 +55,7 @@ export class CompositeBar implements ICompositeBar {
 	private compositeIdToActivityStack: { [compositeId: string]: ICompositeActivity[]; };
 	private compositeSizeInBar: Map<string, number>;
 
+	private initialCompositesStates: CompositeState[];
 	private pinnedComposites: string[];
 	private activeCompositeId: string;
 	private activeUnpinnedCompositeId: string;
@@ -67,30 +72,36 @@ export class CompositeBar implements ICompositeBar {
 		this.compositeSizeInBar = new Map<string, number>();
 
 		this._onDidContextMenu = new Emitter<MouseEvent>();
-
-		const pinnedComposites = JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, null)) as string[];
-		if (pinnedComposites) {
-			const compositeIds = this.options.composites.map(c => c.id);
-			this.pinnedComposites = pinnedComposites.filter(pcid => compositeIds.indexOf(pcid) >= 0);
-		} else {
-			this.pinnedComposites = this.options.composites.map(c => c.id);
-		}
+		this.initialCompositesStates = this.loadCompositesStates();
+		this.pinnedComposites = this.initialCompositesStates
+			.filter(c => c.pinned)
+			.map(c => c.id)
+			.filter(id => this.options.composites.some(c => c.id === id));
 	}
 
 	public get onDidContextMenu(): Event<MouseEvent> {
 		return this._onDidContextMenu.event;
 	}
 
-	public addComposite(compositeData: { id: string; name: string, order: number }): void {
+	public addComposite(compositeData: { id: string; name: string, order: number }, activate: boolean): void {
 		if (this.options.composites.filter(c => c.id === compositeData.id).length) {
 			return;
 		}
-		let i = 0;
-		while (i < this.options.composites.length && this.options.composites[i].order < compositeData.order) {
-			i++;
-		}
 		this.options.composites.push(compositeData);
-		this.pin(compositeData.id, true, i);
+
+		const compositeState = this.initialCompositesStates.filter(c => c.id === compositeData.id)[0];
+		if (!compositeState /* new composites are pinned by default */ || compositeState.pinned) {
+			let index;
+			if (compositeState) {
+				index = this.initialCompositesStates.indexOf(compositeState);
+			} else {
+				index = 0;
+				while (index < this.options.composites.length && this.options.composites[index].order < compositeData.order) {
+					index++;
+				}
+			}
+			this.pin(compositeData.id, true, index, activate);
+		}
 	}
 
 	public removeComposite(id: string): void {
@@ -101,6 +112,8 @@ export class CompositeBar implements ICompositeBar {
 		this.options.composites = this.options.composites.filter(c => c.id !== id);
 		this.unpin(id);
 		this.pullComposite(id);
+		// Only at the end deactivate composite so the unpin and pull properly finish
+		this.deactivateComposite(id);
 	}
 
 	public activateComposite(id: string): void {
@@ -123,6 +136,12 @@ export class CompositeBar implements ICompositeBar {
 		if (this.compositeIdToActions[id]) {
 			this.compositeIdToActions[id].deactivate();
 		}
+		if (this.activeCompositeId === id) {
+			this.activeCompositeId = undefined;
+		}
+		if (this.activeUnpinnedCompositeId === id) {
+			this.activeUnpinnedCompositeId = undefined;
+		}
 	}
 
 	public showActivity(compositeId: string, badge: IBadge, clazz?: string, priority?: number): IDisposable {
@@ -195,7 +214,7 @@ export class CompositeBar implements ICompositeBar {
 	}
 
 	public create(parent: HTMLElement): HTMLElement {
-		const actionBarDiv = parent.appendChild(dom.$('.composite-bar'));
+		const actionBarDiv = parent.appendChild($('.composite-bar'));
 		this.compositeSwitcherBar = new ActionBar(actionBarDiv, {
 			actionItemProvider: (action: Action) => action instanceof CompositeOverflowActivityAction ? this.compositeOverflowActionItem : this.compositeIdToActionItems[action.id],
 			orientation: this.options.orientation,
@@ -205,16 +224,16 @@ export class CompositeBar implements ICompositeBar {
 		this.toDispose.push(this.compositeSwitcherBar);
 
 		// Contextmenu for composites
-		this.toDispose.push(dom.addDisposableListener(parent, dom.EventType.CONTEXT_MENU, (e: MouseEvent) => {
-			dom.EventHelper.stop(e, true);
+		this.toDispose.push(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => {
+			EventHelper.stop(e, true);
 			this._onDidContextMenu.fire(e);
 		}));
 
 		// Allow to drop at the end to move composites to the end
-		this.toDispose.push(dom.addDisposableListener(parent, dom.EventType.DROP, (e: DragEvent) => {
+		this.toDispose.push(addDisposableListener(parent, EventType.DROP, (e: DragEvent) => {
 			const draggedCompositeId = CompositeActionItem.getDraggedCompositeId();
 			if (draggedCompositeId) {
-				dom.EventHelper.stop(e, true);
+				EventHelper.stop(e, true);
 				CompositeActionItem.clearDraggedComposite();
 
 				const targetId = this.pinnedComposites[this.pinnedComposites.length - 1];
@@ -428,19 +447,20 @@ export class CompositeBar implements ICompositeBar {
 		});
 
 		// Persist
-		this.savePinnedComposites();
+		this.saveCompositesStates();
 	}
 
 	public isPinned(compositeId: string): boolean {
 		return this.pinnedComposites.indexOf(compositeId) >= 0;
 	}
 
-	public pin(compositeId: string, update = true, index = this.pinnedComposites.length): void {
+	public pin(compositeId: string, update = true, index = this.pinnedComposites.length, activate: boolean = true): void {
 		if (this.isPinned(compositeId)) {
 			return;
 		}
 
-		this.options.openComposite(compositeId).then(() => {
+		const activatePromise = activate ? this.options.openComposite(compositeId) : TPromise.as(null);
+		activatePromise.then(() => {
 			this.pinnedComposites.splice(index, 0, compositeId);
 			this.pinnedComposites = arrays.distinct(this.pinnedComposites);
 
@@ -449,7 +469,7 @@ export class CompositeBar implements ICompositeBar {
 			}
 
 			// Persist
-			this.savePinnedComposites();
+			this.saveCompositesStates();
 		});
 	}
 
@@ -481,7 +501,7 @@ export class CompositeBar implements ICompositeBar {
 		}, 0);
 
 		// Persist
-		this.savePinnedComposites();
+		this.saveCompositesStates();
 	}
 
 	public layout(dimension: Dimension): void {
@@ -505,8 +525,33 @@ export class CompositeBar implements ICompositeBar {
 		this.updateCompositeSwitcher();
 	}
 
-	private savePinnedComposites(): void {
-		this.storageService.store(this.options.storageId, JSON.stringify(this.pinnedComposites), StorageScope.GLOBAL);
+	private loadCompositesStates(): CompositeState[] {
+		const storedStates = <Array<string | CompositeState>>JSON.parse(this.storageService.get(this.options.storageId, StorageScope.GLOBAL, '[]'));
+		const isOldData = storedStates && storedStates.length && typeof storedStates[0] === 'string';
+		const compositeStates = <CompositeState[]>storedStates.map(c =>
+			typeof c === 'string' /* migration from pinned states to composites states */ ? { id: c, pinned: true } : c);
+
+		if (!isOldData) { /* Add new composites only if it is new data */
+			const newComposites = this.options.composites.filter(c => compositeStates.every(s => s.id !== c.id));
+			newComposites.sort((c1, c2) => c1.order < c2.order ? -1 : 1);
+			newComposites.forEach(c => compositeStates.push({ id: c.id, pinned: true /* new composites are pinned by default */ }));
+		}
+
+		return compositeStates;
+	}
+
+	private saveCompositesStates(): void {
+		const toSave = this.pinnedComposites.map(id => (<CompositeState>{ id, pinned: true }));
+		for (const composite of this.options.composites) {
+			if (this.pinnedComposites.indexOf(composite.id) === -1) { // Unpinned composites
+				toSave.push({ id: composite.id, pinned: false });
+			}
+		}
+		this.storageService.store(this.options.storageId, JSON.stringify(toSave), StorageScope.GLOBAL);
+	}
+
+	public shutdown(): void {
+		this.saveCompositesStates();
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
index 6fb75715ca3..13ceb5abbbf 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
@@ -193,7 +193,7 @@ export class ActivityActionItem extends BaseActionItem {
 			this.$label.text(this.getAction().label);
 		}
 
-		this.$badge = this.builder.clone().div({ 'class': 'badge' }, (badge: Builder) => {
+		this.$badge = this.builder.clone().div({ 'class': 'badge' }, badge => {
 			this.$badgeContent = badge.div({ 'class': 'badge-content' });
 		});
 
diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts
index b38ca7a0638..2a8e0b70b56 100644
--- a/src/vs/workbench/browser/parts/editor/baseEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts
@@ -5,7 +5,6 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder } from 'vs/base/browser/builder';
 import { Panel } from 'vs/workbench/browser/panel';
 import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { IEditor, Position } from 'vs/platform/editor/common/editor';
@@ -64,9 +63,9 @@ export abstract class BaseEditor extends Panel implements IEditor {
 		this._options = null;
 	}
 
-	public create(parent: Builder): void; // create is sync for editors
-	public create(parent: Builder): TPromise<void>;
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): void; // create is sync for editors
+	public create(parent: HTMLElement): TPromise<void>;
+	public create(parent: HTMLElement): TPromise<void> {
 		const res = super.create(parent);
 
 		// Create Editor
@@ -76,9 +75,16 @@ export abstract class BaseEditor extends Panel implements IEditor {
 	}
 
 	/**
-	 * Called to create the editor in the parent builder.
+	 * Called to create the editor in the parent HTMLElement.
 	 */
-	protected abstract createEditor(parent: Builder): void;
+	protected abstract createEditor(parent: HTMLElement): void;
+
+	/**
+	 * Subclasses can set this to false if it does not make sense to center editor input.
+	 */
+	public supportsCenteredLayout(): boolean {
+		return true;
+	}
 
 	/**
 	 * Overload this function to allow for passing in a position argument.
@@ -119,4 +125,4 @@ export abstract class BaseEditor extends Panel implements IEditor {
 		// Super Dispose
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 28e2795592b..f4df65c25c7 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -7,39 +7,49 @@
 
 import * as nls from 'vs/nls';
 import { Event, Emitter } from 'vs/base/common/event';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import { EditorModel, EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { Builder, $ } from 'vs/base/browser/builder';
+import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/parts/editor/resourceViewer';
+import URI from 'vs/base/common/uri';
+import { Dimension } from 'vs/base/browser/dom';
+
+export interface IOpenCallbacks {
+	openInternal: (input: EditorInput, options: EditorOptions) => void;
+	openExternal: (uri: URI) => void;
+}
 
 /*
  * This class is only intended to be subclassed and not instantiated.
  */
 export abstract class BaseBinaryResourceEditor extends BaseEditor {
-	private readonly _onMetadataChanged: Emitter<void>;
-	private metadata: string;
 
+	private readonly _onMetadataChanged: Emitter<void>;
+
+	private callbacks: IOpenCallbacks;
+	private metadata: string;
 	private binaryContainer: Builder;
 	private scrollbar: DomScrollableElement;
 	private resourceViewerContext: ResourceViewerContext;
 
 	constructor(
 		id: string,
+		callbacks: IOpenCallbacks,
 		telemetryService: ITelemetryService,
-		themeService: IThemeService,
-		private windowsService: IWindowsService
+		themeService: IThemeService
 	) {
 		super(id, telemetryService, themeService);
 
 		this._onMetadataChanged = new Emitter<void>();
+		this.toUnbind.push(this._onMetadataChanged);
+
+		this.callbacks = callbacks;
 	}
 
 	public get onMetadataChanged(): Event<void> {
@@ -50,7 +60,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		return this.input ? this.input.getName() : nls.localize('binaryEditor', "Binary Viewer");
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 
 		// Container for Binary
 		const binaryContainerElement = document.createElement('div');
@@ -61,7 +71,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 		// Custom Scrollbars
 		this.scrollbar = new DomScrollableElement(binaryContainerElement, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto });
-		parent.getHTMLElement().appendChild(this.scrollbar.getDomNode());
+		parent.appendChild(this.scrollbar.getDomNode());
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
@@ -74,10 +84,10 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 		// Otherwise set input and resolve
 		return super.setInput(input, options).then(() => {
-			return input.resolve(true).then((resolvedModel: EditorModel) => {
+			return input.resolve(true).then(model => {
 
 				// Assert Model instance
-				if (!(resolvedModel instanceof BinaryEditorModel)) {
+				if (!(model instanceof BinaryEditorModel)) {
 					return TPromise.wrapError<void>(new Error('Unable to open file as binary'));
 				}
 
@@ -87,21 +97,14 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 				}
 
 				// Render Input
-				const model = <BinaryEditorModel>resolvedModel;
 				this.resourceViewerContext = ResourceViewer.show(
 					{ name: model.getName(), resource: model.getResource(), size: model.getSize(), etag: model.getETag(), mime: model.getMime() },
-					this.binaryContainer,
+					this.binaryContainer.getHTMLElement(),
 					this.scrollbar,
-					(resource: URI) => {
-						this.windowsService.openExternal(resource.toString()).then(didOpen => {
-							if (!didOpen) {
-								return this.windowsService.showItemInFolder(resource.fsPath);
-							}
-
-							return void 0;
-						});
-					},
-					(meta) => this.handleMetadataChanged(meta));
+					resource => this.callbacks.openInternal(input, options),
+					resource => this.callbacks.openExternal(resource),
+					meta => this.handleMetadataChanged(meta)
+				);
 
 				return TPromise.as<void>(null);
 			});
@@ -117,6 +120,10 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		return this.metadata;
 	}
 
+	public supportsCenteredLayout(): boolean {
+		return false;
+	}
+
 	public clearInput(): void {
 
 		// Clear Meta
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
index 87fea4fca7f..b67c3c3b42f 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -10,7 +10,7 @@ import * as arrays from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import * as types from 'vs/base/common/types';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { Sash, ISashEvent, IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider, Orientation } from 'vs/base/browser/ui/sash/sash';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -29,7 +29,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import { TabsTitleControl } from 'vs/workbench/browser/parts/editor/tabsTitleControl';
 import { ITitleAreaControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitleControl';
-import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup, EditorOptions, TextEditorOptions, IEditorIdentifier, EditorInput, PREFERENCES_EDITOR_ID, TEXT_DIFF_EDITOR_ID } from 'vs/workbench/common/editor';
+import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup, EditorOptions, TextEditorOptions, IEditorIdentifier, EditorInput } from 'vs/workbench/common/editor';
 import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorBackground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
@@ -40,6 +40,7 @@ import { ResourcesDropHandler, LocalSelectionTransfer, DraggedEditorIdentifier }
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 
+
 export enum Rochade {
 	NONE,
 	TWO_TO_ONE,
@@ -74,7 +75,7 @@ export interface IEditorGroupsControl {
 	updateProgress(position: Position, state: ProgressState): void;
 	updateTitleAreas(refreshActive?: boolean): void;
 
-	layout(dimension: Dimension): void;
+	layout(dimension: DOM.Dimension): void;
 	layout(position: Position): void;
 
 	arrangeGroups(arrangement: GroupArrangement): void;
@@ -118,8 +119,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 	private stacks: IEditorStacksModel;
 
-	private parent: Builder;
-	private dimension: Dimension;
+	private parent: HTMLElement;
+	private dimension: DOM.Dimension;
 	private dragging: boolean;
 
 	private layoutVertically: boolean;
@@ -168,7 +169,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private transfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 
 	constructor(
-		parent: Builder,
+		parent: HTMLElement,
 		groupOrientation: GroupOrientation,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
@@ -185,7 +186,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.stacks = editorGroupService.getStacksModel();
 
 		this.parent = parent;
-		this.dimension = new Dimension(0, 0);
+		this.dimension = new DOM.Dimension(0, 0);
 
 		this.silos = [];
 		this.silosSize = [];
@@ -288,6 +289,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 					titleControl.dispose();
 					titleContainer.empty();
 					this.createTitleControl(this.stacks.groupAt(position), this.silos[position], titleContainer, this.getInstantiationService(position));
+					this.layoutTitleControl(position);
 				}
 
 				// Refresh title when layout options change
@@ -366,8 +368,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.trackFocus(editor, position);
 
 		// Find target container and build into
-		const target = this.silos[position].child();
-		editor.getContainer().build(target);
+		const target = this.silos[position].child().getHTMLElement();
+		target.appendChild(editor.getContainer());
 
 		// Adjust layout according to provided ratios (used when restoring multiple editors at once)
 		if (ratio && (ratio.length === 2 || ratio.length === 3)) {
@@ -439,7 +441,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		}
 
 		// Show editor container
-		editor.getContainer().show();
+		DOM.show(editor.getContainer());
 	}
 
 	private getVisibleEditorCount(): number {
@@ -551,7 +553,11 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.clearPosition(position);
 
 		// Take editor container offdom and hide
-		editor.getContainer().offDOM().hide();
+		const editorContainer = editor.getContainer();
+		if (editorContainer.parentNode) {
+			editorContainer.parentNode.removeChild(editorContainer);
+		}
+		DOM.hide(editorContainer);
 
 		// Adjust layout and rochade if instructed to do so
 		if (layoutAndRochade) {
@@ -777,10 +783,10 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.layoutVertically = (orientation !== 'horizontal');
 
 		// Editor Layout
-		const verticalLayouting = this.parent.hasClass('vertical-layout');
+		const verticalLayouting = DOM.hasClass(this.parent, 'vertical-layout');
 		if (verticalLayouting !== this.layoutVertically) {
-			this.parent.removeClass('vertical-layout', 'horizontal-layout');
-			this.parent.addClass(this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
+			DOM.removeClasses(this.parent, 'vertical-layout', 'horizontal-layout');
+			DOM.addClass(this.parent, this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
 
 			this.sashOne.setOrientation(this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL);
 			this.sashTwo.setOrientation(this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL);
@@ -965,16 +971,16 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 	private create(): void {
 
 		// Store layout as class property
-		this.parent.addClass(this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
+		DOM.addClass(this.parent, this.layoutVertically ? 'vertical-layout' : 'horizontal-layout');
 
 		// Allow to drop into container to open
-		this.enableDropTarget(this.parent.getHTMLElement());
+		this.enableDropTarget(this.parent);
 
 		// Silo One
 		this.silos[Position.ONE] = $(this.parent).div({ class: 'one-editor-silo editor-one' });
 
 		// Sash One
-		this.sashOne = new Sash(this.parent.getHTMLElement(), this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
+		this.sashOne = new Sash(this.parent, this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
 		this.toUnbind.push(this.sashOne.onDidStart(() => this.onSashOneDragStart()));
 		this.toUnbind.push(this.sashOne.onDidChange((e: ISashEvent) => this.onSashOneDrag(e)));
 		this.toUnbind.push(this.sashOne.onDidEnd(() => this.onSashOneDragEnd()));
@@ -985,7 +991,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.silos[Position.TWO] = $(this.parent).div({ class: 'one-editor-silo editor-two' });
 
 		// Sash Two
-		this.sashTwo = new Sash(this.parent.getHTMLElement(), this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
+		this.sashTwo = new Sash(this.parent, this, { baseSize: 5, orientation: this.layoutVertically ? Orientation.VERTICAL : Orientation.HORIZONTAL });
 		this.toUnbind.push(this.sashTwo.onDidStart(() => this.onSashTwoDragStart()));
 		this.toUnbind.push(this.sashTwo.onDidChange((e: ISashEvent) => this.onSashTwoDrag(e)));
 		this.toUnbind.push(this.sashTwo.onDidEnd(() => this.onSashTwoDragEnd()));
@@ -1030,9 +1036,9 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		this.createTitleControl(this.stacks.groupAt(position), silo, titleContainer, instantiationService);
 
 		// Progress Bar
-		const progressBar = new ProgressBar($(container));
+		const progressBar = new ProgressBar(container.getHTMLElement());
 		this.toUnbind.push(attachProgressBarStyler(progressBar, this.themeService));
-		progressBar.getContainer().hide();
+		progressBar.hide();
 		container.setProperty(EditorGroupsControl.PROGRESS_BAR_CONTROL_KEY, progressBar); // associate with container
 
 		// Sash for first position to support centered editor layout
@@ -1281,7 +1287,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			if (!overlay) {
 				const containers = $this.visibleEditors.filter(e => !!e).map(e => e.getContainer());
 				containers.forEach((container, index) => {
-					if (container && DOM.isAncestor(target, container.getHTMLElement())) {
+					if (container && DOM.isAncestor(target, container)) {
 						const activeContrastBorderColor = $this.getColor(activeContrastBorder);
 						overlay = $('div').style({
 							top: $this.tabOptions.showTabs ? `${EditorGroupsControl.EDITOR_TITLE_HEIGHT}px` : 0,
@@ -1624,11 +1630,11 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 		let borderColor = null;
 		if (isDragging) {
-			this.parent.addClass('dragging');
+			DOM.addClass(this.parent, 'dragging');
 			silo.addClass('dragging');
 			borderColor = this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder);
 		} else {
-			this.parent.removeClass('dragging');
+			DOM.removeClass(this.parent, 'dragging');
 			silo.removeClass('dragging');
 		}
 
@@ -2010,17 +2016,17 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		return this.dragging;
 	}
 
-	public layout(dimension: Dimension): void;
+	public layout(dimension: DOM.Dimension): void;
 	public layout(position: Position): void;
 	public layout(arg: any): void {
-		if (arg instanceof Dimension) {
-			this.layoutControl(<Dimension>arg);
+		if (arg instanceof DOM.Dimension) {
+			this.layoutControl(<DOM.Dimension>arg);
 		} else {
 			this.layoutEditor(<Position>arg);
 		}
 	}
 
-	private layoutControl(dimension: Dimension): void {
+	private layoutControl(dimension: DOM.Dimension): void {
 		let oldDimension = this.dimension;
 		this.dimension = dimension;
 
@@ -2138,8 +2144,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		});
 
 		// Layout centered Editor (only in vertical layout when one group is opened)
-		const id = this.visibleEditors[Position.ONE] ? this.visibleEditors[Position.ONE].getId() : undefined;
-		const doCentering = this.partService.isEditorLayoutCentered() && this.stacks.groups.length === 1 && id !== PREFERENCES_EDITOR_ID && id !== TEXT_DIFF_EDITOR_ID;
+		const doCentering = this.partService.isEditorLayoutCentered() && this.stacks.groups.length === 1 &&
+			this.visibleEditors[Position.ONE] && this.visibleEditors[Position.ONE].supportsCenteredLayout();
 		if (doCentering && !this.centeredEditorActive) {
 			this.centeredEditorSashLeft.show();
 			this.centeredEditorSashRight.show();
@@ -2166,16 +2172,18 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 		});
 
 		// Layout title controls
-		POSITIONS.forEach(position => {
-			const siloWidth = this.layoutVertically ? this.silosSize[position] : this.dimension.width;
-
-			this.getTitleAreaControl(position).layout(new Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
-		});
+		POSITIONS.forEach(position => this.layoutTitleControl(position));
 
 		// Update minimized state
 		this.updateMinimizedState();
 	}
 
+	private layoutTitleControl(position: Position): void {
+		const siloWidth = this.layoutVertically ? this.silosSize[position] : this.dimension.width;
+
+		this.getTitleAreaControl(position).layout(new DOM.Dimension(siloWidth, EditorGroupsControl.EDITOR_TITLE_HEIGHT));
+	}
+
 	private layoutEditor(position: Position): void {
 		const editorSize = this.silosSize[position];
 		const editor = this.visibleEditors[position];
@@ -2198,10 +2206,10 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 			}
 
 			const editorContainer = editor.getContainer();
-			editorContainer.style('margin-left', this.centeredEditorActive ? `${editorPosition}px` : null);
-			editorContainer.style('width', this.centeredEditorActive ? `${editorWidth}px` : null);
-			editorContainer.style('border-color', this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null);
-			editor.layout(new Dimension(editorWidth, editorHeight));
+			editorContainer.style.marginLeft = this.centeredEditorActive ? `${editorPosition}px` : null;
+			editorContainer.style.width = this.centeredEditorActive ? `${editorWidth}px` : null;
+			editorContainer.style.borderColor = this.centeredEditorActive ? this.getColor(EDITOR_GROUP_BORDER) || this.getColor(contrastBorder) : null;
+			editor.layout(new DOM.Dimension(editorWidth, editorHeight));
 		}
 	}
 
@@ -2266,13 +2274,13 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 		switch (state) {
 			case ProgressState.INFINITE:
-				progressbar.infinite().getContainer().show();
+				progressbar.infinite().show();
 				break;
 			case ProgressState.DONE:
-				progressbar.done().getContainer().hide();
+				progressbar.done().hide();
 				break;
 			case ProgressState.STOP:
-				progressbar.stop().getContainer().hide();
+				progressbar.stop().hide();
 				break;
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 86c952e038e..6a1c4551fe4 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -9,7 +9,6 @@ import 'vs/css!./media/editorpart';
 import 'vs/workbench/browser/parts/editor/editor.contribution';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
 import * as nls from 'vs/nls';
 import * as strings from 'vs/base/common/strings';
 import * as arrays from 'vs/base/common/arrays';
@@ -40,7 +39,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { EDITOR_GROUP_BACKGROUND } from 'vs/workbench/common/theme';
-import { createCSSRule } from 'vs/base/browser/dom';
+import { createCSSRule, Dimension, addClass, removeClass } from 'vs/base/browser/dom';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { join } from 'vs/base/common/paths';
 import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -103,15 +102,16 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	private forceHideTabs: boolean;
 	private doNotFireTabOptionsChanged: boolean;
 	private revealIfOpen: boolean;
+	private ignoreOpenEditorErrors: boolean;
+	private textCompareEditorVisible: IContextKey<boolean>;
 
-	private _onEditorsChanged: ThrottledEmitter<void>;
+	private readonly _onEditorsChanged: ThrottledEmitter<void>;
 	private readonly _onEditorOpening: Emitter<IEditorOpeningEvent>;
 	private readonly _onEditorGroupMoved: Emitter<void>;
 	private readonly _onEditorOpenFail: Emitter<EditorInput>;
 	private readonly _onGroupOrientationChanged: Emitter<void>;
 	private readonly _onTabOptionsChanged: Emitter<IEditorTabOptions>;
-
-	private textCompareEditorVisible: IContextKey<boolean>;
+	private readonly _onLayout: Emitter<Dimension>;
 
 	// The following data structures are partitioned into array of Position as provided by Services.POSITION array
 	private visibleEditors: BaseEditor[];
@@ -120,9 +120,6 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	private pendingEditorInputsToClose: EditorIdentifier[];
 	private pendingEditorInputCloseTimeout: number;
 
-	private onLayoutEmitter = new Emitter<Dimension>();
-	public onLayout = this.onLayoutEmitter.event;
-
 	constructor(
 		id: string,
 		restoreFromStorage: boolean,
@@ -144,6 +141,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		this._onEditorOpenFail = new Emitter<EditorInput>();
 		this._onGroupOrientationChanged = new Emitter<void>();
 		this._onTabOptionsChanged = new Emitter<IEditorTabOptions>();
+		this._onLayout = new Emitter<Dimension>();
 
 		this.visibleEditors = [];
 
@@ -293,6 +291,10 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		this.editorGroupsControl.resizeGroup(position, groupSizeChange);
 	}
 
+	public get onLayout(): Event<Dimension> {
+		return this._onLayout.event;
+	}
+
 	public get onEditorsChanged(): Event<void> {
 		return this._onEditorsChanged.event;
 	}
@@ -470,11 +472,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Create editor as needed
 		if (!editor.getContainer()) {
-			editor.create($().div({
-				'class': 'editor-container',
-				'role': 'tabpanel',
-				id: descriptor.getId()
-			}));
+			const editorContainer = document.createElement('div');
+			editorContainer.id = descriptor.getId();
+			addClass(editorContainer, 'editor-container');
+			editorContainer.setAttribute('role', 'tabpanel');
+
+			editor.create(editorContainer);
 		}
 
 		return editor;
@@ -546,8 +549,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		// Stop loading promise if any
 		monitor.cancel();
 
-		// Report error only if this was not us restoring previous error state
-		if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) {
+		// Report error only if this was not us restoring previous error state or
+		// we are told to ignore errors that occur from opening an editor
+		if (this.partService.isCreated() && !errors.isPromiseCanceledError(error) && !this.ignoreOpenEditorErrors) {
 			const actions: INotificationActions = { primary: [] };
 			if (errors.isErrorWithActions(error)) {
 				actions.primary = (error as errors.IErrorWithActions).actions;
@@ -559,7 +563,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 				actions
 			});
 
-			once(handle.onDidDispose)(() => dispose(actions.primary));
+			once(handle.onDidClose)(() => dispose(actions.primary));
 		}
 
 		this.editorGroupsControl.updateProgress(position, ProgressState.DONE);
@@ -569,7 +573,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Recover by closing the active editor (if the input is still the active one)
 		if (group.activeEditor === input) {
-			this.doCloseActiveEditor(group, !(options && options.preserveFocus) /* still preserve focus as needed */);
+			this.doCloseActiveEditor(group, !(options && options.preserveFocus) /* still preserve focus as needed */, true /* from error */);
 		}
 	}
 
@@ -603,7 +607,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		}
 	}
 
-	private doCloseActiveEditor(group: EditorGroup, focusNext = true): void {
+	private doCloseActiveEditor(group: EditorGroup, focusNext = true, fromError?: boolean): void {
 		const position = this.stacks.positionOfGroup(group);
 
 		// Update stacks model
@@ -616,7 +620,22 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Otherwise open next active
 		else {
-			this.openEditor(group.activeEditor, !focusNext ? EditorOptions.create({ preserveFocus: true }) : null, position).done(null, errors.onUnexpectedError);
+			// When closing an editor due to an error we can end up in a loop where we continue closing
+			// editors that fail to open (e.g. when the file no longer exists). We do not want to show
+			// repeated errors in this case to the user. As such, if we open the next editor and we are
+			// in a scope of a previous editor failing, we silence the input errors until the editor is
+			// opened.
+			if (fromError) {
+				this.ignoreOpenEditorErrors = true;
+			}
+
+			this.openEditor(group.activeEditor, !focusNext ? EditorOptions.create({ preserveFocus: true }) : null, position).done(() => {
+				this.ignoreOpenEditorErrors = false;
+			}, error => {
+				errors.onUnexpectedError(error);
+
+				this.ignoreOpenEditorErrors = false;
+			});
 		}
 	}
 
@@ -826,16 +845,18 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Close: By Filter or all
 		else {
-			editorsToClose = group.getEditors(true /* in MRU order */);
 			filter = filterOrEditors || Object.create(null);
 
+			const hasDirection = !types.isUndefinedOrNull(filter.direction);
+			editorsToClose = group.getEditors(!hasDirection /* in MRU order only if direction is not specified */);
+
 			// Filter: saved only
 			if (filter.savedOnly) {
 				editorsToClose = editorsToClose.filter(e => !e.isDirty());
 			}
 
 			// Filter: direction (left / right)
-			else if (!types.isUndefinedOrNull(filter.direction)) {
+			else if (hasDirection) {
 				editorsToClose = (filter.direction === Direction.LEFT) ? editorsToClose.slice(0, group.indexOf(filter.except)) : editorsToClose.slice(group.indexOf(filter.except) + 1);
 			}
 
@@ -1134,12 +1155,12 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		return this.editorGroupsControl.getGroupOrientation();
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 
 		// Content Container
-		const contentArea = $(parent)
-			.div()
-			.addClass('content');
+		const contentArea = document.createElement('div');
+		addClass(contentArea, 'content');
+		parent.appendChild(contentArea);
 
 		// get settings
 		this.memento = this.getMemento(this.storageService, MementoScope.WORKSPACE);
@@ -1157,19 +1178,19 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Part container
 		const container = this.getContainer();
-		container.style('background-color', this.getColor(editorBackground));
+		container.style.backgroundColor = this.getColor(editorBackground);
 
 		// Content area
 		const content = this.getContentArea();
 
 		const groupCount = this.stacks.groups.length;
 		if (groupCount > 1) {
-			content.addClass('multiple-groups');
+			addClass(content, 'multiple-groups');
 		} else {
-			content.removeClass('multiple-groups');
+			removeClass(content, 'multiple-groups');
 		}
 
-		content.style('background-color', groupCount > 0 ? this.getColor(EDITOR_GROUP_BACKGROUND) : null);
+		content.style.backgroundColor = groupCount > 0 ? this.getColor(EDITOR_GROUP_BACKGROUND) : null;
 	}
 
 	private onGroupFocusChanged(): void {
@@ -1467,7 +1488,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		this.dimension = sizes[1];
 		this.editorGroupsControl.layout(this.dimension);
 
-		this.onLayoutEmitter.fire(dimension);
+		this._onLayout.fire(dimension);
 
 		return sizes;
 	}
@@ -1500,6 +1521,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		this._onEditorOpening.dispose();
 		this._onEditorGroupMoved.dispose();
 		this._onEditorOpenFail.dispose();
+		this._onGroupOrientationChanged.dispose();
+		this._onTabOptionsChanged.dispose();
+		this._onLayout.dispose();
 
 		// Reset Tokens
 		this.editorOpenToken = [];
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 01ed2d2da59..6476c972704 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -59,25 +59,46 @@ import { Button } from 'vs/base/browser/ui/button/button';
 import { Schemas } from 'vs/base/common/network';
 import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
 import { Themable } from 'vs/workbench/common/theme';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
-// TODO@Sandeep layer breaker
-// tslint:disable-next-line:import-patterns
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+class SideBySideEditorEncodingSupport implements IEncodingSupport {
+	constructor(private master: IEncodingSupport, private details: IEncodingSupport) { }
 
-function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
-	if (input instanceof SideBySideEditorInput) {
-		input = input.master;
+	public getEncoding(): string {
+		return this.master.getEncoding(); // always report from modified (right hand) side
 	}
 
+	public setEncoding(encoding: string, mode: EncodingMode): void {
+		[this.master, this.details].forEach(s => s.setEncoding(encoding, mode));
+	}
+}
+
+function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport {
+
+	// Untitled Editor
 	if (input instanceof UntitledEditorInput) {
 		return input;
 	}
 
+	// Side by Side (diff) Editor
+	if (input instanceof SideBySideEditorInput) {
+		const masterEncodingSupport = toEditorWithEncodingSupport(input.master);
+		const detailsEncodingSupport = toEditorWithEncodingSupport(input.details);
+
+		if (masterEncodingSupport && detailsEncodingSupport) {
+			return new SideBySideEditorEncodingSupport(masterEncodingSupport, detailsEncodingSupport);
+		}
+
+		return masterEncodingSupport;
+	}
+
+	// File or Resource Editor
 	let encodingSupport = input as IFileEditorInput;
 	if (types.areFunctions(encodingSupport.setEncoding, encodingSupport.getEncoding)) {
 		return encodingSupport;
 	}
 
+	// Unsupported for any other editor
 	return null;
 }
 
@@ -311,7 +332,7 @@ export class EditorStatus implements IStatusbarItem {
 		hide(this.selectionElement);
 
 		this.indentationElement = append(this.element, $('a.editor-status-indentation'));
-		this.indentationElement.title = nls.localize('indentation', "Indentation");
+		this.indentationElement.title = nls.localize('selectIndentation', "Select Indentation");
 		this.indentationElement.onclick = () => this.onIndentationClick();
 		hide(this.indentationElement);
 
diff --git a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
index 6f4e21c6ef5..45eef21f8c3 100644
--- a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
+++ b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css
@@ -54,8 +54,9 @@
 	cursor: zoom-out;
 }
 
-.monaco-resource-viewer .open-external,
-.monaco-resource-viewer .open-external:hover {
+.monaco-resource-viewer .embedded-link,
+.monaco-resource-viewer .embedded-link:hover {
 	cursor: pointer;
 	text-decoration: underline;
+	margin-left: 5px;
 }
diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index 6b0144487c7..948465e40ae 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -88,7 +88,7 @@ export class NoTabsTitleControl extends TitleControl {
 		// - click on toolbar: should trigger actions within
 		// - mouse click: do not focus group if there are more than one as it otherwise makes group DND funky
 		// - touch: always focus
-		else if ((this.stacks.groups.length === 1 || !(e instanceof MouseEvent)) && !DOM.isAncestor(((e as GestureEvent).initialTarget || e.target || e.srcElement) as HTMLElement, this.editorActionsToolbar.getContainer().getHTMLElement())) {
+		else if ((this.stacks.groups.length === 1 || !(e instanceof MouseEvent)) && !DOM.isAncestor(((e as GestureEvent).initialTarget || e.target || e.srcElement) as HTMLElement, this.editorActionsToolbar.getContainer())) {
 			this.editorGroupService.focusGroup(group);
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
index 1d2ac46a693..f89c87eea31 100644
--- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import * as mimes from 'vs/base/common/mime';
 import URI from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { LRUCache } from 'vs/base/common/map';
@@ -19,7 +19,6 @@ import { clamp } from 'vs/base/common/numbers';
 import { Themable } from 'vs/workbench/common/theme';
 import { IStatusbarItem, StatusbarItemDescriptor, IStatusbarRegistry, Extensions, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { } from 'vs/platform/workspace/common/workspace';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -119,7 +118,7 @@ class BinarySize {
 }
 
 export interface ResourceViewerContext {
-	layout(dimension: Dimension): void;
+	layout(dimension: DOM.Dimension): void;
 }
 
 /**
@@ -127,26 +126,42 @@ export interface ResourceViewerContext {
  * progress of the binary resource.
  */
 export class ResourceViewer {
+
+	private static readonly MAX_OPEN_INTERNAL_SIZE = BinarySize.MB * 200; // max size until we offer an action to open internally
+
 	public static show(
 		descriptor: IResourceDescriptor,
-		container: Builder,
+		container: HTMLElement,
 		scrollbar: DomScrollableElement,
-		openExternal: (uri: URI) => void,
+		openInternalClb: (uri: URI) => void,
+		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
-	): ResourceViewerContext {
+	): ResourceViewerContext | null {
+
 		// Ensure CSS class
 		$(container).setClass('monaco-resource-viewer');
 
+		// Images
 		if (ResourceViewer.isImageResource(descriptor)) {
-			return ImageView.create(container, descriptor, scrollbar, openExternal, metadataClb);
+			return ImageView.create(container, descriptor, scrollbar, openExternalClb, metadataClb);
+		}
+
+		// Large Files
+		if (descriptor.size > ResourceViewer.MAX_OPEN_INTERNAL_SIZE) {
+			FileTooLargeFileView.create(container, descriptor, scrollbar, metadataClb);
+		}
+
+		// Seemingly Binary Files
+		else {
+			FileSeemsBinaryFileView.create(container, descriptor, scrollbar, openInternalClb, metadataClb);
 		}
 
-		GenericBinaryFileView.create(container, metadataClb, descriptor, scrollbar);
 		return null;
 	}
 
 	private static isImageResource(descriptor: IResourceDescriptor) {
 		const mime = ResourceViewer.getMime(descriptor);
+
 		return mime.indexOf('image/') >= 0;
 	}
 
@@ -158,6 +173,7 @@ export class ResourceViewer {
 				mime = mapExtToMediaMimes[ext.toLowerCase()];
 			}
 		}
+
 		return mime || mimes.MIME_BINARY;
 	}
 }
@@ -167,17 +183,18 @@ class ImageView {
 	private static readonly BASE64_MARKER = 'base64,';
 
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
-		openExternal: (uri: URI) => void,
+		openExternalClb: (uri: URI) => void,
 		metadataClb: (meta: string) => void
 	): ResourceViewerContext | null {
 		if (ImageView.shouldShowImageInline(descriptor)) {
 			return InlineImageView.create(container, descriptor, scrollbar, metadataClb);
 		}
 
-		LargeImageView.create(container, descriptor, openExternal);
+		LargeImageView.create(container, descriptor, openExternalClb);
+
 		return null;
 	}
 
@@ -203,43 +220,81 @@ class ImageView {
 
 class LargeImageView {
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
-		openExternal: (uri: URI) => void
+		openExternalClb: (uri: URI) => void
 	) {
+		const size = BinarySize.formatSize(descriptor.size);
+
 		const imageContainer = $(container)
 			.empty()
 			.p({
-				text: nls.localize('largeImageError', "The file size of the image is too large (>1MB) to display in the editor. ")
+				text: nls.localize('largeImageError', "The image is not displayed in the editor because it is too large ({0}).", size)
 			});
 
 		if (descriptor.resource.scheme !== Schemas.data) {
 			imageContainer.append($('a', {
 				role: 'button',
-				class: 'open-external',
+				class: 'embedded-link',
 				text: nls.localize('resourceOpenExternalButton', "Open image using external program?")
 			}).on(DOM.EventType.CLICK, (e) => {
-				openExternal(descriptor.resource);
+				openExternalClb(descriptor.resource);
 			}));
 		}
 	}
 }
 
-class GenericBinaryFileView {
+class FileTooLargeFileView {
 	public static create(
-		container: Builder,
-		metadataClb: (meta: string) => void,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
-		scrollbar: DomScrollableElement
+		scrollbar: DomScrollableElement,
+		metadataClb: (meta: string) => void
 	) {
+		const size = BinarySize.formatSize(descriptor.size);
+
 		$(container)
 			.empty()
 			.span({
-				text: nls.localize('nativeBinaryError', "The file will not be displayed in the editor because it is either binary, very large or uses an unsupported text encoding.")
+				text: nls.localize('nativeFileTooLargeError', "The file is not displayed in the editor because it is too large ({0}).", size)
 			});
+
+		if (metadataClb) {
+			metadataClb(size);
+		}
+
+		scrollbar.scanDomNode();
+	}
+}
+
+class FileSeemsBinaryFileView {
+	public static create(
+		container: HTMLElement,
+		descriptor: IResourceDescriptor,
+		scrollbar: DomScrollableElement,
+		openInternalClb: (uri: URI) => void,
+		metadataClb: (meta: string) => void
+	) {
+		const binaryContainer = $(container)
+			.empty()
+			.p({
+				text: nls.localize('nativeBinaryError', "The file is not displayed in the editor because it is either binary or uses an unsupported text encoding.")
+			});
+
+		if (descriptor.resource.scheme !== Schemas.data) {
+			binaryContainer.append($('a', {
+				role: 'button',
+				class: 'embedded-link',
+				text: nls.localize('openAsText', "Do you want to open it anyway?")
+			}).on(DOM.EventType.CLICK, (e) => {
+				openInternalClb(descriptor.resource);
+			}));
+		}
+
 		if (metadataClb) {
 			metadataClb(BinarySize.formatSize(descriptor.size));
 		}
+
 		scrollbar.scanDomNode();
 	}
 }
@@ -266,7 +321,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 
 	private onEditorsChanged(): void {
 		this.hide();
-		this.onSelectScale = undefined;
+		this.onSelectScale = void 0;
 	}
 
 	public show(scale: Scale, onSelectScale: (scale: number) => void) {
@@ -295,6 +350,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 				.getHTMLElement();
 			this.statusBarItem.style.display = 'none';
 		}
+
 		return this;
 	}
 
@@ -306,10 +362,11 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem {
 	private get zoomActions(): Action[] {
 		const scales: Scale[] = [10, 5, 2, 1, 0.5, 0.2, 'fit'];
 		return scales.map(scale =>
-			new Action('zoom.' + scale, ZoomStatusbarItem.zoomLabel(scale), undefined, undefined, () => {
+			new Action(`zoom.${scale}`, ZoomStatusbarItem.zoomLabel(scale), void 0, void 0, () => {
 				if (this.onSelectScale) {
 					this.onSelectScale(scale);
 				}
+
 				return null;
 			}));
 	}
@@ -376,13 +433,13 @@ class InlineImageView {
 	private static readonly imageStateCache = new LRUCache<string, ImageState>(100);
 
 	public static create(
-		container: Builder,
+		container: HTMLElement,
 		descriptor: IResourceDescriptor,
 		scrollbar: DomScrollableElement,
 		metadataClb: (meta: string) => void
 	) {
 		const context = {
-			layout(dimension: Dimension) { }
+			layout(dimension: DOM.Dimension) { }
 		};
 
 		const cacheKey = descriptor.resource.toString();
@@ -585,6 +642,4 @@ class InlineImageView {
 
 		return cached.src;
 	}
-}
-
-
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index fd414145054..5e3e963f77a 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -5,14 +5,11 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { Dimension, Builder } from 'vs/base/browser/builder';
-
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorInput, EditorOptions, SideBySideEditorInput } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorControl, Position, IEditor } from 'vs/platform/editor/common/editor';
 import { VSash } from 'vs/base/browser/ui/sash/sash';
-
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -23,7 +20,7 @@ export class SideBySideEditor extends BaseEditor {
 
 	public static readonly ID: string = 'workbench.editor.sidebysideEditor';
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 
 	protected masterEditor: BaseEditor;
 	private masterEditorContainer: HTMLElement;
@@ -41,10 +38,9 @@ export class SideBySideEditor extends BaseEditor {
 		super(SideBySideEditor.ID, telemetryService, themeService);
 	}
 
-	protected createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-		DOM.addClass(parentElement, 'side-by-side-editor');
-		this.createSash(parentElement);
+	protected createEditor(parent: HTMLElement): void {
+		DOM.addClass(parent, 'side-by-side-editor');
+		this.createSash(parent);
 	}
 
 	public setInput(newInput: SideBySideEditorInput, options?: EditorOptions): TPromise<void> {
@@ -90,7 +86,7 @@ export class SideBySideEditor extends BaseEditor {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.sash.setDimenesion(this.dimension);
 	}
@@ -110,6 +106,10 @@ export class SideBySideEditor extends BaseEditor {
 		return this.detailsEditor;
 	}
 
+	public supportsCenteredLayout(): boolean {
+		return false;
+	}
+
 	private updateInput(oldInput: SideBySideEditorInput, newInput: SideBySideEditorInput, options?: EditorOptions): void {
 		if (!newInput.matches(oldInput)) {
 			if (oldInput) {
@@ -137,7 +137,7 @@ export class SideBySideEditor extends BaseEditor {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 
 		const editor = descriptor.instantiate(this.instantiationService);
-		editor.create(new Builder(container));
+		editor.create(container);
 		editor.setVisible(this.isVisible(), this.position);
 
 		return editor;
@@ -151,7 +151,7 @@ export class SideBySideEditor extends BaseEditor {
 	}
 
 	private createEditorContainers(): void {
-		const parentElement = this.getContainer().getHTMLElement();
+		const parentElement = this.getContainer();
 		this.detailsEditorContainer = DOM.append(parentElement, DOM.$('.details-editor-container'));
 		this.detailsEditorContainer.style.position = 'absolute';
 		this.masterEditorContainer = DOM.append(parentElement, DOM.$('.master-editor-container'));
@@ -188,12 +188,12 @@ export class SideBySideEditor extends BaseEditor {
 		this.masterEditorContainer.style.height = `${this.dimension.height}px`;
 		this.masterEditorContainer.style.left = `${splitPoint}px`;
 
-		this.detailsEditor.layout(new Dimension(detailsEditorWidth, this.dimension.height));
-		this.masterEditor.layout(new Dimension(masterEditorWidth, this.dimension.height));
+		this.detailsEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height));
+		this.masterEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height));
 	}
 
 	private disposeEditors(): void {
-		const parentContainer = this.getContainer().getHTMLElement();
+		const parentContainer = this.getContainer();
 		if (this.detailsEditor) {
 			this.detailsEditor.dispose();
 			this.detailsEditor = null;
@@ -216,4 +216,4 @@ export class SideBySideEditor extends BaseEditor {
 		this.disposeEditors();
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index ece29d8aec6..a010f2c32b2 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -38,7 +38,6 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_ACTIVE_FOREGROUND, TAB_INACTIVE_FOREGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND, TAB_UNFOCUSED_INACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_BACKGROUND, WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme';
 import { activeContrastBorder, contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
-import { Dimension } from 'vs/base/browser/builder';
 import { ResourcesDropHandler, fillResourceDataTransfers, LocalSelectionTransfer, DraggedEditorIdentifier } from 'vs/workbench/browser/dnd';
 import { Color } from 'vs/base/common/color';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -60,7 +59,7 @@ export class TabsTitleControl extends TitleControl {
 	private scrollbar: ScrollableElement;
 	private tabDisposeables: IDisposable[];
 	private blockRevealActiveTab: boolean;
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	private layoutScheduled: IDisposable;
 	private transfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
 
@@ -555,7 +554,7 @@ export class TabsTitleControl extends TitleControl {
 		return tabContainer;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		if (!this.activeTab || !dimension) {
 			return;
 		}
@@ -573,7 +572,7 @@ export class TabsTitleControl extends TitleControl {
 		}
 	}
 
-	private doLayout(dimension: Dimension): void {
+	private doLayout(dimension: DOM.Dimension): void {
 		const visibleContainerWidth = this.tabsContainer.offsetWidth;
 		const totalContainerWidth = this.tabsContainer.scrollWidth;
 
@@ -926,7 +925,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	if (tabHoverBackground) {
 		collector.addRule(`
 			.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.active .tabs-container > .tab:hover  {
-				background: ${tabHoverBackground} !important;
+				background-color: ${tabHoverBackground} !important;
 			}
 		`);
 	}
@@ -935,7 +934,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 	if (tabUnfocusedHoverBackground) {
 		collector.addRule(`
 			.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title.inactive .tabs-container > .tab:hover  {
-				background: ${tabUnfocusedHoverBackground} !important;
+				background-color: ${tabUnfocusedHoverBackground} !important;
 			}
 		`);
 	}
diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
index d82743f7c8e..50a3dfd9e8d 100644
--- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts
@@ -9,7 +9,6 @@ import 'vs/css!./media/textdiffeditor';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
-import { Builder } from 'vs/base/browser/builder';
 import { Action, IAction } from 'vs/base/common/actions';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import * as types from 'vs/base/common/types';
@@ -32,10 +31,13 @@ import { IWorkbenchEditorService, DelegatingWorkbenchEditorService } from 'vs/wo
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { ScrollType } from 'vs/editor/common/editorCommon';
+import { ScrollType, IDiffEditorViewState, IDiffEditorModel } from 'vs/editor/common/editorCommon';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Registry } from 'vs/platform/registry/common/platform';
+import URI from 'vs/base/common/uri';
+import { getCodeOrDiffEditor } from 'vs/editor/browser/services/codeEditorService';
+import { once } from 'vs/base/common/event';
 
 /**
  * The text editor that leverages the diff text editor for the editing experience.
@@ -45,10 +47,10 @@ export class TextDiffEditor extends BaseTextEditor {
 	public static readonly ID = TEXT_DIFF_EDITOR_ID;
 
 	private diffNavigator: DiffNavigator;
+	private diffNavigatorDisposables: IDisposable[];
 	private nextDiffAction: NavigateAction;
 	private previousDiffAction: NavigateAction;
 	private toggleIgnoreTrimWhitespaceAction: ToggleIgnoreTrimWhitespaceAction;
-	private _configurationListener: IDisposable;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -63,11 +65,12 @@ export class TextDiffEditor extends BaseTextEditor {
 	) {
 		super(TextDiffEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
 
-		this._configurationListener = this._actualConfigurationService.onDidChangeConfiguration((e) => {
+		this.diffNavigatorDisposables = [];
+		this.toUnbind.push(this._actualConfigurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')) {
 				this.updateIgnoreTrimWhitespaceAction();
 			}
-		});
+		}));
 	}
 
 	public getTitle(): string {
@@ -78,7 +81,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		return nls.localize('textDiffEditor', "Text Diff Editor");
 	}
 
-	public createEditorControl(parent: Builder, configuration: IEditorOptions): IDiffEditor {
+	public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): IDiffEditor {
 
 		// Actions
 		this.nextDiffAction = new NavigateAction(this, true);
@@ -118,7 +121,7 @@ export class TextDiffEditor extends BaseTextEditor {
 		// Create a special child of instantiator that will delegate all calls to openEditor() to the same diff editor if the input matches with the modified one
 		const diffEditorInstantiator = this.instantiationService.createChild(new ServiceCollection([IWorkbenchEditorService, delegatingEditorService]));
 
-		return diffEditorInstantiator.createInstance(DiffEditorWidget, parent.getHTMLElement(), configuration);
+		return diffEditorInstantiator.createInstance(DiffEditorWidget, parent, configuration);
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
@@ -137,9 +140,10 @@ export class TextDiffEditor extends BaseTextEditor {
 		}
 
 		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
-		}
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
+
+		// Remember view settings if input changes
+		this.saveTextDiffEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options).then(() => {
@@ -155,27 +159,32 @@ export class TextDiffEditor extends BaseTextEditor {
 					return null;
 				}
 
-				// Editor
+				// Set Editor Model
 				const diffEditor = <IDiffEditor>this.getControl();
 				diffEditor.setModel((<TextDiffEditorModel>resolvedModel).textDiffEditorModel);
 
-				// Handle TextOptions
-				let alwaysRevealFirst = true;
+				// Apply Options from TextOptions
+				let optionsGotApplied = false;
 				if (options && types.isFunction((<TextEditorOptions>options).apply)) {
-					const hadOptions = (<TextEditorOptions>options).apply(<IDiffEditor>diffEditor, ScrollType.Immediate);
-					if (hadOptions) {
-						alwaysRevealFirst = false; // Do not reveal if we are instructed to open specific line/col
-					}
+					optionsGotApplied = (<TextEditorOptions>options).apply(<IDiffEditor>diffEditor, ScrollType.Immediate);
+				}
+
+				// Otherwise restore View State
+				let hasPreviousViewState = false;
+				if (!optionsGotApplied) {
+					hasPreviousViewState = this.restoreTextDiffEditorViewState(input);
 				}
 
-				// Listen on diff updated changes to reveal the first change
 				this.diffNavigator = new DiffNavigator(diffEditor, {
-					alwaysRevealFirst
+					alwaysRevealFirst: !optionsGotApplied && !hasPreviousViewState // only reveal first change if we had no options or viewstate
 				});
-				this.diffNavigator.onDidUpdate(() => {
+				this.diffNavigatorDisposables.push(this.diffNavigator);
+
+				this.diffNavigatorDisposables.push(this.diffNavigator.onDidUpdate(() => {
 					this.nextDiffAction.updateEnablement();
 					this.previousDiffAction.updateEnablement();
-				});
+				}));
+
 				this.updateIgnoreTrimWhitespaceAction();
 			}, error => {
 
@@ -190,6 +199,26 @@ export class TextDiffEditor extends BaseTextEditor {
 		});
 	}
 
+	public supportsCenteredLayout(): boolean {
+		return false;
+	}
+
+	private restoreTextDiffEditorViewState(input: EditorInput): boolean {
+		if (input instanceof DiffEditorInput) {
+			const resource = this.toDiffEditorViewStateResource(input);
+			if (resource) {
+				const viewState = this.loadTextEditorViewState(resource);
+				if (viewState) {
+					this.getControl().restoreViewState(viewState);
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	private updateIgnoreTrimWhitespaceAction(): void {
 		const ignoreTrimWhitespace = this.configurationService.getValue<boolean>(this.getResource(), 'diffEditor.ignoreTrimWhitespace');
 		if (this.toggleIgnoreTrimWhitespaceAction) {
@@ -278,9 +307,10 @@ export class TextDiffEditor extends BaseTextEditor {
 	public clearInput(): void {
 
 		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
-		}
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
+
+		// Keep editor view state in settings to restore when coming back
+		this.saveTextDiffEditorViewState(this.input);
 
 		// Clear Model
 		this.getControl().setModel(null);
@@ -305,14 +335,85 @@ export class TextDiffEditor extends BaseTextEditor {
 		return super.getControl() as IDiffEditor;
 	}
 
-	public dispose(): void {
+	protected loadTextEditorViewState(resource: URI): IDiffEditorViewState {
+		return super.loadTextEditorViewState(resource) as IDiffEditorViewState;  // overridden for text diff editor support
+	}
 
-		// Dispose previous diff navigator
-		if (this.diffNavigator) {
-			this.diffNavigator.dispose();
+	private saveTextDiffEditorViewState(input: EditorInput): void {
+		if (!(input instanceof DiffEditorInput)) {
+			return; // only supported for diff editor inputs
 		}
 
-		this._configurationListener.dispose();
+		const resource = this.toDiffEditorViewStateResource(input);
+		if (!resource) {
+			return; // unable to retrieve input resource
+		}
+
+		// Clear view state if input is disposed
+		if (input.isDisposed()) {
+			super.clearTextEditorViewState([resource]);
+		}
+
+		// Otherwise save it
+		else {
+			super.saveTextEditorViewState(resource);
+
+			// Make sure to clean up when the input gets disposed
+			once(input.onDispose)(() => {
+				super.clearTextEditorViewState([resource]);
+			});
+		}
+	}
+
+	protected retrieveTextEditorViewState(resource: URI): IDiffEditorViewState {
+		return this.retrieveTextDiffEditorViewState(resource); // overridden for text diff editor support
+	}
+
+	private retrieveTextDiffEditorViewState(resource: URI): IDiffEditorViewState {
+		const editor = getCodeOrDiffEditor(this).diffEditor;
+		if (!editor) {
+			return null; // not supported for non-diff editors
+		}
+
+		const model = editor.getModel();
+		if (!model || !model.modified || !model.original) {
+			return null; // view state always needs a model
+		}
+
+		const modelUri = this.toDiffEditorViewStateResource(model);
+		if (!modelUri) {
+			return null; // model URI is needed to make sure we save the view state correctly
+		}
+
+		if (modelUri.toString() !== resource.toString()) {
+			return null; // prevent saving view state for a model that is not the expected one
+		}
+
+		return editor.saveViewState();
+	}
+
+	private toDiffEditorViewStateResource(modelOrInput: IDiffEditorModel | DiffEditorInput): URI {
+		let original: URI;
+		let modified: URI;
+
+		if (modelOrInput instanceof DiffEditorInput) {
+			original = modelOrInput.originalInput.getResource();
+			modified = modelOrInput.modifiedInput.getResource();
+		} else {
+			original = modelOrInput.original.uri;
+			modified = modelOrInput.modified.uri;
+		}
+
+		if (!original || !modified) {
+			return null;
+		}
+
+		// create a URI that is the Base64 concatenation of original + modified resource
+		return URI.from({ scheme: 'diff', path: `${btoa(original.toString())}${btoa(modified.toString())}` });
+	}
+
+	public dispose(): void {
+		this.diffNavigatorDisposables = dispose(this.diffNavigatorDisposables);
 
 		super.dispose();
 	}
@@ -372,4 +473,4 @@ class ToggleIgnoreTrimWhitespaceAction extends Action {
 		this._configurationService.updateValue(`diffEditor.ignoreTrimWhitespace`, !this._isChecked);
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index e1fb9987eb2..f8342b510f5 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -8,13 +8,12 @@
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import * as objects from 'vs/base/common/objects';
 import * as types from 'vs/base/common/types';
 import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
-import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorInput, EditorOptions, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorViewState, IEditor } from 'vs/editor/common/editorCommon';
 import { Position } from 'vs/platform/editor/common/editor';
@@ -43,15 +42,16 @@ export interface IEditorConfiguration {
  */
 export abstract class BaseTextEditor extends BaseEditor {
 	private editorControl: IEditor;
-	private _editorContainer: Builder;
+	private _editorContainer: HTMLElement;
 	private hasPendingConfigurationChange: boolean;
 	private lastAppliedEditorOptions: IEditorOptions;
+	private editorViewStateMemento: EditorViewStateMemento<IEditorViewState>;
 
 	constructor(
 		id: string,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IStorageService private storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@ITextResourceConfigurationService private readonly _configurationService: ITextResourceConfigurationService,
 		@IThemeService protected themeService: IThemeService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
@@ -59,6 +59,8 @@ export abstract class BaseTextEditor extends BaseEditor {
 	) {
 		super(id, telemetryService, themeService);
 
+		this.editorViewStateMemento = new EditorViewStateMemento<IEditorViewState>(this.getMemento(storageService, Scope.WORKSPACE), TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY, 100);
+
 		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.handleConfigurationChangeEvent(this.configurationService.getValue<IEditorConfiguration>(this.getResource()))));
 	}
 
@@ -123,7 +125,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 		return overrides;
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 
 		// Editor for Text
 		this._editorContainer = parent;
@@ -177,10 +179,10 @@ export abstract class BaseTextEditor extends BaseEditor {
 	 *
 	 * The passed in configuration object should be passed to the editor control when creating it.
 	 */
-	protected createEditorControl(parent: Builder, configuration: IEditorOptions): IEditor {
+	protected createEditorControl(parent: HTMLElement, configuration: IEditorOptions): IEditor {
 
 		// Use a getter for the instantiation service since some subclasses might use scoped instantiation services
-		return this.instantiationService.createInstance(CodeEditor, parent.getHTMLElement(), configuration);
+		return this.instantiationService.createInstance(CodeEditor, parent, configuration);
 	}
 
 	public setInput(input: EditorInput, options?: EditorOptions): TPromise<void> {
@@ -189,7 +191,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 			// Update editor options after having set the input. We do this because there can be
 			// editor input specific options (e.g. an ARIA label depending on the input showing)
 			this.updateEditorConfiguration();
-			this._editorContainer.getHTMLElement().setAttribute('aria-label', this.computeAriaLabel());
+			this._editorContainer.setAttribute('aria-label', this.computeAriaLabel());
 		});
 	}
 
@@ -219,7 +221,7 @@ export abstract class BaseTextEditor extends BaseEditor {
 		this.editorControl.focus();
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 
 		// Pass on to Editor
 		this.editorControl.layout(dimension);
@@ -233,69 +235,51 @@ export abstract class BaseTextEditor extends BaseEditor {
 	 * Saves the text editor view state for the given resource.
 	 */
 	protected saveTextEditorViewState(resource: URI): void {
+		const editorViewState = this.retrieveTextEditorViewState(resource);
+		if (!editorViewState) {
+			return;
+		}
+
+		this.editorViewStateMemento.saveState(resource, this.position, editorViewState);
+	}
+
+	protected retrieveTextEditorViewState(resource: URI): IEditorViewState {
 		const editor = getCodeOrDiffEditor(this).codeEditor;
 		if (!editor) {
-			return; // not supported for diff editors
+			return null; // not supported for diff editors
 		}
 
 		const model = editor.getModel();
 		if (!model) {
-			return; // view state always needs a model
+			return null; // view state always needs a model
 		}
 
 		const modelUri = model.uri;
 		if (!modelUri) {
-			return; // model URI is needed to make sure we save the view state correctly
+			return null; // model URI is needed to make sure we save the view state correctly
 		}
 
 		if (modelUri.toString() !== resource.toString()) {
-			return; // prevent saving view state for a model that is not the expected one
+			return null; // prevent saving view state for a model that is not the expected one
 		}
 
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-
-		let textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (!textEditorViewStateMemento) {
-			textEditorViewStateMemento = Object.create(null);
-			memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY] = textEditorViewStateMemento;
-		}
-
-		let lastKnownViewState = textEditorViewStateMemento[resource.toString()];
-		if (!lastKnownViewState) {
-			lastKnownViewState = Object.create(null);
-			textEditorViewStateMemento[resource.toString()] = lastKnownViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			lastKnownViewState[this.position] = editor.saveViewState();
-		}
+		return editor.saveViewState();
 	}
 
 	/**
 	 * Clears the text editor view state for the given resources.
 	 */
 	protected clearTextEditorViewState(resources: URI[]): void {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (textEditorViewStateMemento) {
-			resources.forEach(resource => delete textEditorViewStateMemento[resource.toString()]);
-		}
+		resources.forEach(resource => {
+			this.editorViewStateMemento.clearState(resource);
+		});
 	}
 
 	/**
 	 * Loads the text editor view state for the given resource and returns it.
 	 */
 	protected loadTextEditorViewState(resource: URI): IEditorViewState {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (textEditorViewStateMemento) {
-			const viewState = textEditorViewStateMemento[resource.toString()];
-			if (viewState) {
-				return viewState[this.position];
-			}
-		}
-
-		return null;
+		return this.editorViewStateMemento.loadState(resource, this.position);
 	}
 
 	private updateEditorConfiguration(configuration = this.configurationService.getValue<IEditorConfiguration>(this.getResource())): void {
@@ -337,6 +321,14 @@ export abstract class BaseTextEditor extends BaseEditor {
 
 	protected abstract getAriaLabel(): string;
 
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
+	}
+
 	public dispose(): void {
 		this.lastAppliedEditorOptions = void 0;
 		this.editorControl.dispose();
diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
index 71f1e85147b..9e4cc6c8799 100644
--- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts
@@ -67,7 +67,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		}
 
 		// Remember view settings if input changes
-		this.saveTextEditorViewStateForInput(this.input);
+		this.saveTextResourceEditorViewState(this.input);
 
 		// Set input and resolve
 		return super.setInput(input, options).then(() => {
@@ -97,7 +97,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 				// Otherwise restore View State
 				if (!optionsGotApplied) {
-					this.restoreViewState(input);
+					this.restoreTextResourceEditorViewState(input);
 				}
 
 				return void 0;
@@ -105,7 +105,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 		});
 	}
 
-	protected restoreViewState(input: EditorInput) {
+	private restoreTextResourceEditorViewState(input: EditorInput) {
 		if (input instanceof UntitledEditorInput || input instanceof ResourceEditorInput) {
 			const viewState = this.loadTextEditorViewState(input.getResource());
 			if (viewState) {
@@ -153,7 +153,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 	public clearInput(): void {
 
 		// Keep editor view state in settings to restore when coming back
-		this.saveTextEditorViewStateForInput(this.input);
+		this.saveTextResourceEditorViewState(this.input);
 
 		// Clear Model
 		this.getControl().setModel(null);
@@ -165,14 +165,14 @@ export class AbstractTextResourceEditor extends BaseTextEditor {
 
 		// Save View State (only for untitled)
 		if (this.input instanceof UntitledEditorInput) {
-			this.saveTextEditorViewStateForInput(this.input);
+			this.saveTextResourceEditorViewState(this.input);
 		}
 
 		// Call Super
 		super.shutdown();
 	}
 
-	protected saveTextEditorViewStateForInput(input: EditorInput): void {
+	private saveTextResourceEditorViewState(input: EditorInput): void {
 		if (!(input instanceof UntitledEditorInput) && !(input instanceof ResourceEditorInput)) {
 			return; // only enabled for untitled and resource inputs
 		}
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index edcaa336ae5..d2c4dfd3adb 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -10,7 +10,6 @@ import * as nls from 'vs/nls';
 import { prepareActions } from 'vs/workbench/browser/actions';
 import { IAction, Action, IRunEvent } from 'vs/base/common/actions';
 import * as errors from 'vs/base/common/errors';
-import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -36,8 +35,8 @@ import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Themable } from 'vs/workbench/common/theme';
 import { isDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Dimension } from 'vs/base/browser/builder';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, findParentWithClass } from 'vs/base/browser/dom';
 
 export interface IToolbarActions {
 	primary: IAction[];
@@ -211,7 +210,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 	}
 
 	public allowDragging(element: HTMLElement): boolean {
-		return !DOM.findParentWithClass(element, 'monaco-action-bar', 'one-editor-silo');
+		return !findParentWithClass(element, 'monaco-action-bar', 'one-editor-silo');
 	}
 
 	protected initActions(services: IInstantiationService): void {
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index 008797743bb..50192e62212 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -10,14 +10,13 @@ import 'vs/css!./media/notificationsActions';
 import { Themable, NOTIFICATIONS_BORDER, NOTIFICATIONS_CENTER_HEADER_FOREGROUND, NOTIFICATIONS_CENTER_HEADER_BACKGROUND, NOTIFICATIONS_CENTER_BORDER } from 'vs/workbench/common/theme';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { INotificationsModel, INotificationChangeEvent, NotificationChangeType } from 'vs/workbench/common/notifications';
-import { Dimension } from 'vs/base/browser/builder';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { NotificationsCenterVisibleContext } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { addClass, removeClass, isAncestor } from 'vs/base/browser/dom';
+import { addClass, removeClass, isAncestor, Dimension } from 'vs/base/browser/dom';
 import { widgetShadow } from 'vs/platform/theme/common/colorRegistry';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { localize } from 'vs/nls';
@@ -290,9 +289,9 @@ export class NotificationsCenter extends Themable {
 		// Hide notifications center first
 		this.hide();
 
-		// Dispose all
+		// Close all
 		while (this.model.notifications.length) {
-			this.model.notifications[0].dispose();
+			this.model.notifications[0].close();
 		}
 	}
 }
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 469360901d6..858f3bbe848 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -115,7 +115,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 		handler: (accessor, args?: any) => {
 			const notification = getNotificationFromContext(accessor.get(IListService), args);
 			if (notification) {
-				notification.dispose();
+				notification.close();
 			}
 		}
 	});
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index 6be7e0e3fa5..f52e60460aa 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -8,10 +8,9 @@
 import 'vs/css!./media/notificationsToasts';
 import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemLabelKind } from 'vs/workbench/common/notifications';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { addClass, removeClass, isAncestor, addDisposableListener, EventType } from 'vs/base/browser/dom';
+import { addClass, removeClass, isAncestor, addDisposableListener, EventType, Dimension } from 'vs/base/browser/dom';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { NotificationsList } from 'vs/workbench/browser/parts/notifications/notificationsList';
-import { Dimension } from 'vs/base/browser/builder';
 import { once } from 'vs/base/common/event';
 import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
 import { Themable, NOTIFICATIONS_TOAST_BORDER } from 'vs/workbench/common/theme';
@@ -169,8 +168,8 @@ export class NotificationsToasts extends Themable {
 			}
 		}));
 
-		// Remove when item gets disposed
-		once(item.onDidDispose)(() => {
+		// Remove when item gets closed
+		once(item.onDidClose)(() => {
 			this.removeToast(item);
 		});
 
@@ -437,6 +436,8 @@ export class NotificationsToasts extends Themable {
 			availableHeight -= (2 * 12); // adjust for paddings top and bottom
 		}
 
+		availableHeight = Math.round(availableHeight * 0.618); // try to not cover the full height for stacked toasts
+
 		return new Dimension(Math.min(maxWidth, availableWidth), availableHeight);
 	}
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 41500cf6f61..9cc3d416e22 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -442,7 +442,7 @@ export class NotificationTemplateRenderer {
 					this.actionRunner.run(action, notification);
 
 					// Hide notification
-					notification.dispose();
+					notification.close();
 				}));
 
 				this.inputDisposeables.push(attachButtonStyler(button, this.themeService));
@@ -456,7 +456,7 @@ export class NotificationTemplateRenderer {
 
 		// Return early if the item has no progress
 		if (!notification.hasProgress()) {
-			this.template.progress.stop().getContainer().hide();
+			this.template.progress.stop().hide();
 
 			return;
 		}
@@ -464,23 +464,23 @@ export class NotificationTemplateRenderer {
 		// Infinite
 		const state = notification.progress.state;
 		if (state.infinite) {
-			this.template.progress.infinite().getContainer().show();
+			this.template.progress.infinite().show();
 		}
 
 		// Total / Worked
-		else if (state.total || state.worked) {
-			if (state.total) {
+		else if (typeof state.total === 'number' || typeof state.worked === 'number') {
+			if (typeof state.total === 'number' && !this.template.progress.hasTotal()) {
 				this.template.progress.total(state.total);
 			}
 
-			if (state.worked) {
-				this.template.progress.worked(state.worked).getContainer().show();
+			if (typeof state.worked === 'number') {
+				this.template.progress.worked(state.worked).show();
 			}
 		}
 
 		// Done
 		else {
-			this.template.progress.done().getContainer().hide();
+			this.template.progress.done().hide();
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index fc207f64896..4b0a0a4c7e3 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -30,10 +30,6 @@
 	border-left-style: solid;
 }
 
-.monaco-workbench > .part.panel > .composite.title > .title-actions {
-	flex-grow: 0;
-}
-
 .monaco-workbench > .part.panel > .title > .title-actions .monaco-action-bar .action-item .action-label {
 	outline-offset: -2px;
 }
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index e7ff7537134..d339b0cfe04 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/panelpart';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
 import { Event } from 'vs/base/common/event';
-import { Builder, Dimension } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IPanel } from 'vs/workbench/common/panel';
@@ -30,6 +30,7 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IBadge } from 'vs/workbench/services/activity/common/activity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension } from 'vs/base/browser/dom';
 
 export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
@@ -42,7 +43,6 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 	private blockOpeningPanel: boolean;
 	private compositeBar: CompositeBar;
 	private dimension: Dimension;
-	private toolbarWidth = new Map<string, number>();
 
 	constructor(
 		id: string,
@@ -100,6 +100,8 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 
 	private registerListeners(): void {
 
+		this.toUnbind.push(this.registry.onDidRegister(panelDescriptor => this.compositeBar.addComposite(panelDescriptor, false)));
+
 		// Activate panel action on opening of a panel
 		this.toUnbind.push(this.onDidPanelOpen(panel => {
 			this.compositeBar.activateComposite(panel.getId());
@@ -123,11 +125,11 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 	public updateStyles(): void {
 		super.updateStyles();
 
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 		container.style('background-color', this.getColor(PANEL_BACKGROUND));
 		container.style('border-left-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
 
-		const title = this.getTitleArea();
+		const title = $(this.getTitleArea());
 		title.style('border-top-color', this.getColor(PANEL_BORDER) || this.getColor(contrastBorder));
 	}
 
@@ -180,7 +182,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		if (descriptor && descriptor.enabled !== enabled) {
 			descriptor.enabled = enabled;
 			if (enabled) {
-				this.compositeBar.addComposite(descriptor);
+				this.compositeBar.addComposite(descriptor, true);
 			} else {
 				this.compositeBar.removeComposite(id);
 			}
@@ -207,8 +209,8 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return this.hideActiveComposite().then(composite => void 0);
 	}
 
-	protected createTitleLabel(parent: Builder): ICompositeTitleLabel {
-		const titleArea = this.compositeBar.create(parent.getHTMLElement());
+	protected createTitleLabel(parent: HTMLElement): ICompositeTitleLabel {
+		const titleArea = this.compositeBar.create(parent);
 		titleArea.classList.add('panel-switcher-container');
 
 		return {
@@ -241,6 +243,11 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		return sizes;
 	}
 
+	public shutdown(): void {
+		this.compositeBar.shutdown();
+		super.shutdown();
+	}
+
 	private layoutCompositeBar(): void {
 		if (this.dimension) {
 			let availableWidth = this.dimension.width - 40; // take padding into account
@@ -257,11 +264,7 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
 		if (!activePanel) {
 			return 0;
 		}
-		if (!this.toolbarWidth.has(activePanel.getId())) {
-			this.toolbarWidth.set(activePanel.getId(), this.toolBar.getContainer().getHTMLElement().offsetWidth);
-		}
-
-		return this.toolbarWidth.get(activePanel.getId());
+		return this.toolBar.getItemsWidth();
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
new file mode 100644
index 00000000000..28ec8b5c3dd
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.quick-input-widget {
+	position: absolute;
+	width: 600px;
+	z-index: 2000;
+	padding-bottom: 6px;
+	left: 50%;
+	margin-left: -300px;
+}
+
+.quick-input-header {
+	display: flex;
+	padding: 6px 6px 4px 6px;
+}
+
+.quick-input-check-all {
+	align-self: center;
+	margin: 0;
+}
+
+.quick-input-filter {
+	flex-grow: 1;
+	display: flex;
+	position: relative;
+}
+
+.quick-input-box {
+	flex-grow: 1;
+	margin-left: 5px;
+}
+
+.quick-input-count {
+	align-self: center;
+	position: absolute;
+	right: 4px;
+}
+
+.quick-input-count .monaco-count-badge {
+	vertical-align: middle;
+}
+
+.quick-input-action {
+	margin-left: 6px;
+}
+
+.quick-input-action .monaco-text-button {
+	font-size: 85%;
+	padding: 7px 6px 6px 6px;
+	line-height: initial;
+}
+
+.quick-input-progress.monaco-progress-container,
+.quick-input-progress.monaco-progress-container .progress-bit {
+	height: 2px;
+}
+
+.quick-input-checkbox-list {
+	line-height: 22px;
+}
+
+.quick-input-checkbox-list .monaco-list {
+	overflow: hidden;
+	max-height: calc(20 * 22px);
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-entry {
+	overflow: hidden;
+	display: flex;
+	height: 100%;
+	padding: 0 6px;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-label {
+	overflow: hidden;
+	display: flex;
+	height: 100%;
+	flex: 1;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-checkbox {
+	align-self: center;
+	margin: 0;
+	/* TODO */
+	/* margin-top: 5px; */
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	flex: 1;
+	margin-left: 10px;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows > .quick-input-checkbox-list-row {
+	display: flex;
+	align-items: center;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-rows .monaco-highlighted-label span {
+	opacity: 1;
+}
+
+.quick-input-checkbox-list .quick-input-checkbox-list-label-meta {
+	opacity: 0.7;
+	line-height: normal;
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
new file mode 100644
index 00000000000..8d4d6642e47
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -0,0 +1,297 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import { Component } from 'vs/workbench/common/component';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { IPartService } from 'vs/workbench/services/part/common/partService';
+import * as dom from 'vs/base/browser/dom';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { contrastBorder, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND } from 'vs/workbench/common/theme';
+import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { QuickInputCheckboxList } from './quickInputCheckboxList';
+import { QuickInputBox } from './quickInputBox';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { CLOSE_ON_FOCUS_LOST_CONFIG } from 'vs/workbench/browser/quickopen';
+import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
+import { attachBadgeStyler, attachProgressBarStyler, attachButtonStyler } from 'vs/platform/theme/common/styler';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
+import { chain } from 'vs/base/common/event';
+import { Button } from 'vs/base/browser/ui/button/button';
+
+const $ = dom.$;
+
+export class QuickInputService extends Component implements IQuickInputService {
+
+	public _serviceBrand: any;
+
+	private static readonly ID = 'workbench.component.quickinput';
+	private static readonly MAX_WIDTH = 600;				// Max total width of quick open widget
+
+	private layoutDimensions: dom.Dimension;
+	private container: HTMLElement;
+	private checkAll: HTMLInputElement;
+	private inputBox: QuickInputBox;
+	private count: CountBadge;
+	private ready = false;
+	private progressBar: ProgressBar;
+	private checkboxList: QuickInputCheckboxList;
+	private ignoreFocusLost = false;
+
+	private resolve: (value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) => void;
+	private progress: (value: IPickOpenEntry) => void;
+
+	constructor(
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IPartService private partService: IPartService,
+		@IQuickOpenService private quickOpenService: IQuickOpenService,
+		@IThemeService themeService: IThemeService
+	) {
+		super(QuickInputService.ID, themeService);
+	}
+
+	private create() {
+		if (this.container) {
+			return;
+		}
+
+		const workbench = document.getElementById(this.partService.getWorkbenchElementId());
+		this.container = dom.append(workbench, $('.quick-input-widget'));
+		this.container.tabIndex = -1;
+		this.container.style.display = 'none';
+
+		const headerContainer = dom.append(this.container, $('.quick-input-header'));
+
+		this.checkAll = <HTMLInputElement>dom.append(headerContainer, $('input.quick-input-check-all'));
+		this.checkAll.type = 'checkbox';
+		this.toUnbind.push(dom.addStandardDisposableListener(this.checkAll, dom.EventType.CHANGE, e => {
+			const checked = this.checkAll.checked;
+			this.checkboxList.setAllVisibleChecked(checked);
+		}));
+		this.toUnbind.push(dom.addDisposableListener(this.checkAll, dom.EventType.CLICK, e => {
+			if (e.x || e.y) { // Avoid 'click' triggered by 'space'...
+				this.inputBox.setFocus();
+			}
+		}));
+
+		const filterContainer = dom.append(headerContainer, $('.quick-input-filter'));
+
+		this.inputBox = new QuickInputBox(filterContainer);
+		this.toUnbind.push(this.inputBox);
+		this.inputBox.onDidChange(value => {
+			this.checkboxList.filter(value);
+		});
+		this.toUnbind.push(this.inputBox.onKeyDown(event => {
+			switch (event.keyCode) {
+				case KeyCode.DownArrow:
+					this.checkboxList.focus('First');
+					this.checkboxList.domFocus();
+					break;
+				case KeyCode.UpArrow:
+					this.checkboxList.focus('Last');
+					this.checkboxList.domFocus();
+					break;
+			}
+		}));
+
+		const badgeContainer = dom.append(filterContainer, $('.quick-input-count'));
+		this.count = new CountBadge(badgeContainer, { countFormat: localize('quickInput.countSelected', "{0} Selected") });
+		this.toUnbind.push(attachBadgeStyler(this.count, this.themeService));
+
+		const okContainer = dom.append(headerContainer, $('.quick-input-action'));
+		const ok = new Button(okContainer);
+		attachButtonStyler(ok, this.themeService);
+		ok.label = localize('ok', "OK");
+		this.toUnbind.push(ok.onDidClick(e => {
+			if (this.ready) {
+				this.close(this.checkboxList.getCheckedElements());
+			}
+		}));
+
+		this.progressBar = new ProgressBar(this.container);
+		dom.addClass(this.progressBar.getContainer(), 'quick-input-progress');
+		this.toUnbind.push(attachProgressBarStyler(this.progressBar, this.themeService));
+
+		this.checkboxList = this.instantiationService.createInstance(QuickInputCheckboxList, this.container);
+		this.toUnbind.push(this.checkboxList);
+		this.toUnbind.push(this.checkboxList.onAllVisibleCheckedChanged(checked => {
+			this.checkAll.checked = checked;
+		}));
+		this.toUnbind.push(this.checkboxList.onCheckedCountChanged(count => {
+			this.count.setCount(count);
+		}));
+		this.toUnbind.push(this.checkboxList.onLeave(() => {
+			// Defer to avoid the input field reacting to the triggering key.
+			setTimeout(() => {
+				this.inputBox.setFocus();
+				this.checkboxList.clearFocus();
+			}, 0);
+		}));
+		this.toUnbind.push(
+			chain(this.checkboxList.onFocusChange)
+				.map(e => e[0])
+				.filter(e => !!e)
+				.latch()
+				.on(e => this.progress && this.progress(e))
+		);
+
+		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
+			if (e.relatedTarget === this.container) {
+				(<HTMLElement>e.target).focus();
+				return;
+			}
+			for (let element = <Element>e.relatedTarget; element; element = element.parentElement) {
+				if (element === this.container) {
+					return;
+				}
+			}
+			if (!this.ignoreFocusLost && !this.environmentService.args['sticky-quickopen'] && this.configurationService.getValue(CLOSE_ON_FOCUS_LOST_CONFIG)) {
+				this.close();
+			}
+		}));
+		this.toUnbind.push(dom.addDisposableListener(this.container, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			switch (event.keyCode) {
+				case KeyCode.Enter:
+					if (this.ready) {
+						dom.EventHelper.stop(e, true);
+						this.close(this.checkboxList.getCheckedElements());
+					}
+					break;
+				case KeyCode.Escape:
+					dom.EventHelper.stop(e, true);
+					this.close();
+					break;
+				case KeyCode.Tab:
+					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
+						const inputs = this.container.querySelectorAll('input');
+						if (event.shiftKey && event.target === inputs[0]) {
+							dom.EventHelper.stop(e, true);
+							inputs[inputs.length - 1].focus();
+						} else if (!event.shiftKey && event.target === inputs[inputs.length - 1]) {
+							dom.EventHelper.stop(e, true);
+							inputs[0].focus();
+						}
+					}
+					break;
+			}
+		}));
+
+		this.toUnbind.push(this.quickOpenService.onShow(() => this.close()));
+
+		this.updateStyles();
+	}
+
+	private close(value?: IPickOpenEntry[] | Thenable<IPickOpenEntry[]>) {
+		if (this.resolve) {
+			this.resolve(value);
+		}
+		this.container.style.display = 'none';
+	}
+
+	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token: CancellationToken = CancellationToken.None): TPromise<T[]> {
+		this.create();
+		this.quickOpenService.close();
+		if (this.resolve) {
+			this.resolve();
+		}
+
+		this.inputBox.value = '';
+		this.inputBox.setPlaceholder(options.placeHolder || '');
+		this.checkboxList.matchOnDescription = options.matchOnDescription;
+		this.checkboxList.matchOnDetail = options.matchOnDetail;
+		this.ignoreFocusLost = options.ignoreFocusLost;
+
+		this.progressBar.stop();
+		this.ready = false;
+
+		this.checkboxList.setElements([]);
+		this.checkAll.checked = this.checkboxList.getAllVisibleChecked();
+		this.count.setCount(this.checkboxList.getCheckedCount());
+
+		this.container.style.display = null;
+		this.updateLayout();
+		this.inputBox.setFocus();
+
+		const result = new TPromise<T[]>((resolve, reject, progress) => {
+			this.resolve = resolve;
+			this.progress = progress;
+		});
+		const d = token.onCancellationRequested(() => this.close());
+		result.then(() => d.dispose(), () => d.dispose());
+
+		const delay = TPromise.timeout(800);
+		delay.then(() => this.progressBar.infinite(), () => { /* ignore */ });
+
+		const wasResolve = this.resolve;
+		picks.then(elements => {
+			delay.cancel();
+			if (this.resolve !== wasResolve) {
+				return;
+			}
+
+			this.progressBar.stop();
+			this.ready = true;
+
+			this.checkboxList.setElements(elements);
+			this.checkboxList.filter(this.inputBox.value);
+			this.checkAll.checked = this.checkboxList.getAllVisibleChecked();
+			this.count.setCount(this.checkboxList.getCheckedCount());
+
+			this.updateLayout();
+		}).then(null, reason => this.close(TPromise.wrapError(reason)));
+
+		return result;
+	}
+
+	public layout(dimension: dom.Dimension): void {
+		this.layoutDimensions = dimension;
+		this.updateLayout();
+	}
+
+	private updateLayout() {
+		if (this.layoutDimensions && this.container) {
+			const titlebarOffset = this.partService.getTitleBarOffset();
+			this.container.style.top = `${titlebarOffset}px`;
+
+			const style = this.container.style;
+			const width = Math.min(this.layoutDimensions.width * 0.62 /* golden cut */, QuickInputService.MAX_WIDTH);
+			style.width = width + 'px';
+			style.marginLeft = '-' + (width / 2) + 'px';
+
+			this.inputBox.layout();
+			this.checkboxList.layout();
+		}
+	}
+
+	protected updateStyles() {
+		const theme = this.themeService.getTheme();
+		if (this.inputBox) {
+			this.inputBox.style(theme);
+		}
+		if (this.container) {
+			const sideBarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
+			this.container.style.backgroundColor = sideBarBackground ? sideBarBackground.toString() : undefined;
+			const sideBarForeground = theme.getColor(SIDE_BAR_FOREGROUND);
+			this.container.style.color = sideBarForeground ? sideBarForeground.toString() : undefined;
+			const contrastBorderColor = theme.getColor(contrastBorder);
+			this.container.style.border = contrastBorderColor ? `1px solid ${contrastBorderColor}` : undefined;
+			const widgetShadowColor = theme.getColor(widgetShadow);
+			this.container.style.boxShadow = widgetShadowColor ? `0 5px 8px ${widgetShadowColor}` : undefined;
+		}
+	}
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
new file mode 100644
index 00000000000..0acd72de5f9
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputBox.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import * as dom from 'vs/base/browser/dom';
+import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { localize } from 'vs/nls';
+import { inputBackground, inputForeground, inputBorder } from 'vs/platform/theme/common/colorRegistry';
+import { ITheme } from 'vs/platform/theme/common/themeService';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+
+const $ = dom.$;
+
+const DEFAULT_INPUT_ARIA_LABEL = localize('quickInputBox.ariaLabel', "Type to narrow down results.");
+
+export class QuickInputBox {
+
+	private container: HTMLElement;
+	private inputBox: InputBox;
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		private parent: HTMLElement
+	) {
+		this.container = dom.append(this.parent, $('.quick-input-box'));
+		this.inputBox = new InputBox(this.container, null, {
+			ariaLabel: DEFAULT_INPUT_ARIA_LABEL
+		});
+		this.disposables.push(this.inputBox);
+
+		// ARIA
+		const inputElement = this.inputBox.inputElement;
+		inputElement.setAttribute('role', 'combobox');
+		inputElement.setAttribute('aria-haspopup', 'false');
+		inputElement.setAttribute('aria-autocomplete', 'list');
+	}
+
+	onKeyDown(handler: (event: StandardKeyboardEvent) => void): IDisposable {
+		return dom.addDisposableListener(this.inputBox.inputElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			handler(new StandardKeyboardEvent(e));
+		});
+	}
+
+	onDidChange(handler: (event: string) => void): IDisposable {
+		return this.inputBox.onDidChange(handler);
+	}
+
+	get value() {
+		return this.inputBox.value;
+	}
+
+	set value(value: string) {
+		this.inputBox.value = value;
+	}
+
+	setPlaceholder(placeholder: string) {
+		this.inputBox.setPlaceHolder(placeholder);
+	}
+
+	setFocus(): void {
+		this.inputBox.focus();
+	}
+
+	layout(): void {
+		this.inputBox.layout();
+	}
+
+	style(theme: ITheme) {
+		this.inputBox.style({
+			inputForeground: theme.getColor(inputForeground),
+			inputBackground: theme.getColor(inputBackground),
+			inputBorder: theme.getColor(inputBorder)
+		});
+	}
+
+	dispose() {
+		this.disposables = dispose(this.disposables);
+	}
+}
diff --git a/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
new file mode 100644
index 00000000000..fa0763bf1af
--- /dev/null
+++ b/src/vs/workbench/browser/parts/quickinput/quickInputCheckboxList.ts
@@ -0,0 +1,381 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import 'vs/css!./quickInput';
+import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import * as dom from 'vs/base/browser/dom';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
+import { IMatch } from 'vs/base/common/filters';
+import { matchesFuzzyOcticonAware, parseOcticons } from 'vs/base/common/octicon';
+import { compareAnything } from 'vs/base/common/comparers';
+import { Emitter, Event, mapEvent } from 'vs/base/common/event';
+import { assign } from 'vs/base/common/objects';
+import { KeyCode } from 'vs/base/common/keyCodes';
+import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
+import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { memoize } from 'vs/base/common/decorators';
+import { range } from 'vs/base/common/arrays';
+import * as platform from 'vs/base/common/platform';
+
+const $ = dom.$;
+
+interface ICheckableElement {
+	index: number;
+	item: IPickOpenEntry;
+	checked: boolean;
+}
+
+class CheckableElement implements ICheckableElement {
+	index: number;
+	item: IPickOpenEntry;
+	shouldAlwaysShow = false;
+	hidden = false;
+	private _onChecked = new Emitter<boolean>();
+	onChecked = this._onChecked.event;
+	_checked: boolean;
+	get checked() {
+		return this._checked;
+	}
+	set checked(value: boolean) {
+		if (value !== this._checked) {
+			this._checked = value;
+			this._onChecked.fire(value);
+		}
+	}
+	labelHighlights?: IMatch[];
+	descriptionHighlights?: IMatch[];
+	detailHighlights?: IMatch[];
+
+	constructor(init: ICheckableElement) {
+		assign(this, init);
+	}
+}
+
+interface ICheckableElementTemplateData {
+	checkbox: HTMLInputElement;
+	label: IconLabel;
+	detail: HighlightedLabel;
+	element: CheckableElement;
+	toDisposeElement: IDisposable[];
+	toDisposeTemplate: IDisposable[];
+}
+
+class CheckableElementRenderer implements IRenderer<CheckableElement, ICheckableElementTemplateData> {
+
+	static readonly ID = 'checkableelement';
+
+	get templateId() {
+		return CheckableElementRenderer.ID;
+	}
+
+	renderTemplate(container: HTMLElement): ICheckableElementTemplateData {
+		const data: ICheckableElementTemplateData = Object.create(null);
+
+		const entry = dom.append(container, $('.quick-input-checkbox-list-entry'));
+		const label = dom.append(entry, $('label.quick-input-checkbox-list-label'));
+
+		// Entry
+		data.checkbox = <HTMLInputElement>dom.append(label, $('input.quick-input-checkbox-list-checkbox'));
+		data.checkbox.type = 'checkbox';
+		data.toDisposeElement = [];
+		data.toDisposeTemplate = [];
+		data.toDisposeTemplate.push(dom.addStandardDisposableListener(data.checkbox, dom.EventType.CHANGE, e => {
+			data.element.checked = data.checkbox.checked;
+		}));
+
+		const rows = dom.append(label, $('.quick-input-checkbox-list-rows'));
+		const row1 = dom.append(rows, $('.quick-input-checkbox-list-row'));
+		const row2 = dom.append(rows, $('.quick-input-checkbox-list-row'));
+
+		// Label
+		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true });
+
+		// Detail
+		const detailContainer = dom.append(row2, $('.quick-input-checkbox-list-label-meta'));
+		data.detail = new HighlightedLabel(detailContainer);
+
+		return data;
+	}
+
+	renderElement(element: CheckableElement, index: number, data: ICheckableElementTemplateData): void {
+		data.toDisposeElement = dispose(data.toDisposeElement);
+		data.element = element;
+		data.checkbox.checked = element.checked;
+		data.toDisposeElement.push(element.onChecked(checked => data.checkbox.checked = checked));
+
+		const { labelHighlights, descriptionHighlights, detailHighlights } = element;
+
+		// Label
+		const options: IIconLabelValueOptions = Object.create(null);
+		options.matches = labelHighlights || [];
+		options.descriptionTitle = element.item.description;
+		options.descriptionMatches = descriptionHighlights || [];
+		data.label.setValue(element.item.label, element.item.description, options);
+
+		// Meta
+		data.detail.set(element.item.detail, detailHighlights);
+	}
+
+	disposeTemplate(data: ICheckableElementTemplateData): void {
+		data.toDisposeElement = dispose(data.toDisposeElement);
+		data.toDisposeTemplate = dispose(data.toDisposeTemplate);
+	}
+}
+
+class CheckableElementDelegate implements IDelegate<CheckableElement> {
+
+	getHeight(element: CheckableElement): number {
+		return element.item.detail ? 44 : 22;
+	}
+
+	getTemplateId(element: CheckableElement): string {
+		return CheckableElementRenderer.ID;
+	}
+}
+
+export class QuickInputCheckboxList {
+
+	private container: HTMLElement;
+	private list: WorkbenchList<CheckableElement>;
+	private elements: CheckableElement[] = [];
+	matchOnDescription = false;
+	matchOnDetail = false;
+	private _onAllVisibleCheckedChanged = new Emitter<boolean>(); // TODO: Debounce
+	onAllVisibleCheckedChanged: Event<boolean> = this._onAllVisibleCheckedChanged.event;
+	private _onCheckedCountChanged = new Emitter<number>(); // TODO: Debounce
+	onCheckedCountChanged: Event<number> = this._onCheckedCountChanged.event;
+	private _onLeave = new Emitter<void>();
+	onLeave: Event<void> = this._onLeave.event;
+	private _fireCheckedEvents = true;
+	private elementDisposables: IDisposable[] = [];
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		private parent: HTMLElement,
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+		this.container = dom.append(this.parent, $('.quick-input-checkbox-list'));
+		const delegate = new CheckableElementDelegate();
+		this.list = this.instantiationService.createInstance(WorkbenchList, this.container, delegate, [new CheckableElementRenderer()], {
+			identityProvider: element => element.label,
+			multipleSelectionSupport: false
+		}) as WorkbenchList<CheckableElement>;
+		this.disposables.push(this.list);
+		this.disposables.push(this.list.onKeyDown(e => {
+			const event = new StandardKeyboardEvent(e);
+			switch (event.keyCode) {
+				case KeyCode.Space:
+					this.toggleCheckbox();
+					break;
+				case KeyCode.KEY_A:
+					if (platform.isMacintosh ? e.metaKey : e.ctrlKey) {
+						this.list.setFocus(range(this.list.length));
+					}
+					break;
+				case KeyCode.UpArrow:
+					const focus1 = this.list.getFocus();
+					if (focus1.length === 1 && focus1[0] === 0) {
+						this._onLeave.fire();
+					}
+					break;
+				case KeyCode.DownArrow:
+					const focus2 = this.list.getFocus();
+					if (focus2.length === 1 && focus2[0] === this.list.length - 1) {
+						this._onLeave.fire();
+					}
+					break;
+			}
+		}));
+		this.disposables.push(dom.addDisposableListener(this.container, dom.EventType.CLICK, e => {
+			if (e.x || e.y) { // Avoid 'click' triggered by 'space' on checkbox.
+				this._onLeave.fire();
+			}
+		}));
+		this.disposables.push(this.list.onSelectionChange(e => {
+			if (e.elements.length) {
+				this.list.setSelection([]);
+			}
+		}));
+	}
+
+	@memoize
+	get onFocusChange() {
+		return mapEvent(this.list.onFocusChange, e => e.elements.map(e => e.item));
+	}
+
+	getAllVisibleChecked() {
+		return this.allVisibleChecked(this.elements, false);
+	}
+
+	private allVisibleChecked(elements: CheckableElement[], whenNoneVisible = true) {
+		for (let i = 0, n = elements.length; i < n; i++) {
+			const element = elements[i];
+			if (!element.hidden) {
+				if (!element.checked) {
+					return false;
+				} else {
+					whenNoneVisible = true;
+				}
+			}
+		}
+		return whenNoneVisible;
+	}
+
+	getCheckedCount() {
+		let count = 0;
+		const elements = this.elements;
+		for (let i = 0, n = elements.length; i < n; i++) {
+			if (elements[i].checked) {
+				count++;
+			}
+		}
+		return count;
+	}
+
+	setAllVisibleChecked(checked: boolean) {
+		try {
+			this._fireCheckedEvents = false;
+			this.elements.forEach(element => {
+				if (!element.hidden) {
+					element.checked = checked;
+				}
+			});
+		} finally {
+			this._fireCheckedEvents = true;
+			this.fireCheckedEvents();
+		}
+	}
+
+	setElements(elements: IPickOpenEntry[]): void {
+		this.elementDisposables = dispose(this.elementDisposables);
+		this.elements = elements.map((item, index) => new CheckableElement({
+			index,
+			item,
+			checked: !!item.picked
+		}));
+		this.elementDisposables.push(...this.elements.map(element => element.onChecked(() => this.fireCheckedEvents())));
+		this.list.splice(0, this.list.length, this.elements);
+		this.list.setFocus([]);
+	}
+
+	getCheckedElements() {
+		return this.elements.filter(e => e.checked)
+			.map(e => e.item);
+	}
+
+	focus(what: 'First' | 'Last' | 'Next' | 'Previous' | 'NextPage' | 'PreviousPage'): void {
+		this.list['focus' + what]();
+		this.list.reveal(this.list.getFocus()[0]);
+	}
+
+	clearFocus() {
+		this.list.setFocus([]);
+	}
+
+	domFocus() {
+		this.list.domFocus();
+	}
+
+	layout(): void {
+		this.list.layout();
+	}
+
+	filter(query: string) {
+		query = query.trim();
+
+		// Reset filtering
+		if (!query) {
+			this.elements.forEach(element => {
+				element.labelHighlights = undefined;
+				element.descriptionHighlights = undefined;
+				element.detailHighlights = undefined;
+				element.hidden = false;
+			});
+		}
+
+		// Filter by value (since we support octicons, use octicon aware fuzzy matching)
+		else {
+			this.elements.forEach(element => {
+				const labelHighlights = matchesFuzzyOcticonAware(query, parseOcticons(element.item.label));
+				const descriptionHighlights = this.matchOnDescription ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.description || '')) : undefined;
+				const detailHighlights = this.matchOnDetail ? matchesFuzzyOcticonAware(query, parseOcticons(element.item.detail || '')) : undefined;
+
+				if (element.shouldAlwaysShow || labelHighlights || descriptionHighlights || detailHighlights) {
+					element.labelHighlights = labelHighlights;
+					element.descriptionHighlights = descriptionHighlights;
+					element.detailHighlights = detailHighlights;
+					element.hidden = false;
+				} else {
+					element.labelHighlights = undefined;
+					element.descriptionHighlights = undefined;
+					element.detailHighlights = undefined;
+					element.hidden = true;
+				}
+			});
+		}
+
+		// Sort by value
+		const normalizedSearchValue = query.toLowerCase();
+		this.elements.sort((a, b) => {
+			if (!query) {
+				return a.index - b.index; // restore natural order
+			}
+			return compareEntries(a, b, normalizedSearchValue);
+		});
+
+		this.list.splice(0, this.list.length, this.elements.filter(element => !element.hidden));
+		this.list.setFocus([]);
+		this.list.layout();
+
+		this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
+	}
+
+	toggleCheckbox() {
+		try {
+			this._fireCheckedEvents = false;
+			const elements = this.list.getFocusedElements();
+			const allChecked = this.allVisibleChecked(elements);
+			for (const element of elements) {
+				element.checked = !allChecked;
+			}
+		} finally {
+			this._fireCheckedEvents = true;
+			this.fireCheckedEvents();
+		}
+	}
+
+	dispose() {
+		this.elementDisposables = dispose(this.elementDisposables);
+		this.disposables = dispose(this.disposables);
+	}
+
+	private fireCheckedEvents() {
+		if (this._fireCheckedEvents) {
+			this._onAllVisibleCheckedChanged.fire(this.getAllVisibleChecked());
+			this._onCheckedCountChanged.fire(this.getCheckedCount());
+		}
+	}
+}
+
+function compareEntries(elementA: CheckableElement, elementB: CheckableElement, lookFor: string): number {
+
+	const labelHighlightsA = elementA.labelHighlights || [];
+	const labelHighlightsB = elementB.labelHighlights || [];
+	if (labelHighlightsA.length && !labelHighlightsB.length) {
+		return -1;
+	}
+
+	if (!labelHighlightsA.length && labelHighlightsB.length) {
+		return 1;
+	}
+
+	return compareAnything(elementA.item.label, elementB.item.label, lookFor);
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 28896b52a38..da5281628c2 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -9,9 +9,7 @@ import 'vs/css!./media/quickopen';
 import { TPromise, ValueCallback } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
-import { Dimension, withElementById } from 'vs/base/browser/builder';
 import * as strings from 'vs/base/common/strings';
-import * as DOM from 'vs/base/browser/dom';
 import URI from 'vs/base/common/uri';
 import * as resources from 'vs/base/common/resources';
 import { defaultGenerator } from 'vs/base/common/idGenerator';
@@ -57,6 +55,7 @@ import { IMatch } from 'vs/base/common/filters';
 import { Schemas } from 'vs/base/common/network';
 import Severity from 'vs/base/common/severity';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, addClass } from 'vs/base/browser/dom';
 
 const HELP_PREFIX = '?';
 
@@ -302,7 +301,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Create upon first open
 		if (!this.pickOpenWidget) {
 			this.pickOpenWidget = new QuickOpenWidget(
-				withElementById(this.partService.getWorkbenchElementId()).getHTMLElement(),
+				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore, handle later */ },
 					onCancel: () => { /* ignore, handle later */ },
@@ -318,7 +317,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.toUnbind.push(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const pickOpenContainer = this.pickOpenWidget.create();
-			DOM.addClass(pickOpenContainer, 'show-file-icons');
+			addClass(pickOpenContainer, 'show-file-icons');
 			this.positionQuickOpenWidget();
 		}
 
@@ -374,7 +373,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 				picksPromiseDone = true;
 
 				// Reset Progress
-				this.pickOpenWidget.getProgressBar().stop().getContainer().hide();
+				this.pickOpenWidget.getProgressBar().stop().hide();
 
 				// Model
 				const model = new QuickOpenModel([], new PickOpenActionProvider());
@@ -487,7 +486,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			// Progress if task takes a long time
 			TPromise.timeout(800).then(() => {
 				if (!picksPromiseDone && this.currentPickerToken === currentPickerToken) {
-					this.pickOpenWidget.getProgressBar().infinite().getContainer().show();
+					this.pickOpenWidget.getProgressBar().infinite().show();
 				}
 			});
 
@@ -557,7 +556,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Create upon first open
 		if (!this.quickOpenWidget) {
 			this.quickOpenWidget = new QuickOpenWidget(
-				withElementById(this.partService.getWorkbenchElementId()).getHTMLElement(),
+				document.getElementById(this.partService.getWorkbenchElementId()),
 				{
 					onOk: () => { /* ignore */ },
 					onCancel: () => { /* ignore */ },
@@ -574,7 +573,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			this.toUnbind.push(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
 
 			const quickOpenContainer = this.quickOpenWidget.create();
-			DOM.addClass(quickOpenContainer, 'show-file-icons');
+			addClass(quickOpenContainer, 'show-file-icons');
 			this.positionQuickOpenWidget();
 		}
 
@@ -623,11 +622,11 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const titlebarOffset = this.partService.getTitleBarOffset();
 
 		if (this.quickOpenWidget) {
-			this.quickOpenWidget.getElement().style('top', `${titlebarOffset}px`);
+			this.quickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
 		}
 
 		if (this.pickOpenWidget) {
-			this.pickOpenWidget.getElement().style('top', `${titlebarOffset}px`);
+			this.pickOpenWidget.getElement().style.top = `${titlebarOffset}px`;
 		}
 	}
 
@@ -742,7 +741,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 
 		// Reset Progress
 		if (!instantProgress) {
-			this.quickOpenWidget.getProgressBar().stop().getContainer().hide();
+			this.quickOpenWidget.getProgressBar().stop().hide();
 		}
 
 		// Reset Extra Class
@@ -784,7 +783,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		// Progress if task takes a long time
 		TPromise.timeout(instantProgress ? 0 : 800).then(() => {
 			if (!resultPromiseDone && currentResultToken === this.currentResultToken) {
-				this.quickOpenWidget.getProgressBar().infinite().getContainer().show();
+				this.quickOpenWidget.getProgressBar().infinite().show();
 			}
 		});
 
@@ -793,7 +792,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 			resultPromiseDone = true;
 
 			if (currentResultToken === this.currentResultToken) {
-				this.quickOpenWidget.getProgressBar().getContainer().hide();
+				this.quickOpenWidget.getProgressBar().hide();
 			}
 		}, (error: any) => {
 			resultPromiseDone = true;
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
index c944aae93aa..d4826a2b8f6 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts
@@ -25,8 +25,10 @@ import { Event } from 'vs/base/common/event';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_FOREGROUND, SIDE_BAR_BORDER } from 'vs/workbench/common/theme';
-import { Dimension } from 'vs/base/browser/builder';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, EventType } from 'vs/base/browser/dom';
+import { $ } from 'vs/base/browser/builder';
+import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 
 export class SidebarPart extends CompositePart<Viewlet> {
 
@@ -75,11 +77,18 @@ export class SidebarPart extends CompositePart<Viewlet> {
 		return this._onDidCompositeClose.event as Event<IViewlet>;
 	}
 
+	public createTitleArea(parent: HTMLElement): HTMLElement {
+		const titleArea = super.createTitleArea(parent);
+		$(titleArea).on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.onTitleAreaContextMenu(new StandardMouseEvent(e)));
+
+		return titleArea;
+	}
+
 	public updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 
 		container.style('background-color', this.getColor(SIDE_BAR_BACKGROUND));
 		container.style('color', this.getColor(SIDE_BAR_FOREGROUND));
@@ -132,6 +141,23 @@ export class SidebarPart extends CompositePart<Viewlet> {
 
 		return super.layout(dimension);
 	}
+
+	private onTitleAreaContextMenu(event: StandardMouseEvent): void {
+		const activeViewlet = this.getActiveViewlet() as Viewlet;
+		if (activeViewlet) {
+			const contextMenuActions = activeViewlet ? activeViewlet.getContextMenuActions() : [];
+			if (contextMenuActions.length) {
+				const anchor: { x: number, y: number } = { x: event.posx, y: event.posy };
+				this.contextMenuService.showContextMenu({
+					getAnchor: () => anchor,
+					getActions: () => TPromise.as(contextMenuActions),
+					getActionItem: action => this.actionItemProvider(action as Action),
+					actionRunner: activeViewlet.getActionRunner(),
+					getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id)
+				});
+			}
+		}
+	}
 }
 
 class FocusSideBarAction extends Action {
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 1004fac2c9b..73592ff0f2b 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -10,7 +10,7 @@ import * as nls from 'vs/nls';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -39,7 +39,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	private static readonly PRIORITY_PROP = 'priority';
 	private static readonly ALIGNMENT_PROP = 'alignment';
 
-	private statusItemsContainer: Builder;
+	private statusItemsContainer: HTMLElement;
 	private statusMsgDispose: IDisposable;
 
 	private styleElement: HTMLStyleElement;
@@ -67,7 +67,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		const toDispose = item.render(el);
 
 		// Insert according to priority
-		const container = this.statusItemsContainer.getHTMLElement();
+		const container = this.statusItemsContainer;
 		const neighbours = this.getEntries(alignment);
 		let inserted = false;
 		for (let i = 0; i < neighbours.length; i++) {
@@ -101,7 +101,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	private getEntries(alignment: StatusbarAlignment): HTMLElement[] {
 		const entries: HTMLElement[] = [];
 
-		const container = this.statusItemsContainer.getHTMLElement();
+		const container = this.statusItemsContainer;
 		const children = container.children;
 		for (let i = 0; i < children.length; i++) {
 			const childElement = <HTMLElement>children.item(i);
@@ -113,8 +113,8 @@ export class StatusbarPart extends Part implements IStatusbarService {
 		return entries;
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		this.statusItemsContainer = $(parent);
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		this.statusItemsContainer = parent;
 
 		// Fill in initial items that were contributed from the registry
 		const registry = Registry.as<IStatusbarRegistry>(Extensions.Statusbar);
@@ -129,7 +129,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 			const el = this.doCreateStatusItem(descriptor.alignment, descriptor.priority);
 
 			const dispose = item.render(el);
-			this.statusItemsContainer.append(el);
+			this.statusItemsContainer.appendChild(el);
 
 			return dispose;
 		}));
@@ -140,7 +140,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
 	protected updateStyles(): void {
 		super.updateStyles();
 
-		const container = this.getContainer();
+		const container = $(this.getContainer());
 
 		// Background colors
 		const backgroundColor = this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_BACKGROUND : STATUS_BAR_NO_FOLDER_BACKGROUND);
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 49198a0da14..4fe96407a85 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -7,8 +7,7 @@
 
 import 'vs/css!./media/titlebarpart';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $, Dimension } from 'vs/base/browser/builder';
-import * as DOM from 'vs/base/browser/dom';
+import { Builder, $ } from 'vs/base/browser/builder';
 import * as paths from 'vs/base/common/paths';
 import { Part } from 'vs/workbench/browser/part';
 import { ITitleService, ITitleProperties } from 'vs/workbench/services/title/common/titleService';
@@ -34,6 +33,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import URI from 'vs/base/common/uri';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { trim } from 'vs/base/common/strings';
+import { addDisposableListener, EventType, EventHelper, Dimension } from 'vs/base/browser/dom';
 
 export class TitlebarPart extends Part implements ITitleService {
 
@@ -86,8 +86,8 @@ export class TitlebarPart extends Part implements ITitleService {
 	}
 
 	private registerListeners(): void {
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.BLUR, () => this.onBlur()));
-		this.toUnbind.push(DOM.addDisposableListener(window, DOM.EventType.FOCUS, () => this.onFocus()));
+		this.toUnbind.push(addDisposableListener(window, EventType.BLUR, () => this.onBlur()));
+		this.toUnbind.push(addDisposableListener(window, EventType.FOCUS, () => this.onFocus()));
 		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChanged(e)));
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
 		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.setTitle(this.getWindowTitle())));
@@ -226,7 +226,7 @@ export class TitlebarPart extends Part implements ITitleService {
 		});
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		this.titleContainer = $(parent);
 
 		// Title
@@ -236,16 +236,16 @@ export class TitlebarPart extends Part implements ITitleService {
 		}
 
 		// Maximize/Restore on doubleclick
-		this.titleContainer.on(DOM.EventType.DBLCLICK, (e) => {
-			DOM.EventHelper.stop(e);
+		this.titleContainer.on(EventType.DBLCLICK, (e) => {
+			EventHelper.stop(e);
 
 			this.onTitleDoubleclick();
 		});
 
 		// Context menu on title
-		this.title.on([DOM.EventType.CONTEXT_MENU, DOM.EventType.MOUSE_DOWN], (e: MouseEvent) => {
-			if (e.type === DOM.EventType.CONTEXT_MENU || e.metaKey) {
-				DOM.EventHelper.stop(e);
+		this.title.on([EventType.CONTEXT_MENU, EventType.MOUSE_DOWN], (e: MouseEvent) => {
+			if (e.type === EventType.CONTEXT_MENU || e.metaKey) {
+				EventHelper.stop(e);
 
 				this.onContextMenu(e);
 			}
@@ -253,7 +253,7 @@ export class TitlebarPart extends Part implements ITitleService {
 
 		// Since the title area is used to drag the window, we do not want to steal focus from the
 		// currently active element. So we restore focus after a timeout back to where it was.
-		this.titleContainer.on([DOM.EventType.MOUSE_DOWN], () => {
+		this.titleContainer.on([EventType.MOUSE_DOWN], () => {
 			const active = document.activeElement;
 			setTimeout(() => {
 				if (active instanceof HTMLElement) {
@@ -262,20 +262,19 @@ export class TitlebarPart extends Part implements ITitleService {
 			}, 0 /* need a timeout because we are in capture phase */);
 		}, void 0, true /* use capture to know the currently active element properly */);
 
-		return this.titleContainer;
+		return this.titleContainer.getHTMLElement();
 	}
 
 	protected updateStyles(): void {
 		super.updateStyles();
 
 		// Part container
-		const container = this.getContainer();
-		if (container) {
-			container.style('color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND));
-			container.style('background-color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND));
+		if (this.titleContainer) {
+			this.titleContainer.style('color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_FOREGROUND : TITLE_BAR_ACTIVE_FOREGROUND));
+			this.titleContainer.style('background-color', this.getColor(this.isInactive ? TITLE_BAR_INACTIVE_BACKGROUND : TITLE_BAR_ACTIVE_BACKGROUND));
 
 			const titleBorder = this.getColor(TITLE_BAR_BORDER);
-			container.style('border-bottom', titleBorder ? `1px solid ${titleBorder}` : null);
+			this.titleContainer.style('border-bottom', titleBorder ? `1px solid ${titleBorder}` : null);
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/views/contributableViews.ts b/src/vs/workbench/browser/parts/views/contributableViews.ts
new file mode 100644
index 00000000000..42c9ea86328
--- /dev/null
+++ b/src/vs/workbench/browser/parts/views/contributableViews.ts
@@ -0,0 +1,446 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { ViewsRegistry, IViewDescriptor, ViewLocation } from 'vs/workbench/common/views';
+import { IContextKeyService, IContextKeyChangeEvent, IReadableSet } from 'vs/platform/contextkey/common/contextkey';
+import { Event, chain, filterEvent, Emitter } from 'vs/base/common/event';
+import { sortedDiff, firstIndex, move } from 'vs/base/common/arrays';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+
+function filterViewEvent(location: ViewLocation, event: Event<IViewDescriptor[]>): Event<IViewDescriptor[]> {
+	return chain(event)
+		.map(views => views.filter(view => view.location === location))
+		.filter(views => views.length > 0)
+		.event;
+}
+
+class CounterSet<T> implements IReadableSet<T> {
+
+	private map = new Map<T, number>();
+
+	add(value: T): CounterSet<T> {
+		this.map.set(value, (this.map.get(value) || 0) + 1);
+		return this;
+	}
+
+	delete(value: T): boolean {
+		let counter = this.map.get(value) || 0;
+
+		if (counter === 0) {
+			return false;
+		}
+
+		counter--;
+
+		if (counter === 0) {
+			this.map.delete(value);
+		} else {
+			this.map.set(value, counter);
+		}
+
+		return true;
+	}
+
+	has(value: T): boolean {
+		return this.map.has(value);
+	}
+}
+
+export interface IViewItem {
+	viewDescriptor: IViewDescriptor;
+	active: boolean;
+}
+
+class ViewDescriptorCollection {
+
+	private contextKeys = new CounterSet<string>();
+	private items: IViewItem[] = [];
+	private disposables: IDisposable[] = [];
+
+	private _onDidChange = new Emitter<void>();
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+
+	get viewDescriptors(): IViewDescriptor[] {
+		return this.items
+			.filter(i => i.active)
+			.map(i => i.viewDescriptor);
+	}
+
+	constructor(
+		location: ViewLocation,
+		@IContextKeyService private contextKeyService: IContextKeyService
+	) {
+		const onRelevantViewsRegistered = filterViewEvent(location, ViewsRegistry.onViewsRegistered);
+		onRelevantViewsRegistered(this.onViewsRegistered, this, this.disposables);
+
+		const onRelevantViewsDeregistered = filterViewEvent(location, ViewsRegistry.onViewsDeregistered);
+		onRelevantViewsDeregistered(this.onViewsDeregistered, this, this.disposables);
+
+		const onRelevantContextChange = filterEvent(contextKeyService.onDidChangeContext, e => e.affectsSome(this.contextKeys));
+		onRelevantContextChange(this.onContextChanged, this);
+
+		this.onViewsRegistered(ViewsRegistry.getViews(location));
+	}
+
+	private onViewsRegistered(viewDescriptors: IViewDescriptor[]): any {
+		let fireChangeEvent = false;
+
+		for (const viewDescriptor of viewDescriptors) {
+			const item = {
+				viewDescriptor,
+				active: this.isViewDescriptorActive(viewDescriptor) // TODO: should read from some state?
+			};
+
+			this.items.push(item);
+
+			if (viewDescriptor.when) {
+				for (const key of viewDescriptor.when.keys()) {
+					this.contextKeys.add(key);
+				}
+			}
+
+			if (item.active) {
+				fireChangeEvent = true;
+			}
+		}
+
+		if (fireChangeEvent) {
+			this._onDidChange.fire();
+		}
+	}
+
+	private onViewsDeregistered(viewDescriptors: IViewDescriptor[]): any {
+		let fireChangeEvent = false;
+
+		for (const viewDescriptor of viewDescriptors) {
+			const index = firstIndex(this.items, i => i.viewDescriptor.id === viewDescriptor.id);
+
+			if (index === -1) {
+				continue;
+			}
+
+			const item = this.items[index];
+			this.items.splice(index, 1);
+
+			if (viewDescriptor.when) {
+				for (const key of viewDescriptor.when.keys()) {
+					this.contextKeys.delete(key);
+				}
+			}
+
+			if (item.active) {
+				fireChangeEvent = true;
+			}
+		}
+
+		if (fireChangeEvent) {
+			this._onDidChange.fire();
+		}
+	}
+
+	private onContextChanged(event: IContextKeyChangeEvent): any {
+		let fireChangeEvent = false;
+
+		for (const item of this.items) {
+			const active = this.isViewDescriptorActive(item.viewDescriptor);
+
+			if (item.active !== active) {
+				fireChangeEvent = true;
+			}
+
+			item.active = active;
+		}
+
+		if (fireChangeEvent) {
+			this._onDidChange.fire();
+		}
+	}
+
+	private isViewDescriptorActive(viewDescriptor: IViewDescriptor): boolean {
+		return !viewDescriptor.when || this.contextKeyService.contextMatchesRules(viewDescriptor.when);
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+export interface IView {
+	viewDescriptor: IViewDescriptor;
+	visible: boolean;
+}
+
+export interface IViewState {
+	visible: boolean;
+	collapsed: boolean;
+	order?: number;
+	size?: number;
+}
+
+export interface IViewDescriptorRef {
+	viewDescriptor: IViewDescriptor;
+	index: number;
+}
+
+export interface IAddedViewDescriptorRef extends IViewDescriptorRef {
+	collapsed: boolean;
+	size?: number;
+}
+
+export class ContributableViewsModel {
+
+	readonly viewDescriptors: IViewDescriptor[] = [];
+	get visibleViewDescriptors(): IViewDescriptor[] {
+		return this.viewDescriptors.filter(v => this.viewStates.get(v.id).visible);
+	}
+
+	private _onDidAdd = new Emitter<IAddedViewDescriptorRef>();
+	readonly onDidAdd: Event<IAddedViewDescriptorRef> = this._onDidAdd.event;
+
+	private _onDidRemove = new Emitter<IViewDescriptorRef>();
+	readonly onDidRemove: Event<IViewDescriptorRef> = this._onDidRemove.event;
+
+	private _onDidMove = new Emitter<{ from: IViewDescriptorRef; to: IViewDescriptorRef; }>();
+	readonly onDidMove: Event<{ from: IViewDescriptorRef; to: IViewDescriptorRef; }> = this._onDidMove.event;
+
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		location: ViewLocation,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		protected viewStates = new Map<string, IViewState>()
+	) {
+		const viewDescriptorCollection = new ViewDescriptorCollection(location, contextKeyService);
+		this.disposables.push(viewDescriptorCollection);
+
+		viewDescriptorCollection.onDidChange(() => this.onDidChangeViewDescriptors(viewDescriptorCollection.viewDescriptors), this, this.disposables);
+		this.onDidChangeViewDescriptors(viewDescriptorCollection.viewDescriptors);
+	}
+
+	isVisible(id: string): boolean {
+		const state = this.viewStates.get(id);
+
+		if (!state) {
+			throw new Error(`Unknown view ${id}`);
+		}
+
+		return state.visible;
+	}
+
+	setVisible(id: string, visible: boolean): void {
+		const { visibleIndex, viewDescriptor, state } = this.find(id);
+
+		if (!viewDescriptor.canToggleVisibility) {
+			throw new Error(`Can't toggle this view's visibility`);
+		}
+
+		if (state.visible === visible) {
+			return;
+		}
+
+		state.visible = visible;
+
+		if (visible) {
+			this._onDidAdd.fire({ index: visibleIndex, viewDescriptor, size: state.size, collapsed: state.collapsed });
+		} else {
+			this._onDidRemove.fire({ index: visibleIndex, viewDescriptor });
+		}
+	}
+
+	isCollapsed(id: string): boolean {
+		const state = this.viewStates.get(id);
+
+		if (!state) {
+			throw new Error(`Unknown view ${id}`);
+		}
+
+		return state.collapsed;
+	}
+
+	setCollapsed(id: string, collapsed: boolean): void {
+		const { state } = this.find(id);
+		state.collapsed = collapsed;
+	}
+
+	getSize(id: string): number | undefined {
+		const state = this.viewStates.get(id);
+
+		if (!state) {
+			throw new Error(`Unknown view ${id}`);
+		}
+
+		return state.size;
+	}
+
+	setSize(id: string, size: number): void {
+		const { state } = this.find(id);
+		state.size = size;
+	}
+
+	move(from: string, to: string): void {
+		const fromIndex = firstIndex(this.viewDescriptors, v => v.id === from);
+		const toIndex = firstIndex(this.viewDescriptors, v => v.id === to);
+
+		const fromViewDescriptor = this.viewDescriptors[fromIndex];
+		const toViewDescriptor = this.viewDescriptors[toIndex];
+
+		move(this.viewDescriptors, fromIndex, toIndex);
+
+		for (let index = 0; index < this.viewDescriptors.length; index++) {
+			const state = this.viewStates.get(this.viewDescriptors[index].id);
+			state.order = index;
+		}
+
+		this._onDidMove.fire({
+			from: { index: fromIndex, viewDescriptor: fromViewDescriptor },
+			to: { index: toIndex, viewDescriptor: toViewDescriptor }
+		});
+	}
+
+	private find(id: string): { index: number, visibleIndex: number, viewDescriptor: IViewDescriptor, state: IViewState } {
+		for (let i = 0, visibleIndex = 0; i < this.viewDescriptors.length; i++) {
+			const viewDescriptor = this.viewDescriptors[i];
+			const state = this.viewStates.get(viewDescriptor.id);
+
+			if (viewDescriptor.id === id) {
+				return { index: i, visibleIndex, viewDescriptor, state };
+			}
+
+			if (state.visible) {
+				visibleIndex++;
+			}
+		}
+
+		throw new Error(`view descriptor ${id} not found`);
+	}
+
+	private compareViewDescriptors(a: IViewDescriptor, b: IViewDescriptor): number {
+		const viewStateA = this.viewStates.get(a.id);
+		const viewStateB = this.viewStates.get(b.id);
+
+		let orderA = viewStateA && viewStateA.order;
+		orderA = typeof orderA === 'number' ? orderA : a.order;
+		orderA = typeof orderA === 'number' ? orderA : Number.POSITIVE_INFINITY;
+
+		let orderB = viewStateB && viewStateB.order;
+		orderB = typeof orderB === 'number' ? orderB : b.order;
+		orderB = typeof orderB === 'number' ? orderB : Number.POSITIVE_INFINITY;
+
+		if (orderA !== orderB) {
+			return orderA - orderB;
+		}
+
+		if (a.id === b.id) {
+			return 0;
+		}
+
+		return a.id < b.id ? -1 : 1;
+	}
+
+	private onDidChangeViewDescriptors(viewDescriptors: IViewDescriptor[]): void {
+		const ids = new Set<string>();
+
+		for (const viewDescriptor of this.viewDescriptors) {
+			ids.add(viewDescriptor.id);
+		}
+
+		viewDescriptors = viewDescriptors.sort(this.compareViewDescriptors.bind(this));
+
+		for (const viewDescriptor of viewDescriptors) {
+			if (!this.viewStates.has(viewDescriptor.id)) {
+				this.viewStates.set(viewDescriptor.id, {
+					visible: true,
+					collapsed: false
+				});
+			}
+		}
+
+		const splices = sortedDiff<IViewDescriptor>(
+			this.viewDescriptors,
+			viewDescriptors,
+			this.compareViewDescriptors.bind(this)
+		).reverse();
+
+		for (const splice of splices) {
+			const startViewDescriptor = this.viewDescriptors[splice.start];
+			let startIndex = startViewDescriptor ? this.find(startViewDescriptor.id).visibleIndex : this.viewDescriptors.length;
+
+			for (let i = 0; i < splice.deleteCount; i++) {
+				const viewDescriptor = this.viewDescriptors[splice.start + i];
+				const { state } = this.find(viewDescriptor.id);
+
+				if (state.visible) {
+					this._onDidRemove.fire({ index: startIndex, viewDescriptor });
+				}
+			}
+
+			for (let i = 0; i < splice.toInsert.length; i++) {
+				const viewDescriptor = splice.toInsert[i];
+				const state = this.viewStates.get(viewDescriptor.id);
+
+				if (state.visible) {
+					this._onDidAdd.fire({ index: startIndex++, viewDescriptor, size: state.size, collapsed: state.collapsed });
+				}
+			}
+		}
+
+		this.viewDescriptors.splice(0, this.viewDescriptors.length, ...viewDescriptors);
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+interface ISerializedViewState {
+	id: string;
+	state: IViewState;
+}
+
+export class PersistentContributableViewsModel extends ContributableViewsModel {
+
+	private viewletStateStorageId: string;
+	private storageService: IStorageService;
+	private contextService: IWorkspaceContextService;
+
+	constructor(
+		location: ViewLocation,
+		viewletStateStorageId: string,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IStorageService storageService: IStorageService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService
+	) {
+		const scope = contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL;
+		const raw = storageService.get(viewletStateStorageId, scope, '[]');
+		const serializedViewsStates = JSON.parse(raw) as ISerializedViewState[];
+		const viewStates = new Map<string, IViewState>();
+
+		for (const { id, state } of serializedViewsStates) {
+			viewStates.set(id, state);
+		}
+
+		super(location, contextKeyService, viewStates);
+
+		this.viewletStateStorageId = viewletStateStorageId;
+		this.storageService = storageService;
+		this.contextService = contextService;
+	}
+
+	saveViewsStates(): void {
+		const serializedViewStates: ISerializedViewState[] = [];
+		this.viewStates.forEach((state, id) => serializedViewStates.push({ id, state }));
+		const raw = JSON.stringify(serializedViewStates);
+
+		const scope = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL;
+		this.storageService.store(this.viewletStateStorageId, raw, scope);
+	}
+
+	dispose(): void {
+		this.saveViewsStates();
+		super.dispose();
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
index 66f4b10dd65..c064cc0bccd 100644
--- a/src/vs/workbench/browser/parts/views/customView.ts
+++ b/src/vs/workbench/browser/parts/views/customView.ts
@@ -9,7 +9,6 @@ import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { LIGHT, FileThemeIcon, FolderThemeIcon } from 'vs/platform/theme/common/themeService';
 import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
 import { TreeItemCollapsibleState, ITreeItem, ITreeViewer, ICustomViewsService, ITreeViewDataProvider, ViewsRegistry, IViewDescriptor, TreeViewItemHandleArg, ICustomViewDescriptor, IViewsViewlet } from 'vs/workbench/common/views';
@@ -171,9 +170,9 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 
 		if (this.tree) {
 			if (this.isVisible) {
-				$(this.tree.getHTMLElement()).show();
+				DOM.show(this.tree.getHTMLElement());
 			} else {
-				$(this.tree.getHTMLElement()).hide(); // make sure the tree goes out of the tabindex world by hiding it
+				DOM.hide(this.tree.getHTMLElement()); // make sure the tree goes out of the tabindex world by hiding it
 			}
 
 			if (this.isVisible) {
@@ -265,7 +264,7 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 			return result.then(() => this.tree.reveal(item))
 				.then(() => {
 					if (select) {
-						this.tree.setSelection([item]);
+						this.tree.setSelection([item], { source: 'api' });
 					}
 				});
 		}
@@ -287,6 +286,9 @@ class CustomTreeViewer extends Disposable implements ITreeViewer {
 	}
 
 	private onSelection({ payload }: any): void {
+		if (payload && payload.source === 'api') {
+			return;
+		}
 		const selection: ITreeItem = this.tree.getSelection()[0];
 		if (selection) {
 			if (selection.command) {
diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts
index 97f55d94df5..76656e42490 100644
--- a/src/vs/workbench/browser/parts/views/panelViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts
@@ -10,8 +10,7 @@ import { Event, Emitter, filterEvent } from 'vs/base/common/event';
 import { ColorIdentifier, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { attachStyler, IColorMapping } from 'vs/platform/theme/common/styler';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND } from 'vs/workbench/common/theme';
-import { Dimension, Builder } from 'vs/base/browser/builder';
-import { append, $, trackFocus, toggleClass, EventType, isAncestor } from 'vs/base/browser/dom';
+import { append, $, trackFocus, toggleClass, EventType, isAncestor, Dimension, addDisposableListener } from 'vs/base/browser/dom';
 import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
 import { firstIndex } from 'vs/base/common/arrays';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
@@ -151,6 +150,10 @@ export class PanelViewlet extends Viewlet {
 		return this.panelview.onDidSashChange;
 	}
 
+	protected get panels(): ViewletPanel[] {
+		return this.panelItems.map(i => i.panel);
+	}
+
 	protected get length(): number {
 		return this.panelItems.length;
 	}
@@ -166,13 +169,12 @@ export class PanelViewlet extends Viewlet {
 		super(id, partService, telemetryService, themeService);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
-		const container = parent.getHTMLElement();
-		this.panelview = this._register(new PanelView(container, this.options));
+		this.panelview = this._register(new PanelView(parent, this.options));
 		this._register(this.panelview.onDidDrop(({ from, to }) => this.movePanel(from as ViewletPanel, to as ViewletPanel)));
-		this._register(parent.on(EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
+		this._register(addDisposableListener(parent, EventType.CONTEXT_MENU, (e: MouseEvent) => this.showContextMenu(new StandardMouseEvent(e))));
 	}
 
 	private showContextMenu(event: StandardMouseEvent): void {
@@ -245,7 +247,20 @@ export class PanelViewlet extends Viewlet {
 		return Math.max(...sizes);
 	}
 
-	addPanel(panel: ViewletPanel, size: number, index = this.panelItems.length - 1): void {
+	addPanels(panels: { panel: ViewletPanel, size: number, index?: number }[]): void {
+		const wasSingleView = this.isSingleView();
+
+		for (const { panel, size, index } of panels) {
+			this.addPanel(panel, size, index);
+		}
+
+		this.updateViewHeaders();
+		if (this.isSingleView() !== wasSingleView) {
+			this.updateTitleArea();
+		}
+	}
+
+	private addPanel(panel: ViewletPanel, size: number, index = this.panelItems.length - 1): void {
 		const disposables: IDisposable[] = [];
 		const onDidFocus = panel.onDidFocus(() => this.lastFocusedPanel = panel, null, disposables);
 		const onDidChange = panel.onDidChange(() => {
@@ -263,17 +278,22 @@ export class PanelViewlet extends Viewlet {
 		const disposable = combinedDisposable([onDidFocus, panelStyler, onDidChange]);
 		const panelItem: IViewletPanelItem = { panel, disposable };
 
-		const wasSingleView = this.isSingleView();
 		this.panelItems.splice(index, 0, panelItem);
 		this.panelview.addPanel(panel, size, index);
+	}
+
+	removePanels(panels: ViewletPanel[]): void {
+		const wasSingleView = this.isSingleView();
+
+		panels.forEach(panel => this.removePanel(panel));
 
 		this.updateViewHeaders();
-		if (this.isSingleView() !== wasSingleView) {
+		if (wasSingleView !== this.isSingleView()) {
 			this.updateTitleArea();
 		}
 	}
 
-	removePanel(panel: ViewletPanel): void {
+	private removePanel(panel: ViewletPanel): void {
 		const index = firstIndex(this.panelItems, i => i.panel === panel);
 
 		if (index === -1) {
@@ -284,15 +304,10 @@ export class PanelViewlet extends Viewlet {
 			this.lastFocusedPanel = undefined;
 		}
 
-		const wasSingleView = this.isSingleView();
 		this.panelview.removePanel(panel);
 		const [panelItem] = this.panelItems.splice(index, 1);
 		panelItem.disposable.dispose();
 
-		this.updateViewHeaders();
-		if (wasSingleView !== this.isSingleView()) {
-			this.updateTitleArea();
-		}
 	}
 
 	movePanel(from: ViewletPanel, to: ViewletPanel): void {
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index cadcc3059eb..18f58d76c88 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -6,7 +6,6 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import * as DOM from 'vs/base/browser/dom';
-import { $, Dimension, Builder } from 'vs/base/browser/builder';
 import { Scope } from 'vs/workbench/common/memento';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IAction, IActionRunner } from 'vs/base/common/actions';
@@ -24,7 +23,7 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
 import { IContextKeyService, IContextKeyChangeEvent } from 'vs/platform/contextkey/common/contextkey';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { PanelViewlet, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
-import { IPanelOptions } from 'vs/base/browser/ui/splitview/panelview';
+import { IPanelOptions, DefaultPanelDndController } from 'vs/base/browser/ui/splitview/panelview';
 import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
 import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
@@ -137,9 +136,9 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel {
 		}
 
 		if (isVisible) {
-			$(tree.getHTMLElement()).show();
+			DOM.show(tree.getHTMLElement());
 		} else {
-			$(tree.getHTMLElement()).hide(); // make sure the tree goes out of the tabindex world by hiding it
+			DOM.hide(tree.getHTMLElement()); // make sure the tree goes out of the tabindex world by hiding it
 		}
 
 		if (isVisible) {
@@ -190,7 +189,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 	private readonly viewsContextKeys: Set<string> = new Set<string>();
 	private viewsViewletPanels: ViewsViewletPanel[] = [];
 	private didLayout = false;
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	protected viewsStates: Map<string, IViewState> = new Map<string, IViewState>();
 	private areExtensionsReady: boolean = false;
 
@@ -210,12 +209,12 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 		@IContextMenuService protected contextMenuService: IContextMenuService,
 		@IExtensionService protected extensionService: IExtensionService
 	) {
-		super(id, { showHeaderInTitleWhenSingleView, dnd: true }, partService, contextMenuService, telemetryService, themeService);
+		super(id, { showHeaderInTitleWhenSingleView, dnd: new DefaultPanelDndController() }, partService, contextMenuService, telemetryService, themeService);
 
 		this.viewletSettings = this.getMemento(storageService, Scope.WORKSPACE);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
 		this._register(this.onDidSashChange(() => this.snapshotViewsStates()));
@@ -276,7 +275,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 		}
 	}
 
-	layout(dimension: Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		super.layout(dimension);
 		this.dimension = dimension;
 		if (this.didLayout) {
@@ -371,14 +370,15 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 			this.snapshotViewsStates();
 
 			if (toRemove.length) {
-				for (const viewDescriptor of toRemove) {
-					let view = this.getView(viewDescriptor.id);
-					this.removePanel(view);
-					this.viewsViewletPanels.splice(this.viewsViewletPanels.indexOf(view), 1);
-					view.dispose();
+				const panelsToRemove: ViewsViewletPanel[] = toRemove.map(viewDescriptor => this.getView(viewDescriptor.id));
+				this.removePanels(panelsToRemove);
+				for (const panel of panelsToRemove) {
+					this.viewsViewletPanels.splice(this.viewsViewletPanels.indexOf(panel), 1);
+					panel.dispose();
 				}
 			}
 
+			const panelsToAdd: { panel: ViewsViewletPanel, size: number, index: number }[] = [];
 			for (const viewDescriptor of toAdd) {
 				let viewState = this.viewsStates.get(viewDescriptor.id);
 				let index = visible.indexOf(viewDescriptor);
@@ -393,8 +393,13 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 				toCreate.push(view);
 
 				const size = (viewState && viewState.size) || 200;
-				this.addPanel(view, size, index);
-				this.viewsViewletPanels.splice(index, 0, view);
+				panelsToAdd.push({ panel: view, size, index });
+			}
+
+			this.addPanels(panelsToAdd);
+
+			for (const { panel, index } of panelsToAdd) {
+				this.viewsViewletPanels.splice(index, 0, panel);
 			}
 
 			return TPromise.join(toCreate.map(view => view.create()))
@@ -545,19 +550,17 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet {
 			return false;
 		}
 
-		if (ViewLocation.getContributedViewLocation(this.location.id)) {
-			let visibleViewsCount = 0;
-			if (this.areExtensionsReady) {
-				visibleViewsCount = this.getViewDescriptorsFromRegistry().reduce((visibleViewsCount, v) => visibleViewsCount + (this.canBeVisible(v) ? 1 : 0), 0);
-			} else {
+		if (ViewLocation.get(this.location.id)) {
+			if (!this.areExtensionsReady) {
+				let visibleViewsCount = 0;
 				// Check in cache so that view do not jump. See #29609
 				this.viewsStates.forEach((viewState, id) => {
 					if (!viewState.isHidden) {
 						visibleViewsCount++;
 					}
 				});
+				return visibleViewsCount === 1;
 			}
-			return visibleViewsCount === 1;
 		}
 
 		return super.isSingleView();
@@ -644,7 +647,7 @@ export class PersistentViewsViewlet extends ViewsViewlet {
 		this._register(this.onDidChangeViewVisibilityState(id => this.onViewVisibilityChanged(id)));
 	}
 
-	create(parent: Builder): TPromise<void> {
+	create(parent: HTMLElement): TPromise<void> {
 		this.loadViewsStates();
 		return super.create(parent);
 	}
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
index 1d5419d0e5e..e6ed31632fe 100644
--- a/src/vs/workbench/browser/viewlet.ts
+++ b/src/vs/workbench/browser/viewlet.ts
@@ -154,7 +154,7 @@ export class ToggleViewletAction extends Action {
 		const activeViewlet = this.viewletService.getActiveViewlet();
 		const activeElement = document.activeElement;
 
-		return activeViewlet && activeElement && DOM.isAncestor(activeElement, (<Viewlet>activeViewlet).getContainer().getHTMLElement());
+		return activeViewlet && activeElement && DOM.isAncestor(activeElement, (<Viewlet>activeViewlet).getContainer());
 	}
 }
 
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 12e0cbaae6b..29cb171b382 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -17,6 +17,7 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ITextModel } from 'vs/editor/common/model';
 import { Schemas } from 'vs/base/common/network';
+import { LRUCache } from 'vs/base/common/map';
 
 export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false);
 
@@ -31,8 +32,6 @@ export enum ConfirmResult {
  */
 export const TEXT_DIFF_EDITOR_ID = 'workbench.editors.textDiffEditor';
 
-export const PREFERENCES_EDITOR_ID = 'workbench.editor.preferencesEditor';
-
 /**
  * Binary diff editor id.
  */
@@ -908,6 +907,114 @@ export function toResource(editor: IEditorInput, options?: IResourceOptions): UR
 	return null;
 }
 
+export interface IEditorViewStates<T> {
+	[Position.ONE]?: T;
+	[Position.TWO]?: T;
+	[Position.THREE]?: T;
+}
+
+export class EditorViewStateMemento<T> {
+	private cache: LRUCache<string, IEditorViewStates<T>>;
+
+	constructor(private memento: object, private key: string, private limit: number = 10) { }
+
+	public saveState(resource: URI, position: Position, state: T): void;
+	public saveState(editor: EditorInput, position: Position, state: T): void;
+	public saveState(resourceOrEditor: URI | EditorInput, position: Position, state: T): void {
+		if (typeof position !== 'number') {
+			return; // we need a position at least
+		}
+
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+
+			let viewStates = cache.get(resource.toString());
+			if (!viewStates) {
+				viewStates = Object.create(null) as IEditorViewStates<T>;
+				cache.set(resource.toString(), viewStates);
+			}
+
+			viewStates[position] = state;
+
+			// Automatically clear when editor input gets disposed if any
+			if (resourceOrEditor instanceof EditorInput) {
+				once(resourceOrEditor.onDispose)(() => {
+					this.clearState(resource);
+				});
+			}
+		}
+	}
+
+	public loadState(resource: URI, position: Position): T;
+	public loadState(editor: EditorInput, position: Position): T;
+	public loadState(resourceOrEditor: URI | EditorInput, position: Position): T {
+		if (typeof position !== 'number') {
+			return void 0; // we need a position at least
+		}
+
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+
+			const viewStates = cache.get(resource.toString());
+			if (viewStates) {
+				return viewStates[position];
+			}
+		}
+
+		return void 0;
+	}
+
+	public clearState(resource: URI): void;
+	public clearState(editor: EditorInput): void;
+	public clearState(resourceOrEditor: URI | EditorInput): void {
+		const resource = this.doGetResource(resourceOrEditor);
+		if (resource) {
+			const cache = this.doLoad();
+			cache.delete(resource.toString());
+		}
+	}
+
+	private doGetResource(resourceOrEditor: URI | EditorInput): URI {
+		if (resourceOrEditor instanceof EditorInput) {
+			return resourceOrEditor.getResource();
+		}
+
+		return resourceOrEditor;
+	}
+
+	private doLoad(): LRUCache<string, IEditorViewStates<T>> {
+		if (!this.cache) {
+			this.cache = new LRUCache<string, T>(this.limit);
+
+			// Restore from serialized map state
+			const rawViewState = this.memento[this.key];
+			if (Array.isArray(rawViewState)) {
+				this.cache.fromJSON(rawViewState);
+			}
+
+			// Migration from old object state
+			else if (rawViewState) {
+				const keys = Object.keys(rawViewState);
+				keys.forEach((key, index) => {
+					if (index < this.limit) {
+						this.cache.set(key, rawViewState[key]);
+					}
+				});
+			}
+		}
+
+		return this.cache;
+	}
+
+	public save(): void {
+		const cache = this.doLoad();
+
+		this.memento[this.key] = cache.toJSON();
+	}
+}
+
 class EditorInputFactoryRegistry implements IEditorInputFactoryRegistry {
 	private instantiationService: IInstantiationService;
 	private fileInputFactory: IFileInputFactory;
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index ebcfc0a44e3..d27b8209c2b 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -44,21 +44,21 @@ export interface INotificationChangeEvent {
 }
 
 export class NotificationHandle implements INotificationHandle {
-	private readonly _onDidDispose: Emitter<void> = new Emitter();
+	private readonly _onDidClose: Emitter<void> = new Emitter();
 
-	constructor(private item: INotificationViewItem, private disposeItem: (item: INotificationViewItem) => void) {
+	constructor(private item: INotificationViewItem, private closeItem: (item: INotificationViewItem) => void) {
 		this.registerListeners();
 	}
 
 	private registerListeners(): void {
-		once(this.item.onDidDispose)(() => {
-			this._onDidDispose.fire();
-			this._onDidDispose.dispose();
+		once(this.item.onDidClose)(() => {
+			this._onDidClose.fire();
+			this._onDidClose.dispose();
 		});
 	}
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	public get progress(): INotificationProgress {
@@ -77,9 +77,9 @@ export class NotificationHandle implements INotificationHandle {
 		this.item.updateActions(actions);
 	}
 
-	public dispose(): void {
-		this.disposeItem(this.item);
-		this._onDidDispose.dispose();
+	public close(): void {
+		this.closeItem(this.item);
+		this._onDidClose.dispose();
 	}
 }
 
@@ -117,7 +117,7 @@ export class NotificationsModel implements INotificationsModel {
 		// Deduplicate
 		const duplicate = this.findNotification(item);
 		if (duplicate) {
-			duplicate.dispose();
+			duplicate.close();
 		}
 
 		// Add to list as first entry
@@ -127,15 +127,15 @@ export class NotificationsModel implements INotificationsModel {
 		this._onDidNotificationChange.fire({ item, index: 0, kind: NotificationChangeType.ADD });
 
 		// Wrap into handle
-		return new NotificationHandle(item, item => this.disposeItem(item));
+		return new NotificationHandle(item, item => this.closeItem(item));
 	}
 
-	private disposeItem(item: INotificationViewItem): void {
+	private closeItem(item: INotificationViewItem): void {
 		const liveItem = this.findNotification(item);
 		if (liveItem && liveItem !== item) {
-			liveItem.dispose(); // item could have been replaced with another one, make sure to dispose the live item
+			liveItem.close(); // item could have been replaced with another one, make sure to close the live item
 		} else {
-			item.dispose(); // otherwise just dispose the item that was passed in
+			item.close(); // otherwise just close the item that was passed in
 		}
 	}
 
@@ -174,7 +174,7 @@ export class NotificationsModel implements INotificationsModel {
 			}
 		});
 
-		once(item.onDidDispose)(() => {
+		once(item.onDidClose)(() => {
 			itemExpansionChangeListener.dispose();
 			itemLabelChangeListener.dispose();
 
@@ -204,7 +204,7 @@ export interface INotificationViewItem {
 	readonly canCollapse: boolean;
 
 	readonly onDidExpansionChange: Event<void>;
-	readonly onDidDispose: Event<void>;
+	readonly onDidClose: Event<void>;
 	readonly onDidLabelChange: Event<INotificationViewItemLabelChangeEvent>;
 
 	expand(): void;
@@ -217,7 +217,7 @@ export interface INotificationViewItem {
 	updateMessage(message: NotificationMessage): void;
 	updateActions(actions?: INotificationActions): void;
 
-	dispose(): void;
+	close(): void;
 
 	equals(item: INotificationViewItem);
 }
@@ -359,7 +359,7 @@ export class NotificationViewItem implements INotificationViewItem {
 	private _progress: NotificationViewItemProgress;
 
 	private readonly _onDidExpansionChange: Emitter<void>;
-	private readonly _onDidDispose: Emitter<void>;
+	private readonly _onDidClose: Emitter<void>;
 	private readonly _onDidLabelChange: Emitter<INotificationViewItemLabelChangeEvent>;
 
 	public static create(notification: INotification): INotificationViewItem {
@@ -435,8 +435,8 @@ export class NotificationViewItem implements INotificationViewItem {
 		this._onDidLabelChange = new Emitter<INotificationViewItemLabelChangeEvent>();
 		this.toDispose.push(this._onDidLabelChange);
 
-		this._onDidDispose = new Emitter<void>();
-		this.toDispose.push(this._onDidDispose);
+		this._onDidClose = new Emitter<void>();
+		this.toDispose.push(this._onDidClose);
 	}
 
 	private setActions(actions: INotificationActions): void {
@@ -464,8 +464,8 @@ export class NotificationViewItem implements INotificationViewItem {
 		return this._onDidLabelChange.event;
 	}
 
-	public get onDidDispose(): Event<void> {
-		return this._onDidDispose.event;
+	public get onDidClose(): Event<void> {
+		return this._onDidClose.event;
 	}
 
 	public get canCollapse(): boolean {
@@ -556,13 +556,17 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 	}
 
-	public dispose(): void {
-		this._onDidDispose.fire();
+	public close(): void {
+		this._onDidClose.fire();
 
 		this.toDispose = dispose(this.toDispose);
 	}
 
 	public equals(other: INotificationViewItem): boolean {
+		if (this.hasProgress() || other.hasProgress()) {
+			return false;
+		}
+
 		if (this._source !== other.source) {
 			return false;
 		}
@@ -578,7 +582,7 @@ export class NotificationViewItem implements INotificationViewItem {
 		}
 
 		for (let i = 0; i < primaryActions.length; i++) {
-			if (primaryActions[i].id !== otherPrimaryActions[i].id) {
+			if ((primaryActions[i].id + primaryActions[i].label) !== (otherPrimaryActions[i].id + otherPrimaryActions[i].label)) {
 				return false;
 			}
 		}
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index fc93969262c..13e52316a1c 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -361,7 +361,7 @@ export const TITLE_BAR_INACTIVE_BACKGROUND = registerColor('titleBar.inactiveBac
 export const TITLE_BAR_BORDER = registerColor('titleBar.border', {
 	dark: null,
 	light: null,
-	hc: null
+	hc: contrastBorder
 }, nls.localize('titleBarBorder', "Title bar border color. Note that this color is currently only supported on macOS."));
 
 // < --- Notifications --- >
diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts
index 5947ecba8cd..c72806df4fb 100644
--- a/src/vs/workbench/common/views.ts
+++ b/src/vs/workbench/common/views.ts
@@ -17,24 +17,24 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 
 export class ViewLocation {
 
-	static readonly Explorer = new ViewLocation('workbench.view.explorer');
-	static readonly Debug = new ViewLocation('workbench.view.debug');
-	static readonly Extensions = new ViewLocation('workbench.view.extensions');
-
-	constructor(private _id: string) {
+	private static locations: Map<string, ViewLocation> = new Map<string, ViewLocation>();
+	static register(id: string): ViewLocation {
+		const viewLocation = new ViewLocation(id);
+		ViewLocation.locations.set(id, viewLocation);
+		return viewLocation;
+	}
+	static get(value: string): ViewLocation {
+		return ViewLocation.locations.get(value);
 	}
 
-	get id(): string {
-		return this._id;
-	}
+	static readonly Explorer: ViewLocation = ViewLocation.register('workbench.view.explorer');
+	static readonly Debug: ViewLocation = ViewLocation.register('workbench.view.debug');
+	static readonly Extensions: ViewLocation = ViewLocation.register('workbench.view.extensions');
+	static readonly SCM: ViewLocation = ViewLocation.register('workbench.view.scm.views.contributed');
+
+	private constructor(private _id: string) { }
+	get id(): string { return this._id; }
 
-	static getContributedViewLocation(value: string): ViewLocation {
-		switch (value) {
-			case 'explorer': return ViewLocation.Explorer;
-			case 'debug': return ViewLocation.Debug;
-		}
-		return void 0;
-	}
 }
 
 export interface IViewDescriptor {
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 3e0b42414db..7abd5ddb6b1 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -871,6 +871,24 @@ export class OpenIssueReporterAction extends Action {
 	}
 }
 
+export class OpenProcessExplorer extends Action {
+	public static readonly ID = 'workbench.action.openProcessExplorer';
+	public static readonly LABEL = nls.localize('openProcessExplorer', "Open Process Explorer");
+
+	constructor(
+		id: string,
+		label: string,
+		@IWorkbenchIssueService private issueService: IWorkbenchIssueService
+	) {
+		super(id, label);
+	}
+
+	public run(): TPromise<boolean> {
+		return this.issueService.openProcessExplorer()
+			.then(() => true);
+	}
+}
+
 export class ReportPerformanceIssueUsingReporterAction extends Action {
 	public static readonly ID = 'workbench.action.reportPerformanceIssueUsingReporter';
 	public static readonly LABEL = nls.localize('reportPerformanceIssue', "Report Performance Issue");
diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js
index 0c0b9b7c018..75f6dc4d7f6 100644
--- a/src/vs/workbench/electron-browser/bootstrap/index.js
+++ b/src/vs/workbench/electron-browser/bootstrap/index.js
@@ -28,7 +28,7 @@ process.lazyEnv = new Promise(function (resolve) {
 		assign(process.env, shellEnv);
 		resolve(process.env);
 	});
-	ipc.send('vscode:fetchShellEnv', remote.getCurrentWindow().id);
+	ipc.send('vscode:fetchShellEnv');
 });
 
 Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https://github.com/v8/v8/wiki/Stack-Trace-API)
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 87d47096eef..eb578183a03 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -9,17 +9,19 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import * as nls from 'vs/nls';
 import product from 'vs/platform/node/product';
 import * as os from 'os';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
-import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction } from 'vs/workbench/electron-browser/actions';
+import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportPerformanceIssueUsingReporterAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ShowAboutDialogAction, InspectContextKeysAction, OpenProcessExplorer } from 'vs/workbench/electron-browser/actions';
 import { registerCommands } from 'vs/workbench/electron-browser/commands';
 import { AddRootFolderAction, GlobalRemoveRootFolderAction, OpenWorkspaceAction, SaveWorkspaceAsAction, OpenWorkspaceConfigFileAction, OpenFolderAsWorkspaceInNewWindowAction, OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vs/workbench/browser/actions/workspaceActions';
-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { inQuickOpenContext, getQuickNavigateHandler } from 'vs/workbench/browser/parts/quickopen/quickopen';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 // Contribute Commands
 registerCommands();
@@ -103,14 +105,25 @@ workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(AddRoo
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalRemoveRootFolderAction, GlobalRemoveRootFolderAction.ID, GlobalRemoveRootFolderAction.LABEL), 'Workspaces: Remove Folder from Workspace...', workspacesCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceAction, OpenWorkspaceAction.ID, OpenWorkspaceAction.LABEL), 'Workspaces: Open Workspace...', workspacesCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(SaveWorkspaceAsAction, SaveWorkspaceAsAction.ID, SaveWorkspaceAsAction.LABEL), 'Workspaces: Save Workspace As...', workspacesCategory);
-workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL), 'Workspaces: Open Workspace Configuration File', workspacesCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenFolderAsWorkspaceInNewWindowAction, OpenFolderAsWorkspaceInNewWindowAction.ID, OpenFolderAsWorkspaceInNewWindowAction.LABEL), 'Workspaces: Open Folder as Workspace in New Window', workspacesCategory);
 
+CommandsRegistry.registerCommand(OpenWorkspaceConfigFileAction.ID, serviceAccessor => {
+	serviceAccessor.get(IInstantiationService).createInstance(OpenWorkspaceConfigFileAction, OpenWorkspaceConfigFileAction.ID, OpenWorkspaceConfigFileAction.LABEL).run();
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
+		id: OpenWorkspaceConfigFileAction.ID,
+		title: `${workspacesCategory}: ${OpenWorkspaceConfigFileAction.LABEL}`,
+	},
+	when: new RawContextKey<string>('workbenchState', '').isEqualTo('workspace')
+});
+
 // Developer related actions
 const developerCategory = nls.localize('developer', "Developer");
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowStartupPerformance, ShowStartupPerformance.ID, ShowStartupPerformance.LABEL), 'Developer: Startup Performance', developerCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSharedProcessAction, ToggleSharedProcessAction.ID, ToggleSharedProcessAction.LABEL), 'Developer: Toggle Shared Process', developerCategory);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(InspectContextKeysAction, InspectContextKeysAction.ID, InspectContextKeysAction.LABEL), 'Developer: Inspect Context Keys', developerCategory);
+workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenProcessExplorer, OpenProcessExplorer.ID, OpenProcessExplorer.LABEL), 'Developer: Open Process Explorer', developerCategory);
 
 const recentFilesPickerContext = ContextKeyExpr.and(inQuickOpenContext, ContextKeyExpr.has(inRecentFilesPickerContextKey));
 
@@ -298,6 +311,7 @@ configurationRegistry.registerConfiguration({
 					nls.localize('window.openFilesInNewWindow.default', "Files will open in a new window unless picked from within the application (e.g. via the File menu)")
 			],
 			'default': 'off',
+			'scope': ConfigurationScope.APPLICATION,
 			'description':
 				isMacintosh ?
 					nls.localize('openFilesInNewWindowMac', "Controls if files should open in a new window.\n- default: files will open in the window with the files' folder open or the last active window unless opened via the Dock or from Finder\n- on: files will open in a new window\n- off: files will open in the window with the files' folder open or the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).") :
@@ -312,6 +326,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.openFoldersInNewWindow.default', "Folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('openFoldersInNewWindow', "Controls if folders should open in a new window or replace the last active window.\n- default: folders will open in a new window unless a folder is picked from within the application (e.g. via the File menu)\n- on: folders will open in a new window\n- off: folders will replace the last active window\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
 		},
 		'window.openWithoutArgumentsInNewWindow': {
@@ -322,6 +337,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.openWithoutArgumentsInNewWindow.off', "Focus the last active running instance")
 			],
 			'default': isMacintosh ? 'off' : 'on',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('openWithoutArgumentsInNewWindow', "Controls if a new empty window should open when starting a second instance without arguments or if the last running instance should get focus.\n- on: open a new empty window\n- off: the last active running instance will get focus\nNote that there can still be cases where this setting is ignored (e.g. when using the -new-window or -reuse-window command line option).")
 		},
 		'window.restoreWindows': {
@@ -334,11 +350,13 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.reopenFolders.none', "Never reopen a window. Always start with an empty one.")
 			],
 			'default': 'one',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('restoreWindows', "Controls how windows are being reopened after a restart. Select 'none' to always start with an empty workspace, 'one' to reopen the last window you worked on, 'folders' to reopen all windows that had folders opened or 'all' to reopen all windows of your last session.")
 		},
 		'window.restoreFullscreen': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('restoreFullscreen', "Controls if a window should restore to full screen mode if it was exited in full screen mode.")
 		},
 		'window.zoomLevel': {
@@ -362,6 +380,7 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.newWindowDimensions.fullscreen', "Open new windows in full screen mode.")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('newWindowDimensions', "Controls the dimensions of opening a new window when at least one window is already opened. By default, a new window will open in the center of the screen with small dimensions. When set to 'inherit', the window will get the same dimensions as the last window that was active. When set to 'maximized', the window will open maximized and fullscreen if configured to 'fullscreen'. Note that this setting does not have an impact on the first window that is opened. The first window will always restore the size and location as you left it before closing.")
 		},
 		'window.closeWhenEmpty': {
@@ -379,12 +398,14 @@ configurationRegistry.registerConfiguration({
 				nls.localize('window.menuBarVisibility.hidden', "Menu is always hidden.")
 			],
 			'default': 'default',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('menuBarVisibility', "Control the visibility of the menu bar. A setting of 'toggle' means that the menu bar is hidden and a single press of the Alt key will show it. By default, the menu bar will be visible, unless the window is full screen."),
 			'included': isWindows || isLinux
 		},
 		'window.enableMenuBarMnemonics': {
 			'type': 'boolean',
 			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('enableMenuBarMnemonics', "If enabled, the main menus can be opened via Alt-key shortcuts. Disabling mnemonics allows to bind these Alt-key shortcuts to editor commands instead."),
 			'included': isWindows || isLinux
 		},
@@ -398,20 +419,30 @@ configurationRegistry.registerConfiguration({
 			'type': 'string',
 			'enum': ['native', 'custom'],
 			'default': 'custom',
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply."),
 			'included': isMacintosh
 		},
 		'window.nativeTabs': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured."),
 			'included': isMacintosh && parseFloat(os.release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
 		},
 		'window.smoothScrollingWorkaround': {
 			'type': 'boolean',
 			'default': false,
+			'scope': ConfigurationScope.APPLICATION,
 			'description': nls.localize('window.smoothScrollingWorkaround', "Enable this workaround if scrolling is no longer smooth after restoring a minimized VS Code window. This is a workaround for an issue (https://github.com/Microsoft/vscode/issues/13612) where scrolling starts to lag on devices with precision trackpads like the Surface devices from Microsoft. Enabling this workaround can result in a little bit of layout flickering after restoring the window from minimized state but is otherwise harmless."),
 			'included': isWindows
+		},
+		'window.clickThroughInactive': {
+			'type': 'boolean',
+			'default': true,
+			'scope': ConfigurationScope.APPLICATION,
+			'description': nls.localize('window.clickThroughInactive', "If enabled, clicking on an inactive window will both activate the window and trigger the element under the mouse if it is clickable. If disabled, clicking anywhere on an inactive window will activate it only and a second click is required on the element."),
+			'included': isMacintosh
 		}
 	}
 });
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index b5d1817b211..087bbe40d24 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -97,7 +97,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise<void> {
 				logService,
 				timerService,
 				storageService
-			}, mainServices, configuration);
+			}, mainServices, mainProcessClient, configuration);
 			shell.open();
 
 			// Inform user about loading issues from the loader
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 21252971525..93ba3e987c8 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -9,8 +9,6 @@ import 'vs/css!./media/shell';
 
 import * as platform from 'vs/base/common/platform';
 import * as perf from 'vs/base/common/performance';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
-import * as dom from 'vs/base/browser/dom';
 import * as aria from 'vs/base/browser/ui/aria/aria';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import * as errors from 'vs/base/common/errors';
@@ -62,7 +60,7 @@ import { WorkbenchModeServiceImpl } from 'vs/workbench/services/mode/common/work
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { ICrashReporterService, NullCrashReporterService, CrashReporterService } from 'vs/workbench/services/crashReporter/electron-browser/crashReporterService';
-import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { getDelayedChannel, IPCClient } from 'vs/base/parts/ipc/common/ipc';
 import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
 import { IExtensionManagementChannel, ExtensionManagementChannelClient } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
 import { IExtensionManagementService, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -96,6 +94,7 @@ import { NotificationService } from 'vs/workbench/services/notification/common/n
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { DialogService } from 'vs/workbench/services/dialogs/electron-browser/dialogService';
 import { DialogChannel } from 'vs/platform/dialogs/common/dialogIpc';
+import { EventType, addDisposableListener, addClass, getClientArea } from 'vs/base/browser/dom';
 
 /**
  * Services that we require for the Shell
@@ -135,12 +134,12 @@ export class WorkbenchShell {
 	private previousErrorValue: string;
 	private previousErrorTime: number;
 	private content: HTMLElement;
-	private contentsContainer: Builder;
+	private contentsContainer: HTMLElement;
 
 	private configuration: IWindowConfiguration;
 	private workbench: Workbench;
 
-	constructor(container: HTMLElement, coreServices: ICoreServices, mainProcessServices: ServiceCollection, configuration: IWindowConfiguration) {
+	constructor(container: HTMLElement, coreServices: ICoreServices, mainProcessServices: ServiceCollection, private mainProcessClient: IPCClient, configuration: IWindowConfiguration) {
 		this.container = container;
 
 		this.configuration = configuration;
@@ -158,19 +157,20 @@ export class WorkbenchShell {
 		this.previousErrorTime = 0;
 	}
 
-	private createContents(parent: Builder): Builder {
+	private createContents(parent: HTMLElement): HTMLElement {
 
 		// ARIA
 		aria.setARIAContainer(document.body);
 
 		// Workbench Container
-		const workbenchContainer = $(parent).div();
+		const workbenchContainer = document.createElement('div');
+		parent.appendChild(workbenchContainer);
 
 		// Instantiation service with services
-		const [instantiationService, serviceCollection] = this.initServiceCollection(parent.getHTMLElement());
+		const [instantiationService, serviceCollection] = this.initServiceCollection(parent);
 
 		// Workbench
-		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent.getHTMLElement(), workbenchContainer.getHTMLElement());
+		this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent, workbenchContainer);
 
 		// Window
 		this.workbench.getInstantiationService().createInstance(ElectronWindow, this.container);
@@ -189,7 +189,7 @@ export class WorkbenchShell {
 
 	private createWorkbench(instantiationService: IInstantiationService, serviceCollection: ServiceCollection, parent: HTMLElement, workbenchContainer: HTMLElement): Workbench {
 		try {
-			const workbench = instantiationService.createInstance(Workbench, parent, workbenchContainer, this.configuration, serviceCollection, this.lifecycleService);
+			const workbench = instantiationService.createInstance(Workbench, parent, workbenchContainer, this.configuration, serviceCollection, this.lifecycleService, this.mainProcessClient);
 
 			// Set lifecycle phase to `Restoring`
 			this.lifecycleService.phase = LifecyclePhase.Restoring;
@@ -312,7 +312,7 @@ export class WorkbenchShell {
 				perf.mark('didStatLocalStorage');
 
 				/* __GDPR__
-					"localStorageTimers2" : {
+					"localStorageTimers<NUMBER>" : {
 						"statTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 						"accessTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
 						"firstReadTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
@@ -475,13 +475,15 @@ export class WorkbenchShell {
 		});
 
 		// Shell Class for CSS Scoping
-		$(this.container).addClass('monaco-shell');
+		addClass(this.container, 'monaco-shell');
 
 		// Controls
-		this.content = $('.monaco-shell-content').appendTo(this.container).getHTMLElement();
+		this.content = document.createElement('div');
+		addClass(this.content, 'monaco-shell-content');
+		this.container.appendChild(this.content);
 
 		// Create Contents
-		this.contentsContainer = this.createContents($(this.content));
+		this.contentsContainer = this.createContents(this.content);
 
 		// Layout
 		this.layout();
@@ -493,7 +495,7 @@ export class WorkbenchShell {
 	private registerListeners(): void {
 
 		// Resize
-		$(window).on(dom.EventType.RESIZE, () => this.layout(), this.toUnbind);
+		this.toUnbind.push(addDisposableListener(window, EventType.RESIZE, () => this.layout()));
 	}
 
 	public onUnexpectedError(error: any): void {
@@ -520,10 +522,10 @@ export class WorkbenchShell {
 	}
 
 	private layout(): void {
-		const clArea = $(this.container).getClientArea();
+		const clientArea = getClientArea(this.container);
 
-		const contentsSize = new Dimension(clArea.width, clArea.height);
-		this.contentsContainer.size(contentsSize.width, contentsSize.height);
+		this.contentsContainer.style.width = `${clientArea.width}px`;
+		this.contentsContainer.style.height = `${clientArea.height}px`;
 
 		this.contextViewService.layout();
 		this.workbench.layout();
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index 53402073fbf..5da959f79eb 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -131,7 +131,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support runAction event
-		ipc.on('vscode:runAction', (_event: any, request: IRunActionInWindowRequest) => {
+		ipc.on('vscode:runAction', (event: any, request: IRunActionInWindowRequest) => {
 			const args: any[] = [];
 
 			// If we run an action from the touchbar, we fill in the currently active resource
@@ -162,7 +162,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support resolve keybindings event
-		ipc.on('vscode:resolveKeybindings', (_event: any, rawActionIds: string) => {
+		ipc.on('vscode:resolveKeybindings', (event: any, rawActionIds: string) => {
 			let actionIds: string[] = [];
 			try {
 				actionIds = JSON.parse(rawActionIds);
@@ -178,7 +178,7 @@ export class ElectronWindow extends Themable {
 			}, () => errors.onUnexpectedError);
 		});
 
-		ipc.on('vscode:reportError', (_event: any, error: string) => {
+		ipc.on('vscode:reportError', (event: any, error: string) => {
 			if (error) {
 				const errorParsed = JSON.parse(error);
 				errorParsed.mainProcess = true;
@@ -187,13 +187,13 @@ export class ElectronWindow extends Themable {
 		});
 
 		// Support openFiles event for existing and new files
-		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => this.onOpenFiles(request));
+		ipc.on('vscode:openFiles', (event: any, request: IOpenFileRequest) => this.onOpenFiles(request));
 
 		// Support addFolders event if we have a workspace opened
-		ipc.on('vscode:addFolders', (_event: any, request: IAddFoldersRequest) => this.onAddFoldersRequest(request));
+		ipc.on('vscode:addFolders', (event: any, request: IAddFoldersRequest) => this.onAddFoldersRequest(request));
 
 		// Message support
-		ipc.on('vscode:showInfoMessage', (_event: any, message: string) => {
+		ipc.on('vscode:showInfoMessage', (event: any, message: string) => {
 			this.notificationService.info(message);
 		});
 
@@ -240,7 +240,7 @@ export class ElectronWindow extends Themable {
 		});
 
 		// keyboard layout changed event
-		ipc.on('vscode:accessibilitySupportChanged', (_event: any, accessibilitySupportEnabled: boolean) => {
+		ipc.on('vscode:accessibilitySupportChanged', (event: any, accessibilitySupportEnabled: boolean) => {
 			browser.setAccessibilitySupport(accessibilitySupportEnabled ? AccessibilitySupport.Enabled : AccessibilitySupport.Disabled);
 		});
 
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index 88d3f128bba..4ea24f29b42 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -35,8 +35,10 @@ import { WorkbenchLayout } from 'vs/workbench/browser/layout';
 import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbench/browser/actions';
 import { PanelRegistry, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
 import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickOpenController';
+import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
+import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
 import { getServices } from 'vs/platform/instantiation/common/extensions';
-import { Position, Parts, IPartService, ILayoutOptions, Dimension } from 'vs/workbench/services/part/common/partService';
+import { Position, Parts, IPartService, ILayoutOptions, IDimension } from 'vs/workbench/services/part/common/partService';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
@@ -104,6 +106,11 @@ import { NotificationsAlerts } from 'vs/workbench/browser/parts/notifications/no
 import { NotificationsStatus } from 'vs/workbench/browser/parts/notifications/notificationsStatus';
 import { registerNotificationCommands } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
 import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts';
+import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
+import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService';
+import { IInactiveExtensionUrlHandler, InactiveExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler';
 
 export const EditorsVisibleContext = new RawContextKey<boolean>('editorIsOpen', false);
 export const InZenModeContext = new RawContextKey<boolean>('inZenMode', false);
@@ -199,6 +206,7 @@ export class Workbench implements IPartService {
 	private editorPart: EditorPart;
 	private statusbarPart: StatusbarPart;
 	private quickOpen: QuickOpenController;
+	private quickInput: QuickInputService;
 	private notificationsCenter: NotificationsCenter;
 	private notificationsToasts: NotificationsToasts;
 	private workbenchLayout: WorkbenchLayout;
@@ -228,9 +236,10 @@ export class Workbench implements IPartService {
 	constructor(
 		parent: HTMLElement,
 		container: HTMLElement,
-		configuration: IWindowConfiguration,
+		private configuration: IWindowConfiguration,
 		serviceCollection: ServiceCollection,
 		private lifecycleService: LifecycleService,
+		private mainProcessClient: IPCClient,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IStorageService private storageService: IStorageService,
@@ -264,7 +273,7 @@ export class Workbench implements IPartService {
 		return this._onTitleBarVisibilityChange.event;
 	}
 
-	public get onEditorLayout(): Event<Dimension> {
+	public get onEditorLayout(): Event<IDimension> {
 		return this.editorPart.onLayout;
 	}
 
@@ -315,6 +324,12 @@ export class Workbench implements IPartService {
 		// Workbench Layout
 		this.createWorkbenchLayout();
 
+		// Driver
+		if (this.environmentService.driverHandle) {
+			registerWindowDriver(this.mainProcessClient, this.configuration.windowId, this.instantiationService)
+				.then(disposable => this.toUnbind.push(disposable));
+		}
+
 		// Restore Parts
 		return this.restoreParts();
 	}
@@ -421,6 +436,7 @@ export class Workbench implements IPartService {
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleDevToolsAction, ToggleDevToolsAction.ID, ToggleDevToolsAction.LABEL, isDeveloping ? { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_I } } : void 0), 'Developer: Toggle Developer Tools', localize('developer', "Developer"));
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenRecentAction, OpenRecentAction.ID, OpenRecentAction.LABEL, { primary: isDeveloping ? null : KeyMod.CtrlCmd | KeyCode.KEY_R, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_R } }), 'File: Open Recent...', localize('file', "File"));
 		workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ReloadWindowWithExtensionsDisabledAction, ReloadWindowWithExtensionsDisabledAction.ID, ReloadWindowWithExtensionsDisabledAction.LABEL), 'Reload Window Without Extensions');
+
 		// Actions for macOS native tabs management (only when enabled)
 		const windowConfig = this.configurationService.getValue<IWindowConfiguration>();
 		if (windowConfig && windowConfig.window && windowConfig.window.nativeTabs) {
@@ -571,7 +587,7 @@ export class Workbench implements IPartService {
 		// File Service
 		this.fileService = this.instantiationService.createInstance(RemoteFileService);
 		serviceCollection.set(IFileService, this.fileService);
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.configurationService.handleWorkspaceFileEvents(e)));
+		this.configurationService.acquireFileService(this.fileService);
 
 		// Editor service (editor part)
 		this.editorPart = this.instantiationService.createInstance(EditorPart, Identifiers.EDITOR_PART, !this.hasFilesToCreateOpenOrDiff);
@@ -601,6 +617,9 @@ export class Workbench implements IPartService {
 		// SCM Service
 		serviceCollection.set(ISCMService, new SyncDescriptor(SCMService));
 
+		// Inactive extension URL handler
+		serviceCollection.set(IInactiveExtensionUrlHandler, new SyncDescriptor(InactiveExtensionUrlHandler));
+
 		// Text Model Resolver Service
 		serviceCollection.set(ITextModelService, new SyncDescriptor(TextModelResolverService));
 
@@ -622,6 +641,14 @@ export class Workbench implements IPartService {
 		this.toUnbind.push({ dispose: () => this.quickOpen.shutdown() });
 		serviceCollection.set(IQuickOpenService, this.quickOpen);
 
+		// Quick input service
+		this.quickInput = this.instantiationService.createInstance(QuickInputService);
+		this.toUnbind.push({ dispose: () => this.quickInput.shutdown() });
+		serviceCollection.set(IQuickInputService, this.quickInput);
+
+		// PreferencesService
+		serviceCollection.set(IPreferencesService, this.instantiationService.createInstance(PreferencesService));
+
 		// Contributed services
 		const contributedServices = getServices();
 		for (let contributedService of contributedServices) {
@@ -635,7 +662,7 @@ export class Workbench implements IPartService {
 
 		this.instantiationService.createInstance(DefaultConfigurationExportHelper);
 
-		this.configurationService.setInstantiationService(this.getInstantiationService());
+		this.configurationService.acquireInstantiationService(this.getInstantiationService());
 	}
 
 	private initSettings(): void {
@@ -712,7 +739,7 @@ export class Workbench implements IPartService {
 	}
 
 	public getContainer(part: Parts): HTMLElement {
-		let container: Builder = null;
+		let container: HTMLElement = null;
 		switch (part) {
 			case Parts.TITLEBAR_PART:
 				container = this.titlebarPart.getContainer();
@@ -733,7 +760,8 @@ export class Workbench implements IPartService {
 				container = this.statusbarPart.getContainer();
 				break;
 		}
-		return container && container.getHTMLElement();
+
+		return container;
 	}
 
 	public isVisible(part: Parts): boolean {
@@ -933,10 +961,10 @@ export class Workbench implements IPartService {
 		this.sideBarPosition = position;
 
 		// Adjust CSS
-		this.activitybarPart.getContainer().removeClass(oldPositionValue);
-		this.sidebarPart.getContainer().removeClass(oldPositionValue);
-		this.activitybarPart.getContainer().addClass(newPositionValue);
-		this.sidebarPart.getContainer().addClass(newPositionValue);
+		DOM.removeClass(this.activitybarPart.getContainer(), oldPositionValue);
+		DOM.removeClass(this.sidebarPart.getContainer(), oldPositionValue);
+		DOM.addClass(this.activitybarPart.getContainer(), newPositionValue);
+		DOM.addClass(this.sidebarPart.getContainer(), newPositionValue);
 
 		// Update Styles
 		this.activitybarPart.updateStyles();
@@ -958,8 +986,8 @@ export class Workbench implements IPartService {
 			this.storageService.store(Workbench.panelPositionStorageKey, Position[this.panelPosition].toLowerCase(), StorageScope.WORKSPACE);
 
 			// Adjust CSS
-			this.panelPart.getContainer().removeClass(oldPositionValue);
-			this.panelPart.getContainer().addClass(newPositionValue);
+			DOM.removeClass(this.panelPart.getContainer(), oldPositionValue);
+			DOM.addClass(this.panelPart.getContainer(), newPositionValue);
 
 			// Update Styles
 			this.panelPart.updateStyles();
@@ -1099,10 +1127,10 @@ export class Workbench implements IPartService {
 		const editorContainer = this.editorPart.getContainer();
 		if (visibleEditors === 0) {
 			this.editorsVisibleContext.reset();
-			this.editorBackgroundDelayer.trigger(() => editorContainer.addClass('empty'));
+			this.editorBackgroundDelayer.trigger(() => DOM.addClass(editorContainer, 'empty'));
 		} else {
 			this.editorsVisibleContext.set(true);
-			this.editorBackgroundDelayer.trigger(() => editorContainer.removeClass('empty'));
+			this.editorBackgroundDelayer.trigger(() => DOM.removeClass(editorContainer, 'empty'));
 		}
 	}
 
@@ -1143,8 +1171,8 @@ export class Workbench implements IPartService {
 	private createWorkbenchLayout(): void {
 		this.workbenchLayout = this.instantiationService.createInstance(
 			WorkbenchLayout,
-			$(this.container),							// Parent
-			this.workbench,								// Workbench Container
+			this.container,								// Parent
+			this.workbench.getHTMLElement(),			// Workbench Container
 			{
 				titlebar: this.titlebarPart,			// Title Bar
 				activitybar: this.activitybarPart,		// Activity Bar
@@ -1154,6 +1182,7 @@ export class Workbench implements IPartService {
 				statusbar: this.statusbarPart,			// Statusbar
 			},
 			this.quickOpen,								// Quickopen
+			this.quickInput,							// QuickInput
 			this.notificationsCenter,					// Notifications Center
 			this.notificationsToasts					// Notifications Toasts
 		);
@@ -1208,7 +1237,7 @@ export class Workbench implements IPartService {
 			role: 'contentinfo'
 		});
 
-		this.titlebarPart.create(titlebarContainer);
+		this.titlebarPart.create(titlebarContainer.getHTMLElement());
 	}
 
 	private createActivityBarPart(): void {
@@ -1219,7 +1248,7 @@ export class Workbench implements IPartService {
 				role: 'navigation'
 			});
 
-		this.activitybarPart.create(activitybarPartContainer);
+		this.activitybarPart.create(activitybarPartContainer.getHTMLElement());
 	}
 
 	private createSidebarPart(): void {
@@ -1230,7 +1259,7 @@ export class Workbench implements IPartService {
 				role: 'complementary'
 			});
 
-		this.sidebarPart.create(sidebarPartContainer);
+		this.sidebarPart.create(sidebarPartContainer.getHTMLElement());
 	}
 
 	private createPanelPart(): void {
@@ -1241,7 +1270,7 @@ export class Workbench implements IPartService {
 				role: 'complementary'
 			});
 
-		this.panelPart.create(panelPartContainer);
+		this.panelPart.create(panelPartContainer.getHTMLElement());
 	}
 
 	private createEditorPart(): void {
@@ -1252,7 +1281,7 @@ export class Workbench implements IPartService {
 				role: 'main'
 			});
 
-		this.editorPart.create(editorContainer);
+		this.editorPart.create(editorContainer.getHTMLElement());
 	}
 
 	private createStatusbarPart(): void {
@@ -1262,7 +1291,7 @@ export class Workbench implements IPartService {
 			role: 'contentinfo'
 		});
 
-		this.statusbarPart.create(statusbarContainer);
+		this.statusbarPart.create(statusbarContainer.getHTMLElement());
 	}
 
 	private createNotificationsHandlers(): void {
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 9a17c7976dc..c2fe40a0852 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -17,7 +17,6 @@ import { QueryType, ISearchQuery } from 'vs/platform/search/common/search';
 import { DiskSearch } from 'vs/workbench/services/search/node/searchService';
 import { IInitData, IEnvironment, IWorkspaceData, MainContext } from 'vs/workbench/api/node/extHost.protocol';
 import * as errors from 'vs/base/common/errors';
-import * as watchdog from 'native-watchdog';
 import * as glob from 'vs/base/common/glob';
 import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -26,16 +25,16 @@ import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
 import URI from 'vs/base/common/uri';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
 
-// const nativeExit = process.exit.bind(process);
+const nativeExit = process.exit.bind(process);
 function patchProcess(allowExit: boolean) {
-	process.exit = function (code) {
+	process.exit = function (code?: number) {
 		if (allowExit) {
 			exit(code);
 		} else {
 			const err = new Error('An extension called process.exit() and this was prevented.');
 			console.warn(err.stack);
 		}
-	};
+	} as (code?: number) => never;
 
 	process.crash = function () {
 		const err = new Error('An extension called process.crash() and this was prevented.');
@@ -43,14 +42,20 @@ function patchProcess(allowExit: boolean) {
 	};
 }
 export function exit(code?: number) {
-	//nativeExit(code);
-
 	// TODO@electron
 	// See https://github.com/Microsoft/vscode/issues/32990
 	// calling process.exit() does not exit the process when the process is being debugged
 	// It waits for the debugger to disconnect, but in our version, the debugger does not
 	// receive an event that the process desires to exit such that it can disconnect.
 
+	let watchdog: { exit: (exitCode: number) => void; } = null;
+	try {
+		watchdog = require.__$__nodeRequire('native-watchdog');
+	} catch (err) {
+		nativeExit(code);
+		return;
+	}
+
 	// Do exactly what node.js would have done, minus the wait for the debugger part
 
 	if (code || code === 0) {
diff --git a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
index 77f1297d4ed..d7c1b98eca9 100644
--- a/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
+++ b/src/vs/workbench/parts/cache/node/nodeCachedDataManager.ts
@@ -36,7 +36,7 @@ export class NodeCachedDataManager implements IWorkbenchContribution {
 				/* __GDPR__
 					"cachedDataError" : {
 						"errorCode" : { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-						"path": { "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
+						"path": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 					}
 				*/
 				this._telemetryService.publicLog('cachedDataError', {
@@ -55,12 +55,12 @@ export class NodeCachedDataManager implements IWorkbenchContribution {
 			}
 		*/
 		this._telemetryService.publicLog('cachedDataInfo', {
-			didRequestCachedData: Boolean(global.require.getConfig().nodeCachedDataDir),
+			didRequestCachedData: Boolean((<any>global).require.getConfig().nodeCachedDataDir),
 			didRejectCachedData,
 			didProduceCachedData
 		});
 
-		global.require.config({ onNodeCachedData: undefined });
+		(<any>global).require.config({ onNodeCachedData: undefined });
 		delete MonacoEnvironment.onNodeCachedData;
 	}
 }
diff --git a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
index 42d312d8c7e..96f5b32b7f0 100644
--- a/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
+++ b/src/vs/workbench/parts/codeEditor/codeEditor.contribution.ts
@@ -13,10 +13,4 @@ import './electron-browser/toggleMultiCursorModifier';
 import './electron-browser/toggleRenderControlCharacter';
 import './electron-browser/toggleRenderWhitespace';
 import './electron-browser/toggleWordWrap';
-import { OPTIONS, TextBufferType } from 'vs/editor/common/model/textModel';
-
-// Configure text buffer implementation
-if (process.env['VSCODE_PIECE_TREE']) {
-	console.log(`Using TextBufferType.PieceTree (env variable VSCODE_PIECE_TREE)`);
-	OPTIONS.TEXT_BUFFER_IMPLEMENTATION = TextBufferType.PieceTree;
-}
+import './electron-browser/workbenchReferenceSearch';
\ No newline at end of file
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
new file mode 100644
index 00000000000..ef42c2def1f
--- /dev/null
+++ b/src/vs/workbench/parts/codeEditor/electron-browser/workbenchReferenceSearch.ts
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { IEditorService } from 'vs/platform/editor/common/editor';
+import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ReferencesController } from 'vs/editor/contrib/referenceSearch/referencesController';
+
+export class WorkbenchReferencesController extends ReferencesController {
+
+	public constructor(
+		editor: ICodeEditor,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IEditorService editorService: IEditorService,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@INotificationService notificationService: INotificationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IStorageService storageService: IStorageService,
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@optional(IEnvironmentService) environmentService: IEnvironmentService
+	) {
+		super(
+			false,
+			editor,
+			contextKeyService,
+			editorService,
+			textModelResolverService,
+			notificationService,
+			instantiationService,
+			contextService,
+			storageService,
+			themeService,
+			configurationService,
+			environmentService
+		);
+	}
+}
+
+registerEditorContribution(WorkbenchReferencesController);
diff --git a/src/vs/workbench/parts/debug/browser/breakpointsView.ts b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
index f1413ed1e93..3c7afd4f1f6 100644
--- a/src/vs/workbench/parts/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/browser/breakpointsView.ts
@@ -124,8 +124,9 @@ export class BreakpointsView extends ViewsViewletPanel {
 		const actions: IAction[] = [];
 		const element = e.element;
 
+		const breakpointType = element instanceof Breakpoint && element.logMessage ? nls.localize('logPoint', "Log Point") : nls.localize('breakpoint', "Breakpoint");
 		if (element instanceof Breakpoint || element instanceof FunctionBreakpoint) {
-			actions.push(new Action('workbench.action.debug.openEditorAndEditBreakpoint', nls.localize('editConditionalBreakpoint', "Edit Breakpoint..."), undefined, true, () => {
+			actions.push(new Action('workbench.action.debug.openEditorAndEditBreakpoint', nls.localize('editBreakpoint', "Edit {0}...", breakpointType), undefined, true, () => {
 				if (element instanceof Breakpoint) {
 					return openBreakpointSource(element, false, false, this.debugService, this.editorService).then(editor => {
 						const codeEditor = editor.getControl();
@@ -142,7 +143,7 @@ export class BreakpointsView extends ViewsViewletPanel {
 			actions.push(new Separator());
 		}
 
-		actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, RemoveBreakpointAction.LABEL, this.debugService, this.keybindingService));
+		actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, nls.localize('removeBreakpoint', "Remove {0}", breakpointType), this.debugService, this.keybindingService));
 
 		if (this.debugService.getModel().getBreakpoints().length + this.debugService.getModel().getFunctionBreakpoints().length > 1) {
 			actions.push(new RemoveAllBreakpointsAction(RemoveAllBreakpointsAction.ID, RemoveAllBreakpointsAction.LABEL, this.debugService, this.keybindingService));
@@ -202,7 +203,7 @@ export class BreakpointsView extends ViewsViewletPanel {
 
 	private get elements(): IEnablement[] {
 		const model = this.debugService.getModel();
-		const elements = (<IEnablement[]>model.getExceptionBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getBreakpoints());
+		const elements = (<ReadonlyArray<IEnablement>>model.getExceptionBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getBreakpoints());
 
 		return elements;
 	}
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index ccb596753d1..d42736e6268 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -11,7 +11,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IDebugService, State, IProcess, IThread, IEnablement, IBreakpoint, IStackFrame, IExpression, REPL_ID, ProcessState }
+import { IDebugService, State, IProcess, IThread, IEnablement, IBreakpoint, IStackFrame, REPL_ID, ProcessState }
 	from 'vs/workbench/parts/debug/common/debug';
 import { Variable, Expression, Thread, Breakpoint, Process } from 'vs/workbench/parts/debug/common/debugModel';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
@@ -215,10 +215,21 @@ export class RestartAction extends AbstractDebugAction {
 	static LABEL = nls.localize('restartDebug', "Restart");
 	static RECONNECT_LABEL = nls.localize('reconnectDebug', "Reconnect");
 
-	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
+	private startAction: StartAction;
+
+	constructor(id: string, label: string,
+		@IDebugService debugService: IDebugService,
+		@IKeybindingService keybindingService: IKeybindingService,
+		@IWorkspaceContextService private contextService?: IWorkspaceContextService,
+		@IHistoryService historyService?: IHistoryService
+	) {
 		super(id, label, 'debug-action restart', debugService, keybindingService, 70);
 		this.setLabel(this.debugService.getViewModel().focusedProcess);
 		this.toDispose.push(this.debugService.getViewModel().onDidFocusStackFrame(() => this.setLabel(this.debugService.getViewModel().focusedProcess)));
+
+		if (contextService !== undefined && historyService !== undefined) {
+			this.startAction = new StartAction(id, label, debugService, keybindingService, contextService, historyService);
+		}
 	}
 
 	private setLabel(process: IProcess): void {
@@ -229,8 +240,9 @@ export class RestartAction extends AbstractDebugAction {
 		if (!(process instanceof Process)) {
 			process = this.debugService.getViewModel().focusedProcess;
 		}
+
 		if (!process) {
-			return TPromise.as(null);
+			return this.startAction.run();
 		}
 
 		if (this.debugService.getModel().getProcesses().length <= 1) {
@@ -240,7 +252,11 @@ export class RestartAction extends AbstractDebugAction {
 	}
 
 	protected isEnabled(state: State): boolean {
-		return super.isEnabled(state) && (state === State.Running || state === State.Stopped);
+		return super.isEnabled(state) && (
+			state === State.Running ||
+			state === State.Stopped ||
+			StartAction.isEnabled(this.debugService, this.contextService, this.debugService.getConfigurationManager().selectedConfiguration.name)
+		);
 	}
 }
 
@@ -388,6 +404,27 @@ export class PauseAction extends AbstractDebugAction {
 	}
 }
 
+export class TerminateThreadAction extends AbstractDebugAction {
+	static readonly ID = 'workbench.action.debug.terminateThread';
+	static LABEL = nls.localize('terminateThread', "Terminate Thread");
+
+	constructor(id: string, label: string, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
+		super(id, label, undefined, debugService, keybindingService);
+	}
+
+	public run(thread: IThread): TPromise<any> {
+		if (!(thread instanceof Thread)) {
+			thread = this.debugService.getViewModel().focusedThread;
+		}
+
+		return thread ? thread.terminate() : TPromise.as(null);
+	}
+
+	protected isEnabled(state: State): boolean {
+		return super.isEnabled(state) && (state === State.Running || state === State.Stopped);
+	}
+}
+
 export class RestartFrameAction extends AbstractDebugAction {
 	static readonly ID = 'workbench.action.debug.restartFrame';
 	static LABEL = nls.localize('restartFrame', "Restart Frame");
@@ -453,7 +490,7 @@ export class EnableAllBreakpointsAction extends AbstractDebugAction {
 
 	protected isEnabled(state: State): boolean {
 		const model = this.debugService.getModel();
-		return super.isEnabled(state) && (<IEnablement[]>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => !bp.enabled);
+		return super.isEnabled(state) && (<ReadonlyArray<IEnablement>>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => !bp.enabled);
 	}
 }
 
@@ -472,7 +509,7 @@ export class DisableAllBreakpointsAction extends AbstractDebugAction {
 
 	protected isEnabled(state: State): boolean {
 		const model = this.debugService.getModel();
-		return super.isEnabled(state) && (<IEnablement[]>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => bp.enabled);
+		return super.isEnabled(state) && (<ReadonlyArray<IEnablement>>model.getBreakpoints()).concat(model.getFunctionBreakpoints()).concat(model.getExceptionBreakpoints()).some(bp => bp.enabled);
 	}
 }
 
@@ -600,15 +637,18 @@ export class AddToWatchExpressionsAction extends AbstractDebugAction {
 	static readonly ID = 'workbench.debug.viewlet.action.addToWatchExpressions';
 	static LABEL = nls.localize('addToWatchExpressions', "Add to Watch");
 
-	constructor(id: string, label: string, private expression: IExpression, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
+	constructor(id: string, label: string, private variable: Variable, @IDebugService debugService: IDebugService, @IKeybindingService keybindingService: IKeybindingService) {
 		super(id, label, 'debug-action add-to-watch', debugService, keybindingService);
+		this.updateEnablement();
 	}
 
 	public run(): TPromise<any> {
-		const name = this.expression instanceof Variable ? this.expression.evaluateName : this.expression.name;
-		this.debugService.addWatchExpression(name);
+		this.debugService.addWatchExpression(this.variable.evaluateName);
 		return TPromise.as(undefined);
+	}
 
+	protected isEnabled(state: State): boolean {
+		return super.isEnabled(state) && this.variable && !!this.variable.evaluateName;
 	}
 }
 
diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
index 8eb08ca23f2..dcdbd5ae3d9 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -7,7 +7,7 @@ import 'vs/css!./media/debugActionsWidget';
 import * as errors from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import * as browser from 'vs/base/browser/browser';
-import * as builder from 'vs/base/browser/builder';
+import { $, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import * as arrays from 'vs/base/common/arrays';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
@@ -31,7 +31,6 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { RunOnceScheduler } from 'vs/base/common/async';
 
-const $ = builder.$;
 const DEBUG_ACTIONS_WIDGET_POSITION_KEY = 'debug.actionswidgetposition';
 
 export const debugToolBarBackground = registerColor('debugToolBar.background', {
@@ -47,8 +46,8 @@ export const debugToolBarBorder = registerColor('debugToolBar.border', {
 
 export class DebugActionsWidget extends Themable implements IWorkbenchContribution {
 
-	private $el: builder.Builder;
-	private dragArea: builder.Builder;
+	private $el: Builder;
+	private dragArea: Builder;
 	private actionBar: ActionBar;
 	private allActions: AbstractDebugAction[];
 	private activeActions: AbstractDebugAction[];
@@ -79,7 +78,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		this.$el.append(actionBarContainter);
 
 		this.activeActions = [];
-		this.actionBar = new ActionBar(actionBarContainter, {
+		this.actionBar = new ActionBar(actionBarContainter.getHTMLElement(), {
 			orientation: ActionsOrientation.HORIZONTAL,
 			actionItemProvider: (action: IAction) => {
 				if (action.id === FocusProcessAction.ID) {
@@ -228,7 +227,7 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 		}
 		if (!this.isBuilt) {
 			this.isBuilt = true;
-			this.$el.build(builder.withElementById(this.partService.getWorkbenchElementId()).getHTMLElement());
+			this.$el.build(document.getElementById(this.partService.getWorkbenchElementId()));
 		}
 
 		this.isVisible = true;
diff --git a/src/vs/workbench/parts/debug/browser/debugCommands.ts b/src/vs/workbench/parts/debug/browser/debugCommands.ts
index 98653f91eec..0055357ca3e 100644
--- a/src/vs/workbench/parts/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/browser/debugCommands.ts
@@ -188,13 +188,13 @@ export function registerCommands(): void {
 				const position = control.getPosition();
 				const modelUri = control.getModel().uri;
 				const bp = debugService.getModel().getBreakpoints()
-					.filter(bp => bp.lineNumber === position.lineNumber && bp.column === position.column && bp.uri.toString() === modelUri.toString()).pop();
+					.filter(bp => bp.lineNumber === position.lineNumber && (bp.column === position.column || !bp.column && position.column <= 1) && bp.uri.toString() === modelUri.toString()).pop();
 
 				if (bp) {
 					return TPromise.as(null);
 				}
 				if (debugService.getConfigurationManager().canSetBreakpointsIn(control.getModel())) {
-					return debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column }]);
+					return debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column > 1 ? position.column : undefined }]);
 				}
 			}
 
diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
index 90cd905c6ca..7ca6eb20b7e 100644
--- a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
+++ b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -23,7 +23,7 @@ import { Source } from 'vs/workbench/parts/debug/common/debugSource';
  *       debug:arbitrary_path?session=123e4567-e89b-12d3-a456-426655440000&ref=1016
  *       \___/ \____________/ \__________________________________________/ \______/
  *         |          |                             |                          |
- *      scheme   source.path                    session id            source.referencequery
+ *      scheme   source.path                    session id            source.reference
  *
  * the arbitrary_path and the session id are encoded with 'encodeURIComponent'
  *
@@ -58,7 +58,7 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		if (!process) {
 			return TPromise.wrapError<ITextModel>(new Error(localize('unable', "Unable to resolve the resource without a debug session")));
 		}
-		const source = process.sources.get(resource.toString());
+		const source = process.getSourceForUri(resource);
 		let rawSource: DebugProtocol.Source;
 		if (source) {
 			rawSource = source.raw;
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
index 74b2f2b7c1f..a8342fec394 100644
--- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts
@@ -8,12 +8,11 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { Range } from 'vs/editor/common/core/range';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ServicesAccessor, registerEditorAction, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { ServicesAccessor, registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, BreakpointWidgetContext } from 'vs/workbench/parts/debug/common/debug';
+import { IDebugService, CONTEXT_IN_DEBUG_MODE, CONTEXT_NOT_IN_DEBUG_REPL, CONTEXT_DEBUG_STATE, State, REPL_ID, VIEWLET_ID, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext } from 'vs/workbench/parts/debug/common/debug';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 class ToggleBreakpointAction extends EditorAction {
@@ -210,26 +209,6 @@ class ShowDebugHoverAction extends EditorAction {
 	}
 }
 
-class CloseBreakpointWidgetCommand extends EditorCommand {
-
-	constructor() {
-		super({
-			id: 'closeBreakpointWidget',
-			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
-			kbOpts: {
-				weight: KeybindingsRegistry.WEIGHT.editorContrib(8),
-				kbExpr: EditorContextKeys.focus,
-				primary: KeyCode.Escape,
-				secondary: [KeyMod.Shift | KeyCode.Escape]
-			}
-		});
-	}
-
-	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
-		return editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).closeBreakpointWidget();
-	}
-}
-
 registerEditorAction(ToggleBreakpointAction);
 registerEditorAction(ConditionalBreakpointAction);
 registerEditorAction(LogPointAction);
@@ -237,4 +216,3 @@ registerEditorAction(RunToCursorAction);
 registerEditorAction(SelectionToReplAction);
 registerEditorAction(SelectionToWatchExpressionsAction);
 registerEditorAction(ShowDebugHoverAction);
-registerEditorCommand(new CloseBreakpointWidgetCommand());
diff --git a/src/vs/workbench/parts/debug/browser/debugStatus.ts b/src/vs/workbench/parts/debug/browser/debugStatus.ts
index 318a96be4f6..f72afca4b5d 100644
--- a/src/vs/workbench/parts/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/parts/debug/browser/debugStatus.ts
@@ -90,8 +90,9 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 			this.icon = dom.append(a, $('.icon'));
 			this.label = dom.append(a, $('span.label'));
 			this.setLabel();
-			this.updateStyles();
 		}
+
+		this.updateStyles();
 	}
 
 	private setLabel(): void {
diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
index b3bcf05b04c..35ee37d8769 100644
--- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts
@@ -5,7 +5,6 @@
 
 import 'vs/css!./media/debugViewlet';
 import * as nls from 'vs/nls';
-import { Builder } from 'vs/base/browser/builder';
 import { Action, IAction } from 'vs/base/common/actions';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -56,11 +55,10 @@ export class DebugViewlet extends PersistentViewsViewlet {
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateTitleArea()));
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		const el = parent.getHTMLElement();
-		DOM.addClass(el, 'debug-viewlet');
+		DOM.addClass(parent, 'debug-viewlet');
 	}
 
 	public focus(): void {
@@ -111,22 +109,26 @@ export class DebugViewlet extends PersistentViewsViewlet {
 		}
 	}
 
-	addPanel(panel: ViewsViewletPanel, size: number, index?: number): void {
-		super.addPanel(panel, size, index);
+	addPanels(panels: { panel: ViewsViewletPanel, size: number, index?: number }[]): void {
+		super.addPanels(panels);
 
-		// attach event listener to
-		if (panel.id === BREAKPOINTS_VIEW_ID) {
-			this.breakpointView = panel;
-			this.updateBreakpointsMaxSize();
-		} else {
-			this.panelListeners.set(panel.id, panel.onDidChange(() => this.updateBreakpointsMaxSize()));
+		for (const { panel } of panels) {
+			// attach event listener to
+			if (panel.id === BREAKPOINTS_VIEW_ID) {
+				this.breakpointView = panel;
+				this.updateBreakpointsMaxSize();
+			} else {
+				this.panelListeners.set(panel.id, panel.onDidChange(() => this.updateBreakpointsMaxSize()));
+			}
 		}
 	}
 
-	removePanel(panel: ViewsViewletPanel): void {
-		super.removePanel(panel);
-		dispose(this.panelListeners.get(panel.id));
-		this.panelListeners.delete(panel.id);
+	removePanels(panels: ViewsViewletPanel[]): void {
+		super.removePanels(panels);
+		for (const panel of panels) {
+			dispose(this.panelListeners.get(panel.id));
+			this.panelListeners.delete(panel.id);
+		}
 	}
 
 	private updateBreakpointsMaxSize(): void {
diff --git a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
index 8d190b91ca0..165dd70d690 100644
--- a/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
+++ b/src/vs/workbench/parts/debug/browser/media/breakpointWidget.css
@@ -14,28 +14,11 @@
 	justify-content: center;
 	flex-direction: column;
 	padding: 0 10px;
+	flex-shrink: 0;
 }
 
-.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputBoxContainer {
+.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer {
 	flex: 1;
-}
-
-.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .monaco-inputbox {
-	border: none;
-}
-
-.monaco-editor .breakpoint-widget .input {
-	font-family: Monaco, Menlo, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
-	line-height: 22px;
-	background-color: transparent;
-	padding: 8px;
-}
-
-.monaco-workbench.mac .monaco-editor .breakpoint-widget .input {
-	font-size: 11px;
-}
-
-.monaco-workbench.windows .monaco-editor .breakpoint-widget .input,
-.monaco-workbench.linux .monaco-editor .breakpoint-widget .input {
-	font-size: 13px;
+	margin-top: 6px;
+	margin-bottom: 6px;
 }
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 5d92e818732..566acd9d9af 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -20,6 +20,7 @@ import { Range, IRange } from 'vs/editor/common/core/range';
 import { RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IDisposable } from 'vs/base/common/lifecycle';
 
 export const VIEWLET_ID = 'workbench.view.debug';
 export const VARIABLES_VIEW_ID = 'workbench.debug.variablesView';
@@ -37,6 +38,7 @@ export const CONTEXT_NOT_IN_DEBUG_REPL: ContextKeyExpr = CONTEXT_IN_DEBUG_REPL.t
 export const CONTEXT_ON_FIRST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onFirstDebugReplLine', false);
 export const CONTEXT_ON_LAST_DEBUG_REPL_LINE = new RawContextKey<boolean>('onLastDebugReplLine', false);
 export const CONTEXT_BREAKPOINT_WIDGET_VISIBLE = new RawContextKey<boolean>('breakpointWidgetVisible', false);
+export const CONTEXT_IN_BREAKPOINT_WIDGET = new RawContextKey<boolean>('inBreakpointWidget', false);
 export const CONTEXT_BREAKPOINTS_FOCUSED = new RawContextKey<boolean>('breakpointsFocused', true);
 export const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = new RawContextKey<boolean>('watchExpressionsFocused', true);
 export const CONTEXT_VARIABLES_FOCUSED = new RawContextKey<boolean>('variablesFocused', true);
@@ -121,6 +123,7 @@ export interface ISession {
 	stepOut(args: DebugProtocol.StepOutArguments): TPromise<DebugProtocol.StepOutResponse>;
 	continue(args: DebugProtocol.ContinueArguments): TPromise<DebugProtocol.ContinueResponse>;
 	pause(args: DebugProtocol.PauseArguments): TPromise<DebugProtocol.PauseResponse>;
+	terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse>;
 	stepBack(args: DebugProtocol.StepBackArguments): TPromise<DebugProtocol.StepBackResponse>;
 	reverseContinue(args: DebugProtocol.ReverseContinueArguments): TPromise<DebugProtocol.ReverseContinueResponse>;
 
@@ -139,8 +142,8 @@ export interface IProcess extends ITreeElement {
 	getName(includeRoot: boolean): string;
 	configuration: IConfig;
 	session: ISession;
-	sources: Map<string, Source>;
 	state: ProcessState;
+	getSourceForUri(modelUri: uri): Source;
 	getThread(threadId: number): IThread;
 	getAllThreads(): IThread[];
 	getSource(raw: DebugProtocol.Source): Source;
@@ -197,6 +200,7 @@ export interface IThread extends ITreeElement {
 	stepBack(): TPromise<any>;
 	continue(): TPromise<any>;
 	pause(): TPromise<any>;
+	terminate(): TPromise<any>;
 	reverseContinue(): TPromise<any>;
 }
 
@@ -255,6 +259,7 @@ export interface IBreakpoint extends IBaseBreakpoint {
 	column: number;
 	endColumn?: number;
 	message: string;
+	adapterData: any;
 }
 
 export interface IFunctionBreakpoint extends IBaseBreakpoint {
@@ -303,13 +308,13 @@ export interface IViewModel extends ITreeElement {
 }
 
 export interface IModel extends ITreeElement {
-	getProcesses(): IProcess[];
-	getBreakpoints(): IBreakpoint[];
+	getProcesses(): ReadonlyArray<IProcess>;
+	getBreakpoints(): ReadonlyArray<IBreakpoint>;
 	areBreakpointsActivated(): boolean;
-	getFunctionBreakpoints(): IFunctionBreakpoint[];
-	getExceptionBreakpoints(): IExceptionBreakpoint[];
-	getWatchExpressions(): IExpression[];
-	getReplElements(): IReplElement[];
+	getFunctionBreakpoints(): ReadonlyArray<IFunctionBreakpoint>;
+	getExceptionBreakpoints(): ReadonlyArray<IExceptionBreakpoint>;
+	getWatchExpressions(): ReadonlyArray<IExpression>;
+	getReplElements(): ReadonlyArray<IReplElement>;
 
 	onDidChangeBreakpoints: Event<IBreakpointsChangeEvent>;
 	onDidChangeCallStack: Event<void>;
@@ -345,6 +350,7 @@ export interface IDebugConfiguration {
 	hideActionBar: boolean;
 	showInStatusBar: 'never' | 'always' | 'onFirstSessionStart';
 	internalConsoleOptions: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
+	extensionHostDebugAdapter: boolean;
 }
 
 export interface IGlobalConfig {
@@ -354,23 +360,29 @@ export interface IGlobalConfig {
 }
 
 export interface IEnvConfig {
-	name?: string;
-	type: string;
-	request: string;
 	internalConsoleOptions?: 'neverOpen' | 'openOnSessionStart' | 'openOnFirstSessionStart';
 	preLaunchTask?: string;
 	postDebugTask?: string;
-	__restart?: any;
-	__sessionId?: string;
 	debugServer?: number;
 	noDebug?: boolean;
-	port?: number;
 }
 
 export interface IConfig extends IEnvConfig {
+
+	// fundamental attributes
+	type: string;
+	request: string;
+	name?: string;
+
+	// platform specifics
 	windows?: IEnvConfig;
 	osx?: IEnvConfig;
 	linux?: IEnvConfig;
+
+	// internals
+	__sessionId?: string;
+	__restart?: any;
+	port?: number; // TODO
 }
 
 export interface ICompound {
@@ -378,34 +390,58 @@ export interface ICompound {
 	configurations: (string | { name: string, folder: string })[];
 }
 
+export interface IDebugAdapter extends IDisposable {
+	readonly onError: Event<Error>;
+	readonly onExit: Event<number>;
+	onRequest(callback: (request: DebugProtocol.Request) => void);
+	onEvent(callback: (event: DebugProtocol.Event) => void);
+	startSession(): TPromise<void>;
+	sendMessage(message: DebugProtocol.ProtocolMessage): void;
+	sendResponse(response: DebugProtocol.Response): void;
+	sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void): void;
+	stopSession(): TPromise<void>;
+}
+
+export interface IDebugAdapterProvider extends ITerminalLauncher {
+	createDebugAdapter(debugType: string, adapterInfo: IAdapterExecutable | null): IDebugAdapter;
+	substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig>;
+}
+
 export interface IAdapterExecutable {
 	command?: string;
 	args?: string[];
 }
 
-export interface IRawEnvAdapter {
-	type?: string;
-	label?: string;
+export interface IPlatformSpecificAdapterContribution {
 	program?: string;
 	args?: string[];
 	runtime?: string;
 	runtimeArgs?: string[];
 }
 
-export interface IRawAdapter extends IRawEnvAdapter {
+export interface IDebuggerContribution extends IPlatformSpecificAdapterContribution {
+	type?: string;
+	label?: string;
+	// debug adapter executable
 	adapterExecutableCommand?: string;
-	enableBreakpointsFor?: { languageIds: string[] };
-	configurationAttributes?: any;
-	configurationSnippets?: IJSONSchemaSnippet[];
-	initialConfigurations?: any[];
-	languages?: string[];
-	variables?: { [key: string]: string };
+	win?: IPlatformSpecificAdapterContribution;
+	winx86?: IPlatformSpecificAdapterContribution;
+	windows?: IPlatformSpecificAdapterContribution;
+	osx?: IPlatformSpecificAdapterContribution;
+	linux?: IPlatformSpecificAdapterContribution;
+
+	// internal
 	aiKey?: string;
-	win?: IRawEnvAdapter;
-	winx86?: IRawEnvAdapter;
-	windows?: IRawEnvAdapter;
-	osx?: IRawEnvAdapter;
-	linux?: IRawEnvAdapter;
+
+	// supported languages
+	languages?: string[];
+	enableBreakpointsFor?: { languageIds: string[] };
+
+	// debug configuration support
+	configurationAttributes?: any;
+	initialConfigurations?: any[];
+	configurationSnippets?: IJSONSchemaSnippet[];
+	variables?: { [key: string]: string };
 }
 
 export interface IDebugConfigurationProvider {
@@ -416,6 +452,25 @@ export interface IDebugConfigurationProvider {
 	debugAdapterExecutable(folderUri: uri | undefined): TPromise<IAdapterExecutable>;
 }
 
+export interface ITerminalLauncher {
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void>;
+}
+
+export interface ITerminalSettings {
+	external: {
+		windowsExec: string,
+		osxExec: string,
+		linuxExec: string
+	};
+	integrated: {
+		shell: {
+			osx: string,
+			windows: string,
+			linux: string
+		}
+	};
+}
+
 export interface IConfigurationManager {
 	/**
 	 * Returns true if breakpoints can be set for a given editor model. Depends on mode.
@@ -446,6 +501,11 @@ export interface IConfigurationManager {
 
 	resolveConfigurationByProviders(folderUri: uri | undefined, type: string | undefined, debugConfiguration: any): TPromise<any>;
 	debugAdapterExecutable(folderUri: uri | undefined, type: string): TPromise<IAdapterExecutable | undefined>;
+
+	registerDebugAdapterProvider(debugTypes: string[], debugAdapterLauncher: IDebugAdapterProvider): IDisposable;
+	createDebugAdapter(debugType: string, adapterExecutable: IAdapterExecutable | null): IDebugAdapter | undefined;
+	substituteVariables(debugType: string, folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig>;
+	runInTerminal(debugType: string, args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void>;
 }
 
 export interface ILaunch {
@@ -488,12 +548,6 @@ export interface ILaunch {
 	 */
 	getConfigurationNames(includeCompounds?: boolean): string[];
 
-	/**
-	 * Returns the resolved configuration.
-	 * Replaces os specific values, system variables, interactive variables.
-	 */
-	resolveConfiguration(config: IConfig): TPromise<IConfig>;
-
 	/**
 	 * Opens the launch.json file. Creates if it does not exist.
 	 */
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index b07273aaf54..f15a2b56c47 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -20,7 +20,7 @@ import { ISuggestion } from 'vs/editor/common/modes';
 import { Position } from 'vs/editor/common/core/position';
 import {
 	ITreeElement, IExpression, IExpressionContainer, IProcess, IStackFrame, IExceptionBreakpoint, IBreakpoint, IFunctionBreakpoint, IModel, IReplElementSource,
-	IConfig, ISession, IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, ProcessState, IBreakpointsChangeEvent, IBreakpointUpdateData
+	IConfig, ISession, IThread, IRawModelUpdate, IScope, IRawStoppedDetails, IEnablement, IBreakpointData, IExceptionInfo, IReplElement, ProcessState, IBreakpointsChangeEvent, IBreakpointUpdateData, IBaseBreakpoint
 } from 'vs/workbench/parts/debug/common/debug';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -525,6 +525,10 @@ export class Thread implements IThread {
 		return this.process.session.pause({ threadId: this.threadId });
 	}
 
+	public terminate(): TPromise<any> {
+		return this.process.session.terminateThreads({ threadIds: [this.threadId] });
+	}
+
 	public reverseContinue(): TPromise<any> {
 		return this.process.session.reverseContinue({ threadId: this.threadId });
 	}
@@ -532,8 +536,9 @@ export class Thread implements IThread {
 
 export class Process implements IProcess {
 
-	public sources: Map<string, Source>;
+	private sources: Map<string, Source>;
 	private threads: Map<number, Thread>;
+
 	public inactive = true;
 
 	constructor(public configuration: IConfig, private _session: ISession & ITreeElement) {
@@ -558,6 +563,10 @@ export class Process implements IProcess {
 		return this.configuration.type === 'attach' ? ProcessState.ATTACH : ProcessState.LAUNCH;
 	}
 
+	public getSourceForUri(modelUri: uri): Source {
+		return this.sources.get(modelUri.toString());
+	}
+
 	public getSource(raw: DebugProtocol.Source): Source {
 		let source = new Source(raw, this.getId());
 		if (this.sources.has(source.uri.toString())) {
@@ -672,12 +681,48 @@ export class Process implements IProcess {
 			return result;
 		}, err => []);
 	}
+
+	setNotAvailable(modelUri: uri) {
+		const source = this.sources.get(modelUri.toString());
+		if (source) {
+			source.available = false;
+		}
+	}
 }
 
-export class Breakpoint implements IBreakpoint {
+export class Enablement implements IEnablement {
+	constructor(
+		public enabled: boolean,
+		private id: string
+	) { }
+
+	public getId(): string {
+		return this.id;
+	}
+}
+
+export class BaseBreakpoint extends Enablement implements IBaseBreakpoint {
 
 	public verified: boolean;
 	public idFromAdapter: number;
+
+	constructor(
+		enabled: boolean,
+		public hitCondition: string,
+		public condition: string,
+		public logMessage: string,
+		id: string
+	) {
+		super(enabled, id);
+		if (enabled === undefined) {
+			this.enabled = true;
+		}
+		this.verified = false;
+	}
+}
+
+export class Breakpoint extends BaseBreakpoint implements IBreakpoint {
+
 	public message: string;
 	public endLineNumber: number;
 	public endColumn: number;
@@ -686,48 +731,34 @@ export class Breakpoint implements IBreakpoint {
 		public uri: uri,
 		public lineNumber: number,
 		public column: number,
-		public enabled: boolean,
-		public condition: string,
-		public hitCondition: string,
-		public logMessage: string,
+		enabled: boolean,
+		condition: string,
+		hitCondition: string,
+		logMessage: string,
 		public adapterData: any,
-		private id = generateUuid()
+		id = generateUuid()
 	) {
-		if (enabled === undefined) {
-			this.enabled = true;
-		}
-		this.verified = false;
-	}
-
-	public getId(): string {
-		return this.id;
+		super(enabled, hitCondition, condition, logMessage, id);
 	}
 }
 
-export class FunctionBreakpoint implements IFunctionBreakpoint {
+export class FunctionBreakpoint extends BaseBreakpoint implements IFunctionBreakpoint {
 
-	public verified: boolean;
-	public idFromAdapter: number;
-
-	constructor(public name: string, public enabled: boolean, public hitCondition: string, public condition: string, public logMessage: string, private id = generateUuid()) {
-		this.verified = false;
-	}
-
-	public getId(): string {
-		return this.id;
+	constructor(
+		public name: string,
+		enabled: boolean,
+		hitCondition: string,
+		condition: string,
+		logMessage: string,
+		id = generateUuid()) {
+		super(enabled, hitCondition, condition, logMessage, id);
 	}
 }
 
-export class ExceptionBreakpoint implements IExceptionBreakpoint {
+export class ExceptionBreakpoint extends Enablement implements IExceptionBreakpoint {
 
-	private id: string;
-
-	constructor(public filter: string, public label: string, public enabled: boolean) {
-		this.id = generateUuid();
-	}
-
-	public getId(): string {
-		return this.id;
+	constructor(public filter: string, public label: string, enabled: boolean) {
+		super(enabled, generateUuid());
 	}
 }
 
@@ -839,10 +870,23 @@ export class Model implements IModel {
 		return thread.fetchCallStack();
 	}
 
-	public getBreakpoints(): Breakpoint[] {
+	public getBreakpoints(): IBreakpoint[] {
 		return this.breakpoints;
 	}
 
+	public getBreakpointsForResource(resource: uri): IBreakpoint[] {
+		const uriString = resource.toString();
+		return this.breakpoints.filter(bp => bp.uri.toString() === uriString);
+	}
+
+	public getEnabledBreakpointsForResource(resource: uri): IBreakpoint[] {
+		if (this.breakpointsActivated) {
+			const uriString = resource.toString();
+			return this.breakpoints.filter(bp => bp.uri.toString() === uriString && bp.enabled);
+		}
+		return [];
+	}
+
 	public getFunctionBreakpoints(): IFunctionBreakpoint[] {
 		return this.functionBreakpoints;
 	}
@@ -857,7 +901,7 @@ export class Model implements IModel {
 				const ebp = this.exceptionBreakpoints.filter(ebp => ebp.filter === d.filter).pop();
 				return new ExceptionBreakpoint(d.filter, d.label, ebp ? ebp.enabled : d.default);
 			});
-			this._onDidChangeBreakpoints.fire();
+			this._onDidChangeBreakpoints.fire({});
 		}
 	}
 
@@ -867,10 +911,10 @@ export class Model implements IModel {
 
 	public setBreakpointsActivated(activated: boolean): void {
 		this.breakpointsActivated = activated;
-		this._onDidChangeBreakpoints.fire();
+		this._onDidChangeBreakpoints.fire({});
 	}
 
-	public addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): Breakpoint[] {
+	public addBreakpoints(uri: uri, rawData: IBreakpointData[], fireEvent = true): IBreakpoint[] {
 		const newBreakpoints = rawData.map(rawBp => new Breakpoint(uri, rawBp.lineNumber, rawBp.column, rawBp.enabled, rawBp.condition, rawBp.hitCondition, rawBp.logMessage, undefined, rawBp.id));
 		this.breakpoints = this.breakpoints.concat(newBreakpoints);
 		this.breakpointsActivated = true;
@@ -975,7 +1019,7 @@ export class Model implements IModel {
 		this._onDidChangeBreakpoints.fire({ changed: changed });
 	}
 
-	public addFunctionBreakpoint(functionName: string, id: string): FunctionBreakpoint {
+	public addFunctionBreakpoint(functionName: string, id: string): IFunctionBreakpoint {
 		const newFunctionBreakpoint = new FunctionBreakpoint(functionName, true, undefined, undefined, undefined, id);
 		this.functionBreakpoints.push(newFunctionBreakpoint);
 		this._onDidChangeBreakpoints.fire({ added: [newFunctionBreakpoint] });
@@ -1096,11 +1140,7 @@ export class Model implements IModel {
 	}
 
 	public sourceIsNotAvailable(uri: uri): void {
-		this.processes.forEach(p => {
-			if (p.sources.has(uri.toString())) {
-				p.sources.get(uri.toString()).available = false;
-			}
-		});
+		this.processes.forEach(p => p.setNotAvailable(uri));
 		this._onDidChangeCallStack.fire();
 	}
 
diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts
index a1c372db5a0..c2ff61f69fe 100644
--- a/src/vs/workbench/parts/debug/common/debugSource.ts
+++ b/src/vs/workbench/parts/debug/common/debugSource.ts
@@ -15,6 +15,20 @@ import { Schemas } from 'vs/base/common/network';
 
 const UNKNOWN_SOURCE_LABEL = nls.localize('unknownSource', "Unknown Source");
 
+/**
+ * Debug URI format
+ *
+ * a debug URI represents a Source object and the debug session where the Source comes from.
+ *
+ *       debug:arbitrary_path?session=123e4567-e89b-12d3-a456-426655440000&ref=1016
+ *       \___/ \____________/ \__________________________________________/ \______/
+ *         |          |                             |                          |
+ *      scheme   source.path                    session id            source.reference
+ *
+ * the arbitrary_path and the session id are encoded with 'encodeURIComponent'
+ *
+ */
+
 export class Source {
 
 	public readonly uri: uri;
@@ -30,8 +44,9 @@ export class Source {
 			this.uri = uri.parse(`${DEBUG_SCHEME}:${encodeURIComponent(path)}?session=${encodeURIComponent(sessionId)}&ref=${this.raw.sourceReference}`);
 		} else {
 			if (paths.isAbsolute(path)) {
-				this.uri = uri.file(path); // path should better be absolute!
+				this.uri = uri.file(path);
 			} else {
+				// assume that path is a URI
 				this.uri = uri.parse(path);
 			}
 		}
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
index d046222b670..037df6816e5 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointWidget.ts
@@ -6,26 +6,48 @@
 import 'vs/css!../browser/media/breakpointWidget';
 import * as nls from 'vs/nls';
 import * as errors from 'vs/base/common/errors';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { isWindows, isMacintosh } from 'vs/base/common/platform';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as dom from 'vs/base/browser/dom';
-import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
+import { Position } from 'vs/editor/common/core/position';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ZoneWidget } from 'vs/editor/contrib/zoneWidget/zoneWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context } from 'vs/workbench/parts/debug/common/debug';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { once } from 'vs/base/common/functional';
-import { attachInputBoxStyler, attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
+import { IDebugService, IBreakpoint, BreakpointWidgetContext as Context, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DEBUG_SCHEME, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID, CONTEXT_IN_BREAKPOINT_WIDGET } from 'vs/workbench/parts/debug/common/debug';
+import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { SimpleDebugEditor } from 'vs/workbench/parts/debug/electron-browser/simpleDebugEditor';
+import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { ServicesAccessor, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import uri from 'vs/base/common/uri';
+import { SuggestRegistry, ISuggestResult, SuggestContext } from 'vs/editor/common/modes';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { ITextModel } from 'vs/editor/common/model';
+import { wireCancellationToken } from 'vs/base/common/async';
+import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
+import { transparent, editorForeground } from 'vs/platform/theme/common/colorRegistry';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IDecorationOptions } from 'vs/editor/common/editorCommon';
 
 const $ = dom.$;
+const IPrivateBreakopintWidgetService = createDecorator<IPrivateBreakopintWidgetService>('privateBreakopintWidgetService');
+export interface IPrivateBreakopintWidgetService {
+	_serviceBrand: any;
+	close(success: boolean): void;
+}
+const DECORATION_KEY = 'breakpointwidgetdecoration';
 
-export class BreakpointWidget extends ZoneWidget {
+export class BreakpointWidget extends ZoneWidget implements IPrivateBreakopintWidgetService {
+	public _serviceBrand: any;
 
-	private inputBox: InputBox;
+	private selectContainer: HTMLElement;
+	private input: SimpleDebugEditor;
 	private toDispose: lifecycle.IDisposable[];
 	private conditionInput = '';
 	private hitCountInput = '';
@@ -35,13 +57,17 @@ export class BreakpointWidget extends ZoneWidget {
 	constructor(editor: ICodeEditor, private lineNumber: number, private column: number, private context: Context,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IDebugService private debugService: IDebugService,
-		@IThemeService private themeService: IThemeService
+		@IThemeService private themeService: IThemeService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IModelService private modelService: IModelService,
+		@ICodeEditorService private codeEditorService: ICodeEditorService,
 	) {
 		super(editor, { showFrame: true, showArrow: false, frameWidth: 1 });
 
 		this.toDispose = [];
 		const uri = this.editor.getModel().uri;
-		this.breakpoint = this.debugService.getModel().getBreakpoints().filter(bp => bp.lineNumber === this.lineNumber && bp.column === this.column && bp.uri.toString() === uri.toString()).pop();
+		this.breakpoint = this.debugService.getModel().getBreakpoints().filter(bp => bp.lineNumber === this.lineNumber && bp.uri.toString() === uri.toString()).pop();
 
 		if (this.context === undefined) {
 			if (this.breakpoint && !this.breakpoint.condition && !this.breakpoint.hitCondition && this.breakpoint.logMessage) {
@@ -58,6 +84,8 @@ export class BreakpointWidget extends ZoneWidget {
 				this.dispose();
 			}
 		}));
+		this.codeEditorService.registerDecorationType(DECORATION_KEY, {});
+
 		this.create();
 	}
 
@@ -72,17 +100,6 @@ export class BreakpointWidget extends ZoneWidget {
 		}
 	}
 
-	private get ariaLabel(): string {
-		switch (this.context) {
-			case Context.LOG_MESSAGE:
-				return nls.localize('breakpointWidgetLogMessageAriaLabel', "The program will log this message everytime this breakpoint is hit. Press Enter to accept or Escape to cancel.");
-			case Context.HIT_COUNT:
-				return nls.localize('breakpointWidgetHitCountAriaLabel', "The program will only stop here if the hit count is met. Press Enter to accept or Escape to cancel.");
-			default:
-				return nls.localize('breakpointWidgetAriaLabel', "The program will only stop here if this condition is true. Press Enter to accept or Escape to cancel.");
-		}
-	}
-
 	private getInputValue(breakpoint: IBreakpoint): string {
 		switch (this.context) {
 			case Context.LOG_MESSAGE:
@@ -95,15 +112,16 @@ export class BreakpointWidget extends ZoneWidget {
 	}
 
 	private rememberInput(): void {
+		const value = this.input.getModel().getValue();
 		switch (this.context) {
 			case Context.LOG_MESSAGE:
-				this.logMessageInput = this.inputBox.value;
+				this.logMessageInput = value;
 				break;
 			case Context.HIT_COUNT:
-				this.hitCountInput = this.inputBox.value;
+				this.hitCountInput = value;
 				break;
 			default:
-				this.conditionInput = this.inputBox.value;
+				this.conditionInput = value;
 		}
 	}
 
@@ -111,89 +129,199 @@ export class BreakpointWidget extends ZoneWidget {
 		this.setCssClass('breakpoint-widget');
 		const selectBox = new SelectBox([nls.localize('expression', "Expression"), nls.localize('hitCount', "Hit Count"), nls.localize('logMessage', "Log Message")], this.context, this.contextViewService);
 		this.toDispose.push(attachSelectBoxStyler(selectBox, this.themeService));
-		selectBox.render(dom.append(container, $('.breakpoint-select-container')));
+		this.selectContainer = $('.breakpoint-select-container');
+		selectBox.render(dom.append(container, this.selectContainer));
 		selectBox.onDidSelect(e => {
 			this.rememberInput();
 			this.context = e.index;
 
-			this.inputBox.setAriaLabel(this.ariaLabel);
-			this.inputBox.setPlaceHolder(this.placeholder);
-			this.inputBox.value = this.getInputValue(this.breakpoint);
+			const value = this.getInputValue(this.breakpoint);
+			this.input.getModel().setValue(value);
 		});
 
-		const inputBoxContainer = dom.append(container, $('.inputBoxContainer'));
-		this.inputBox = new InputBox(inputBoxContainer, this.contextViewService, {
-			placeholder: this.placeholder,
-			ariaLabel: this.ariaLabel
-		});
-		this.toDispose.push(attachInputBoxStyler(this.inputBox, this.themeService));
-		this.toDispose.push(this.inputBox);
+		this.createBreakpointInput(dom.append(container, $('.inputContainer')));
 
-		dom.addClass(this.inputBox.inputElement, isWindows ? 'windows' : isMacintosh ? 'mac' : 'linux');
-		this.inputBox.value = this.getInputValue(this.breakpoint);
+		this.input.getModel().setValue(this.getInputValue(this.breakpoint));
+		this.input.setPosition({ lineNumber: 1, column: this.input.getModel().getLineMaxColumn(1) });
 		// Due to an electron bug we have to do the timeout, otherwise we do not get focus
-		setTimeout(() => this.inputBox.focus(), 0);
+		setTimeout(() => this.input.focus(), 100);
+	}
 
-		let disposed = false;
-		const wrapUp = once((success: boolean) => {
-			if (!disposed) {
-				disposed = true;
-				if (success) {
-					// if there is already a breakpoint on this location - remove it.
+	public close(success: boolean): void {
+		if (success) {
+			// if there is already a breakpoint on this location - remove it.
 
-					let condition = this.breakpoint && this.breakpoint.condition;
-					let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
-					let logMessage = this.breakpoint && this.breakpoint.logMessage;
-					this.rememberInput();
+			let condition = this.breakpoint && this.breakpoint.condition;
+			let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
+			let logMessage = this.breakpoint && this.breakpoint.logMessage;
+			this.rememberInput();
 
-					if (this.conditionInput) {
-						condition = this.conditionInput;
-					}
-					if (this.hitCountInput) {
-						hitCondition = this.hitCountInput;
-					}
-					if (this.logMessageInput) {
-						logMessage = this.logMessageInput;
-					}
+			if (this.conditionInput) {
+				condition = this.conditionInput;
+			}
+			if (this.hitCountInput) {
+				hitCondition = this.hitCountInput;
+			}
+			if (this.logMessageInput) {
+				logMessage = this.logMessageInput;
+			}
 
-					if (this.breakpoint) {
-						this.debugService.updateBreakpoints(this.breakpoint.uri, {
-							[this.breakpoint.getId()]: {
-								condition,
-								hitCondition,
-								verified: this.breakpoint.verified,
-								logMessage
-							}
-						}, false);
-					} else {
-						this.debugService.addBreakpoints(this.editor.getModel().uri, [{
-							lineNumber: this.lineNumber,
-							column: this.breakpoint ? this.breakpoint.column : undefined,
-							enabled: true,
-							condition,
-							hitCondition,
-							logMessage
-						}]).done(null, errors.onUnexpectedError);
+			if (this.breakpoint) {
+				this.debugService.updateBreakpoints(this.breakpoint.uri, {
+					[this.breakpoint.getId()]: {
+						condition,
+						hitCondition,
+						verified: this.breakpoint.verified,
+						column: this.breakpoint.column,
+						logMessage
 					}
+				}, false);
+			} else {
+				this.debugService.addBreakpoints(this.editor.getModel().uri, [{
+					lineNumber: this.lineNumber,
+					enabled: true,
+					condition,
+					hitCondition,
+					logMessage
+				}]).done(null, errors.onUnexpectedError);
+			}
+		}
+
+		this.dispose();
+	}
+
+	protected _doLayout(heightInPixel: number, widthInPixel: number): void {
+		this.input.layout({ height: 18, width: widthInPixel - 113 });
+	}
+
+	private createBreakpointInput(container: HTMLElement): void {
+		const scopedContextKeyService = this.contextKeyService.createScoped(container);
+		this.toDispose.push(scopedContextKeyService);
+
+		const scopedInstatiationService = this.instantiationService.createChild(new ServiceCollection(
+			[IContextKeyService, scopedContextKeyService], [IPrivateBreakopintWidgetService, this]));
+
+		const options = SimpleDebugEditor.getEditorOptions();
+		this.input = scopedInstatiationService.createInstance(SimpleDebugEditor, container, options);
+		CONTEXT_IN_BREAKPOINT_WIDGET.bindTo(scopedContextKeyService).set(true);
+		const model = this.modelService.createModel('', null, uri.parse(`${DEBUG_SCHEME}:breakpointinput`), true);
+		this.input.setModel(model);
+		this.toDispose.push(model);
+		const setDecorations = () => {
+			const value = this.input.getModel().getValue();
+			const decorations = !!value ? [] : this.createDecorations();
+			this.input.setDecorations(DECORATION_KEY, decorations);
+		};
+		this.input.getModel().onDidChangeContent(() => setDecorations());
+		this.themeService.onThemeChange(() => setDecorations());
+
+		this.toDispose.push(SuggestRegistry.register({ scheme: DEBUG_SCHEME, hasAccessToAllModels: true }, {
+			provideCompletionItems: (model: ITextModel, position: Position, _context: SuggestContext, token: CancellationToken): Thenable<ISuggestResult> => {
+				let suggestionsPromise: TPromise<ISuggestResult>;
+				if (this.context === Context.CONDITION || this.context === Context.LOG_MESSAGE && this.isCurlyBracketOpen()) {
+					suggestionsPromise = provideSuggestionItems(this.editor.getModel(), new Position(this.lineNumber, this.column), 'none', undefined, _context).then(suggestions => {
+						return {
+							suggestions: suggestions.map(s => {
+								if (this.context === Context.CONDITION) {
+									s.suggestion.overwriteBefore = position.column - 1;
+									s.suggestion.overwriteAfter = 0;
+								}
+
+								return s.suggestion;
+							})
+						};
+					});
+				} else {
+					suggestionsPromise = TPromise.as({ suggestions: [] });
 				}
 
-				this.dispose();
-			}
-		});
-
-		this.toDispose.push(dom.addStandardDisposableListener(this.inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => {
-			const isEscape = e.equals(KeyCode.Escape);
-			const isEnter = e.equals(KeyCode.Enter);
-			if (isEscape || isEnter) {
-				e.stopPropagation();
-				wrapUp(isEnter);
+				return wireCancellationToken(token, suggestionsPromise);
 			}
 		}));
 	}
 
+	private createDecorations(): IDecorationOptions[] {
+		return [{
+			range: {
+				startLineNumber: 0,
+				endLineNumber: 0,
+				startColumn: 0,
+				endColumn: 1
+			},
+			renderOptions: {
+				after: {
+					contentText: this.placeholder,
+					color: transparent(editorForeground, 0.4)(this.themeService.getTheme()).toString()
+				}
+			}
+		}];
+	}
+
+	private isCurlyBracketOpen(): boolean {
+		const value = this.input.getModel().getValue();
+		for (let i = this.input.getPosition().column - 2; i >= 0; i--) {
+			if (value[i] === '{') {
+				return true;
+			}
+
+			if (value[i] === '}') {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
 	public dispose(): void {
 		super.dispose();
+		this.input.dispose();
 		lifecycle.dispose(this.toDispose);
 		setTimeout(() => this.editor.focus(), 0);
 	}
 }
+
+class AcceptBreakpointWidgetInputAction extends EditorCommand {
+
+	constructor() {
+		super({
+			id: 'breakpointWidget.action.acceptInput',
+			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
+			kbOpts: {
+				kbExpr: CONTEXT_IN_BREAKPOINT_WIDGET,
+				primary: KeyCode.Enter
+			}
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		accessor.get(IPrivateBreakopintWidgetService).close(true);
+	}
+}
+
+class CloseBreakpointWidgetCommand extends EditorCommand {
+
+	constructor() {
+		super({
+			id: 'closeBreakpointWidget',
+			precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
+			kbOpts: {
+				kbExpr: EditorContextKeys.textInputFocus,
+				primary: KeyCode.Escape,
+				secondary: [KeyMod.Shift | KeyCode.Escape]
+			}
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: any): void {
+		const debugContribution = editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID);
+		if (debugContribution) {
+			// if focus is in outer editor we need to use the debug contribution to close
+			return debugContribution.closeBreakpointWidget();
+		}
+
+		accessor.get(IPrivateBreakopintWidgetService).close(false);
+	}
+}
+
+registerEditorCommand(new AcceptBreakpointWidgetInputAction());
+registerEditorCommand(new CloseBreakpointWidgetCommand());
diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index 8e3b75e7f39..6703b2b0c70 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -18,7 +18,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/browser/baseDebugView';
 import { ITree, IActionProvider, IDataSource, IRenderer, IAccessibilityProvider } from 'vs/base/parts/tree/browser/tree';
 import { IAction, IActionItem } from 'vs/base/common/actions';
-import { RestartAction, StopAction, ContinueAction, StepOverAction, StepIntoAction, StepOutAction, PauseAction, RestartFrameAction } from 'vs/workbench/parts/debug/browser/debugActions';
+import { RestartAction, StopAction, ContinueAction, StepOverAction, StepIntoAction, StepOutAction, PauseAction, RestartFrameAction, TerminateThreadAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { CopyStackTraceAction } from 'vs/workbench/parts/debug/electron-browser/electronDebugActions';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -27,6 +27,7 @@ import { basenameOrAuthority } from 'vs/base/common/resources';
 import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 
 const $ = dom.$;
 
@@ -268,6 +269,9 @@ class CallStackActionProvider implements IActionProvider {
 			} else {
 				actions.push(new PauseAction(PauseAction.ID, PauseAction.LABEL, this.debugService, this.keybindingService));
 			}
+
+			actions.push(new Separator());
+			actions.push(new TerminateThreadAction(TerminateThreadAction.ID, TerminateThreadAction.LABEL, this.debugService, this.keybindingService));
 		} else if (element instanceof StackFrame) {
 			if (element.thread.process.session.capabilities.supportsRestartFrame) {
 				actions.push(new RestartFrameAction(RestartFrameAction.ID, RestartFrameAction.LABEL, this.debugService, this.keybindingService));
diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
index d808ca71e7e..796f6c5e59f 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts
@@ -30,7 +30,7 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { DebugEditorModelManager } from 'vs/workbench/parts/debug/browser/debugEditorModelManager';
 import {
 	StepOverAction, ClearReplAction, FocusReplAction, StepIntoAction, StepOutAction, StartAction, RestartAction, ContinueAction, StopAction, DisconnectAction, PauseAction, AddFunctionBreakpointAction,
-	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction
+	ConfigureAction, DisableAllBreakpointsAction, EnableAllBreakpointsAction, RemoveAllBreakpointsAction, RunAction, ReapplyBreakpointsAction, SelectAndStartAction, TerminateThreadAction
 } from 'vs/workbench/parts/debug/browser/debugActions';
 import { DebugActionsWidget } from 'vs/workbench/parts/debug/browser/debugActionsWidget';
 import * as service from 'vs/workbench/parts/debug/electron-browser/debugService';
@@ -86,7 +86,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	VIEWLET_ID,
 	nls.localize('debug', "Debug"),
 	'debug',
-	40
+	3
 ));
 
 const openViewletKb: IKeybindings = {
@@ -134,6 +134,7 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(StopAction, StopAction
 registry.registerWorkbenchAction(new SyncActionDescriptor(DisconnectAction, DisconnectAction.ID, DisconnectAction.LABEL), 'Debug: Disconnect', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ContinueAction, ContinueAction.ID, ContinueAction.LABEL, { primary: KeyCode.F5 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Continue', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(PauseAction, PauseAction.ID, PauseAction.LABEL, { primary: KeyCode.F6 }, CONTEXT_IN_DEBUG_MODE), 'Debug: Pause', debugCategory);
+registry.registerWorkbenchAction(new SyncActionDescriptor(TerminateThreadAction, TerminateThreadAction.ID, TerminateThreadAction.LABEL, undefined, CONTEXT_IN_DEBUG_MODE), 'Debug: Terminate Thread', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureAction, ConfigureAction.ID, ConfigureAction.LABEL), 'Debug: Open launch.json', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(AddFunctionBreakpointAction, AddFunctionBreakpointAction.ID, AddFunctionBreakpointAction.LABEL), 'Debug: Add Function Breakpoint', debugCategory);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ReapplyBreakpointsAction, ReapplyBreakpointsAction.ID, ReapplyBreakpointsAction.LABEL), 'Debug: Reapply All Breakpoints', debugCategory);
@@ -209,6 +210,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize({ comment: ['This is the description for a setting'], key: 'launch' }, "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces"),
 			default: { configurations: [], compounds: [] },
 			$ref: launchSchemaId
+		},
+		'debug.extensionHostDebugAdapter': {
+			type: 'boolean',
+			description: nls.localize({ comment: ['This is the description for a setting'], key: 'extensionHostDebugAdapter' }, "Run debug adapter in extension host"),
+			default: false
 		}
 	}
 });
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 92dcad553fb..1428ee55ed1 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -8,7 +8,6 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
-import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import * as objects from 'vs/base/common/objects';
 import uri from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
@@ -26,17 +25,18 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IDebugConfigurationProvider, IRawAdapter, ICompound, IDebugConfiguration, IConfig, IEnvConfig, IGlobalConfig, IConfigurationManager, ILaunch, IAdapterExecutable } from 'vs/workbench/parts/debug/common/debug';
-import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter';
+import { IDebugConfigurationProvider, IDebuggerContribution, ICompound, IDebugConfiguration, IConfig, IGlobalConfig, IConfigurationManager, ILaunch, IAdapterExecutable, IDebugAdapterProvider, IDebugAdapter, ITerminalSettings, ITerminalLauncher } from 'vs/workbench/parts/debug/common/debug';
+import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { TerminalLauncher } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
 
 // debuggers extension point
-export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawAdapter[]>('debuggers', [], {
+export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IDebuggerContribution[]>('debuggers', [], {
 	description: nls.localize('vscode.extension.contributes.debuggers', 'Contributes debug adapters.'),
 	type: 'array',
 	defaultSnippets: [{ body: [{ type: '', extensions: [] }] }],
@@ -221,7 +221,7 @@ const DEBUG_SELECTED_CONFIG_NAME_KEY = 'debug.selectedconfigname';
 const DEBUG_SELECTED_ROOT = 'debug.selectedroot';
 
 export class ConfigurationManager implements IConfigurationManager {
-	private adapters: Adapter[];
+	private debuggers: Debugger[];
 	private breakpointModeIdsSet = new Set<string>();
 	private launches: ILaunch[];
 	private selectedName: string;
@@ -229,6 +229,9 @@ export class ConfigurationManager implements IConfigurationManager {
 	private toDispose: IDisposable[];
 	private _onDidSelectConfigurationName = new Emitter<void>();
 	private providers: IDebugConfigurationProvider[];
+	private debugAdapterProviders: Map<string, IDebugAdapterProvider>;
+	private terminalLauncher: ITerminalLauncher;
+
 
 	constructor(
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
@@ -238,10 +241,11 @@ export class ConfigurationManager implements IConfigurationManager {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ICommandService private commandService: ICommandService,
 		@IStorageService private storageService: IStorageService,
-		@ILifecycleService lifecycleService: ILifecycleService
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService
 	) {
 		this.providers = [];
-		this.adapters = [];
+		this.debuggers = [];
 		this.toDispose = [];
 		this.registerListeners(lifecycleService);
 		this.initLaunches();
@@ -250,6 +254,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		if (previousSelectedLaunch) {
 			this.selectConfiguration(previousSelectedLaunch, this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE));
 		}
+		this.debugAdapterProviders = new Map<string, IDebugAdapterProvider>();
 	}
 
 	public registerDebugConfigurationProvider(handle: number, debugConfigurationProvider: IDebugConfigurationProvider): void {
@@ -260,10 +265,10 @@ export class ConfigurationManager implements IConfigurationManager {
 		debugConfigurationProvider.handle = handle;
 		this.providers = this.providers.filter(p => p.handle !== handle);
 		this.providers.push(debugConfigurationProvider);
-		const adapter = this.getAdapter(debugConfigurationProvider.type);
+		const dbg = this.getDebugger(debugConfigurationProvider.type);
 		// Check if the provider contributes provideDebugConfigurations method
-		if (adapter && debugConfigurationProvider.provideDebugConfigurations) {
-			adapter.hasConfigurationProvider = true;
+		if (dbg && debugConfigurationProvider.provideDebugConfigurations) {
+			dbg.hasConfigurationProvider = true;
 		}
 	}
 
@@ -300,12 +305,53 @@ export class ConfigurationManager implements IConfigurationManager {
 		return TPromise.as(undefined);
 	}
 
+	public registerDebugAdapterProvider(debugTypes: string[], debugAdapterLauncher: IDebugAdapterProvider): IDisposable {
+		debugTypes.forEach(debugType => this.debugAdapterProviders.set(debugType, debugAdapterLauncher));
+		return {
+			dispose: () => {
+				debugTypes.forEach(debugType => this.debugAdapterProviders.delete(debugType));
+			}
+		};
+	}
+
+	private getDebugAdapterProvider(type: string): IDebugAdapterProvider | undefined {
+		return this.debugAdapterProviders.get(type);
+	}
+
+	public createDebugAdapter(debugType: string, adapterExecutable: IAdapterExecutable): IDebugAdapter | undefined {
+		let dap = this.getDebugAdapterProvider(debugType);
+		if (dap) {
+			return dap.createDebugAdapter(debugType, adapterExecutable);
+		}
+		return undefined;
+	}
+
+	public substituteVariables(debugType: string, folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
+		let dap = this.getDebugAdapterProvider(debugType);
+		if (dap) {
+			return dap.substituteVariables(folder, config);
+		}
+		return TPromise.as(config);
+	}
+
+	public runInTerminal(debugType: string, args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+
+		let tl: ITerminalLauncher = this.getDebugAdapterProvider(debugType);
+		if (!tl) {
+			if (!this.terminalLauncher) {
+				this.terminalLauncher = this.instantiationService.createInstance(TerminalLauncher);
+			}
+			tl = this.terminalLauncher;
+		}
+		return tl.runInTerminal(args, config);
+	}
+
 	private registerListeners(lifecycleService: ILifecycleService): void {
 		debuggersExtPoint.setHandler((extensions) => {
 			extensions.forEach(extension => {
 				extension.value.forEach(rawAdapter => {
 					if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
-						extension.collector.error(nls.localize('debugNoType', "Debug adapter 'type' can not be omitted and must be of type 'string'."));
+						extension.collector.error(nls.localize('debugNoType', "Debugger 'type' can not be omitted and must be of type 'string'."));
 					}
 					if (rawAdapter.enableBreakpointsFor) {
 						rawAdapter.enableBreakpointsFor.languageIds.forEach(modeId => {
@@ -313,17 +359,17 @@ export class ConfigurationManager implements IConfigurationManager {
 						});
 					}
 
-					const duplicate = this.adapters.filter(a => a.type === rawAdapter.type).pop();
+					const duplicate = this.getDebugger(rawAdapter.type);
 					if (duplicate) {
 						duplicate.merge(rawAdapter, extension.description);
 					} else {
-						this.adapters.push(new Adapter(this, rawAdapter, extension.description, this.configurationService, this.commandService));
+						this.debuggers.push(new Debugger(this, rawAdapter, extension.description, this.configurationService, this.commandService, this.configurationResolverService));
 					}
 				});
 			});
 
 			// update the schema to include all attributes, snippets and types from extensions.
-			this.adapters.forEach(adapter => {
+			this.debuggers.forEach(adapter => {
 				const items = (<IJSONSchema>schema.properties['configurations'].items);
 				const schemaAttributes = adapter.getSchemaAttributes();
 				if (schemaAttributes) {
@@ -448,24 +494,24 @@ export class ConfigurationManager implements IConfigurationManager {
 		return this.breakpointModeIdsSet.has(modeId);
 	}
 
-	public getAdapter(type: string): Adapter {
-		return this.adapters.filter(adapter => strings.equalsIgnoreCase(adapter.type, type)).pop();
+	public getDebugger(type: string): Debugger {
+		return this.debuggers.filter(dbg => strings.equalsIgnoreCase(dbg.type, type)).pop();
 	}
 
-	public guessAdapter(type?: string): TPromise<Adapter> {
+	public guessDebugger(type?: string): TPromise<Debugger> {
 		if (type) {
-			const adapter = this.getAdapter(type);
+			const adapter = this.getDebugger(type);
 			return TPromise.as(adapter);
 		}
 
 		const editor = this.editorService.getActiveEditor();
-		let candidates: Adapter[];
+		let candidates: Debugger[];
 		if (editor) {
 			const codeEditor = editor.getControl();
 			if (isCodeEditor(codeEditor)) {
 				const model = codeEditor.getModel();
 				const language = model ? model.getLanguageIdentifier().language : undefined;
-				const adapters = this.adapters.filter(a => a.languages && a.languages.indexOf(language) >= 0);
+				const adapters = this.debuggers.filter(a => a.languages && a.languages.indexOf(language) >= 0);
 				if (adapters.length === 1) {
 					return TPromise.as(adapters[0]);
 				}
@@ -476,11 +522,11 @@ export class ConfigurationManager implements IConfigurationManager {
 		}
 
 		if (!candidates) {
-			candidates = this.adapters.filter(a => a.hasInitialConfiguration() || a.hasConfigurationProvider);
+			candidates = this.debuggers.filter(a => a.hasInitialConfiguration() || a.hasConfigurationProvider);
 		}
 		return this.quickOpenService.pick([...candidates, { label: 'More...', separator: { border: true } }], { placeHolder: nls.localize('selectDebug', "Select Environment") })
 			.then(picked => {
-				if (picked instanceof Adapter) {
+				if (picked instanceof Debugger) {
 					return picked;
 				}
 				if (picked) {
@@ -510,7 +556,6 @@ class Launch implements ILaunch {
 		@IFileService private fileService: IFileService,
 		@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
 		@IConfigurationService protected configurationService: IConfigurationService,
-		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
 		@IExtensionService private extensionService: IExtensionService
 	) {
@@ -569,41 +614,6 @@ class Launch implements ILaunch {
 		return config.configurations.filter(config => config && config.name === name).shift();
 	}
 
-	protected getWorkspaceForResolving(): IWorkspaceFolder {
-		if (this.workspace) {
-			return this.workspace;
-		}
-
-		if (this.contextService.getWorkspace().folders.length === 1) {
-			return this.contextService.getWorkspace().folders[0];
-		}
-
-		return undefined;
-	}
-
-	public resolveConfiguration(config: IConfig): TPromise<IConfig> {
-		const result = objects.deepClone(config) as IConfig;
-		// Set operating system specific properties #1873
-		const setOSProperties = (flag: boolean, osConfig: IEnvConfig) => {
-			if (flag && osConfig) {
-				Object.keys(osConfig).forEach(key => {
-					result[key] = osConfig[key];
-				});
-			}
-		};
-		setOSProperties(isWindows, result.windows);
-		setOSProperties(isMacintosh, result.osx);
-		setOSProperties(isLinux, result.linux);
-
-		// massage configuration attributes - append workspace path to relatvie paths, substitute variables in paths.
-		Object.keys(result).forEach(key => {
-			result[key] = this.configurationResolverService.resolveAny(this.getWorkspaceForResolving(), result[key]);
-		});
-
-		const adapter = this.configurationManager.getAdapter(result.type);
-		return this.configurationResolverService.resolveInteractiveVariables(result, adapter ? adapter.variables : null);
-	}
-
 	public openConfigFile(sideBySide: boolean, type?: string): TPromise<IEditor> {
 		return this.extensionService.activateByEvent('onDebugInitialConfigurations').then(() => this.extensionService.activateByEvent('onDebug').then(() => {
 			const resource = this.uri;
@@ -613,7 +623,7 @@ class Launch implements ILaunch {
 
 				// launch.json not found: create one by collecting launch configs from debugConfigProviders
 
-				return this.configurationManager.guessAdapter(type).then(adapter => {
+				return this.configurationManager.guessDebugger(type).then(adapter => {
 					if (adapter) {
 						return this.configurationManager.provideDebugConfigurations(this.workspace.uri, adapter.type).then(initialConfigs => {
 							return adapter.getInitialConfigurationContent(initialConfigs);
@@ -673,7 +683,7 @@ class WorkspaceLaunch extends Launch implements ILaunch {
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IExtensionService extensionService: IExtensionService
 	) {
-		super(configurationManager, undefined, fileService, editorService, configurationService, configurationResolverService, contextService, extensionService);
+		super(configurationManager, undefined, fileService, editorService, configurationService, contextService, extensionService);
 	}
 
 	get uri(): uri {
@@ -705,7 +715,7 @@ class UserLaunch extends Launch implements ILaunch {
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IExtensionService extensionService: IExtensionService
 	) {
-		super(configurationManager, undefined, fileService, editorService, configurationService, configurationResolverService, contextService, extensionService);
+		super(configurationManager, undefined, fileService, editorService, configurationService, contextService, extensionService);
 	}
 
 	get uri(): uri {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index b700d3e313d..0b5f26ba2ed 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -11,6 +11,7 @@ import * as lifecycle from 'vs/base/common/lifecycle';
 import * as env from 'vs/base/common/platform';
 import uri from 'vs/base/common/uri';
 import { visit } from 'vs/base/common/json';
+import severity from 'vs/base/common/severity';
 import { Constants } from 'vs/editor/common/core/uint';
 import { IAction, Action } from 'vs/base/common/actions';
 import { KeyCode } from 'vs/base/common/keyCodes';
@@ -43,6 +44,7 @@ import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ContextSubMenu } from 'vs/base/browser/contextmenu';
 import { memoize } from 'vs/base/common/decorators';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 
 const HOVER_DELAY = 300;
 const LAUNCH_JSON_REGEX = /launch\.json$/;
@@ -77,7 +79,8 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IThemeService themeService: IThemeService,
-		@IKeybindingService private keybindingService: IKeybindingService
+		@IKeybindingService private keybindingService: IKeybindingService,
+		@IDialogService private dialogService: IDialogService,
 	) {
 		this.breakpointHintDecoration = [];
 		this.hoverWidget = new DebugHoverWidget(this.editor, this.debugService, this.instantiationService, themeService);
@@ -92,10 +95,11 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	private getContextMenuActions(breakpoints: IBreakpoint[], uri: uri, lineNumber: number): TPromise<(IAction | ContextSubMenu)[]> {
 		const actions: (IAction | ContextSubMenu)[] = [];
 		if (breakpoints.length === 1) {
-			actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, RemoveBreakpointAction.LABEL, this.debugService, this.keybindingService));
+			const breakpointType = breakpoints[0].logMessage ? nls.localize('logPoint', "Log Point") : nls.localize('breakpoint', "Breakpoint");
+			actions.push(new RemoveBreakpointAction(RemoveBreakpointAction.ID, nls.localize('removeBreakpoint', "Remove {0}", breakpointType), this.debugService, this.keybindingService));
 			actions.push(new Action(
 				'workbench.debug.action.editBreakpointAction',
-				nls.localize('editBreakpoint', "Edit Breakpoint..."),
+				nls.localize('editBreakpoint', "Edit {0}...", breakpointType),
 				undefined,
 				true,
 				() => TPromise.as(this.editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).showBreakpointWidget(breakpoints[0].lineNumber, breakpoints[0].column))
@@ -103,7 +107,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 
 			actions.push(new Action(
 				`workbench.debug.viewlet.action.toggleBreakpoint`,
-				breakpoints[0].enabled ? nls.localize('disableBreakpoint', "Disable Breakpoint") : nls.localize('enableBreakpoint', "Enable Breakpoint"),
+				breakpoints[0].enabled ? nls.localize('disableBreakpoint', "Disable {0}", breakpointType) : nls.localize('enableBreakpoint', "Enable {0}", breakpointType),
 				undefined,
 				true,
 				() => this.debugService.enableOrDisableBreakpoints(!breakpoints[0].enabled, breakpoints[0])
@@ -145,7 +149,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 			));
 			actions.push(new Action(
 				'addConditionalBreakpoint',
-				nls.localize('conditionalBreakpoint', "Add Conditional Breakpoint..."),
+				nls.localize('addConditionalBreakpoint', "Add Conditional Breakpoint..."),
 				null,
 				true,
 				() => TPromise.as(this.editor.getContribution<IDebugEditorContribution>(EDITOR_CONTRIBUTION_ID).showBreakpointWidget(lineNumber, undefined))
@@ -190,7 +194,25 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 					.filter(bp => bp.uri.toString() === uri.toString() && bp.lineNumber === lineNumber);
 
 				if (breakpoints.length) {
-					breakpoints.forEach(bp => this.debugService.removeBreakpoints(bp.getId()));
+					if (breakpoints.some(bp => !!bp.condition || !!bp.logMessage || !!bp.hitCondition)) {
+						const logPoint = breakpoints.every(bp => !!bp.logMessage);
+						const breakpointType = logPoint ? nls.localize('logPoint', "Log Point") : nls.localize('breakpoint', "Breakpoint");
+						this.dialogService.show(severity.Info, nls.localize('breakpointHasCondition', "This {0} has a valuable {1} that will get lost on remove. Consider disabling the {0} instead.",
+							breakpointType.toLowerCase(), logPoint ? nls.localize('message', "message") : nls.localize('condition', "condition")), [
+								nls.localize('removeLogPoint', "Remove {0}", breakpointType),
+								nls.localize('disableLogPoint', "Disable {0}", breakpointType),
+								nls.localize('cancel', "Cancel")
+							], { cancelId: 2 }).then(choice => {
+								if (choice === 0) {
+									breakpoints.forEach(bp => this.debugService.removeBreakpoints(bp.getId()));
+								}
+								if (choice === 1) {
+									breakpoints.forEach(bp => this.debugService.enableOrDisableBreakpoints(false, bp));
+								}
+							});
+					} else {
+						breakpoints.forEach(bp => this.debugService.removeBreakpoints(bp.getId()));
+					}
 				} else if (canSetBreakpoints) {
 					this.debugService.addBreakpoints(uri, [{ lineNumber }]);
 				}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index e6248b7f74e..c91609db06a 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -27,6 +27,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
 import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 
 const $ = dom.$;
 const MAX_ELEMENTS_SHOWN = 18;
@@ -208,15 +209,17 @@ export class DebugHoverWidget implements IContentWidget {
 
 			this.highlightDecorations = this.editor.deltaDecorations(this.highlightDecorations, [{
 				range: new Range(pos.lineNumber, expressionRange.startColumn, pos.lineNumber, expressionRange.startColumn + matchingExpression.length),
-				options: {
-					className: 'hoverHighlight'
-				}
+				options: DebugHoverWidget._HOVER_HIGHLIGHT_DECORATION_OPTIONS
 			}]);
 
 			return this.doShow(pos, expression, focus);
 		});
 	}
 
+	private static _HOVER_HIGHLIGHT_DECORATION_OPTIONS = ModelDecorationOptions.register({
+		className: 'hoverHighlight'
+	});
+
 	private doFindExpression(container: IExpressionContainer, namesToFind: string[]): TPromise<IExpression> {
 		if (!container) {
 			return TPromise.as(null);
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 276910af561..d24ae70b037 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -82,7 +82,6 @@ export class DebugService implements debug.IDebugService {
 	private debugType: IContextKey<string>;
 	private debugState: IContextKey<string>;
 	private breakpointsToSendOnResourceSaved: Set<string>;
-	private launchJsonChanged: boolean;
 	private firstSessionStart: boolean;
 	private skipRunningTask: boolean;
 	private previousState: debug.State;
@@ -154,11 +153,17 @@ export class DebugService implements debug.IDebugService {
 		const session = <RawDebugSession>process.session;
 
 		if (broadcast.channel === EXTENSION_ATTACH_BROADCAST_CHANNEL) {
-			this.onSessionEnd(session);
-
+			const initialAttach = process.configuration.request === 'launch';
 			process.configuration.request = 'attach';
 			process.configuration.port = broadcast.payload.port;
-			this.doCreateProcess(process.session.root, process.configuration, process.getId());
+			// Do not end process on initial attach (since the request is still 'launch')
+			if (initialAttach) {
+				session.attach(process.configuration);
+			} else {
+				this.onSessionEnd(session);
+				this.doCreateProcess(process.session.root, process.configuration, process.getId());
+			}
+
 			return;
 		}
 
@@ -352,10 +357,10 @@ export class DebugService implements debug.IDebugService {
 
 			const outputSeverity = event.body.category === 'stderr' ? severity.Error : event.body.category === 'console' ? severity.Warning : severity.Info;
 			if (event.body.category === 'telemetry') {
-				// only log telemetry events from debug adapter if the adapter provided the telemetry key
+				// only log telemetry events from debug adapter if the debug extension provided the telemetry key
 				// and the user opted in telemetry
 				if (session.customTelemetryService && this.telemetryService.isOptedIn) {
-					// __GDPR__TODO__ We're sending events in the name of the debug adapter and we can not ensure that those are declared correctly.
+					// __GDPR__TODO__ We're sending events in the name of the debug extension and we can not ensure that those are declared correctly.
 					session.customTelemetryService.publicLog(event.body.output, event.body.data);
 				}
 
@@ -698,7 +703,6 @@ export class DebugService implements debug.IDebugService {
 					this.allProcesses.clear();
 					this.model.getBreakpoints().forEach(bp => bp.verified = false);
 				}
-				this.launchJsonChanged = false;
 
 				let config: debug.IConfig, compound: debug.ICompound;
 				if (!configOrName) {
@@ -766,7 +770,7 @@ export class DebugService implements debug.IDebugService {
 					config.noDebug = true;
 				}
 
-				return (type ? TPromise.as(null) : this.configurationManager.guessAdapter().then(a => type = a && a.type)).then(() =>
+				return (type ? TPromise.as(null) : this.configurationManager.guessDebugger().then(a => type = a && a.type)).then(() =>
 					(type ? this.extensionService.activateByEvent(`onDebugResolve:${type}`) : TPromise.as(null)).then(() =>
 						this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
 							// a falsy config indicates an aborted launch
@@ -786,15 +790,38 @@ export class DebugService implements debug.IDebugService {
 		});
 	}
 
+	private substituteVariables(launch: debug.ILaunch, config: debug.IConfig): TPromise<debug.IConfig> {
+		const dbg = this.configurationManager.getDebugger(config.type);
+		if (dbg) {
+			let folder: IWorkspaceFolder = undefined;
+			if (launch.workspace) {
+				folder = launch.workspace;
+			} else {
+				const folders = this.contextService.getWorkspace().folders;
+				if (folders.length === 1) {
+					folder = folders[0];
+				}
+			}
+			return dbg.substituteVariables(folder, config).then(config => {
+				return config;
+			}, (err: Error) => {
+				this.showError(err.message);
+				return undefined;	// bail out
+			});
+		}
+		return TPromise.as(config);
+	}
+
 	private createProcess(launch: debug.ILaunch, config: debug.IConfig, sessionId: string): TPromise<void> {
 		return this.textFileService.saveAll().then(() =>
-			(launch ? launch.resolveConfiguration(config) : TPromise.as(config)).then(resolvedConfig => {
+			this.substituteVariables(launch, config).then(resolvedConfig => {
+
 				if (!resolvedConfig) {
 					// User canceled resolving of interactive variables, silently return
 					return undefined;
 				}
 
-				if (!this.configurationManager.getAdapter(resolvedConfig.type) || (config.request !== 'attach' && config.request !== 'launch')) {
+				if (!this.configurationManager.getDebugger(resolvedConfig.type) || (config.request !== 'attach' && config.request !== 'launch')) {
 					let message: string;
 					if (config.request !== 'attach' && config.request !== 'launch') {
 						message = config.request ? nls.localize('debugRequestNotSupported', "Attribute '{0}' has an unsupported value '{1}' in the chosen debug configuration.", 'request', config.request)
@@ -855,9 +882,9 @@ export class DebugService implements debug.IDebugService {
 			telemetryInfo['common.vscodesessionid'] = info.sessionId;
 			return telemetryInfo;
 		}).then(data => {
-			const adapter = this.configurationManager.getAdapter(configuration.type);
-			const { aiKey, type } = adapter;
-			const publisher = adapter.extensionDescription.publisher;
+			const dbg = this.configurationManager.getDebugger(configuration.type);
+			const { aiKey, type } = dbg;
+			const publisher = dbg.extensionDescription.publisher;
 			let client: TelemetryClient;
 
 			let customTelemetryService: TelemetryService;
@@ -882,7 +909,7 @@ export class DebugService implements debug.IDebugService {
 				customTelemetryService = new TelemetryService({ appender }, this.configurationService);
 			}
 
-			const session = this.instantiationService.createInstance(RawDebugSession, sessionId, configuration.debugServer, adapter, customTelemetryService, root);
+			const session = this.instantiationService.createInstance(RawDebugSession, sessionId, configuration.debugServer, dbg, customTelemetryService, root);
 			const process = this.model.addProcess(configuration, session);
 			this.allProcesses.set(process.getId(), process);
 
@@ -946,8 +973,8 @@ export class DebugService implements debug.IDebugService {
 					breakpointCount: this.model.getBreakpoints().length,
 					exceptionBreakpoints: this.model.getExceptionBreakpoints(),
 					watchExpressionsCount: this.model.getWatchExpressions().length,
-					extensionName: adapter.extensionDescription.id,
-					isBuiltin: adapter.extensionDescription.isBuiltin,
+					extensionName: dbg.extensionDescription.id,
+					isBuiltin: dbg.extensionDescription.isBuiltin,
 					launchJsonExists: root && !!this.configurationService.getValue<debug.IGlobalConfig>('launch', { resource: root.uri })
 				});
 			}).then(() => process, (error: Error | string) => {
@@ -1081,12 +1108,9 @@ export class DebugService implements debug.IDebugService {
 
 				return new TPromise<void>((c, e) => {
 					setTimeout(() => {
-						// Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration
 						let config = process.configuration;
-
 						const launch = process.session.root ? this.configurationManager.getLaunch(process.session.root.uri) : undefined;
-						if (this.launchJsonChanged && launch) {
-							this.launchJsonChanged = false;
+						if (launch) {
 							config = launch.getConfiguration(process.configuration.name) || config;
 							// Take the type from the process since the debug extension might overwrite it #21316
 							config.type = process.configuration.type;
@@ -1149,7 +1173,9 @@ export class DebugService implements debug.IDebugService {
 			process.inactive = true;
 			this._onDidEndProcess.fire(process);
 			if (process.configuration.postDebugTask) {
-				this.runTask(process.getId(), process.session.root, process.configuration.postDebugTask);
+				this.runTask(process.getId(), process.session.root, process.configuration.postDebugTask).done(undefined, err =>
+					this.notificationService.error(err)
+				);
 			}
 		}
 
@@ -1205,9 +1231,9 @@ export class DebugService implements debug.IDebugService {
 				return TPromise.as(null);
 			}
 
-			const breakpointsToSend = this.model.getBreakpoints().filter(bp => this.model.areBreakpointsActivated() && bp.enabled && bp.uri.toString() === modelUri.toString());
+			const breakpointsToSend = this.model.getEnabledBreakpointsForResource(modelUri);
 
-			const source = process.sources.get(modelUri.toString());
+			const source = process.getSourceForUri(modelUri);
 			let rawSource: DebugProtocol.Source;
 			if (source) {
 				rawSource = source.raw;
@@ -1303,13 +1329,9 @@ export class DebugService implements debug.IDebugService {
 		}
 
 		fileChangesEvent.getUpdated().forEach(event => {
-			if (this.breakpointsToSendOnResourceSaved.has(event.resource.toString())) {
-				this.breakpointsToSendOnResourceSaved.delete(event.resource.toString());
+			if (this.breakpointsToSendOnResourceSaved.delete(event.resource.toString())) {
 				this.sendBreakpoints(event.resource, true).done(null, errors.onUnexpectedError);
 			}
-			if (event.resource.toString().indexOf('.vscode/launch.json') >= 0) {
-				this.launchJsonChanged = true;
-			}
 		});
 	}
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
index 4709acbb680..e38f831bf0e 100644
--- a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts
@@ -18,6 +18,7 @@ export class CopyValueAction extends Action {
 
 	constructor(id: string, label: string, private value: any, @IDebugService private debugService: IDebugService) {
 		super(id, label, 'debug-action copy-value');
+		this._enabled = typeof this.value === 'string' || (this.value instanceof Variable && !!this.value.evaluateName);
 	}
 
 	public run(): TPromise<any> {
@@ -38,15 +39,13 @@ export class CopyEvaluatePathAction extends Action {
 	static readonly ID = 'workbench.debug.viewlet.action.copyEvaluatePath';
 	static LABEL = nls.localize('copyAsExpression', "Copy as Expression");
 
-	constructor(id: string, label: string, private value: any) {
+	constructor(id: string, label: string, private value: Variable) {
 		super(id, label);
+		this._enabled = this.value && !!this.value.evaluateName;
 	}
 
 	public run(): TPromise<any> {
-		if (this.value instanceof Variable) {
-			clipboard.writeText(this.value.evaluateName);
-		}
-
+		clipboard.writeText(this.value.evaluateName);
 		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
index 04f3a0dfe6e..dd96720d946 100644
--- a/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
@@ -4,27 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import * as cp from 'child_process';
 import * as net from 'net';
 import { Event, Emitter } from 'vs/base/common/event';
-import * as platform from 'vs/base/common/platform';
 import * as objects from 'vs/base/common/objects';
 import { Action } from 'vs/base/common/actions';
 import * as errors from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
-import * as stdfork from 'vs/base/node/stdFork';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
-import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts/execution/common/execution';
 import * as debug from 'vs/workbench/parts/debug/common/debug';
-import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter';
-import { V8Protocol } from 'vs/workbench/parts/debug/node/v8Protocol';
+import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
 import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { TerminalSupport } from 'vs/workbench/parts/debug/electron-browser/terminalSupport';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { StreamDebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
+
 
 export interface SessionExitedEvent extends debug.DebugEvent {
 	body: {
@@ -40,14 +33,46 @@ export interface SessionTerminatedEvent extends debug.DebugEvent {
 	};
 }
 
-export class RawDebugSession extends V8Protocol implements debug.ISession {
+export class SocketDebugAdapter extends StreamDebugAdapter {
+
+	private socket: net.Socket;
+
+	constructor(private host: string, private port: number) {
+		super();
+	}
+
+	startSession(): TPromise<void> {
+		return new TPromise<void>((c, e) => {
+			this.socket = net.createConnection(this.port, this.host, () => {
+				this.connect(this.socket, <any>this.socket);
+				c(null);
+			});
+			this.socket.on('error', (err: any) => {
+				e(err);
+			});
+			this.socket.on('close', () => this._onExit.fire(0));
+		});
+	}
+
+	stopSession(): TPromise<void> {
+		if (this.socket !== null) {
+			this.socket.end();
+			this.socket = undefined;
+		}
+		return void 0;
+	}
+}
+
+export class RawDebugSession implements debug.ISession {
+
+	private debugAdapter: debug.IDebugAdapter;
 
 	public emittedStopped: boolean;
 	public readyForBreakpoints: boolean;
 
-	private serverProcess: cp.ChildProcess;
-	private socket: net.Socket = null;
-	private cachedInitServer: TPromise<void>;
+	//private serverProcess: cp.ChildProcess;
+	//private socket: net.Socket = null;
+	private cachedInitServerP: TPromise<void>;
 	private startTime: number;
 	public disconnected: boolean;
 	private sentPromises: TPromise<DebugProtocol.Response>[];
@@ -66,19 +91,15 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 	private readonly _onDidEvent: Emitter<DebugProtocol.Event>;
 
 	constructor(
-		id: string,
+		private id: string,
 		private debugServerPort: number,
-		private adapter: Adapter,
+		private _debugger: Debugger,
 		public customTelemetryService: ITelemetryService,
 		public root: IWorkspaceFolder,
 		@INotificationService private notificationService: INotificationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IOutputService private outputService: IOutputService,
-		@ITerminalService private terminalService: ITerminalService,
-		@IExternalTerminalService private nativeTerminalService: IExternalTerminalService,
-		@IConfigurationService private configurationService: IConfigurationService
+		@IOutputService private outputService: IOutputService
 	) {
-		super(id);
 		this.emittedStopped = false;
 		this.readyForBreakpoints = false;
 		this.allThreadsContinued = true;
@@ -96,6 +117,10 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		this._onDidEvent = new Emitter<DebugProtocol.Event>();
 	}
 
+	public getId(): string {
+		return this.id;
+	}
+
 	public get onDidInitialize(): Event<DebugProtocol.InitializedEvent> {
 		return this._onDidInitialize.event;
 	}
@@ -137,28 +162,49 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 	}
 
 	private initServer(): TPromise<void> {
-		if (this.cachedInitServer) {
-			return this.cachedInitServer;
+
+		if (this.cachedInitServerP) {
+			return this.cachedInitServerP;
 		}
 
-		const serverPromise = this.debugServerPort ? this.connectServer(this.debugServerPort) : this.startServer();
-		this.cachedInitServer = serverPromise.then(() => {
+		const startSessionP = this.startSession();
+
+		this.cachedInitServerP = startSessionP.then(() => {
 			this.startTime = new Date().getTime();
 		}, err => {
-			this.cachedInitServer = null;
+			this.cachedInitServerP = null;
 			return TPromise.wrapError(err);
 		});
 
-		return this.cachedInitServer;
+		return this.cachedInitServerP;
+	}
+
+	private startSession(): TPromise<void> {
+
+		const debugAdapterP = this.debugServerPort
+			? TPromise.as(new SocketDebugAdapter('127.0.0.1', this.debugServerPort))
+			: this._debugger.createDebugAdapter(this.root, this.outputService);
+
+		return debugAdapterP.then(debugAdapter => {
+
+			this.debugAdapter = debugAdapter;
+
+			this.debugAdapter.onError(err => this.onDapServerError(err));
+			this.debugAdapter.onEvent(event => this.onDapEvent(event));
+			this.debugAdapter.onRequest(request => this.dispatchRequest(request));
+			this.debugAdapter.onExit(code => this.onServerExit());
+
+			return this.debugAdapter.startSession();
+		});
 	}
 
 	public custom(request: string, args: any): TPromise<DebugProtocol.Response> {
 		return this.send(request, args);
 	}
 
-	protected send<R extends DebugProtocol.Response>(command: string, args: any, cancelOnDisconnect = true): TPromise<R> {
+	private send<R extends DebugProtocol.Response>(command: string, args: any, cancelOnDisconnect = true): TPromise<R> {
 		return this.initServer().then(() => {
-			const promise = super.send<R>(command, args).then(response => response, (errorResponse: DebugProtocol.ErrorResponse) => {
+			const promise = this.internalSend<R>(command, args).then(response => response, (errorResponse: DebugProtocol.ErrorResponse) => {
 				const error = errorResponse && errorResponse.body ? errorResponse.body.error : null;
 				const errorMessage = errorResponse ? errorResponse.message : '';
 				const telemetryMessage = error ? debug.formatPII(error.format, true, error.variables) : errorMessage;
@@ -199,8 +245,22 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		});
 	}
 
-	protected onEvent(event: debug.DebugEvent): void {
-		event.sessionId = this.getId();
+	private internalSend<R extends DebugProtocol.Response>(command: string, args: any): TPromise<R> {
+		let errorCallback: (error: Error) => void;
+		return new TPromise<R>((completeDispatch, errorDispatch) => {
+			errorCallback = errorDispatch;
+			this.debugAdapter.sendRequest(command, args, (result: R) => {
+				if (result.success) {
+					completeDispatch(result);
+				} else {
+					errorDispatch(result);
+				}
+			});
+		}, () => errorCallback(errors.canceled()));
+	}
+
+	private onDapEvent(event: debug.DebugEvent): void {
+		event.sessionId = this.id;
 
 		if (event.event === 'initialized') {
 			this.readyForBreakpoints = true;
@@ -290,6 +350,10 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		return this.send('pause', args);
 	}
 
+	public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse> {
+		return this.send('terminateThreads', args);
+	}
+
 	public setVariable(args: DebugProtocol.SetVariableArguments): TPromise<DebugProtocol.SetVariableResponse> {
 		return this.send<DebugProtocol.SetVariableResponse>('setVariable', args);
 	}
@@ -317,7 +381,7 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 			this.sentPromises = [];
 		}, 1000);
 
-		if ((this.serverProcess || this.socket) && !this.disconnected) {
+		if (this.debugAdapter && !this.disconnected) {
 			// point of no return: from now on don't report any errors
 			this.disconnected = true;
 			return this.send('disconnect', { restart: restart }, false).then(() => this.stopServer(), () => this.stopServer());
@@ -392,17 +456,26 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		return (new Date().getTime() - this.startTime) / 1000;
 	}
 
-	protected dispatchRequest(request: DebugProtocol.Request, response: DebugProtocol.Response): void {
+	private dispatchRequest(request: DebugProtocol.Request): void {
+
+		const response: DebugProtocol.Response = {
+			type: 'response',
+			seq: 0,
+			command: request.command,
+			request_seq: request.seq,
+			success: true
+		};
 
 		if (request.command === 'runInTerminal') {
 
-			TerminalSupport.runInTerminal(this.terminalService, this.nativeTerminalService, this.configurationService, <DebugProtocol.RunInTerminalRequestArguments>request.arguments, <DebugProtocol.RunInTerminalResponse>response).then(() => {
-				this.sendResponse(response);
-			}, e => {
+			this._debugger.runInTerminal(<DebugProtocol.RunInTerminalRequestArguments>request.arguments).then(_ => {
+				this.debugAdapter.sendResponse(response);
+			}, err => {
 				response.success = false;
-				response.message = e.message;
-				this.sendResponse(response);
+				response.message = err.message;
+				this.debugAdapter.sendResponse(response);
 			});
+
 		} else if (request.command === 'handshake') {
 			try {
 				const vsda = <any>require.__$__nodeRequire('vsda');
@@ -411,16 +484,16 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 				response.body = {
 					signature: sig
 				};
-				this.sendResponse(response);
+				this.debugAdapter.sendResponse(response);
 			} catch (e) {
 				response.success = false;
 				response.message = e.message;
-				this.sendResponse(response);
+				this.debugAdapter.sendResponse(response);
 			}
 		} else {
 			response.success = false;
 			response.message = `unknown request '${request.command}'`;
-			this.sendResponse(response);
+			this.debugAdapter.sendResponse(response);
 		}
 	}
 
@@ -436,111 +509,36 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
 		});
 	}
 
-	private connectServer(port: number): TPromise<void> {
-		return new TPromise<void>((c, e) => {
-			this.socket = net.createConnection(port, '127.0.0.1', () => {
-				this.connect(this.socket, <any>this.socket);
-				c(null);
-			});
-			this.socket.on('error', (err: any) => {
-				e(err);
-			});
-			this.socket.on('close', () => this.onServerExit());
-		});
-	}
-
-	private startServer(): TPromise<any> {
-		return this.adapter.getAdapterExecutable(this.root).then(ae => this.launchServer(ae).then(() => {
-			this.serverProcess.on('error', (err: Error) => this.onServerError(err));
-			this.serverProcess.on('exit', (code: number, signal: string) => this.onServerExit());
-
-			const sanitize = (s: string) => s.toString().replace(/\r?\n$/mg, '');
-			// this.serverProcess.stdout.on('data', (data: string) => {
-			// 	console.log('%c' + sanitize(data), 'background: #ddd; font-style: italic;');
-			// });
-			this.serverProcess.stderr.on('data', (data: string) => {
-				this.outputService.getChannel(ExtensionsChannelId).append(sanitize(data));
-			});
-
-			this.connect(this.serverProcess.stdout, this.serverProcess.stdin);
-		}));
-	}
-
-	private launchServer(launch: debug.IAdapterExecutable): TPromise<void> {
-		return new TPromise<void>((c, e) => {
-			if (launch.command === 'node') {
-				if (Array.isArray(launch.args) && launch.args.length > 0) {
-					stdfork.fork(launch.args[0], launch.args.slice(1), {}, (err, child) => {
-						if (err) {
-							e(new Error(nls.localize('unableToLaunchDebugAdapter', "Unable to launch debug adapter from '{0}'.", launch.args[0])));
-						}
-						this.serverProcess = child;
-						c(null);
-					});
-				} else {
-					e(new Error(nls.localize('unableToLaunchDebugAdapterNoArgs', "Unable to launch debug adapter.")));
-				}
-			} else {
-				this.serverProcess = cp.spawn(launch.command, launch.args, {
-					stdio: [
-						'pipe', 	// stdin
-						'pipe', 	// stdout
-						'pipe'		// stderr
-					],
-				});
-				c(null);
-			}
-		});
-	}
-
 	private stopServer(): TPromise<any> {
 
-		if (this.socket !== null) {
-			this.socket.end();
-			this.cachedInitServer = null;
+		if (/* this.socket !== null */ this.debugAdapter instanceof SocketDebugAdapter) {
+			this.debugAdapter.stopSession();
+			this.cachedInitServerP = null;
 		}
 
-		this.onEvent({ event: 'exit', type: 'event', seq: 0 });
-		if (!this.serverProcess) {
+		this.onDapEvent({ event: 'exit', type: 'event', seq: 0 });
+		if (/* !this.serverProcess */ this.debugAdapter instanceof SocketDebugAdapter) {
 			return TPromise.as(null);
 		}
 
 		this.disconnected = true;
 
-		let ret: TPromise<void>;
-		// when killing a process in windows its child
-		// processes are *not* killed but become root
-		// processes. Therefore we use TASKKILL.EXE
-		if (platform.isWindows) {
-			ret = new TPromise<void>((c, e) => {
-				const killer = cp.exec(`taskkill /F /T /PID ${this.serverProcess.pid}`, function (err, stdout, stderr) {
-					if (err) {
-						return e(err);
-					}
-				});
-				killer.on('exit', c);
-				killer.on('error', e);
-			});
-		} else {
-			this.serverProcess.kill('SIGTERM');
-			ret = TPromise.as(null);
-		}
-
-		return ret;
+		return this.debugAdapter.stopSession();
 	}
 
-	protected onServerError(err: Error): void {
-		this.notificationService.error(nls.localize('stoppingDebugAdapter', "{0}. Stopping the debug adapter.", err.message));
+	private onDapServerError(err: Error): void {
+		this.notificationService.error(err.message || err.toString());
 		this.stopServer().done(null, errors.onUnexpectedError);
 	}
 
 	private onServerExit(): void {
-		this.serverProcess = null;
-		this.cachedInitServer = null;
+		//this.serverProcess = null;
+		this.debugAdapter = null;
+		this.cachedInitServerP = null;
 		if (!this.disconnected) {
 			this.notificationService.error(nls.localize('debugAdapterCrash', "Debug adapter process has terminated unexpectedly"));
 		}
-		this.onEvent({ event: 'exit', type: 'event', seq: 0 });
+		this.onDapEvent({ event: 'exit', type: 'event', seq: 0 });
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index da481600c74..f11e1016db6 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -10,7 +10,6 @@ import { wireCancellationToken } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as errors from 'vs/base/common/errors';
 import { IAction } from 'vs/base/common/actions';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import * as dom from 'vs/base/browser/dom';
 import { isMacintosh } from 'vs/base/common/platform';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -80,7 +79,7 @@ export class Repl extends Panel implements IPrivateReplService {
 	private replInputContainer: HTMLElement;
 	private refreshTimeoutHandle: number;
 	private actions: IAction[];
-	private dimension: Dimension;
+	private dimension: dom.Dimension;
 	private replInputHeight: number;
 	private model: ITextModel;
 
@@ -127,9 +126,9 @@ export class Repl extends Panel implements IPrivateReplService {
 		}
 	}
 
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
-		this.container = dom.append(parent.getHTMLElement(), $('.repl'));
+		this.container = dom.append(parent, $('.repl'));
 		this.treeContainer = dom.append(this.container, $('.repl-tree'));
 		this.createReplInput(this.container);
 
@@ -242,7 +241,7 @@ export class Repl extends Panel implements IPrivateReplService {
 		return text;
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.dimension = dimension;
 		if (this.tree) {
 			this.renderer.setWidth(dimension.width - 25, this.characterWidth);
diff --git a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts b/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
index 2b7a2e33839..fd1e6e04bf5 100644
--- a/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/simpleDebugEditor.ts
@@ -19,6 +19,7 @@ import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
 import { TabCompletionController } from 'vs/workbench/parts/snippets/electron-browser/tabCompletion';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class SimpleDebugEditor extends CodeEditorWidget {
 	constructor(
@@ -28,9 +29,10 @@ export class SimpleDebugEditor extends CodeEditorWidget {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService,
 	) {
-		super(domElement, options, true, instantiationService, codeEditorService, commandService, contextKeyService, themeService);
+		super(domElement, options, true, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService);
 	}
 
 	protected _getContributions(): IEditorContributionCtor[] {
@@ -56,6 +58,7 @@ export class SimpleDebugEditor extends CodeEditorWidget {
 			lineNumbers: 'off',
 			folding: false,
 			selectOnLineNumbers: false,
+			hideCursorInOverviewRuler: true,
 			selectionHighlight: false,
 			scrollbar: {
 				horizontal: 'hidden'
diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
index 084ff3264de..d6901928791 100644
--- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
@@ -8,41 +8,47 @@ import * as platform from 'vs/base/common/platform';
 import * as cp from 'child_process';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ITerminalService, ITerminalInstance, ITerminalConfiguration } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal';
 import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts/execution/common/execution';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
 
 const enum ShellType { cmd, powershell, bash }
 
-export class TerminalSupport {
+export class TerminalLauncher implements ITerminalLauncher {
 
-	private static integratedTerminalInstance: ITerminalInstance;
-	private static terminalDisposedListener: IDisposable;
+	private integratedTerminalInstance: ITerminalInstance;
+	private terminalDisposedListener: IDisposable;
 
-	public static runInTerminal(terminalService: ITerminalService, nativeTerminalService: IExternalTerminalService, configurationService: IConfigurationService, args: DebugProtocol.RunInTerminalRequestArguments, response: DebugProtocol.RunInTerminalResponse): TPromise<void> {
+	constructor(
+		@ITerminalService private terminalService: ITerminalService,
+		@IExternalTerminalService private nativeTerminalService: IExternalTerminalService
+	) {
+	}
+
+	runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
 
 		if (args.kind === 'external') {
-			return nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
+			return this.nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {});
 		}
 
-		if (!TerminalSupport.terminalDisposedListener) {
+		if (!this.terminalDisposedListener) {
 			// React on terminal disposed and check if that is the debug terminal #12956
-			TerminalSupport.terminalDisposedListener = terminalService.onInstanceDisposed(terminal => {
-				if (TerminalSupport.integratedTerminalInstance && TerminalSupport.integratedTerminalInstance.id === terminal.id) {
-					TerminalSupport.integratedTerminalInstance = null;
+			this.terminalDisposedListener = this.terminalService.onInstanceDisposed(terminal => {
+				if (this.integratedTerminalInstance && this.integratedTerminalInstance.id === terminal.id) {
+					this.integratedTerminalInstance = null;
 				}
 			});
 		}
 
-		let t = TerminalSupport.integratedTerminalInstance;
+		let t = this.integratedTerminalInstance;
 		if ((t && this.isBusy(t)) || !t) {
-			t = terminalService.createInstance({ name: args.title || nls.localize('debug.terminal.title', "debuggee") });
-			TerminalSupport.integratedTerminalInstance = t;
+			t = this.terminalService.createTerminal({ name: args.title || nls.localize('debug.terminal.title', "debuggee") });
+			this.integratedTerminalInstance = t;
 		}
-		terminalService.setActiveInstance(t);
-		terminalService.showPanel(true);
+		this.terminalService.setActiveInstance(t);
+		this.terminalService.showPanel(true);
 
-		const command = this.prepareCommand(args, configurationService);
+		const command = this.prepareCommand(args, config);
 
 		return new TPromise((resolve, error) => {
 			setTimeout(_ => {
@@ -52,7 +58,7 @@ export class TerminalSupport {
 		});
 	}
 
-	private static isBusy(t: ITerminalInstance): boolean {
+	private isBusy(t: ITerminalInstance): boolean {
 		if (t.processId) {
 			try {
 				// if shell has at least one child process, assume that shell is busy
@@ -82,13 +88,13 @@ export class TerminalSupport {
 		return true;
 	}
 
-	private static prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments, configurationService: IConfigurationService): string {
+	private prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): string {
 
 		let shellType: ShellType;
 
 		// get the shell configuration for the current platform
 		let shell: string;
-		const shell_config = (<ITerminalConfiguration>configurationService.getValue<any>().terminal.integrated).shell;
+		const shell_config = config.integrated.shell;
 		if (platform.isWindows) {
 			shell = shell_config.windows;
 			shellType = ShellType.cmd;
@@ -206,4 +212,4 @@ export class TerminalSupport {
 
 		return command;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts
index 632847907bb..c74bd1c9e4d 100644
--- a/src/vs/workbench/parts/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts
@@ -4,263 +4,512 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
-import * as path from 'path';
+import * as cp from 'child_process';
+import * as stream from 'stream';
 import * as nls from 'vs/nls';
-import { TPromise } from 'vs/base/common/winjs.base';
+import * as paths from 'vs/base/common/paths';
 import * as strings from 'vs/base/common/strings';
 import * as objects from 'vs/base/common/objects';
-import * as paths from 'vs/base/common/paths';
 import * as platform from 'vs/base/common/platform';
-import { IJSONSchema, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
-import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { IConfig, IRawAdapter, IAdapterExecutable, INTERNAL_CONSOLE_OPTIONS_SCHEMA, IConfigurationManager } from 'vs/workbench/parts/debug/common/debug';
+import * as stdfork from 'vs/base/node/stdFork';
+import { Emitter, Event } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IOutputService } from 'vs/workbench/parts/output/common/output';
+import { IDebugAdapter, IAdapterExecutable, IDebuggerContribution, IPlatformSpecificAdapterContribution, IConfig } from 'vs/workbench/parts/debug/common/debug';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 
-export class Adapter {
+/**
+ * Abstract implementation of the low level API for a debug adapter.
+ * Missing is how this API communicates with the debug adapter.
+ */
+export abstract class AbstractDebugAdapter implements IDebugAdapter {
 
-	constructor(private configurationManager: IConfigurationManager, private rawAdapter: IRawAdapter, public extensionDescription: IExtensionDescription,
-		@IConfigurationService private configurationService: IConfigurationService,
-		@ICommandService private commandService: ICommandService
-	) {
-		if (rawAdapter.windows) {
-			rawAdapter.win = rawAdapter.windows;
+	private sequence: number;
+	private pendingRequests: Map<number, (e: DebugProtocol.Response) => void>;
+	private requestCallback: (request: DebugProtocol.Request) => void;
+	private eventCallback: (request: DebugProtocol.Event) => void;
+
+	protected readonly _onError: Emitter<Error>;
+	protected readonly _onExit: Emitter<number>;
+
+	constructor() {
+		this.sequence = 1;
+		this.pendingRequests = new Map<number, (e: DebugProtocol.Response) => void>();
+
+		this._onError = new Emitter<Error>();
+		this._onExit = new Emitter<number>();
+	}
+
+	abstract startSession(): TPromise<void>;
+	abstract stopSession(): TPromise<void>;
+
+	public dispose(): void {
+	}
+
+	abstract sendMessage(message: DebugProtocol.ProtocolMessage): void;
+
+	public get onError(): Event<Error> {
+		return this._onError.event;
+	}
+
+	public get onExit(): Event<number> {
+		return this._onExit.event;
+	}
+
+	public onEvent(callback: (event: DebugProtocol.Event) => void): void {
+		if (this.eventCallback) {
+			this._onError.fire(new Error(`attempt to set more than one 'Event' callback`));
+		}
+		this.eventCallback = callback;
+	}
+
+	public onRequest(callback: (request: DebugProtocol.Request) => void): void {
+		if (this.requestCallback) {
+			this._onError.fire(new Error(`attempt to set more than one 'Request' callback`));
+		}
+		this.requestCallback = callback;
+	}
+
+	public sendResponse(response: DebugProtocol.Response): void {
+		if (response.seq > 0) {
+			this._onError.fire(new Error(`attempt to send more than one response for command ${response.command}`));
+		} else {
+			this.internalSend('response', response);
 		}
 	}
 
-	public hasConfigurationProvider = false;
+	public sendRequest(command: string, args: any, clb: (result: DebugProtocol.Response) => void): void {
 
-	public getAdapterExecutable(root: IWorkspaceFolder, verifyAgainstFS = true): TPromise<IAdapterExecutable> {
+		const request: any = {
+			command: command
+		};
+		if (args && Object.keys(args).length > 0) {
+			request.arguments = args;
+		}
 
-		return this.configurationManager.debugAdapterExecutable(root ? root.uri : undefined, this.rawAdapter.type).then(adapterExecutable => {
+		this.internalSend('request', request);
 
-			if (adapterExecutable) {
-				return this.verifyAdapterDetails(adapterExecutable, verifyAgainstFS);
-			}
-
-			// try deprecated command based extension API
-			if (this.rawAdapter.adapterExecutableCommand) {
-				return this.commandService.executeCommand<IAdapterExecutable>(this.rawAdapter.adapterExecutableCommand, root ? root.uri.toString() : undefined).then(ad => {
-					return this.verifyAdapterDetails(ad, verifyAgainstFS);
-				});
-			}
-
-			// fallback: executable contribution specified in package.json
-			adapterExecutable = <IAdapterExecutable>{
-				command: this.getProgram(),
-				args: this.getAttributeBasedOnPlatform('args')
-			};
-			const runtime = this.getRuntime();
-			if (runtime) {
-				const runtimeArgs = this.getAttributeBasedOnPlatform('runtimeArgs');
-				adapterExecutable.args = (runtimeArgs || []).concat([adapterExecutable.command]).concat(adapterExecutable.args || []);
-				adapterExecutable.command = runtime;
-			}
-			return this.verifyAdapterDetails(adapterExecutable, verifyAgainstFS);
-		});
+		if (clb) {
+			// store callback for this request
+			this.pendingRequests.set(request.seq, clb);
+		}
 	}
 
-	private verifyAdapterDetails(details: IAdapterExecutable, verifyAgainstFS: boolean): TPromise<IAdapterExecutable> {
+	public acceptMessage(message: DebugProtocol.ProtocolMessage): void {
+		switch (message.type) {
+			case 'event':
+				if (this.eventCallback) {
+					this.eventCallback(<DebugProtocol.Event>message);
+				}
+				break;
+			case 'request':
+				if (this.requestCallback) {
+					this.requestCallback(<DebugProtocol.Request>message);
+				}
+				break;
+			case 'response':
+				const response = <DebugProtocol.Response>message;
+				const clb = this.pendingRequests.get(response.request_seq);
+				if (clb) {
+					this.pendingRequests.delete(response.request_seq);
+					clb(response);
+				}
+				break;
+		}
+	}
 
-		if (details.command) {
-			if (verifyAgainstFS) {
-				if (path.isAbsolute(details.command)) {
-					return new TPromise<IAdapterExecutable>((c, e) => {
-						fs.exists(details.command, exists => {
-							if (exists) {
-								c(details);
-							} else {
-								e(new Error(nls.localize('debugAdapterBinNotFound', "Debug adapter executable '{0}' does not exist.", details.command)));
-							}
-						});
-					});
+	private internalSend(typ: 'request' | 'response' | 'event', message: DebugProtocol.ProtocolMessage): void {
+
+		message.type = typ;
+		message.seq = this.sequence++;
+
+		this.sendMessage(message);
+	}
+}
+
+/**
+ * An implementation that communicates via two streams with the debug adapter.
+ */
+export abstract class StreamDebugAdapter extends AbstractDebugAdapter {
+
+	private static readonly TWO_CRLF = '\r\n\r\n';
+	private static readonly HEADER_LINESEPARATOR = /\r?\n/;	// allow for non-RFC 2822 conforming line separators
+	private static readonly HEADER_FIELDSEPARATOR = /: */;
+
+	private outputStream: stream.Writable;
+	private rawData: Buffer;
+	private contentLength: number;
+
+	constructor() {
+		super();
+	}
+
+	public connect(readable: stream.Readable, writable: stream.Writable): void {
+
+		this.outputStream = writable;
+		this.rawData = Buffer.allocUnsafe(0);
+		this.contentLength = -1;
+
+		readable.on('data', (data: Buffer) => this.handleData(data));
+
+		// readable.on('close', () => {
+		// 	this._emitEvent(new Event('close'));
+		// });
+		// readable.on('error', (error) => {
+		// 	this._emitEvent(new Event('error', 'readable error: ' + (error && error.message)));
+		// });
+
+		// writable.on('error', (error) => {
+		// 	this._emitEvent(new Event('error', 'writable error: ' + (error && error.message)));
+		// });
+	}
+
+	public sendMessage(message: DebugProtocol.ProtocolMessage): void {
+
+		if (this.outputStream) {
+			const json = JSON.stringify(message);
+			this.outputStream.write(`Content-Length: ${Buffer.byteLength(json, 'utf8')}${StreamDebugAdapter.TWO_CRLF}${json}`, 'utf8');
+		}
+	}
+
+	private handleData(data: Buffer): void {
+
+		this.rawData = Buffer.concat([this.rawData, data]);
+
+		while (true) {
+			if (this.contentLength >= 0) {
+				if (this.rawData.length >= this.contentLength) {
+					const message = this.rawData.toString('utf8', 0, this.contentLength);
+					this.rawData = this.rawData.slice(this.contentLength);
+					this.contentLength = -1;
+					if (message.length > 0) {
+						try {
+							this.acceptMessage(<DebugProtocol.ProtocolMessage>JSON.parse(message));
+						} catch (e) {
+							this._onError.fire(new Error((e.message || e) + '\n' + message));
+						}
+					}
+					continue;	// there may be more complete messages to process
+				}
+			} else {
+				const idx = this.rawData.indexOf(StreamDebugAdapter.TWO_CRLF);
+				if (idx !== -1) {
+					const header = this.rawData.toString('utf8', 0, idx);
+					const lines = header.split(StreamDebugAdapter.HEADER_LINESEPARATOR);
+					for (const h of lines) {
+						const kvPair = h.split(StreamDebugAdapter.HEADER_FIELDSEPARATOR);
+						if (kvPair[0] === 'Content-Length') {
+							this.contentLength = Number(kvPair[1]);
+						}
+					}
+					this.rawData = this.rawData.slice(idx + StreamDebugAdapter.TWO_CRLF.length);
+					continue;
+				}
+			}
+			break;
+		}
+	}
+}
+
+/**
+ * An implementation that launches the debug adapter as a separate process and communicates via stdin/stdout.
+*/
+export class DebugAdapter extends StreamDebugAdapter {
+
+	private _serverProcess: cp.ChildProcess;
+
+	constructor(private _debugType: string, private _adapterExecutable: IAdapterExecutable | null, extensionDescriptions: IExtensionDescription[], private _outputService?: IOutputService) {
+		super();
+
+		if (!this._adapterExecutable) {
+			this._adapterExecutable = DebugAdapter.platformAdapterExecutable(extensionDescriptions, this._debugType);
+		}
+	}
+
+	startSession(): TPromise<void> {
+
+		return new TPromise<void>((c, e) => {
+
+			// verify executables
+			if (this._adapterExecutable.command) {
+				if (paths.isAbsolute(this._adapterExecutable.command)) {
+					if (!fs.existsSync(this._adapterExecutable.command)) {
+						e(new Error(nls.localize('debugAdapterBinNotFound', "Debug adapter executable '{0}' does not exist.", this._adapterExecutable.command)));
+					}
 				} else {
 					// relative path
-					if (details.command.indexOf('/') < 0 && details.command.indexOf('\\') < 0) {
+					if (this._adapterExecutable.command.indexOf('/') < 0 && this._adapterExecutable.command.indexOf('\\') < 0) {
 						// no separators: command looks like a runtime name like 'node' or 'mono'
-						return TPromise.as(details);	// TODO: check that the runtime is available on PATH
+						// TODO: check that the runtime is available on PATH
 					}
 				}
 			} else {
-				return TPromise.as(details);
+				e(new Error(nls.localize({ key: 'debugAdapterCannotDetermineExecutable', comment: ['Adapter executable file not found'] },
+					"Cannot determine executable for debug adapter '{0}'.", this._debugType)));
 			}
-		}
 
-		return TPromise.wrapError(new Error(nls.localize({ key: 'debugAdapterCannotDetermineExecutable', comment: ['Adapter executable file not found'] },
-			"Cannot determine executable for debug adapter '{0}'.", this.type)));
-	}
-
-	private getRuntime(): string {
-		let runtime = this.getAttributeBasedOnPlatform('runtime');
-		if (runtime && runtime.indexOf('./') === 0) {
-			runtime = paths.join(this.extensionDescription.extensionFolderPath, runtime);
-		}
-		return runtime;
-	}
-
-	private getProgram(): string {
-		let program = this.getAttributeBasedOnPlatform('program');
-		if (program) {
-			program = paths.join(this.extensionDescription.extensionFolderPath, program);
-		}
-		return program;
-	}
-
-	public get aiKey(): string {
-		return this.rawAdapter.aiKey;
-	}
-
-	public get label(): string {
-		return this.rawAdapter.label || this.rawAdapter.type;
-	}
-
-	public get type(): string {
-		return this.rawAdapter.type;
-	}
-
-	public get variables(): { [key: string]: string } {
-		return this.rawAdapter.variables;
-	}
-
-	public get configurationSnippets(): IJSONSchemaSnippet[] {
-		return this.rawAdapter.configurationSnippets;
-	}
-
-	public get languages(): string[] {
-		return this.rawAdapter.languages;
-	}
-
-	public merge(secondRawAdapter: IRawAdapter, extensionDescription: IExtensionDescription): void {
-		// Give priority to built in debug adapters
-		if (extensionDescription.isBuiltin) {
-			this.extensionDescription = extensionDescription;
-		}
-		objects.mixin(this.rawAdapter, secondRawAdapter, extensionDescription.isBuiltin);
-	}
-
-	public hasInitialConfiguration(): boolean {
-		return !!this.rawAdapter.initialConfigurations;
-	}
-
-	public getInitialConfigurationContent(initialConfigs?: IConfig[]): TPromise<string> {
-		// at this point we got some configs from the package.json and/or from registered DebugConfigurationProviders
-		let initialConfigurations = this.rawAdapter.initialConfigurations || [];
-		if (initialConfigs) {
-			initialConfigurations = initialConfigurations.concat(initialConfigs);
-		}
-
-		const configs = JSON.stringify(initialConfigurations, null, '\t').split('\n').map(line => '\t' + line).join('\n').trim();
-		const comment1 = nls.localize('launch.config.comment1', "Use IntelliSense to learn about possible attributes.");
-		const comment2 = nls.localize('launch.config.comment2', "Hover to view descriptions of existing attributes.");
-		const comment3 = nls.localize('launch.config.comment3', "For more information, visit: {0}", 'https://go.microsoft.com/fwlink/?linkid=830387');
-
-		let content = [
-			'{',
-			`\t// ${comment1}`,
-			`\t// ${comment2}`,
-			`\t// ${comment3}`,
-			`\t"version": "0.2.0",`,
-			`\t"configurations": ${configs}`,
-			'}'
-		].join('\n');
-
-		// fix formatting
-		const editorConfig = this.configurationService.getValue<any>();
-		if (editorConfig.editor && editorConfig.editor.insertSpaces) {
-			content = content.replace(new RegExp('\t', 'g'), strings.repeat(' ', editorConfig.editor.tabSize));
-		}
-
-		return TPromise.as(content);
-	}
-
-	public getSchemaAttributes(): IJSONSchema[] {
-		if (!this.rawAdapter.configurationAttributes) {
-			return null;
-		}
-		// fill in the default configuration attributes shared by all adapters.
-		return Object.keys(this.rawAdapter.configurationAttributes).map(request => {
-			const attributes: IJSONSchema = this.rawAdapter.configurationAttributes[request];
-			const defaultRequired = ['name', 'type', 'request'];
-			attributes.required = attributes.required && attributes.required.length ? defaultRequired.concat(attributes.required) : defaultRequired;
-			attributes.additionalProperties = false;
-			attributes.type = 'object';
-			if (!attributes.properties) {
-				attributes.properties = {};
+			if (this._adapterExecutable.command === 'node' && this._outputService) {
+				if (Array.isArray(this._adapterExecutable.args) && this._adapterExecutable.args.length > 0) {
+					stdfork.fork(this._adapterExecutable.args[0], this._adapterExecutable.args.slice(1), {}, (err, child) => {
+						if (err) {
+							e(new Error(nls.localize('unableToLaunchDebugAdapter', "Unable to launch debug adapter from '{0}'.", this._adapterExecutable.args[0])));
+						}
+						this._serverProcess = child;
+						c(null);
+					});
+				} else {
+					e(new Error(nls.localize('unableToLaunchDebugAdapterNoArgs', "Unable to launch debug adapter.")));
+				}
+			} else {
+				this._serverProcess = cp.spawn(this._adapterExecutable.command, this._adapterExecutable.args);
+				c(null);
 			}
-			const properties = attributes.properties;
-			properties['type'] = {
-				enum: [this.type],
-				description: nls.localize('debugType', "Type of configuration."),
-				pattern: '^(?!node2)',
-				errorMessage: nls.localize('debugTypeNotRecognised', "The debug type is not recognized. Make sure that you have a corresponding debug extension installed and that it is enabled."),
-				patternErrorMessage: nls.localize('node2NotSupported', "\"node2\" is no longer supported, use \"node\" instead and set the \"protocol\" attribute to \"inspector\".")
-			};
-			properties['name'] = {
-				type: 'string',
-				description: nls.localize('debugName', "Name of configuration; appears in the launch configuration drop down menu."),
-				default: 'Launch'
-			};
-			properties['request'] = {
-				enum: [request],
-				description: nls.localize('debugRequest', "Request type of configuration. Can be \"launch\" or \"attach\"."),
-			};
-			properties['debugServer'] = {
-				type: 'number',
-				description: nls.localize('debugServer', "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"),
-				default: 4711
-			};
-			properties['preLaunchTask'] = {
-				type: ['string', 'null'],
-				default: null,
-				description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
-			};
-			properties['postDebugTask'] = {
-				type: ['string', 'null'],
-				default: null,
-				description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
-			};
-			properties['internalConsoleOptions'] = INTERNAL_CONSOLE_OPTIONS_SCHEMA;
+		}).then(_ => {
+			this._serverProcess.on('error', (err: Error) => this._onError.fire(err));
+			this._serverProcess.on('exit', (code: number, signal: string) => this._onExit.fire(code));
 
-			const osProperties = objects.deepClone(properties);
-			properties['windows'] = {
-				type: 'object',
-				description: nls.localize('debugWindowsConfiguration', "Windows specific launch configuration attributes."),
-				properties: osProperties
-			};
-			properties['osx'] = {
-				type: 'object',
-				description: nls.localize('debugOSXConfiguration', "OS X specific launch configuration attributes."),
-				properties: osProperties
-			};
-			properties['linux'] = {
-				type: 'object',
-				description: nls.localize('debugLinuxConfiguration', "Linux specific launch configuration attributes."),
-				properties: osProperties
-			};
-			Object.keys(attributes.properties).forEach(name => {
-				// Use schema allOf property to get independent error reporting #21113
-				attributes.properties[name].pattern = attributes.properties[name].pattern || '^(?!.*\\$\\{(env|config|command)\\.)';
-				attributes.properties[name].patternErrorMessage = attributes.properties[name].patternErrorMessage ||
-					nls.localize('deprecatedVariables', "'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead.");
-			});
+			if (this._outputService) {
+				const sanitize = (s: string) => s.toString().replace(/\r?\n$/mg, '');
+				// this.serverProcess.stdout.on('data', (data: string) => {
+				// 	console.log('%c' + sanitize(data), 'background: #ddd; font-style: italic;');
+				// });
+				this._serverProcess.stderr.on('data', (data: string) => {
+					this._outputService.getChannel(ExtensionsChannelId).append(sanitize(data));
+				});
+			}
 
-			return attributes;
+			this.connect(this._serverProcess.stdout, this._serverProcess.stdin);
+		}, err => {
+			this._onError.fire(err);
 		});
 	}
 
-	private getAttributeBasedOnPlatform(key: string): any {
-		let result: any;
-		if (platform.isWindows && !process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432') && this.rawAdapter.winx86) {
-			result = this.rawAdapter.winx86[key];
-		} else if (platform.isWindows && this.rawAdapter.win) {
-			result = this.rawAdapter.win[key];
-		} else if (platform.isMacintosh && this.rawAdapter.osx) {
-			result = this.rawAdapter.osx[key];
-		} else if (platform.isLinux && this.rawAdapter.linux) {
-			result = this.rawAdapter.linux[key];
+	stopSession(): TPromise<void> {
+
+		// when killing a process in windows its child
+		// processes are *not* killed but become root
+		// processes. Therefore we use TASKKILL.EXE
+		if (platform.isWindows) {
+			return new TPromise<void>((c, e) => {
+				const killer = cp.exec(`taskkill /F /T /PID ${this._serverProcess.pid}`, function (err, stdout, stderr) {
+					if (err) {
+						return e(err);
+					}
+				});
+				killer.on('exit', c);
+				killer.on('error', e);
+			});
+		} else {
+			this._serverProcess.kill('SIGTERM');
+			return TPromise.as(null);
+		}
+	}
+
+	private static extract(contribution: IDebuggerContribution, extensionFolderPath: string): IDebuggerContribution {
+		if (!contribution) {
+			return undefined;
+		}
+		let result: IDebuggerContribution = {};
+
+		if (contribution.runtime) {
+			if (contribution.runtime.indexOf('./') === 0) {	// TODO
+				result.runtime = paths.join(extensionFolderPath, contribution.runtime);
+			} else {
+				result.runtime = contribution.runtime;
+			}
+		}
+		if (contribution.runtimeArgs) {
+			result.runtimeArgs = contribution.runtimeArgs;
+		}
+		if (contribution.program) {
+			if (!paths.isAbsolute(contribution.program)) {
+				result.program = paths.join(extensionFolderPath, contribution.program);
+			} else {
+				result.program = contribution.program;
+			}
+		}
+		if (contribution.args) {
+			result.args = contribution.args;
 		}
 
-		return result || this.rawAdapter[key];
+		if (contribution.win) {
+			result.win = DebugAdapter.extract(contribution.win, extensionFolderPath);
+		}
+		if (contribution.winx86) {
+			result.winx86 = DebugAdapter.extract(contribution.winx86, extensionFolderPath);
+		}
+		if (contribution.windows) {
+			result.windows = DebugAdapter.extract(contribution.windows, extensionFolderPath);
+		}
+		if (contribution.osx) {
+			result.osx = DebugAdapter.extract(contribution.osx, extensionFolderPath);
+		}
+		if (contribution.linux) {
+			result.linux = DebugAdapter.extract(contribution.linux, extensionFolderPath);
+		}
+		return result;
+	}
+
+	static platformAdapterExecutable(extensionDescriptions: IExtensionDescription[], debugType: string): IAdapterExecutable {
+
+		let result: IDebuggerContribution = {};
+
+		debugType = debugType.toLowerCase();
+
+		// merge all contributions into one
+		for (const ed of extensionDescriptions) {
+			if (ed.contributes) {
+				const debuggers = <IDebuggerContribution[]>ed.contributes['debuggers'];
+				if (debuggers && debuggers.length > 0) {
+					const dbgs = debuggers.filter(d => strings.equalsIgnoreCase(d.type, debugType));
+					for (const dbg of dbgs) {
+
+						// extract relevant attributes and make then absolute where needed
+						const dbg1 = DebugAdapter.extract(dbg, ed.extensionFolderPath);
+
+						// merge
+						objects.mixin(result, dbg1, ed.isBuiltin);
+					}
+				}
+			}
+		}
+
+		// select the right platform
+		let platformInfo: IPlatformSpecificAdapterContribution;
+		if (platform.isWindows && !process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432')) {
+			platformInfo = result.winx86 || result.win || result.windows;
+		} else if (platform.isWindows) {
+			platformInfo = result.win || result.windows;
+		} else if (platform.isMacintosh) {
+			platformInfo = result.osx;
+		} else if (platform.isLinux) {
+			platformInfo = result.linux;
+		}
+		platformInfo = platformInfo || result;
+
+		// these are the relevant attributes
+		let program = platformInfo.program || result.program;
+		const args = platformInfo.args || result.args;
+		let runtime = platformInfo.runtime || result.runtime;
+		const runtimeArgs = platformInfo.runtimeArgs || result.runtimeArgs;
+
+		if (runtime) {
+			return {
+				command: runtime,
+				args: (runtimeArgs || []).concat([program]).concat(args || [])
+			};
+		} else {
+			return {
+				command: program,
+				args: args || []
+			};
+		}
+	}
+
+	static substituteVariables(workspaceFolder: IWorkspaceFolder, config: IConfig, resolverService: IConfigurationResolverService): IConfig {
+
+		const result = objects.deepClone(config) as IConfig;
+
+		// hoist platform specific attributes to top level
+		if (platform.isWindows && result.windows) {
+			Object.keys(result.windows).forEach(key => result[key] = result.windows[key]);
+		} else if (platform.isMacintosh && result.osx) {
+			Object.keys(result.osx).forEach(key => result[key] = result.osx[key]);
+		} else if (platform.isLinux && result.linux) {
+			Object.keys(result.linux).forEach(key => result[key] = result.linux[key]);
+		}
+
+		// delete all platform specific sections
+		delete result.windows;
+		delete result.osx;
+		delete result.linux;
+
+		// substitute all variables in string values
+		return resolverService.resolveAny(workspaceFolder, result);
+	}
+}
+
+// path hooks helpers
+
+export function convertToDAPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePaths: (source: DebugProtocol.Source) => void): void {
+	convertPaths(msg, (toDA: boolean, source: DebugProtocol.Source | undefined) => {
+		if (toDA && source) {
+			fixSourcePaths(source);
+		}
+	});
+}
+
+export function convertToVSCPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePaths: (source: DebugProtocol.Source) => void): void {
+	convertPaths(msg, (toDA: boolean, source: DebugProtocol.Source | undefined) => {
+		if (!toDA && source) {
+			fixSourcePaths(source);
+		}
+	});
+}
+
+function convertPaths(msg: DebugProtocol.ProtocolMessage, fixSourcePaths: (toDA: boolean, source: DebugProtocol.Source | undefined) => void): void {
+	switch (msg.type) {
+		case 'event':
+			const event = <DebugProtocol.Event>msg;
+			switch (event.event) {
+				case 'output':
+					fixSourcePaths(false, (<DebugProtocol.OutputEvent>event).body.source);
+					break;
+				case 'loadedSource':
+					fixSourcePaths(false, (<DebugProtocol.LoadedSourceEvent>event).body.source);
+					break;
+				case 'breakpoint':
+					fixSourcePaths(false, (<DebugProtocol.BreakpointEvent>event).body.breakpoint.source);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 'request':
+			const request = <DebugProtocol.Request>msg;
+			switch (request.command) {
+				case 'setBreakpoints':
+					fixSourcePaths(true, (<DebugProtocol.SetBreakpointsArguments>request.arguments).source);
+					break;
+				case 'source':
+					fixSourcePaths(true, (<DebugProtocol.SourceArguments>request.arguments).source);
+					break;
+				case 'gotoTargets':
+					fixSourcePaths(true, (<DebugProtocol.GotoTargetsArguments>request.arguments).source);
+					break;
+				default:
+					break;
+			}
+			break;
+		case 'response':
+			const response = <DebugProtocol.Response>msg;
+			switch (response.command) {
+				case 'stackTrace':
+					const r1 = <DebugProtocol.StackTraceResponse>response;
+					r1.body.stackFrames.forEach(frame => fixSourcePaths(false, frame.source));
+					break;
+				case 'loadedSources':
+					const r2 = <DebugProtocol.LoadedSourcesResponse>response;
+					r2.body.sources.forEach(source => fixSourcePaths(false, source));
+					break;
+				case 'scopes':
+					const r3 = <DebugProtocol.ScopesResponse>response;
+					r3.body.scopes.forEach(scope => fixSourcePaths(false, scope.source));
+					break;
+				case 'setFunctionBreakpoints':
+					const r4 = <DebugProtocol.SetFunctionBreakpointsResponse>response;
+					r4.body.breakpoints.forEach(bp => fixSourcePaths(false, bp.source));
+					break;
+				case 'setBreakpoints':
+					const r5 = <DebugProtocol.SetBreakpointsResponse>response;
+					r5.body.breakpoints.forEach(bp => fixSourcePaths(false, bp.source));
+					break;
+				default:
+					break;
+			}
+			break;
 	}
 }
diff --git a/src/vs/workbench/parts/debug/node/debugger.ts b/src/vs/workbench/parts/debug/node/debugger.ts
new file mode 100644
index 00000000000..e6e1ffed7ab
--- /dev/null
+++ b/src/vs/workbench/parts/debug/node/debugger.ts
@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { TPromise } from 'vs/base/common/winjs.base';
+import * as strings from 'vs/base/common/strings';
+import * as objects from 'vs/base/common/objects';
+import { IJSONSchema, IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IConfig, IDebuggerContribution, IAdapterExecutable, INTERNAL_CONSOLE_OPTIONS_SCHEMA, IConfigurationManager, IDebugAdapter, IDebugConfiguration, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IOutputService } from 'vs/workbench/parts/output/common/output';
+import { DebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+
+export class Debugger {
+
+	private _mergedExtensionDescriptions: IExtensionDescription[];
+
+	constructor(private configurationManager: IConfigurationManager, private debuggerContribution: IDebuggerContribution, public extensionDescription: IExtensionDescription,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@ICommandService private commandService: ICommandService,
+		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService,
+	) {
+		this._mergedExtensionDescriptions = [extensionDescription];
+	}
+
+	public hasConfigurationProvider = false;
+
+	public createDebugAdapter(root: IWorkspaceFolder, outputService: IOutputService): TPromise<IDebugAdapter> {
+		return this.getAdapterExecutable(root).then(adapterExecutable => {
+			const debugConfigs = this.configurationService.getValue<IDebugConfiguration>('debug');
+			if (debugConfigs.extensionHostDebugAdapter) {
+				return this.configurationManager.createDebugAdapter(this.type, adapterExecutable);
+			} else {
+				return new DebugAdapter(this.type, adapterExecutable, this._mergedExtensionDescriptions, outputService);
+			}
+		});
+	}
+
+	public getAdapterExecutable(root: IWorkspaceFolder): TPromise<IAdapterExecutable | null> {
+
+		// first try to get an executable from DebugConfigurationProvider
+		return this.configurationManager.debugAdapterExecutable(root ? root.uri : undefined, this.type).then(adapterExecutable => {
+
+			if (adapterExecutable) {
+				return adapterExecutable;
+			}
+
+			// try deprecated command based extension API to receive an executable
+			if (this.debuggerContribution.adapterExecutableCommand) {
+				return this.commandService.executeCommand<IAdapterExecutable>(this.debuggerContribution.adapterExecutableCommand, root ? root.uri.toString() : undefined);
+			}
+
+			// give up and let DebugAdapter determine executable based on package.json contribution
+			return TPromise.as(null);
+		});
+	}
+
+	public substituteVariables(folder: IWorkspaceFolder, config: IConfig): TPromise<IConfig> {
+
+		let configP: TPromise<IConfig>;
+		const debugConfigs = this.configurationService.getValue<IDebugConfiguration>('debug');
+		if (debugConfigs.extensionHostDebugAdapter) {
+			configP = this.configurationManager.substituteVariables(this.type, folder, config);
+		} else {
+			try {
+				configP = TPromise.as(DebugAdapter.substituteVariables(folder, config, this.configurationResolverService));
+			} catch (e) {
+				return TPromise.wrapError(e);
+			}
+		}
+
+		return configP.then(result => {
+			// substitute 'command' variables (including interactive)
+			return this.configurationResolverService.resolveInteractiveVariables(result, this.variables);
+		});
+	}
+
+	public runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments): TPromise<void> {
+		const debugConfigs = this.configurationService.getValue<IDebugConfiguration>('debug');
+		const config = this.configurationService.getValue<ITerminalSettings>('terminal');
+		const type = debugConfigs.extensionHostDebugAdapter ? this.type : '*';
+		return this.configurationManager.runInTerminal(type, args, config);
+	}
+
+	public get aiKey(): string {
+		return this.debuggerContribution.aiKey;
+	}
+
+	public get label(): string {
+		return this.debuggerContribution.label || this.debuggerContribution.type;
+	}
+
+	public get type(): string {
+		return this.debuggerContribution.type;
+	}
+
+	public get variables(): { [key: string]: string } {
+		return this.debuggerContribution.variables;
+	}
+
+	public get configurationSnippets(): IJSONSchemaSnippet[] {
+		return this.debuggerContribution.configurationSnippets;
+	}
+
+	public get languages(): string[] {
+		return this.debuggerContribution.languages;
+	}
+
+	public merge(secondRawAdapter: IDebuggerContribution, extensionDescription: IExtensionDescription): void {
+
+		// remember all ext descriptions that are the source of this debugger
+		this._mergedExtensionDescriptions.push(extensionDescription);
+
+		// Give priority to built in debug adapters
+		if (extensionDescription.isBuiltin) {
+			this.extensionDescription = extensionDescription;
+		}
+		objects.mixin(this.debuggerContribution, secondRawAdapter, extensionDescription.isBuiltin);
+	}
+
+	public hasInitialConfiguration(): boolean {
+		return !!this.debuggerContribution.initialConfigurations;
+	}
+
+	public getInitialConfigurationContent(initialConfigs?: IConfig[]): TPromise<string> {
+		// at this point we got some configs from the package.json and/or from registered DebugConfigurationProviders
+		let initialConfigurations = this.debuggerContribution.initialConfigurations || [];
+		if (initialConfigs) {
+			initialConfigurations = initialConfigurations.concat(initialConfigs);
+		}
+
+		const configs = JSON.stringify(initialConfigurations, null, '\t').split('\n').map(line => '\t' + line).join('\n').trim();
+		const comment1 = nls.localize('launch.config.comment1', "Use IntelliSense to learn about possible attributes.");
+		const comment2 = nls.localize('launch.config.comment2', "Hover to view descriptions of existing attributes.");
+		const comment3 = nls.localize('launch.config.comment3', "For more information, visit: {0}", 'https://go.microsoft.com/fwlink/?linkid=830387');
+
+		let content = [
+			'{',
+			`\t// ${comment1}`,
+			`\t// ${comment2}`,
+			`\t// ${comment3}`,
+			`\t"version": "0.2.0",`,
+			`\t"configurations": ${configs}`,
+			'}'
+		].join('\n');
+
+		// fix formatting
+		const editorConfig = this.configurationService.getValue<any>();
+		if (editorConfig.editor && editorConfig.editor.insertSpaces) {
+			content = content.replace(new RegExp('\t', 'g'), strings.repeat(' ', editorConfig.editor.tabSize));
+		}
+
+		return TPromise.as(content);
+	}
+
+	public getSchemaAttributes(): IJSONSchema[] {
+		if (!this.debuggerContribution.configurationAttributes) {
+			return null;
+		}
+		// fill in the default configuration attributes shared by all adapters.
+		return Object.keys(this.debuggerContribution.configurationAttributes).map(request => {
+			const attributes: IJSONSchema = this.debuggerContribution.configurationAttributes[request];
+			const defaultRequired = ['name', 'type', 'request'];
+			attributes.required = attributes.required && attributes.required.length ? defaultRequired.concat(attributes.required) : defaultRequired;
+			attributes.additionalProperties = false;
+			attributes.type = 'object';
+			if (!attributes.properties) {
+				attributes.properties = {};
+			}
+			const properties = attributes.properties;
+			properties['type'] = {
+				enum: [this.type],
+				description: nls.localize('debugType', "Type of configuration."),
+				pattern: '^(?!node2)',
+				errorMessage: nls.localize('debugTypeNotRecognised', "The debug type is not recognized. Make sure that you have a corresponding debug extension installed and that it is enabled."),
+				patternErrorMessage: nls.localize('node2NotSupported', "\"node2\" is no longer supported, use \"node\" instead and set the \"protocol\" attribute to \"inspector\".")
+			};
+			properties['name'] = {
+				type: 'string',
+				description: nls.localize('debugName', "Name of configuration; appears in the launch configuration drop down menu."),
+				default: 'Launch'
+			};
+			properties['request'] = {
+				enum: [request],
+				description: nls.localize('debugRequest', "Request type of configuration. Can be \"launch\" or \"attach\"."),
+			};
+			properties['debugServer'] = {
+				type: 'number',
+				description: nls.localize('debugServer', "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"),
+				default: 4711
+			};
+			properties['preLaunchTask'] = {
+				type: ['string', 'null'],
+				default: '',
+				description: nls.localize('debugPrelaunchTask', "Task to run before debug session starts.")
+			};
+			properties['postDebugTask'] = {
+				type: ['string', 'null'],
+				default: '',
+				description: nls.localize('debugPostDebugTask', "Task to run after debug session ends.")
+			};
+			properties['internalConsoleOptions'] = INTERNAL_CONSOLE_OPTIONS_SCHEMA;
+
+			const osProperties = objects.deepClone(properties);
+			properties['windows'] = {
+				type: 'object',
+				description: nls.localize('debugWindowsConfiguration', "Windows specific launch configuration attributes."),
+				properties: osProperties
+			};
+			properties['osx'] = {
+				type: 'object',
+				description: nls.localize('debugOSXConfiguration', "OS X specific launch configuration attributes."),
+				properties: osProperties
+			};
+			properties['linux'] = {
+				type: 'object',
+				description: nls.localize('debugLinuxConfiguration', "Linux specific launch configuration attributes."),
+				properties: osProperties
+			};
+			Object.keys(attributes.properties).forEach(name => {
+				// Use schema allOf property to get independent error reporting #21113
+				attributes.properties[name].pattern = attributes.properties[name].pattern || '^(?!.*\\$\\{(env|config|command)\\.)';
+				attributes.properties[name].patternErrorMessage = attributes.properties[name].patternErrorMessage ||
+					nls.localize('deprecatedVariables', "'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead.");
+			});
+
+			return attributes;
+		});
+	}
+}
diff --git a/src/vs/workbench/parts/debug/node/terminals.ts b/src/vs/workbench/parts/debug/node/terminals.ts
new file mode 100644
index 00000000000..c0cfca5db35
--- /dev/null
+++ b/src/vs/workbench/parts/debug/node/terminals.ts
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as cp from 'child_process';
+import * as nls from 'vs/nls';
+import * as env from 'vs/base/common/platform';
+import * as pfs from 'vs/base/node/pfs';
+import { assign } from 'vs/base/common/objects';
+import { TPromise } from 'vs/base/common/winjs.base';
+import uri from 'vs/base/common/uri';
+import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
+
+const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
+
+let terminalLauncher: ITerminalLauncher = undefined;
+
+export function getTerminalLauncher() {
+	if (!terminalLauncher) {
+		if (env.isWindows) {
+			terminalLauncher = new WinTerminalService();
+		} else if (env.isMacintosh) {
+			terminalLauncher = new MacTerminalService();
+		} else if (env.isLinux) {
+			terminalLauncher = new LinuxTerminalService();
+		}
+	}
+	return terminalLauncher;
+}
+
+let _DEFAULT_TERMINAL_LINUX_READY: TPromise<string> = null;
+export function getDefaultTerminalLinuxReady(): TPromise<string> {
+	if (!_DEFAULT_TERMINAL_LINUX_READY) {
+		_DEFAULT_TERMINAL_LINUX_READY = new TPromise<string>(c => {
+			if (env.isLinux) {
+				TPromise.join([pfs.exists('/etc/debian_version'), process.lazyEnv]).then(([isDebian]) => {
+					if (isDebian) {
+						c('x-terminal-emulator');
+					} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {
+						c('gnome-terminal');
+					} else if (process.env.DESKTOP_SESSION === 'kde-plasma') {
+						c('konsole');
+					} else if (process.env.COLORTERM) {
+						c(process.env.COLORTERM);
+					} else if (process.env.TERM) {
+						c(process.env.TERM);
+					} else {
+						c('xterm');
+					}
+				});
+				return;
+			}
+
+			c('xterm');
+		}, () => { });
+	}
+	return _DEFAULT_TERMINAL_LINUX_READY;
+}
+
+let _DEFAULT_TERMINAL_WINDOWS: string = null;
+export function getDefaultTerminalWindows(): string {
+	if (!_DEFAULT_TERMINAL_WINDOWS) {
+		const isWoW64 = !!process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
+		_DEFAULT_TERMINAL_WINDOWS = `${process.env.windir ? process.env.windir : 'C:\\Windows'}\\${isWoW64 ? 'Sysnative' : 'System32'}\\cmd.exe`;
+	}
+	return _DEFAULT_TERMINAL_WINDOWS;
+}
+
+abstract class TerminalLauncher implements ITerminalLauncher {
+	public runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, config: ITerminalSettings): TPromise<void> {
+		return this.runInTerminal0(args.title, args.cwd, args.args, args.env || {}, config);
+	}
+	runInTerminal0(title: string, dir: string, args: string[], envVars: env.IProcessEnvironment, config): TPromise<void> {
+		return void 0;
+	}
+}
+
+class WinTerminalService extends TerminalLauncher {
+
+	private static readonly CMD = 'cmd.exe';
+
+	public runInTerminal0(title: string, dir: string, args: string[], envVars: env.IProcessEnvironment, configuration: ITerminalSettings): TPromise<void> {
+
+		const exec = configuration.external.windowsExec || getDefaultTerminalWindows();
+
+		return new TPromise<void>((c, e) => {
+
+			const title = `"${dir} - ${TERMINAL_TITLE}"`;
+			const command = `""${args.join('" "')}" & pause"`; // use '|' to only pause on non-zero exit code
+
+			const cmdArgs = [
+				'/c', 'start', title, '/wait', exec, '/c', command
+			];
+
+			// merge environment variables into a copy of the process.env
+			const env = assign({}, process.env, envVars);
+
+			// delete environment variables that have a null value
+			Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
+
+			const options: any = {
+				cwd: dir,
+				env: env,
+				windowsVerbatimArguments: true
+			};
+
+			const cmd = cp.spawn(WinTerminalService.CMD, cmdArgs, options);
+			cmd.on('error', e);
+
+			c(null);
+		});
+	}
+}
+
+class MacTerminalService extends TerminalLauncher {
+
+	private static readonly DEFAULT_TERMINAL_OSX = 'Terminal.app';
+	private static readonly OSASCRIPT = '/usr/bin/osascript';	// osascript is the AppleScript interpreter on OS X
+
+	public runInTerminal0(title: string, dir: string, args: string[], envVars: env.IProcessEnvironment, configuration: ITerminalSettings): TPromise<void> {
+
+		const terminalApp = configuration.external.osxExec || MacTerminalService.DEFAULT_TERMINAL_OSX;
+
+		return new TPromise<void>((c, e) => {
+
+			if (terminalApp === MacTerminalService.DEFAULT_TERMINAL_OSX || terminalApp === 'iTerm.app') {
+
+				// On OS X we launch an AppleScript that creates (or reuses) a Terminal window
+				// and then launches the program inside that window.
+
+				const script = terminalApp === MacTerminalService.DEFAULT_TERMINAL_OSX ? 'TerminalHelper' : 'iTermHelper';
+				const scriptpath = uri.parse(require.toUrl(`vs/workbench/parts/execution/electron-browser/${script}.scpt`)).fsPath;
+
+				const osaArgs = [
+					scriptpath,
+					'-t', title || TERMINAL_TITLE,
+					'-w', dir,
+				];
+
+				for (let a of args) {
+					osaArgs.push('-a');
+					osaArgs.push(a);
+				}
+
+				if (envVars) {
+					for (let key in envVars) {
+						const value = envVars[key];
+						if (value === null) {
+							osaArgs.push('-u');
+							osaArgs.push(key);
+						} else {
+							osaArgs.push('-e');
+							osaArgs.push(`${key}=${value}`);
+						}
+					}
+				}
+
+				let stderr = '';
+				const osa = cp.spawn(MacTerminalService.OSASCRIPT, osaArgs);
+				osa.on('error', e);
+				osa.stderr.on('data', (data) => {
+					stderr += data.toString();
+				});
+				osa.on('exit', (code: number) => {
+					if (code === 0) {	// OK
+						c(null);
+					} else {
+						if (stderr) {
+							const lines = stderr.split('\n', 1);
+							e(new Error(lines[0]));
+						} else {
+							e(new Error(nls.localize('mac.terminal.script.failed', "Script '{0}' failed with exit code {1}", script, code)));
+						}
+					}
+				});
+			} else {
+				e(new Error(nls.localize('mac.terminal.type.not.supported', "'{0}' not supported", terminalApp)));
+			}
+		});
+	}
+}
+
+class LinuxTerminalService extends TerminalLauncher {
+
+	private static readonly WAIT_MESSAGE = nls.localize('press.any.key', "Press any key to continue...");
+
+	public runInTerminal0(title: string, dir: string, args: string[], envVars: env.IProcessEnvironment, configuration: ITerminalSettings): TPromise<void> {
+
+		const terminalConfig = configuration.external;
+		const execPromise = terminalConfig.linuxExec ? TPromise.as(terminalConfig.linuxExec) : getDefaultTerminalLinuxReady();
+
+		return new TPromise<void>((c, e) => {
+
+			let termArgs: string[] = [];
+			//termArgs.push('--title');
+			//termArgs.push(`"${TERMINAL_TITLE}"`);
+			execPromise.then(exec => {
+				if (exec.indexOf('gnome-terminal') >= 0) {
+					termArgs.push('-x');
+				} else {
+					termArgs.push('-e');
+				}
+				termArgs.push('bash');
+				termArgs.push('-c');
+
+				const bashCommand = `${quote(args)}; echo; read -p "${LinuxTerminalService.WAIT_MESSAGE}" -n1;`;
+				termArgs.push(`''${bashCommand}''`);	// wrapping argument in two sets of ' because node is so "friendly" that it removes one set...
+
+				// merge environment variables into a copy of the process.env
+				const env = assign({}, process.env, envVars);
+
+				// delete environment variables that have a null value
+				Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
+
+				const options: any = {
+					cwd: dir,
+					env: env
+				};
+
+				let stderr = '';
+				const cmd = cp.spawn(exec, termArgs, options);
+				cmd.on('error', e);
+				cmd.stderr.on('data', (data) => {
+					stderr += data.toString();
+				});
+				cmd.on('exit', (code: number) => {
+					if (code === 0) {	// OK
+						c(null);
+					} else {
+						if (stderr) {
+							const lines = stderr.split('\n', 1);
+							e(new Error(lines[0]));
+						} else {
+							e(new Error(nls.localize('linux.term.failed', "'{0}' failed with exit code {1}", exec, code)));
+						}
+					}
+				});
+			});
+		});
+	}
+}
+
+/**
+ * Quote args if necessary and combine into a space separated string.
+ */
+function quote(args: string[]): string {
+	let r = '';
+	for (let a of args) {
+		if (a.indexOf(' ') >= 0) {
+			r += '"' + a + '"';
+		} else {
+			r += a;
+		}
+		r += ' ';
+	}
+	return r;
+}
diff --git a/src/vs/workbench/parts/debug/node/v8Protocol.ts b/src/vs/workbench/parts/debug/node/v8Protocol.ts
deleted file mode 100644
index cd9c151d7cb..00000000000
--- a/src/vs/workbench/parts/debug/node/v8Protocol.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as stream from 'stream';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { canceled } from 'vs/base/common/errors';
-
-export abstract class V8Protocol {
-
-	private static readonly TWO_CRLF = '\r\n\r\n';
-
-	private outputStream: stream.Writable;
-	private sequence: number;
-	private pendingRequests: Map<number, (e: DebugProtocol.Response) => void>;
-	private rawData: Buffer;
-	private contentLength: number;
-
-	constructor(private id: string) {
-		this.sequence = 1;
-		this.contentLength = -1;
-		this.pendingRequests = new Map<number, (e: DebugProtocol.Response) => void>();
-		this.rawData = Buffer.allocUnsafe(0);
-	}
-
-	public getId(): string {
-		return this.id;
-	}
-
-	protected abstract onServerError(err: Error): void;
-	protected abstract onEvent(event: DebugProtocol.Event): void;
-	protected abstract dispatchRequest(request: DebugProtocol.Request, response: DebugProtocol.Response): void;
-
-	protected connect(readable: stream.Readable, writable: stream.Writable): void {
-
-		this.outputStream = writable;
-
-		readable.on('data', (data: Buffer) => {
-			this.rawData = Buffer.concat([this.rawData, data]);
-			this.handleData();
-		});
-	}
-
-	protected send<R extends DebugProtocol.Response>(command: string, args: any): TPromise<R> {
-		let errorCallback: (error: Error) => void;
-		return new TPromise<R>((completeDispatch, errorDispatch) => {
-			errorCallback = errorDispatch;
-			this.doSend(command, args, (result: R) => {
-				if (result.success) {
-					completeDispatch(result);
-				} else {
-					errorDispatch(result);
-				}
-			});
-		}, () => errorCallback(canceled()));
-	}
-
-	public sendResponse(response: DebugProtocol.Response): void {
-		if (response.seq > 0) {
-			console.error(`attempt to send more than one response for command ${response.command}`);
-		} else {
-			this.sendMessage('response', response);
-		}
-	}
-
-	private doSend(command: string, args: any, clb: (result: DebugProtocol.Response) => void): void {
-
-		const request: any = {
-			command: command
-		};
-		if (args && Object.keys(args).length > 0) {
-			request.arguments = args;
-		}
-
-		this.sendMessage('request', request);
-
-		if (clb) {
-			// store callback for this request
-			this.pendingRequests.set(request.seq, clb);
-		}
-	}
-
-	private sendMessage(typ: 'request' | 'response' | 'event', message: DebugProtocol.ProtocolMessage): void {
-
-		message.type = typ;
-		message.seq = this.sequence++;
-
-		const json = JSON.stringify(message);
-		const length = Buffer.byteLength(json, 'utf8');
-
-		this.outputStream.write('Content-Length: ' + length.toString() + V8Protocol.TWO_CRLF, 'utf8');
-		this.outputStream.write(json, 'utf8');
-	}
-
-	private handleData(): void {
-		while (true) {
-			if (this.contentLength >= 0) {
-				if (this.rawData.length >= this.contentLength) {
-					const message = this.rawData.toString('utf8', 0, this.contentLength);
-					this.rawData = this.rawData.slice(this.contentLength);
-					this.contentLength = -1;
-					if (message.length > 0) {
-						this.dispatch(message);
-					}
-					continue;	// there may be more complete messages to process
-				}
-			} else {
-				const s = this.rawData.toString('utf8', 0, this.rawData.length);
-				const idx = s.indexOf(V8Protocol.TWO_CRLF);
-				if (idx !== -1) {
-					const match = /Content-Length: (\d+)/.exec(s);
-					if (match && match[1]) {
-						this.contentLength = Number(match[1]);
-						this.rawData = this.rawData.slice(idx + V8Protocol.TWO_CRLF.length);
-						continue;	// try to handle a complete message
-					}
-				}
-			}
-			break;
-		}
-	}
-
-	private dispatch(body: string): void {
-		try {
-			const rawData = JSON.parse(body);
-			switch (rawData.type) {
-				case 'event':
-					this.onEvent(<DebugProtocol.Event>rawData);
-					break;
-				case 'response':
-					const response = <DebugProtocol.Response>rawData;
-					const clb = this.pendingRequests.get(response.request_seq);
-					if (clb) {
-						this.pendingRequests.delete(response.request_seq);
-						clb(response);
-					}
-					break;
-				case 'request':
-					const request = <DebugProtocol.Request>rawData;
-					const resp: DebugProtocol.Response = {
-						type: 'response',
-						seq: 0,
-						command: request.command,
-						request_seq: request.seq,
-						success: true
-					};
-					this.dispatchRequest(request, resp);
-					break;
-			}
-		} catch (e) {
-			this.onServerError(new Error(e.message || e));
-		}
-	}
-}
diff --git a/src/vs/workbench/parts/debug/test/common/mockDebug.ts b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
index e626309a642..6db8bef34f6 100644
--- a/src/vs/workbench/parts/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/parts/debug/test/common/mockDebug.ts
@@ -111,6 +111,7 @@ export class MockDebugService implements IDebugService {
 }
 
 export class MockSession implements ISession {
+
 	public readyForBreakpoints = true;
 	public emittedStopped = true;
 
@@ -217,6 +218,10 @@ export class MockSession implements ISession {
 		return TPromise.as(null);
 	}
 
+	public terminateThreads(args: DebugProtocol.TerminateThreadsArguments): TPromise<DebugProtocol.TerminateThreadsResponse, any> {
+		return TPromise.as(null);
+	}
+
 	public setVariable(args: DebugProtocol.SetVariableArguments): TPromise<DebugProtocol.SetVariableResponse> {
 		return TPromise.as(null);
 	}
diff --git a/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts b/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts
deleted file mode 100644
index fadc7c6c5fd..00000000000
--- a/src/vs/workbench/parts/debug/test/node/debugAdapter.test.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as assert from 'assert';
-import * as paths from 'vs/base/common/paths';
-import * as platform from 'vs/base/common/platform';
-import { IRawAdapter, IAdapterExecutable, IConfigurationManager } from 'vs/workbench/parts/debug/common/debug';
-import { Adapter } from 'vs/workbench/parts/debug/node/debugAdapter';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import uri from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
-
-
-suite('Debug - Adapter', () => {
-	let adapter: Adapter;
-	const extensionFolderPath = 'a/b/c/';
-	const rawAdapter = {
-		type: 'mock',
-		label: 'Mock Debug',
-		enableBreakpointsFor: { 'languageIds': ['markdown'] },
-		program: './out/mock/mockDebug.js',
-		args: ['arg1', 'arg2'],
-		configurationAttributes: {
-			launch: {
-				required: ['program'],
-				properties: {
-					program: {
-						'type': 'string',
-						'description': 'Workspace relative path to a text file.',
-						'default': 'readme.md'
-					}
-				}
-			}
-		},
-		variables: null,
-		initialConfigurations: [
-			{
-				name: 'Mock-Debug',
-				type: 'mock',
-				request: 'launch',
-				program: 'readme.md'
-			}
-		]
-	};
-	const configurationManager = {
-		debugAdapterExecutable(folderUri: uri | undefined, type: string): TPromise<IAdapterExecutable | undefined> {
-			return TPromise.as(undefined);
-		}
-	};
-
-	setup(() => {
-		adapter = new Adapter(<IConfigurationManager>configurationManager, rawAdapter, { extensionFolderPath, id: 'adapter', name: 'myAdapter', version: '1.0.0', publisher: 'vscode', isBuiltin: false, engines: null },
-			new TestConfigurationService(), null);
-	});
-
-	teardown(() => {
-		adapter = null;
-	});
-
-	test('attributes', () => {
-		assert.equal(adapter.type, rawAdapter.type);
-		assert.equal(adapter.label, rawAdapter.label);
-
-		return adapter.getAdapterExecutable(undefined, false).then(details => {
-			assert.equal(details.command, paths.join(extensionFolderPath, rawAdapter.program));
-			assert.deepEqual(details.args, rawAdapter.args);
-		});
-	});
-
-	test('schema attributes', () => {
-		const schemaAttribute = adapter.getSchemaAttributes()[0];
-		assert.notDeepEqual(schemaAttribute, rawAdapter.configurationAttributes);
-		Object.keys(rawAdapter.configurationAttributes.launch).forEach(key => {
-			assert.deepEqual(schemaAttribute[key], rawAdapter.configurationAttributes.launch[key]);
-		});
-
-		assert.equal(schemaAttribute['additionalProperties'], false);
-		assert.equal(!!schemaAttribute['properties']['request'], true);
-		assert.equal(!!schemaAttribute['properties']['name'], true);
-		assert.equal(!!schemaAttribute['properties']['type'], true);
-		assert.equal(!!schemaAttribute['properties']['preLaunchTask'], true);
-	});
-
-	test('merge', () => {
-
-		const da: IRawAdapter = {
-			type: 'mock',
-			win: {
-				runtime: 'winRuntime'
-			},
-			linux: {
-				runtime: 'linuxRuntime'
-			},
-			osx: {
-				runtime: 'osxRuntime'
-			},
-			runtimeArgs: ['first arg'],
-			program: 'mockprogram',
-			args: ['arg']
-		};
-
-		adapter.merge(da, {
-			name: 'my name',
-			id: 'my_id',
-			version: '1.0',
-			publisher: 'mockPublisher',
-			isBuiltin: true,
-			extensionFolderPath: 'a/b/c/d',
-			engines: null
-		});
-
-		return adapter.getAdapterExecutable(undefined, false).then(details => {
-			assert.equal(details.command, platform.isLinux ? da.linux.runtime : platform.isMacintosh ? da.osx.runtime : da.win.runtime);
-			assert.deepEqual(details.args, da.runtimeArgs.concat(['a/b/c/d/mockprogram'].concat(da.args)));
-		});
-	});
-
-	test('initial config file content', () => {
-
-		const expected = ['{',
-			'	// Use IntelliSense to learn about possible attributes.',
-			'	// Hover to view descriptions of existing attributes.',
-			'	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387',
-			'	"version": "0.2.0",',
-			'	"configurations": [',
-			'		{',
-			'			"name": "Mock-Debug",',
-			'			"type": "mock",',
-			'			"request": "launch",',
-			'			"program": "readme.md"',
-			'		}',
-			'	]',
-			'}'].join('\n');
-
-		return adapter.getInitialConfigurationContent().then(content => {
-			assert.equal(content, expected);
-		}, err => assert.fail());
-	});
-});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/debug/test/node/debugger.test.ts b/src/vs/workbench/parts/debug/test/node/debugger.test.ts
new file mode 100644
index 00000000000..0e7dadf2ea2
--- /dev/null
+++ b/src/vs/workbench/parts/debug/test/node/debugger.test.ts
@@ -0,0 +1,182 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as paths from 'vs/base/common/paths';
+import * as platform from 'vs/base/common/platform';
+import { IAdapterExecutable, IConfigurationManager } from 'vs/workbench/parts/debug/common/debug';
+import { Debugger } from 'vs/workbench/parts/debug/node/debugger';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import uri from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { DebugAdapter } from 'vs/workbench/parts/debug/node/debugAdapter';
+
+
+suite('Debug - Debugger', () => {
+	let _debugger: Debugger;
+
+	const extensionFolderPath = 'a/b/c/';
+	const debuggerContribution = {
+		type: 'mock',
+		label: 'Mock Debug',
+		enableBreakpointsFor: { 'languageIds': ['markdown'] },
+		program: './out/mock/mockDebug.js',
+		args: ['arg1', 'arg2'],
+		configurationAttributes: {
+			launch: {
+				required: ['program'],
+				properties: {
+					program: {
+						'type': 'string',
+						'description': 'Workspace relative path to a text file.',
+						'default': 'readme.md'
+					}
+				}
+			}
+		},
+		variables: null,
+		initialConfigurations: [
+			{
+				name: 'Mock-Debug',
+				type: 'mock',
+				request: 'launch',
+				program: 'readme.md'
+			}
+		]
+	};
+
+	const extensionDescriptor0 = {
+		id: 'adapter',
+		name: 'myAdapter',
+		version: '1.0.0',
+		publisher: 'vscode',
+		extensionFolderPath: extensionFolderPath,
+		isBuiltin: false,
+		engines: null,
+		contributes: {
+			'debuggers': [
+				debuggerContribution
+			]
+		}
+	};
+
+	const extensionDescriptor1 = {
+		id: 'extension1',
+		name: 'extension1',
+		version: '1.0.0',
+		publisher: 'vscode',
+		extensionFolderPath: '/e1/b/c/',
+		isBuiltin: false,
+		engines: null,
+		contributes: {
+			'debuggers': [
+				{
+					type: 'mock',
+					runtime: 'runtime',
+					runtimeArgs: ['rarg'],
+					program: 'mockprogram',
+					args: ['parg']
+				}
+			]
+		}
+	};
+
+	const extensionDescriptor2 = {
+		id: 'extension2',
+		name: 'extension2',
+		version: '1.0.0',
+		publisher: 'vscode',
+		extensionFolderPath: '/e2/b/c/',
+		isBuiltin: false,
+		engines: null,
+		contributes: {
+			'debuggers': [
+				{
+					type: 'mock',
+					win: {
+						runtime: 'winRuntime',
+						program: 'winProgram'
+					},
+					linux: {
+						runtime: 'linuxRuntime',
+						program: 'linuxProgram'
+					},
+					osx: {
+						runtime: 'osxRuntime',
+						program: 'osxProgram'
+					}
+				}
+			]
+		}
+	};
+
+
+	const configurationManager = <IConfigurationManager>{
+		debugAdapterExecutable(folderUri: uri | undefined, type: string): TPromise<IAdapterExecutable | undefined> {
+			return TPromise.as(undefined);
+		}
+	};
+
+	setup(() => {
+		_debugger = new Debugger(configurationManager, debuggerContribution, extensionDescriptor0, new TestConfigurationService(), null, null);
+	});
+
+	teardown(() => {
+		_debugger = null;
+	});
+
+	test('attributes', () => {
+		assert.equal(_debugger.type, debuggerContribution.type);
+		assert.equal(_debugger.label, debuggerContribution.label);
+
+		const ae = DebugAdapter.platformAdapterExecutable([extensionDescriptor0], 'mock');
+
+		assert.equal(ae.command, paths.join(extensionFolderPath, debuggerContribution.program));
+		assert.deepEqual(ae.args, debuggerContribution.args);
+	});
+
+	test('schema attributes', () => {
+		const schemaAttribute = _debugger.getSchemaAttributes()[0];
+		assert.notDeepEqual(schemaAttribute, debuggerContribution.configurationAttributes);
+		Object.keys(debuggerContribution.configurationAttributes.launch).forEach(key => {
+			assert.deepEqual(schemaAttribute[key], debuggerContribution.configurationAttributes.launch[key]);
+		});
+
+		assert.equal(schemaAttribute['additionalProperties'], false);
+		assert.equal(!!schemaAttribute['properties']['request'], true);
+		assert.equal(!!schemaAttribute['properties']['name'], true);
+		assert.equal(!!schemaAttribute['properties']['type'], true);
+		assert.equal(!!schemaAttribute['properties']['preLaunchTask'], true);
+	});
+
+	test('merge platform specific attributes', () => {
+		const ae = DebugAdapter.platformAdapterExecutable([extensionDescriptor1, extensionDescriptor2], 'mock');
+		assert.equal(ae.command, platform.isLinux ? 'linuxRuntime' : (platform.isMacintosh ? 'osxRuntime' : 'winRuntime'));
+		const xprogram = platform.isLinux ? 'linuxProgram' : (platform.isMacintosh ? 'osxProgram' : 'winProgram');
+		assert.deepEqual(ae.args, ['rarg', '/e2/b/c/' + xprogram, 'parg']);
+	});
+
+	test('initial config file content', () => {
+
+		const expected = ['{',
+			'	// Use IntelliSense to learn about possible attributes.',
+			'	// Hover to view descriptions of existing attributes.',
+			'	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387',
+			'	"version": "0.2.0",',
+			'	"configurations": [',
+			'		{',
+			'			"name": "Mock-Debug",',
+			'			"type": "mock",',
+			'			"request": "launch",',
+			'			"program": "readme.md"',
+			'		}',
+			'	]',
+			'}'].join('\n');
+
+		return _debugger.getInitialConfigurationContent().then(content => {
+			assert.equal(content, expected);
+		}, err => assert.fail(err));
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
index 003b60d75b2..21804198294 100644
--- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts
@@ -15,7 +15,7 @@ import { ITerminalService } from 'vs/workbench/parts/execution/common/execution'
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
+import { Extensions, IConfigurationRegistry, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ITerminalService as IIntegratedTerminalService, KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED } from 'vs/workbench/parts/terminal/common/terminal';
 import { getDefaultTerminalWindows, getDefaultTerminalLinuxReady, DEFAULT_TERMINAL_OSX, ITerminalConfiguration } from 'vs/workbench/parts/execution/electron-browser/terminal';
 import { WinTerminalService, MacTerminalService, LinuxTerminalService } from 'vs/workbench/parts/execution/electron-browser/terminalService';
@@ -52,26 +52,25 @@ getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
 					'external'
 				],
 				'description': nls.localize('explorer.openInTerminalKind', "Customizes what kind of terminal to launch."),
-				'default': 'integrated',
-				'isExecutable': false
+				'default': 'integrated'
 			},
 			'terminal.external.windowsExec': {
 				'type': 'string',
 				'description': nls.localize('terminal.external.windowsExec', "Customizes which terminal to run on Windows."),
 				'default': getDefaultTerminalWindows(),
-				'isExecutable': true
+				'scope': ConfigurationScope.APPLICATION
 			},
 			'terminal.external.osxExec': {
 				'type': 'string',
 				'description': nls.localize('terminal.external.osxExec', "Customizes which terminal application to run on OS X."),
 				'default': DEFAULT_TERMINAL_OSX,
-				'isExecutable': true
+				'scope': ConfigurationScope.APPLICATION
 			},
 			'terminal.external.linuxExec': {
 				'type': 'string',
 				'description': nls.localize('terminal.external.linuxExec', "Customizes which terminal to run on Linux."),
 				'default': defaultTerminalLinux,
-				'isExecutable': true
+				'scope': ConfigurationScope.APPLICATION
 			}
 		}
 	});
@@ -92,7 +91,7 @@ CommandsRegistry.registerCommand({
 			const directoriesToOpen = distinct(stats.map(({ stat }) => stat.isDirectory ? stat.resource.fsPath : paths.dirname(stat.resource.fsPath)));
 			return directoriesToOpen.map(dir => {
 				if (configurationService.getValue<ITerminalConfiguration>().terminal.explorerKind === 'integrated') {
-					const instance = integratedTerminalService.createInstance({ cwd: dir }, true);
+					const instance = integratedTerminalService.createTerminal({ cwd: dir }, true);
 					if (instance && (resources.length === 1 || !resource || dir === resource.fsPath || dir === paths.dirname(resource.fsPath))) {
 						integratedTerminalService.setActiveInstance(instance);
 						integratedTerminalService.showPanel(true);
@@ -117,6 +116,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const root = historyService.getLastActiveWorkspaceRoot(Schemas.file);
 		if (root) {
 			terminalService.openTerminal(root.fsPath);
+		} else {
+			// Opens current file's folder, if no folder is open in editor
+			const activeFile = historyService.getLastActiveFile();
+			if (activeFile) {
+				terminalService.openTerminal(paths.dirname(activeFile.fsPath));
+			}
 		}
 	}
 });
diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
index c4230a35fdf..c6dab0141ca 100644
--- a/src/vs/workbench/parts/execution/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/execution/electron-browser/terminal.ts
@@ -43,7 +43,7 @@ let _DEFAULT_TERMINAL_WINDOWS: string = null;
 export function getDefaultTerminalWindows(): string {
 	if (!_DEFAULT_TERMINAL_WINDOWS) {
 		const isWoW64 = !!process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
-		_DEFAULT_TERMINAL_WINDOWS = `${process.env.windir ? process.env.windir : 'C:'}\\${isWoW64 ? 'Sysnative' : 'System32'}\\cmd.exe`;
+		_DEFAULT_TERMINAL_WINDOWS = `${process.env.windir ? process.env.windir : 'C:\\Windows'}\\${isWoW64 ? 'Sysnative' : 'System32'}\\cmd.exe`;
 	}
 	return _DEFAULT_TERMINAL_WINDOWS;
 }
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index 0d5e207078e..df3e59bcee6 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -10,7 +10,7 @@ import { IAction, Action } from 'vs/base/common/actions';
 import { Throttler } from 'vs/base/common/async';
 import * as DOM from 'vs/base/browser/dom';
 import * as paths from 'vs/base/common/paths';
-import { Event, once } from 'vs/base/common/event';
+import { Event } from 'vs/base/common/event';
 import * as json from 'vs/base/common/json';
 import { ActionItem, IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -48,31 +48,25 @@ import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
 
-class DownloadExtensionAction extends Action {
-
-	constructor(
-		private extension: IExtension,
-		@IOpenerService private openerService: IOpenerService,
-		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
-	) {
-		super('extensions.download', localize('download', "Download Manually"), '', true);
-	}
-
-	run(): TPromise<void> {
-		return this.openerService.open(URI.parse(this.extension.downloadUrl)).then(() => {
-			const action = this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
-			const handle = this.notificationService.notify({
-				severity: Severity.Info,
-				message: localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', this.extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
-		});
-	}
-}
+const promptDownloadManually = (extension: IExtension, message: string, instantiationService: IInstantiationService, notificationService: INotificationService, openerService: IOpenerService) => {
+	notificationService.prompt(Severity.Error, message, [{
+		label: localize('download', "Download Manually"),
+		run: () => openerService.open(URI.parse(extension.downloadUrl)).then(() => {
+			notificationService.prompt(
+				Severity.Info,
+				localize('install vsix', 'Once downloaded, please manually install the downloaded VSIX of \'{0}\'.', extension.id),
+				[{
+					label: InstallVSIXAction.LABEL,
+					run: () => {
+						const action = instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL);
+						action.run();
+						action.dispose();
+					}
+				}]
+			);
+		})
+	}]);
+};
 
 export class InstallAction extends Action {
 
@@ -90,7 +84,8 @@ export class InstallAction extends Action {
 	constructor(
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super('extensions.install', InstallAction.InstallLabel, InstallAction.Class, false);
 
@@ -133,15 +128,7 @@ export class InstallAction extends Action {
 
 			console.error(err);
 
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -306,7 +293,8 @@ export class UpdateAction extends Action {
 	constructor(
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService
+		@INotificationService private notificationService: INotificationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super('extensions.update', UpdateAction.Label, UpdateAction.DisabledClass, false);
 
@@ -348,15 +336,8 @@ export class UpdateAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -833,7 +814,8 @@ export class UpdateAllAction extends Action {
 		label = UpdateAllAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(id, label, '', false);
 
@@ -860,15 +842,8 @@ export class UpdateAllAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToUpdate', "Failed to update \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1205,7 +1180,8 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionTipsService private extensionTipsService: IExtensionTipsService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(id, label, 'extension-action');
 		this.extensionsWorkbenchService.onChange(() => this.update(), this, this.disposables);
@@ -1269,15 +1245,8 @@ export class InstallWorkspaceRecommendedExtensionsAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1300,7 +1269,8 @@ export class InstallRecommendedExtensionAction extends Action {
 		@IViewletService private viewletService: IViewletService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IOpenerService private openerService: IOpenerService
 	) {
 		super(InstallRecommendedExtensionAction.ID, InstallRecommendedExtensionAction.LABEL, null);
 		this.extensionId = extensionId;
@@ -1338,15 +1308,8 @@ export class InstallRecommendedExtensionAction extends Action {
 			}
 
 			console.error(err);
-			const action = this.instantiationService.createInstance(DownloadExtensionAction, extension);
-			const handle = this.notificationService.notify({
-				severity: Severity.Error,
-				message: localize('failedToInstall', "Failed to install \'{0}\'.", extension.id),
-				actions: {
-					primary: [action]
-				}
-			});
-			once(handle.onDidDispose)(() => action.dispose());
+
+			promptDownloadManually(extension, localize('failedToInstall', "Failed to install \'{0}\'.", extension.id), this.instantiationService, this.notificationService, this.openerService);
 		});
 	}
 
@@ -1921,13 +1884,13 @@ export class InstallVSIXAction extends Action {
 		label = InstallVSIXAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowsService: IWindowService
+		@IWindowService private windowService: IWindowService
 	) {
 		super(id, label, 'extension-action install-vsix', true);
 	}
 
 	run(): TPromise<any> {
-		return this.windowsService.showOpenDialog({
+		return this.windowService.showOpenDialog({
 			title: localize('installFromVSIX', "Install from VSIX"),
 			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
 			properties: ['openFile'],
@@ -1938,19 +1901,19 @@ export class InstallVSIXAction extends Action {
 			}
 
 			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				return this.notificationService.prompt(Severity.Info, localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."), [localize('InstallVSIXAction.reloadNow', "Reload Now")]).then(choice => {
-					if (choice === 0) {
-						return this.windowsService.reloadWindow();
-					}
-
-					return TPromise.as(undefined);
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
+					[{
+						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			});
 		});
 	}
 }
 
-
 export class ReinstallAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.reinstall';
@@ -1994,19 +1957,14 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.notify({
-					message: localize('ReinstallAction.success', "Successfully reinstalled the extension."),
-					severity: Severity.Info,
-					actions: {
-						primary: [<IAction>{
-							id: 'reload',
-							label: localize('ReinstallAction.reloadNow', "Reload Now"),
-							enabled: true,
-							run: () => this.windowService.reloadWindow(),
-							dispose: () => null
-						}]
-					}
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('ReinstallAction.success', "Successfully reinstalled the extension."),
+					[{
+						label: localize('ReinstallAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			}, error => this.notificationService.error(error));
 	}
 }
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
index 08780638219..ea7188eab8e 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts
@@ -17,7 +17,6 @@ import Cache from 'vs/base/common/cache';
 import { Action } from 'vs/base/common/actions';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
-import { Builder } from 'vs/base/browser/builder';
 import { domEvent } from 'vs/base/browser/event';
 import { append, $, addClass, removeClass, finalHandler, join, toggleClass } from 'vs/base/browser/dom';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -33,7 +32,7 @@ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
+import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -178,7 +177,7 @@ export class ExtensionEditor extends BaseEditor {
 	private contentDisposables: IDisposable[] = [];
 	private transientDisposables: IDisposable[] = [];
 	private disposables: IDisposable[];
-	private activeWebview: Webview;
+	private activeWebview: WebviewElement;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -206,10 +205,8 @@ export class ExtensionEditor extends BaseEditor {
 		this.findInputFocusContextKey = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.bindTo(this.contextKeyService);
 	}
 
-	createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
-		const root = append(container, $('.extension-editor'));
+	createEditor(parent: HTMLElement): void {
+		const root = append(parent, $('.extension-editor'));
 		this.header = append(root, $('.header'));
 
 		this.icon = append(this.header, $<HTMLImageElement>('img.icon', { draggable: false }));
@@ -428,7 +425,7 @@ export class ExtensionEditor extends BaseEditor {
 			.then<void>(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
 				const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {};
-				this.activeWebview = new Webview(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
+				this.activeWebview = new WebviewElement(this.partService.getContainer(Parts.EDITOR_PART), this.themeService, this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions);
 				this.activeWebview.mountTo(this.content);
 				const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview);
 				this.contentDisposables.push(toDisposable(removeLayoutParticipant));
@@ -642,7 +639,7 @@ export class ExtensionEditor extends BaseEditor {
 		const details = $('details', { open: true, ontoggle: onDetailsToggle },
 			$('summary', null, localize('localizations', "Localizations ({0})", localizations.length)),
 			$('table', null,
-				$('tr', null, $('th', null, localize('localizations language id', "Language Id")), $('th', null, localize('localizations language name', "Langauge Name")), $('th', null, localize('localizations localized language name', "Langauge Name (Localized)"))),
+				$('tr', null, $('th', null, localize('localizations language id', "Language Id")), $('th', null, localize('localizations language name', "Language Name")), $('th', null, localize('localizations localized language name', "Language Name (Localized)"))),
 				...localizations.map(localization => $('tr', null, $('td', null, localization.languageId), $('td', null, localization.languageName), $('td', null, localization.languageNameLocalized)))
 			)
 		);
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 0b7b540ca90..93215f58bfd 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -36,7 +36,7 @@ import { asJson } from 'vs/base/node/request';
 import { isNumber } from 'vs/base/common/types';
 import { language, LANGUAGE_DEFAULT } from 'vs/base/common/platform';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
 
 interface IExtensionsContent {
 	recommendations: string[];
@@ -160,15 +160,13 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				if (!pager || !pager.firstPage || !pager.firstPage.length) {
 					return;
 				}
-				const message = localize('showLanguagePackExtensions', "The Marketplace has extensions that can help localizing VS Code to '{0}' locale", language);
-				const options: PromptOption[] = [
-					searchMarketplace,
-					{ label: choiceNever }
-				];
 
-				this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Search Marketplace */:
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('showLanguagePackExtensions', "The Marketplace has extensions that can help localizing VS Code to '{0}' locale", language),
+					[{
+						label: searchMarketplace,
+						run: () => {
 							/* __GDPR__
 								"languagePackSuggestion:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -182,8 +180,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									viewlet.search(`tag:lp-${language}`);
 									viewlet.focus();
 								});
-							break;
-						case 1 /* Never show again */:
+						}
+					},
+					{
+						label: choiceNever,
+						isSecondary: true,
+						run: () => {
 							languagePackSuggestionIgnoreList.push(language);
 							this.storageService.store(
 								'extensionsAssistant/languagePackSuggestionIgnore',
@@ -197,17 +199,18 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'neverShowAgain', language });
-							break;
-					}
-				}, () => {
-					/* __GDPR__
-						"languagePackSuggestion:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"language": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 						}
-					*/
-					this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'cancelled', language });
-				});
+					}],
+					() => {
+						/* __GDPR__
+							"languagePackSuggestion:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"language": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('languagePackSuggestion:popup', { userReaction: 'cancelled', language });
+					}
+				);
 			});
 		});
 	}
@@ -487,26 +490,25 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					message = localize('reallyRecommendedExtensionPack', "The '{0}' extension pack is recommended for this file type.", name);
 				}
 
-				const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-				const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
-				const options: PromptOption[] = [
-					localize('install', 'Install'),
-					recommendationsAction.label,
-					{ label: choiceNever }
-				];
-
-				this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Install */:
+				this.notificationService.prompt(Severity.Info, message,
+					[{
+						label: localize('install', 'Install'),
+						run: () => {
 							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-								}
+							"extensionRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
-							return installAction.run();
-						case 1 /* Show Recommendations */:
+
+							const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
+							installAction.run();
+							installAction.dispose();
+						}
+					}, {
+						label: localize('showRecommendations', "Show Recommendations"),
+						run: () => {
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -514,8 +516,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
-							return recommendationsAction.run();
-						case 2 /* Never show again */:
+
+							const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
+							recommendationsAction.run();
+							recommendationsAction.dispose();
+						}
+					}, {
+						label: choiceNever,
+						isSecondary: true,
+						run: () => {
 							importantRecommendationsIgnoreList.push(id);
 							this.storageService.store(
 								'extensionsAssistant/importantRecommendationsIgnore',
@@ -529,17 +538,19 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								}
 							*/
 							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-							return this.ignoreExtensionRecommendations();
-					}
-				}, () => {
-					/* __GDPR__
-						"extensionRecommendations:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-							"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							this.ignoreExtensionRecommendations();
 						}
-					*/
-					this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
-				});
+					}],
+					() => {
+						/* __GDPR__
+							"extensionRecommendations:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
+					}
+				);
 			});
 
 			const mimeTypesPromise = this.getMimeTypes(uri.fsPath);
@@ -568,15 +579,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 						return;
 					}
 
-					const message = localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension);
-					const options: PromptOption[] = [
-						searchMarketplace,
-						{ label: choiceNever }
-					];
-
-					this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-						switch (choice) {
-							case 0 /* Search Marketplace */:
+					this.notificationService.prompt(
+						Severity.Info,
+						localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension),
+						[{
+							label: searchMarketplace,
+							run: () => {
 								/* __GDPR__
 									"fileExtensionSuggestion:popup" : {
 										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -590,8 +598,11 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 										viewlet.search(`ext:${fileExtension}`);
 										viewlet.focus();
 									});
-								break;
-							case 1 /* Never show again */:
+							}
+						}, {
+							label: choiceNever,
+							isSecondary: true,
+							run: () => {
 								fileExtensionSuggestionIgnoreList.push(fileExtension);
 								this.storageService.store(
 									'extensionsAssistant/fileExtensionsSuggestionIgnore',
@@ -605,17 +616,18 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 									}
 								*/
 								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'neverShowAgain', fileExtension: fileExtension });
-								break;
-						}
-					}, () => {
-						/* __GDPR__
-							"fileExtensionSuggestion:popup" : {
-								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-								"fileExtension": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 							}
-						*/
-						this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'cancelled', fileExtension: fileExtension });
-					});
+						}],
+						() => {
+							/* __GDPR__
+								"fileExtensionSuggestion:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"fileExtension": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'cancelled', fileExtension: fileExtension });
+						}
+					);
 				});
 			});
 		});
@@ -635,73 +647,88 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					.filter(id => local.every(local => `${local.manifest.publisher.toLowerCase()}.${local.manifest.name.toLowerCase()}` !== id));
 
 				if (!recommendations.length) {
-					return;
+					return TPromise.as(void 0);
 				}
 
-				const message = localize('workspaceRecommended', "This workspace has extension recommendations.");
-				const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-				const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
+				return new TPromise<void>(c => {
+					this.notificationService.prompt(
+						Severity.Info,
+						localize('workspaceRecommended', "This workspace has extension recommendations."),
+						[{
+							label: localize('installAll', "Install All"),
+							run: () => {
+								/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
 
-				const options: PromptOption[] = [
-					installAllAction.label,
-					showAction.label,
-					{ label: choiceNever }
-				];
+								const installAllAction = this.instantiationService.createInstance(InstallWorkspaceRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction.ID, localize('installAll', "Install All"));
+								installAllAction.run();
+								installAllAction.dispose();
 
-				return this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-					switch (choice) {
-						case 0 /* Install */:
+								c(void 0);
+							}
+						}, {
+							label: localize('showRecommendations', "Show Recommendations"),
+							run: () => {
+								/* __GDPR__
+									"extensionRecommendations:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
+
+								const showAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
+								showAction.run();
+								showAction.dispose();
+
+								c(void 0);
+							}
+						}, {
+							label: choiceNever,
+							isSecondary: true,
+							run: () => {
+								/* __GDPR__
+									"extensionRecommendations:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
+								this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
+
+								c(void 0);
+							}
+						}],
+						() => {
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 								}
 							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'install' });
-							return installAllAction.run();
-						case 1 /* Show Recommendations */:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'show' });
-							return showAction.run();
-						case 2 /* Never show again */:
-							/* __GDPR__
-								"extensionRecommendations:popup" : {
-									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-								}
-							*/
-							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'neverShowAgain' });
-							return this.storageService.store(storageKey, true, StorageScope.WORKSPACE);
-					}
-				}, () => {
-					/* __GDPR__
-						"extensionRecommendations:popup" : {
-							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+
+							c(void 0);
 						}
-					*/
-					this.telemetryService.publicLog('extensionWorkspaceRecommendations:popup', { userReaction: 'cancelled' });
+					);
 				});
 			});
 		});
 	}
 
 	private ignoreExtensionRecommendations() {
-		const message = localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?");
-		const options = [
-			localize('ignoreAll', "Yes, Ignore All"),
-			localize('no', "No")
-		];
-
-		this.notificationService.prompt(Severity.Info, message, options).done(choice => {
-			switch (choice) {
-				case 0:	// If the user ignores the current message and selects different file type
-					return this.setIgnoreRecommendationsConfig(true);
-				case 1:
-					return this.setIgnoreRecommendationsConfig(false);
-			}
-		});
+		this.notificationService.prompt(
+			Severity.Info,
+			localize('ignoreExtensionRecommendations', "Do you want to ignore all extension recommendations?"),
+			[{
+				label: localize('ignoreAll', "Yes, Ignore All"),
+				run: () => this.setIgnoreRecommendationsConfig(true)
+			}, {
+				label: localize('no', "No"),
+				run: () => this.setIgnoreRecommendationsConfig(false)
+			}]
+		);
 	}
 
 	private _suggestBasedOnExecutables(): TPromise<any> {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
index 6cdd37b47c3..20d875bae68 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -27,14 +27,14 @@ import {
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 import { ExtensionEditor } from 'vs/workbench/parts/extensions/electron-browser/extensionEditor';
-import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet';
+import { StatusUpdater, ExtensionsViewlet, MaliciousExtensionChecker, ExtensionsViewletViewsContribution } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet';
 import { IQuickOpenRegistry, Extensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import * as jsonContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { KeymapExtensions, BetterMergeDisabled } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
+import { KeymapExtensions } from 'vs/workbench/parts/extensions/electron-browser/extensionsUtils';
 import { adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { GalleryExtensionsHandler, ExtensionsHandler } from 'vs/workbench/parts/extensions/browser/extensionsQuickOpen';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
@@ -54,7 +54,7 @@ workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Ru
 workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(ConfigureRecommendedExtensionsCommandsContributor, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Running);
-workbenchRegistry.registerWorkbenchContribution(BetterMergeDisabled, LifecyclePhase.Running);
+workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Starting);
 
 Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)
 	.registerChannel(ExtensionsChannelId, ExtensionsLabel);
@@ -121,7 +121,7 @@ const viewletDescriptor = new ViewletDescriptor(
 	VIEWLET_ID,
 	localize('extensions', "Extensions"),
 	'extensions',
-	100
+	4
 );
 
 Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets)
@@ -205,7 +205,8 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 			'extensions.autoUpdate': {
 				type: 'boolean',
 				description: localize('extensionsAutoUpdate', "Automatically update extensions"),
-				default: true
+				default: true,
+				scope: ConfigurationScope.APPLICATION
 			},
 			'extensions.ignoreRecommendations': {
 				type: 'boolean',
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
index aa3773bbe87..06d3286942b 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Action, IAction } from 'vs/base/common/actions';
+import { Action } from 'vs/base/common/actions';
 import * as paths from 'vs/base/common/paths';
 import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -59,13 +59,13 @@ export class InstallVSIXAction extends Action {
 		label = InstallVSIXAction.LABEL,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@INotificationService private notificationService: INotificationService,
-		@IWindowService private windowsService: IWindowService
+		@IWindowService private windowService: IWindowService
 	) {
 		super(id, label, 'extension-action install-vsix', true);
 	}
 
 	run(): TPromise<any> {
-		return this.windowsService.showOpenDialog({
+		return this.windowService.showOpenDialog({
 			title: localize('installFromVSIX', "Install from VSIX"),
 			filters: [{ name: 'VSIX Extensions', extensions: ['vsix'] }],
 			properties: ['openFile'],
@@ -76,13 +76,14 @@ export class InstallVSIXAction extends Action {
 			}
 
 			return TPromise.join(result.map(vsix => this.extensionsWorkbenchService.install(vsix))).then(() => {
-				return this.notificationService.prompt(Severity.Info, localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."), [localize('InstallVSIXAction.reloadNow', "Reload Now")]).then(choice => {
-					if (choice === 0) {
-						return this.windowsService.reloadWindow();
-					}
-
-					return TPromise.as(undefined);
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('InstallVSIXAction.success', "Successfully installed the extension. Reload to enable it."),
+					[{
+						label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			});
 		});
 	}
@@ -131,19 +132,14 @@ export class ReinstallAction extends Action {
 	private reinstallExtension(extension: IExtension): TPromise<void> {
 		return this.extensionsWorkbenchService.reinstall(extension)
 			.then(() => {
-				this.notificationService.notify({
-					message: localize('ReinstallAction.success', "Successfully reinstalled the extension."),
-					severity: Severity.Info,
-					actions: {
-						primary: [<IAction>{
-							id: 'reload',
-							label: localize('ReinstallAction.reloadNow', "Reload Now"),
-							enabled: true,
-							run: () => this.windowService.reloadWindow(),
-							dispose: () => null
-						}]
-					}
-				});
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('ReinstallAction.success', "Successfully reinstalled the extension."),
+					[{
+						label: localize('ReinstallAction.reloadNow', "Reload Now"),
+						run: () => this.windowService.reloadWindow()
+					}]
+				);
 			}, error => this.notificationService.error(error));
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index 42f909ce560..104644f1c7f 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -8,17 +8,15 @@
 import * as arrays from 'vs/base/common/arrays';
 import { localize } from 'vs/nls';
 import { Event, chain, anyEvent, debounceEvent } from 'vs/base/common/event';
-import { onUnexpectedError, canceled } from 'vs/base/common/errors';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, IExtensionTipsService, LocalExtensionType, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, IExtensionTipsService, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { BetterMergeDisabledNowKey, BetterMergeId, areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
@@ -63,36 +61,37 @@ export class KeymapExtensions implements IWorkbenchContribution {
 		});
 	}
 
-	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
-		const message = localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', '));
-		const options = [
-			localize('yes', "Yes"),
-			localize('no', "No")
-		];
-		return this.notificationService.prompt(Severity.Info, message, options)
-			.then(value => {
-				const confirmed = value === 0;
-				const telemetryData: { [key: string]: any; } = {
-					newKeymap: newKeymap.identifier,
-					oldKeymaps: oldKeymaps.map(k => k.identifier),
-					confirmed
-				};
-				/* __GDPR__
-					"disableOtherKeymaps" : {
-						"newKeymap": { "${inline}": [ "${ExtensionIdentifier}" ] },
-						"oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
-					}
-				*/
-				this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
-				if (confirmed) {
-					return TPromise.join(oldKeymaps.map(keymap => {
-						return this.extensionEnablementService.setEnablement(keymap.local, EnablementState.Disabled);
-					}));
+	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): void {
+		const onPrompt = (confirmed: boolean) => {
+			const telemetryData: { [key: string]: any; } = {
+				newKeymap: newKeymap.identifier,
+				oldKeymaps: oldKeymaps.map(k => k.identifier),
+				confirmed
+			};
+			/* __GDPR__
+				"disableOtherKeymaps" : {
+					"newKeymap": { "${inline}": [ "${ExtensionIdentifier}" ] },
+					"oldKeymaps": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"confirmed" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
 				}
-				return undefined;
-			}, error => TPromise.wrapError(canceled()))
-			.then(() => { /* drop resolved value */ });
+			*/
+			this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
+			if (confirmed) {
+				TPromise.join(oldKeymaps.map(keymap => {
+					return this.extensionEnablementService.setEnablement(keymap.local, EnablementState.Disabled);
+				}));
+			}
+		};
+
+		this.notificationService.prompt(Severity.Info, localize('disableOtherKeymapsConfirmation', "Disable other keymaps ({0}) to avoid conflicts between keybindings?", oldKeymaps.map(k => `'${k.local.manifest.displayName}'`).join(', ')),
+			[{
+				label: localize('yes', "Yes"),
+				run: () => onPrompt(true)
+			}, {
+				label: localize('no', "No"),
+				run: () => onPrompt(false)
+			}]
+		);
 	}
 
 	dispose(): void {
@@ -143,29 +142,3 @@ export function isKeymapExtension(tipsService: IExtensionTipsService, extension:
 function stripVersion(id: string): string {
 	return getIdAndVersionFromLocalExtensionId(id).id;
 }
-
-export class BetterMergeDisabled implements IWorkbenchContribution {
-
-	constructor(
-		@IStorageService storageService: IStorageService,
-		@INotificationService notificationService: INotificationService,
-		@IExtensionService extensionService: IExtensionService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
-		@ITelemetryService telemetryService: ITelemetryService,
-	) {
-		extensionService.whenInstalledExtensionsRegistered().then(() => {
-			if (storageService.getBoolean(BetterMergeDisabledNowKey, StorageScope.GLOBAL, false)) {
-				storageService.remove(BetterMergeDisabledNowKey, StorageScope.GLOBAL);
-
-				notificationService.prompt(Severity.Info, localize('betterMergeDisabled', "The Better Merge extension is now built-in, the installed extension was disabled and can be uninstalled."), [localize('uninstall', "Uninstall")]).then(choice => {
-					if (choice === 0) {
-						extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => {
-							return Promise.all(extensions.filter(e => stripVersion(e.identifier.id) === BetterMergeId)
-								.map(e => extensionManagementService.uninstall(e, true)));
-						});
-					}
-				});
-			}
-		});
-	}
-}
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 3529fe7d3b3..2b02d88b44c 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -12,7 +12,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { isPromiseCanceledError, onUnexpectedError, create as createError } from 'vs/base/common/errors';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, Dimension } from 'vs/base/browser/builder';
 import { Event as EventOf, mapEvent, chain } from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
 import { domEvent } from 'vs/base/browser/event';
@@ -21,7 +20,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
-import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass } from 'vs/base/browser/dom';
+import { append, $, addStandardDisposableListener, EventType, addClass, removeClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -67,65 +66,11 @@ const SearchBuiltInExtensionsContext = new RawContextKey<boolean>('searchBuiltIn
 const RecommendedExtensionsContext = new RawContextKey<boolean>('recommendedExtensions', false);
 const DefaultRecommendedExtensionsContext = new RawContextKey<boolean>('defaultRecommendedExtensions', false);
 
-export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtensionsViewlet {
-
-	private onSearchChange: EventOf<string>;
-	private nonEmptyWorkspaceContextKey: IContextKey<boolean>;
-	private searchExtensionsContextKey: IContextKey<boolean>;
-	private searchInstalledExtensionsContextKey: IContextKey<boolean>;
-	private searchBuiltInExtensionsContextKey: IContextKey<boolean>;
-	private recommendedExtensionsContextKey: IContextKey<boolean>;
-	private defaultRecommendedExtensionsContextKey: IContextKey<boolean>;
-
-	private searchDelayer: ThrottledDelayer<any>;
-	private root: HTMLElement;
-
-	private searchBox: HTMLInputElement;
-	private extensionsBox: HTMLElement;
-	private primaryActions: IAction[];
-	private secondaryActions: IAction[];
-	private disposables: IDisposable[] = [];
+export class ExtensionsViewletViewsContribution implements IWorkbenchContribution {
 
 	constructor(
-		@IPartService partService: IPartService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IProgressService private progressService: IProgressService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IEditorGroupService private editorInputService: IEditorGroupService,
-		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
-		@INotificationService private notificationService: INotificationService,
-		@IViewletService private viewletService: IViewletService,
-		@IThemeService themeService: IThemeService,
-		@IConfigurationService private configurationService: IConfigurationService,
-		@IStorageService storageService: IStorageService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IExtensionService extensionService: IExtensionService
 	) {
-		super(VIEWLET_ID, ViewLocation.Extensions, `${VIEWLET_ID}.state`, true, partService, telemetryService, storageService, instantiationService, themeService, contextService, contextKeyService, contextMenuService, extensionService);
-
 		this.registerViews();
-		this.searchDelayer = new ThrottledDelayer(500);
-		this.nonEmptyWorkspaceContextKey = NonEmptyWorkspaceContext.bindTo(contextKeyService);
-		this.searchExtensionsContextKey = SearchExtensionsContext.bindTo(contextKeyService);
-		this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
-		this.searchBuiltInExtensionsContextKey = SearchBuiltInExtensionsContext.bindTo(contextKeyService);
-		this.recommendedExtensionsContextKey = RecommendedExtensionsContext.bindTo(contextKeyService);
-		this.defaultRecommendedExtensionsContextKey = DefaultRecommendedExtensionsContext.bindTo(contextKeyService);
-		this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
-		this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
-
-		this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
-				this.secondaryActions = null;
-				this.updateTitleArea();
-			}
-			if (e.affectedKeys.indexOf(ShowRecommendationsOnlyOnDemandKey) > -1) {
-				this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
-			}
-		}, this, this.disposables);
 	}
 
 	private registerViews(): void {
@@ -240,7 +185,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 	private createSearchBuiltInBasicsExtensionsListViewDescriptor(): IViewDescriptor {
 		return {
 			id: 'extensions.builtInBasicsExtensionsList',
-			name: localize('builtInBasicsExtensions', "Languages"),
+			name: localize('builtInBasicsExtensions', "Programming Languages"),
 			location: ViewLocation.Extensions,
 			ctor: BuiltInBasicsExtensionsView,
 			when: ContextKeyExpr.has('searchBuiltInExtensions'),
@@ -248,10 +193,71 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 			canToggleVisibility: true
 		};
 	}
+}
 
-	async create(parent: Builder): TPromise<void> {
-		parent.addClass('extensions-viewlet');
-		this.root = parent.getHTMLElement();
+export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtensionsViewlet {
+
+	private onSearchChange: EventOf<string>;
+	private nonEmptyWorkspaceContextKey: IContextKey<boolean>;
+	private searchExtensionsContextKey: IContextKey<boolean>;
+	private searchInstalledExtensionsContextKey: IContextKey<boolean>;
+	private searchBuiltInExtensionsContextKey: IContextKey<boolean>;
+	private recommendedExtensionsContextKey: IContextKey<boolean>;
+	private defaultRecommendedExtensionsContextKey: IContextKey<boolean>;
+
+	private searchDelayer: ThrottledDelayer<any>;
+	private root: HTMLElement;
+
+	private searchBox: HTMLInputElement;
+	private extensionsBox: HTMLElement;
+	private primaryActions: IAction[];
+	private secondaryActions: IAction[];
+	private disposables: IDisposable[] = [];
+
+	constructor(
+		@IPartService partService: IPartService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IProgressService private progressService: IProgressService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+		@IEditorGroupService private editorInputService: IEditorGroupService,
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService,
+		@INotificationService private notificationService: INotificationService,
+		@IViewletService private viewletService: IViewletService,
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IStorageService storageService: IStorageService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IExtensionService extensionService: IExtensionService
+	) {
+		super(VIEWLET_ID, ViewLocation.Extensions, `${VIEWLET_ID}.state`, true, partService, telemetryService, storageService, instantiationService, themeService, contextService, contextKeyService, contextMenuService, extensionService);
+
+		this.searchDelayer = new ThrottledDelayer(500);
+		this.nonEmptyWorkspaceContextKey = NonEmptyWorkspaceContext.bindTo(contextKeyService);
+		this.searchExtensionsContextKey = SearchExtensionsContext.bindTo(contextKeyService);
+		this.searchInstalledExtensionsContextKey = SearchInstalledExtensionsContext.bindTo(contextKeyService);
+		this.searchBuiltInExtensionsContextKey = SearchBuiltInExtensionsContext.bindTo(contextKeyService);
+		this.recommendedExtensionsContextKey = RecommendedExtensionsContext.bindTo(contextKeyService);
+		this.defaultRecommendedExtensionsContextKey = DefaultRecommendedExtensionsContext.bindTo(contextKeyService);
+		this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
+		this.disposables.push(this.viewletService.onDidViewletOpen(this.onViewletOpen, this, this.disposables));
+
+		this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(AutoUpdateConfigurationKey)) {
+				this.secondaryActions = null;
+				this.updateTitleArea();
+			}
+			if (e.affectedKeys.indexOf(ShowRecommendationsOnlyOnDemandKey) > -1) {
+				this.defaultRecommendedExtensionsContextKey.set(!this.configurationService.getValue<boolean>(ShowRecommendationsOnlyOnDemandKey));
+			}
+		}, this, this.disposables);
+	}
+
+	async create(parent: HTMLElement): TPromise<void> {
+		addClass(parent, 'extensions-viewlet');
+		this.root = parent;
 
 		const header = append(this.root, $('.header'));
 
@@ -278,7 +284,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 
 		this.onSearchChange = mapEvent(onSearchInput, e => e.target.value);
 
-		await super.create(new Builder(this.extensionsBox));
+		await super.create(this.extensionsBox);
 
 		const installed = await this.extensionManagementService.getInstalled(LocalExtensionType.User);
 
@@ -377,7 +383,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens
 	private async doSearch(): TPromise<any> {
 		const value = this.searchBox.value || '';
 		this.searchExtensionsContextKey.set(!!value);
-		this.searchInstalledExtensionsContextKey.set(InstalledExtensionsView.isInsalledExtensionsQuery(value));
+		this.searchInstalledExtensionsContextKey.set(InstalledExtensionsView.isInstalledExtensionsQuery(value));
 		this.searchBuiltInExtensionsContextKey.set(ExtensionsListView.isBuiltInExtensionsQuery(value));
 		this.recommendedExtensionsContextKey.set(ExtensionsListView.isRecommendedExtensionsQuery(value));
 		this.nonEmptyWorkspaceContextKey.set(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY);
@@ -535,13 +541,14 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 				if (maliciousExtensions.length) {
 					return TPromise.join(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e, true).then(() => {
-						return this.notificationService.prompt(Severity.Warning, localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)), [localize('reloadNow', "Reload Now")]).then(choice => {
-							if (choice === 0) {
-								return this.windowService.reloadWindow();
-							}
-
-							return TPromise.as(undefined);
-						});
+						this.notificationService.prompt(
+							Severity.Warning,
+							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", getGalleryExtensionIdFromLocal(e)),
+							[{
+								label: localize('reloadNow', "Reload Now"),
+								run: () => this.windowService.reloadWindow()
+							}]
+						);
 					})));
 				} else {
 					return TPromise.as(null);
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 07dd776deb6..1065c40b80d 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -204,7 +204,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			let result = await this.extensionsWorkbenchService.queryLocal();
 
 			result = result
-				.filter(e => e.type === LocalExtensionType.User && e.name.toLowerCase().indexOf(value) > -1);
+				.filter(e => e.type === LocalExtensionType.User && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1));
 
 			return new PagedModel(this.sortExtensions(result, options));
 		}
@@ -224,7 +224,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 			const local = await this.extensionsWorkbenchService.queryLocal();
 			const result = local
 				.sort((e1, e2) => e1.displayName.localeCompare(e2.displayName))
-				.filter(extension => extension.outdated && extension.name.toLowerCase().indexOf(value) > -1);
+				.filter(extension => extension.outdated && (extension.name.toLowerCase().indexOf(value) > -1 || extension.displayName.toLowerCase().indexOf(value) > -1));
 
 			return new PagedModel(this.sortExtensions(result, options));
 		}
@@ -237,7 +237,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 
 			const result = local
 				.sort((e1, e2) => e1.displayName.localeCompare(e2.displayName))
-				.filter(e => runningExtensions.every(r => !areSameExtensions(r, e)) && e.name.toLowerCase().indexOf(value) > -1);
+				.filter(e => runningExtensions.every(r => !areSameExtensions(r, e)) && (e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1));
 
 			return new PagedModel(this.sortExtensions(result, options));
 		}
@@ -251,7 +251,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 				.sort((e1, e2) => e1.displayName.localeCompare(e2.displayName))
 				.filter(e => e.type === LocalExtensionType.User &&
 					(e.enablementState === EnablementState.Enabled || e.enablementState === EnablementState.WorkspaceEnabled) &&
-					e.name.toLowerCase().indexOf(value) > -1
+					(e.name.toLowerCase().indexOf(value) > -1 || e.displayName.toLowerCase().indexOf(value) > -1)
 				);
 
 			return new PagedModel(this.sortExtensions(result, options));
@@ -559,7 +559,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 
 export class InstalledExtensionsView extends ExtensionsListView {
 
-	public static isInsalledExtensionsQuery(query: string): boolean {
+	public static isInstalledExtensionsQuery(query: string): boolean {
 		return ExtensionsListView.isInstalledExtensionsQuery(query)
 			|| ExtensionsListView.isOutdatedExtensionsQuery(query)
 			|| ExtensionsListView.isDisabledExtensionsQuery(query)
@@ -567,7 +567,7 @@ export class InstalledExtensionsView extends ExtensionsListView {
 	}
 
 	async show(query: string): TPromise<IPagedModel<IExtension>> {
-		if (InstalledExtensionsView.isInsalledExtensionsQuery(query)) {
+		if (InstalledExtensionsView.isInstalledExtensionsQuery(query)) {
 			return super.show(query);
 		}
 		let searchInstalledQuery = '@installed';
diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
index b0a1a2e64fa..969dbc34445 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/extensionEditor.css
@@ -34,6 +34,7 @@
 	flex: 1;
 	padding-left: 20px;
 	overflow: hidden;
+	user-select: text;
 }
 
 .extension-editor > .header > .details > .title {
@@ -77,6 +78,7 @@
 	margin-left: 10px;
 	padding: 0px 4px;
 	border-radius: 4px;
+	user-select: none;
 }
 
 .extension-editor > .header > .details > .subtitle {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 331d6a62735..e51d6079969 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -14,7 +14,6 @@ import { EditorInput } from 'vs/workbench/common/editor';
 import pkg from 'vs/platform/node/package';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder, Dimension } from 'vs/base/browser/builder';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -24,7 +23,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/workbench/services/extensions/common/extensions';
 import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
-import { append, $, addClass, toggleClass } from 'vs/base/browser/dom';
+import { append, $, addClass, toggleClass, Dimension } from 'vs/base/browser/dom';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
@@ -212,10 +211,8 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 		return result;
 	}
 
-	protected createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
-		addClass(container, 'runtime-extensions-editor');
+	protected createEditor(parent: HTMLElement): void {
+		addClass(parent, 'runtime-extensions-editor');
 
 		const TEMPLATE_ID = 'runtimeExtensionElementTemplate';
 
@@ -299,7 +296,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 				let syncTime = activationTimes.codeLoadingTime + activationTimes.activateCallTime;
 				data.activationTime.textContent = activationTimes.startup ? `Startup Activation: ${syncTime}ms` : `Activation: ${syncTime}ms`;
 				data.actionbar.context = element;
-				toggleClass(data.actionbar.getContainer().getHTMLElement(), 'hidden', element.marketplaceInfo && element.marketplaceInfo.type === LocalExtensionType.User && (!element.description.repository || !element.description.repository.url));
+				toggleClass(data.actionbar.getContainer(), 'hidden', element.marketplaceInfo && element.marketplaceInfo.type === LocalExtensionType.User && (!element.description.repository || !element.description.repository.url));
 
 				let title: string;
 				if (activationTimes.activationEvent === '*') {
@@ -307,15 +304,30 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 				} else if (/^workspaceContains:/.test(activationTimes.activationEvent)) {
 					let fileNameOrGlob = activationTimes.activationEvent.substr('workspaceContains:'.length);
 					if (fileNameOrGlob.indexOf('*') >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
-						title = nls.localize('workspaceContainsGlobActivation', "Activated because a file matching {0} exists in your workspace", fileNameOrGlob);
+						title = nls.localize({
+							key: 'workspaceContainsGlobActivation',
+							comment: [
+								'{0} will be a glob pattern'
+							]
+						}, "Activated because a file matching {0} exists in your workspace", fileNameOrGlob);
 					} else {
-						title = nls.localize('workspaceContainsFileActivation', "Activated because file {0} exists in your workspace", fileNameOrGlob);
+						title = nls.localize({
+							key: 'workspaceContainsFileActivation',
+							comment: [
+								'{0} will be a file name'
+							]
+						}, "Activated because file {0} exists in your workspace", fileNameOrGlob);
 					}
 				} else if (/^onLanguage:/.test(activationTimes.activationEvent)) {
 					let language = activationTimes.activationEvent.substr('onLanguage:'.length);
 					title = nls.localize('languageActivation', "Activated because you opened a {0} file", language);
 				} else {
-					title = nls.localize('workspaceGenericActivation', "Activated on {0}", activationTimes.activationEvent);
+					title = nls.localize({
+						key: 'workspaceGenericActivation',
+						comment: [
+							'The {0} placeholder will be an activation event, like e.g. \'language:typescript\', \'debug\', etc.'
+						]
+					}, "Activated on {0}", activationTimes.activationEvent);
 				}
 				data.activationTime.title = title;
 				if (!isFalsyOrEmpty(element.status.runtimeErrors)) {
@@ -362,7 +374,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 			}
 		};
 
-		this._list = this._instantiationService.createInstance(WorkbenchList, container, delegate, [renderer], {
+		this._list = this._instantiationService.createInstance(WorkbenchList, parent, delegate, [renderer], {
 			multipleSelectionSupport: false
 		}) as WorkbenchList<IRuntimeExtension>;
 
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index 77f8b5b09b5..89fc28f9bf0 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -323,36 +323,14 @@ class ExtensionDependencies implements IExtensionDependencies {
 	}
 }
 
-enum Operation {
-	Installing,
-	Updating,
-	Uninstalling
-}
-
-interface IActiveExtension {
-	operation: Operation;
-	extension: Extension;
-	start: Date;
-}
-
-function toTelemetryEventName(operation: Operation) {
-	switch (operation) {
-		case Operation.Installing: return 'extensionGallery:install';
-		case Operation.Updating: return 'extensionGallery:update';
-		case Operation.Uninstalling: return 'extensionGallery:uninstall';
-	}
-
-	return '';
-}
-
 export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService, IURLHandler {
 
 	private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours
 
 	_serviceBrand: any;
 	private stateProvider: IExtensionStateProvider<ExtensionState>;
-	private installing: IActiveExtension[] = [];
-	private uninstalling: IActiveExtension[] = [];
+	private installing: Extension[] = [];
+	private uninstalling: Extension[] = [];
 	private installed: Extension[] = [];
 	private syncDelayer: ThrottledDelayer<void>;
 	private autoUpdateDelayer: ThrottledDelayer<void>;
@@ -405,8 +383,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 
 	get local(): IExtension[] {
 		const installing = this.installing
-			.filter(e => !this.installed.some(installed => installed.id === e.extension.id))
-			.map(e => e.extension);
+			.filter(e => !this.installed.some(installed => installed.id === e.id))
+			.map(e => e);
 
 		return [...this.installed, ...installing];
 	}
@@ -810,35 +788,22 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 
 		extension.gallery = gallery;
 
-		const start = new Date();
-		const operation = Operation.Installing;
-		this.installing.push({ operation, extension, start });
+		this.installing.push(extension);
 
 		this._onChange.fire();
 	}
 
 	private onDidInstallExtension(event: DidInstallExtensionEvent): void {
 		const { local, zipPath, error, gallery } = event;
-		const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e.extension, gallery.identifier))[0] : null;
-		const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null;
+		const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e, gallery.identifier))[0] : null;
+		const extension: Extension = installingExtension ? installingExtension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null;
 		if (extension) {
 			this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing;
 
-			if (error) {
-				if (extension.gallery) {
-					// Updating extension can be only a gallery extension
-					const installed = this.installed.filter(e => e.id === extension.id)[0];
-					if (installed && installingExtension) {
-						installingExtension.operation = Operation.Updating;
-					}
-				}
-			} else {
+			if (!error) {
 				extension.local = local;
 				const installed = this.installed.filter(e => e.id === extension.id)[0];
 				if (installed) {
-					if (installingExtension) {
-						installingExtension.operation = Operation.Updating;
-					}
 					installed.local = local;
 				} else {
 					this.installed.push(extension);
@@ -846,7 +811,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			}
 			if (extension.gallery) {
 				// Report telemetry only for gallery extensions
-				this.reportTelemetry(installingExtension, error);
+				this.reportExtensionRecommendationsTelemetry(installingExtension);
 			}
 		}
 		this._onChange.fire();
@@ -861,10 +826,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			return;
 		}
 
-		const start = new Date();
-		const operation = Operation.Uninstalling;
-		const uninstalling = this.uninstalling.filter(e => e.extension.local.identifier.id === id)[0] || { id, operation, extension, start };
-		this.uninstalling = [uninstalling, ...this.uninstalling.filter(e => e.extension.local.identifier.id !== id)];
+		const uninstalling = this.uninstalling.filter(e => e.local.identifier.id === id)[0] || extension;
+		this.uninstalling = [uninstalling, ...this.uninstalling.filter(e => e.local.identifier.id !== id)];
 
 		this._onChange.fire();
 	}
@@ -875,16 +838,12 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 			this.installed = this.installed.filter(e => e.local.identifier.id !== id);
 		}
 
-		const uninstalling = this.uninstalling.filter(e => e.extension.local.identifier.id === id)[0];
-		this.uninstalling = this.uninstalling.filter(e => e.extension.local.identifier.id !== id);
+		const uninstalling = this.uninstalling.filter(e => e.local.identifier.id === id)[0];
+		this.uninstalling = this.uninstalling.filter(e => e.local.identifier.id !== id);
 		if (!uninstalling) {
 			return;
 		}
 
-		if (!error) {
-			this.reportTelemetry(uninstalling);
-		}
-
 		this._onChange.fire();
 	}
 
@@ -900,11 +859,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 	}
 
 	private getExtensionState(extension: Extension): ExtensionState {
-		if (extension.gallery && this.installing.some(e => e.extension.gallery && areSameExtensions(e.extension.gallery.identifier, extension.gallery.identifier))) {
+		if (extension.gallery && this.installing.some(e => e.gallery && areSameExtensions(e.gallery.identifier, extension.gallery.identifier))) {
 			return ExtensionState.Installing;
 		}
 
-		if (this.uninstalling.some(e => e.extension.id === extension.id)) {
+		if (this.uninstalling.some(e => e.id === extension.id)) {
 			return ExtensionState.Uninstalling;
 		}
 
@@ -912,46 +871,22 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 		return local ? ExtensionState.Installed : ExtensionState.Uninstalled;
 	}
 
-	private reportTelemetry(active: IActiveExtension, errorcode?: string): void {
-		const data = active.extension.telemetryData;
-		const duration = new Date().getTime() - active.start.getTime();
-		const eventName = toTelemetryEventName(active.operation);
+	private reportExtensionRecommendationsTelemetry(extension: Extension): void {
 		const extRecommendations = this.extensionTipsService.getAllRecommendationsWithReason() || {};
-		const recommendationsData = extRecommendations[active.extension.id.toLowerCase()] ? { recommendationReason: extRecommendations[active.extension.id.toLowerCase()].reasonId } : {};
-		/* __GDPR__
-			"extensionGallery:install" : {
-				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"${include}": [
-					"${GalleryExtensionTelemetryData}"
-				]
-			}
-		*/
-		/* __GDPR__
-			"extensionGallery:update" : {
-				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"${include}": [
-					"${GalleryExtensionTelemetryData}"
-				]
-			}
-		*/
-		/* __GDPR__
-			"extensionGallery:uninstall" : {
-				"success": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"duration" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
-				"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
-				"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-				"${include}": [
-					"${GalleryExtensionTelemetryData}"
-				]
-			}
-		*/
-		this.telemetryService.publicLog(eventName, assign(data, { success: !errorcode, duration, errorcode }, recommendationsData));
+		const recommendationReason = extRecommendations[extension.id.toLowerCase()];
+		if (recommendationReason) {
+			const recommendationsData = { recommendationReason: recommendationReason.reasonId };
+			const data = extension.telemetryData;
+			/* __GDPR__
+				"extensionGallery:install:recommendations" : {
+					"recommendationReason": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
+					"${include}": [
+						"${GalleryExtensionTelemetryData}"
+					]
+				}
+			*/
+			this.telemetryService.publicLog('extensionGallery:install:recommendations', assign(data, recommendationsData));
+		}
 	}
 
 	private onError(err: any): void {
@@ -1003,17 +938,14 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
 
 				return this.windowService.show().then(() => {
 					return this.open(extension).then(() => {
-						const message = nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher);
-						const options = [
-							nls.localize('install', "Install")
-						];
-						return this.notificationService.prompt(Severity.Info, message, options).then(value => {
-							if (value === 0) {
-								return this.install(extension);
-							}
-
-							return TPromise.as(null);
-						});
+						this.notificationService.prompt(
+							Severity.Info,
+							nls.localize('installConfirmation', "Would you like to install the '{0}' extension?", extension.displayName, extension.publisher),
+							[{
+								label: nls.localize('install', "Install"),
+								run: () => this.install(extension).done(undefined, error => this.onError(error))
+							}]
+						);
 					});
 				});
 			});
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
index fd2f7e41c28..e99f9a52370 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsTipsService.test.ts
@@ -23,12 +23,13 @@ import { Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TestTextResourceConfigurationService, TestContextService, TestLifecycleService, TestEnvironmentService, TestNotificationService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextResourceConfigurationService, TestContextService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import URI from 'vs/base/common/uri';
 import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 import { IFileService } from 'vs/platform/files/common/files';
-import { FileService } from 'vs/workbench/services/files/node/fileService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import * as extfs from 'vs/base/node/extfs';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { IPager } from 'vs/base/common/paging';
@@ -45,7 +46,7 @@ import product from 'vs/platform/node/product';
 import { ITextModel } from 'vs/editor/common/model';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { URLService } from 'vs/platform/url/common/urlService';
 
 const mockExtensionGallery: IGalleryExtension[] = [
@@ -223,9 +224,9 @@ suite('ExtensionsTipsService Test', () => {
 		prompted = false;
 
 		class TestNotificationService2 extends TestNotificationService {
-			public prompt() {
+			public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void) {
 				prompted = true;
-				return TPromise.as(3);
+				return null;
 			}
 		}
 
@@ -265,7 +266,7 @@ suite('ExtensionsTipsService Test', () => {
 			const myWorkspace = testWorkspace(URI.from({ scheme: 'file', path: folderDir }));
 			workspaceService = new TestContextService(myWorkspace);
 			instantiationService.stub(IWorkspaceContextService, workspaceService);
-			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 		});
 	}
 
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
index 4ab3841d55e..eb1e969e4a8 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts
@@ -96,8 +96,8 @@ export class FeedbackDropdown extends Dropdown {
 			}
 		});
 
-		this.element.addClass('send-feedback');
-		this.element.title(nls.localize('sendFeedback', "Tweet Feedback"));
+		dom.addClass(this.element, 'send-feedback');
+		this.element.title = nls.localize('sendFeedback', "Tweet Feedback");
 
 		this.feedbackService = options.feedbackService;
 
@@ -118,7 +118,7 @@ export class FeedbackDropdown extends Dropdown {
 	}
 
 	protected getAnchor(): HTMLElement | IAnchor {
-		const res = dom.getDomNodePagePosition(this.element.getHTMLElement());
+		const res = dom.getDomNodePagePosition(this.element);
 
 		return {
 			x: res.left,
@@ -249,7 +249,7 @@ export class FeedbackDropdown extends Dropdown {
 
 		$('label').attr('for', 'hide-button').text(nls.localize('showFeedback', "Show Feedback Smiley in Status Bar")).appendTo($hideButtonContainer);
 
-		this.sendButton = new Button($buttons);
+		this.sendButton = new Button($buttons.getHTMLElement());
 		this.sendButton.enabled = false;
 		this.sendButton.label = nls.localize('tweet', "Tweet");
 		this.$sendButton = new Builder(this.sendButton.element);
diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
index 9a233504390..1a659b36d9a 100644
--- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
+++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts
@@ -95,7 +95,7 @@ export class FeedbackStatusbarItem extends Themable implements IStatusbarItem {
 		super.updateStyles();
 
 		if (this.dropdown) {
-			this.dropdown.label.style('background-color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
+			$(this.dropdown.label).style('background-color', this.getColor(this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? STATUS_BAR_FOREGROUND : STATUS_BAR_NO_FOLDER_FOREGROUND));
 		}
 	}
 
diff --git a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
index 346898902ab..89fe412b1ac 100644
--- a/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/binaryFileEditor.ts
@@ -6,10 +6,15 @@
 
 import * as nls from 'vs/nls';
 import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
-import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
+import URI from 'vs/base/common/uri';
+import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 
 /**
  * An implementation of editor for binary files like images.
@@ -21,12 +26,38 @@ export class BinaryFileEditor extends BaseBinaryResourceEditor {
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
-		@IWindowsService windowsService: IWindowsService
+		@IWindowsService private windowsService: IWindowsService,
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService
 	) {
-		super(BinaryFileEditor.ID, telemetryService, themeService, windowsService);
+		super(
+			BinaryFileEditor.ID,
+			{
+				openInternal: (input, options) => this.openInternal(input, options),
+				openExternal: resource => this.openExternal(resource)
+			},
+			telemetryService,
+			themeService
+		);
+	}
+
+	private openInternal(input: EditorInput, options: EditorOptions): void {
+		if (input instanceof FileEditorInput) {
+			input.setForceOpenAsText();
+			this.editorService.openEditor(input, options, this.position).done(null, onUnexpectedError);
+		}
+	}
+
+	private openExternal(resource: URI): void {
+		this.windowsService.openExternal(resource.toString()).then(didOpen => {
+			if (!didOpen) {
+				return this.windowsService.showItemInFolder(resource.fsPath);
+			}
+
+			return void 0;
+		});
 	}
 
 	public getTitle(): string {
 		return this.input ? this.input.getName() : nls.localize('binaryFileEditor', "Binary File Viewer");
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
index 899757c4082..98763468408 100644
--- a/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/browser/editors/fileEditorTracker.ts
@@ -11,9 +11,8 @@ import URI from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 import { toResource, SideBySideEditorInput, IEditorGroup, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
-import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent, indexOf } from 'vs/platform/files/common/files';
+import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
@@ -28,6 +27,8 @@ import { ResourceMap } from 'vs/base/common/map';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
+import { IWindowService } from 'vs/platform/windows/common/windows';
+import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 
 export class FileEditorTracker implements IWorkbenchContribution {
 
@@ -46,6 +47,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
+		@IWindowService private windowService: IWindowService
 	) {
 		this.toUnbind = [];
 		this.modelLoadQueue = new ResourceQueue();
@@ -67,6 +69,9 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		// Editor changing
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
 
+		// Update visible editors when focus is gained
+		this.toUnbind.push(this.windowService.onDidChangeFocus(e => this.onWindowFocusChange(e)));
+
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
 
@@ -82,6 +87,24 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		}
 	}
 
+	private onWindowFocusChange(focused: boolean): void {
+		if (focused) {
+			// the window got focus and we use this as a hint that files might have been changed outside
+			// of this window. since file events can be unreliable, we queue a load for models that
+			// are visible in any editor. since this is a fast operation in the case nothing has changed,
+			// we tolerate the additional work.
+			distinct(
+				this.editorService.getVisibleEditors()
+					.map(editor => {
+						const resource = toResource(editor.input, { supportSideBySide: true });
+						return resource ? this.textFileService.models.get(resource) : void 0;
+					})
+					.filter(model => model && !model.isDirty()),
+				m => m.getResource().toString()
+			).forEach(model => this.queueModelLoad(model));
+		}
+	}
+
 	// Note: there is some duplication with the other file event handler below. Since we cannot always rely on the disk events
 	// carrying all necessary data in all environments, we also use the file operation events to make sure operations are handled.
 	// In any case there is no guarantee if the local event is fired first or the disk one. Thus, code must handle the case
@@ -208,7 +231,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 						if (oldResource.toString() === resource.toString()) {
 							reopenFileResource = newResource; // file got moved
 						} else {
-							const index = indexOf(resource.path, oldResource.path, !isLinux /* ignorecase */);
+							const index = this.getIndexOfPath(resource.path, oldResource.path);
 							reopenFileResource = newResource.with({ path: paths.join(newResource.path, resource.path.substr(index + oldResource.path.length + 1)) }); // parent folder got moved
 						}
 
@@ -229,6 +252,23 @@ export class FileEditorTracker implements IWorkbenchContribution {
 		});
 	}
 
+	private getIndexOfPath(path: string, candidate: string): number {
+		if (candidate.length > path.length) {
+			return -1;
+		}
+
+		if (path === candidate) {
+			return 0;
+		}
+
+		if (!isLinux /* ignore case */) {
+			path = path.toLowerCase();
+			candidate = candidate.toLowerCase();
+		}
+
+		return path.indexOf(candidate);
+	}
+
 	private getViewStateFor(resource: URI, group: IEditorGroup): IEditorViewState | undefined {
 		const stacks = this.editorGroupService.getStacksModel();
 		const editors = this.editorService.getVisibleEditors();
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
index 05f2bfad02c..751b4350f5c 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts
@@ -11,7 +11,7 @@ import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as types from 'vs/base/common/types';
 import * as paths from 'vs/base/common/paths';
 import { Action } from 'vs/base/common/actions';
-import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, IExplorerViewlet } from 'vs/workbench/parts/files/common/files';
+import { VIEWLET_ID, IExplorerViewlet, TEXT_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
 import { EditorOptions, TextEditorOptions, IEditorCloseEvent } from 'vs/workbench/common/editor';
@@ -24,7 +24,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -171,18 +171,18 @@ export class TextFileEditor extends BaseTextEditor {
 				}
 
 				if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_EXCEED_MEMORY_LIMIT) {
-					let memoryLimit = this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
+					let memoryLimit = Math.max(2048, +this.configurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') || 4096);
 
 					return TPromise.wrapError<void>(errors.create(toErrorMessage(error), {
 						actions: [
-							new Action('workbench.window.action.relaunchWithIncreasedMemoryLimit', nls.localize('relaunchWithIncreasedMemoryLimit', "Relaunch"), null, true, () => {
+							new Action('workbench.window.action.relaunchWithIncreasedMemoryLimit', nls.localize('relaunchWithIncreasedMemoryLimit', "Restart with {0} MB", memoryLimit), null, true, () => {
 								return this.windowsService.relaunch({
 									addArgs: [
 										`--max-memory=${memoryLimit}`
 									]
 								});
 							}),
-							new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure'), null, true, () => {
+							new Action('workbench.window.action.configureMemoryLimit', nls.localize('configureMemoryLimit', 'Configure Memory Limit'), null, true, () => {
 								return this.preferencesService.openGlobalSettings().then(editor => {
 									if (editor instanceof PreferencesEditor) {
 										editor.focusSearch('files.maxMemoryForLargeFilesMB');
@@ -260,4 +260,4 @@ export class TextFileEditor extends BaseTextEditor {
 			this.saveTextEditorViewState(input.getResource());
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts
index 2665af86fe9..e1c25edab60 100644
--- a/src/vs/workbench/parts/files/browser/files.ts
+++ b/src/vs/workbench/parts/files/browser/files.ts
@@ -12,7 +12,6 @@ import { ExplorerItem, OpenEditor } from 'vs/workbench/parts/files/common/explor
 import { toResource } from 'vs/workbench/common/editor';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { List } from 'vs/base/browser/ui/list/listWidget';
-import { IFileStat } from 'vs/platform/files/common/files';
 
 // Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding
 // To cover all these cases we need to properly compute the resource on which the command is being executed
@@ -23,7 +22,16 @@ export function getResourceForCommand(resource: URI | object, listService: IList
 
 	let list = listService.lastFocusedList;
 	if (list && list.isDOMFocused()) {
-		const focus = list.getFocus();
+		let focus: any;
+		if (list instanceof List) {
+			const focused = list.getFocusedElements();
+			if (focused.length) {
+				focus = focused[0];
+			}
+		} else {
+			focus = list.getFocus();
+		}
+
 		if (focus instanceof ExplorerItem) {
 			return focus.resource;
 		} else if (focus instanceof OpenEditor) {
@@ -39,27 +47,25 @@ export function getMultiSelectedResources(resource: URI | object, listService: I
 	if (list && list.isDOMFocused()) {
 		// Explorer
 		if (list instanceof Tree) {
-			const focus: IFileStat = list.getFocus();
+			const selection = list.getSelection().map((fs: ExplorerItem) => fs.resource);
+			const focus = list.getFocus();
+			const mainUriStr = URI.isUri(resource) ? resource.toString() : focus instanceof ExplorerItem ? focus.resource.toString() : undefined;
 			// If the resource is passed it has to be a part of the returned context.
-			if (focus && (!URI.isUri(resource) || focus.resource.toString() === resource.toString())) {
-				const selection = list.getSelection();
-				// We only respect the selection if it contains the focused element.
-				if (selection && selection.indexOf(focus) >= 0) {
-					return selection.map(fs => fs.resource);
-				}
+			// We only respect the selection if it contains the focused element.
+			if (selection.some(s => s.toString() === mainUriStr)) {
+				return selection;
 			}
 		}
 
 		// Open editors view
 		if (list instanceof List) {
-			const focus = list.getFocusedElements();
-			// If the resource is passed it has to be a part of the returned context.
-			if (focus.length && (!URI.isUri(resource) || (focus[0] instanceof OpenEditor && focus[0].getResource().toString() === resource.toString()))) {
-				const selection = list.getSelectedElements();
-				// We only respect the selection if it contains the focused element.
-				if (selection && selection.indexOf(focus[0]) >= 0) {
-					return selection.filter(s => s instanceof OpenEditor).map((oe: OpenEditor) => oe.getResource());
-				}
+			const selection = list.getSelectedElements().filter(s => s instanceof OpenEditor).map((oe: OpenEditor) => oe.getResource());
+			const focusedElements = list.getFocusedElements();
+			const focus = focusedElements.length ? focusedElements[0] : undefined;
+			const mainUriStr = URI.isUri(resource) ? resource.toString() : (focus instanceof OpenEditor) ? focus.getResource().toString() : undefined;
+			// We only respect the selection if it contains the main element.
+			if (selection.some(s => s.toString() === mainUriStr)) {
+				return selection;
 			}
 		}
 	}
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 5c353824875..fa44017d7f3 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -15,7 +15,6 @@ import { EncodingMode, ConfirmResult, EditorInput, IFileEditorInput, ITextEditor
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
-import { BINARY_FILE_EDITOR_ID, TEXT_FILE_EDITOR_ID, FILE_EDITOR_INPUT_ID } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService, AutoSaveMode, ModelState, TextFileModelChangeEvent } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -25,12 +24,15 @@ import { Verbosity, IRevertOptions } from 'vs/platform/editor/common/editor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
+import { FILE_EDITOR_INPUT_ID, TEXT_FILE_EDITOR_ID, BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 
 /**
  * A file editor input is the input type for the file editor of file system resources.
  */
 export class FileEditorInput extends EditorInput implements IFileEditorInput {
+	private preferredEncoding: string;
 	private forceOpenAsBinary: boolean;
+	private forceOpenAsText: boolean;
 	private textModelReference: TPromise<IReference<ITextEditorModel>>;
 	private name: string;
 	private toUnbind: IDisposable[];
@@ -40,7 +42,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	 */
 	constructor(
 		private resource: URI,
-		private preferredEncoding: string,
+		preferredEncoding: string,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ITextFileService private textFileService: ITextFileService,
@@ -52,6 +54,8 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		this.toUnbind = [];
 
+		this.setPreferredEncoding(preferredEncoding);
+
 		this.registerListeners();
 	}
 
@@ -83,6 +87,10 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 	public setPreferredEncoding(encoding: string): void {
 		this.preferredEncoding = encoding;
+
+		if (encoding) {
+			this.forceOpenAsText = true; // encoding is a good hint to open the file as text
+		}
 	}
 
 	public getEncoding(): string {
@@ -107,8 +115,14 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 	}
 
+	public setForceOpenAsText(): void {
+		this.forceOpenAsText = true;
+		this.forceOpenAsBinary = false;
+	}
+
 	public setForceOpenAsBinary(): void {
 		this.forceOpenAsBinary = true;
+		this.forceOpenAsText = false;
 	}
 
 	public getTypeId(): string {
@@ -234,11 +248,17 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		// Resolve as binary
 		if (this.forceOpenAsBinary) {
-			return this.resolveAsBinary();
+			return this.doResolveAsBinary();
 		}
 
 		// Resolve as text
-		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload: refresh }).then(model => {
+		return this.doResolveAsText(refresh);
+	}
+
+	private doResolveAsText(reload?: boolean): TPromise<TextFileEditorModel | BinaryEditorModel> {
+
+		// Resolve as text
+		return this.textFileService.models.loadOrCreate(this.resource, { encoding: this.preferredEncoding, reload, allowBinary: this.forceOpenAsText }).then(model => {
 
 			// This is a bit ugly, because we first resolve the model and then resolve a model reference. the reason being that binary
 			// or very large files do not resolve to a text file model but should be opened as binary files without text. First calling into
@@ -253,7 +273,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 			// In case of an error that indicates that the file is binary or too large, just return with the binary editor model
 			if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_IS_BINARY || (<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
-				return this.resolveAsBinary();
+				return this.doResolveAsBinary();
 			}
 
 			// Bubble any other error up
@@ -261,7 +281,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		});
 	}
 
-	private resolveAsBinary(): TPromise<BinaryEditorModel> {
+	private doResolveAsBinary(): TPromise<BinaryEditorModel> {
 		return this.instantiationService.createInstance(BinaryEditorModel, this.resource, this.getName()).load().then(m => m as BinaryEditorModel);
 	}
 
@@ -306,4 +326,4 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 4634e685b8b..df76d082ac3 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -17,7 +17,7 @@ import { IEditorGroup, toResource, IEditorIdentifier } from 'vs/workbench/common
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { getPathLabel } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
-import { startsWith, beginsWithIgnoreCase } from 'vs/base/common/strings';
+import { startsWith, startsWithIgnoreCase, equalsIgnoreCase } from 'vs/base/common/strings';
 
 export class Model {
 
@@ -77,7 +77,7 @@ export class ExplorerItem {
 	public etag: string;
 	private _isDirectory: boolean;
 	private _isSymbolicLink: boolean;
-	private children: { [name: string]: ExplorerItem };
+	private children: Map<string, ExplorerItem>;
 	public parent: ExplorerItem;
 
 	public isDirectoryResolved: boolean;
@@ -109,7 +109,7 @@ export class ExplorerItem {
 		if (value !== this._isDirectory) {
 			this._isDirectory = value;
 			if (this._isDirectory) {
-				this.children = Object.create(null);
+				this.children = new Map<string, ExplorerItem>();
 			} else {
 				this.children = undefined;
 			}
@@ -177,6 +177,7 @@ export class ExplorerItem {
 		local.isDirectory = disk.isDirectory;
 		local.mtime = disk.mtime;
 		local.isDirectoryResolved = disk.isDirectoryResolved;
+		local._isSymbolicLink = disk.isSymbolicLink;
 
 		// Merge Children if resolved
 		if (mergingDirectories && disk.isDirectoryResolved) {
@@ -184,18 +185,16 @@ export class ExplorerItem {
 			// Map resource => stat
 			const oldLocalChildren = new ResourceMap<ExplorerItem>();
 			if (local.children) {
-				for (let name in local.children) {
-					const child = local.children[name];
+				local.children.forEach(child => {
 					oldLocalChildren.set(child.resource, child);
-				}
+				});
 			}
 
 			// Clear current children
-			local.children = Object.create(null);
+			local.children = new Map<string, ExplorerItem>();
 
 			// Merge received children
-			for (let name in disk.children) {
-				const diskChild = disk.children[name];
+			disk.children.forEach(diskChild => {
 				const formerLocalChild = oldLocalChildren.get(diskChild.resource);
 				// Existing child: merge
 				if (formerLocalChild) {
@@ -209,7 +208,7 @@ export class ExplorerItem {
 					diskChild.parent = local;
 					local.addChild(diskChild);
 				}
-			}
+			});
 		}
 	}
 
@@ -222,7 +221,7 @@ export class ExplorerItem {
 		child.parent = this;
 		child.updateResource(false);
 
-		this.children[this.getPlatformAwareName(child.name)] = child;
+		this.children.set(this.getPlatformAwareName(child.name), child);
 	}
 
 	public getChild(name: string): ExplorerItem {
@@ -230,7 +229,7 @@ export class ExplorerItem {
 			return undefined;
 		}
 
-		return this.children[this.getPlatformAwareName(name)];
+		return this.children.get(this.getPlatformAwareName(name));
 	}
 
 	/**
@@ -241,7 +240,20 @@ export class ExplorerItem {
 			return undefined;
 		}
 
-		return Object.keys(this.children).map(name => this.children[name]);
+		const items: ExplorerItem[] = [];
+		this.children.forEach(child => {
+			items.push(child);
+		});
+
+		return items;
+	}
+
+	public getChildrenCount(): number {
+		if (!this.children) {
+			return 0;
+		}
+
+		return this.children.size;
 	}
 
 	public getChildrenNames(): string[] {
@@ -249,18 +261,23 @@ export class ExplorerItem {
 			return [];
 		}
 
-		return Object.keys(this.children);
+		const names: string[] = [];
+		this.children.forEach(child => {
+			names.push(child.name);
+		});
+
+		return names;
 	}
 
 	/**
 	 * Removes a child element from this folder.
 	 */
 	public removeChild(child: ExplorerItem): void {
-		delete this.children[this.getPlatformAwareName(child.name)];
+		this.children.delete(this.getPlatformAwareName(child.name));
 	}
 
 	private getPlatformAwareName(name: string): string {
-		return isLinux ? name : name.toLowerCase();
+		return (isLinux || !name) ? name : name.toLowerCase();
 	}
 
 	/**
@@ -288,9 +305,9 @@ export class ExplorerItem {
 
 		if (recursive) {
 			if (this.isDirectory && this.children) {
-				for (let name in this.children) {
-					this.children[name].updateResource(true);
-				}
+				this.children.forEach(child => {
+					child.updateResource(true);
+				});
 			}
 		}
 	}
@@ -316,7 +333,7 @@ export class ExplorerItem {
 	public find(resource: URI): ExplorerItem {
 		// Return if path found
 		if (resource && this.resource.scheme === resource.scheme && this.resource.authority === resource.authority &&
-			(isLinux ? startsWith(resource.path, this.resource.path) : beginsWithIgnoreCase(resource.path, this.resource.path))
+			(isLinux ? startsWith(resource.path, this.resource.path) : startsWithIgnoreCase(resource.path, this.resource.path))
 		) {
 			return this.findByPath(resource.path, this.resource.path.length);
 		}
@@ -325,7 +342,10 @@ export class ExplorerItem {
 	}
 
 	private findByPath(path: string, index: number): ExplorerItem {
-		if (paths.isEqual(this.resource.path, path, !isLinux)) {
+		if (this.resource.path === path) {
+			return this;
+		}
+		if (!isLinux && equalsIgnoreCase(this.resource.path, path)) {
 			return this;
 		}
 
@@ -343,7 +363,7 @@ export class ExplorerItem {
 			// The name to search is between two separators
 			const name = path.substring(index, indexOfNextSep);
 
-			const child = this.children[this.getPlatformAwareName(name)];
+			const child = this.children.get(this.getPlatformAwareName(name));
 
 			if (child) {
 				// We found a child with the given name, search inside it
@@ -358,13 +378,14 @@ export class ExplorerItem {
 /* A helper that can be used to show a placeholder when creating a new stat */
 export class NewStatPlaceholder extends ExplorerItem {
 
+	public static NAME = '';
 	private static ID = 0;
 
 	private id: number;
 	private directoryPlaceholder: boolean;
 
 	constructor(isDirectory: boolean, root: ExplorerItem) {
-		super(URI.file(''), root, false, false, '');
+		super(URI.file(''), root, false, false, NewStatPlaceholder.NAME);
 
 		this.id = NewStatPlaceholder.ID++;
 		this.isDirectoryResolved = isDirectory;
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
index 1c492a3a555..1ddc3245d5f 100644
--- a/src/vs/workbench/parts/files/common/files.ts
+++ b/src/vs/workbench/parts/files/common/files.ts
@@ -59,20 +59,26 @@ export const FilesExplorerFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has
 export const ExplorerFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has(explorerViewletVisibleId), ContextKeyExpr.has(explorerViewletFocusId), ContextKeyExpr.not(InputFocusedContextKey));
 
 /**
- * File editor input id.
+ * Preferences editor id.
  */
-export const FILE_EDITOR_INPUT_ID = 'workbench.editors.files.fileEditorInput';
+export const PREFERENCES_EDITOR_ID = 'workbench.editor.preferencesEditor';
 
 /**
  * Text file editor id.
  */
 export const TEXT_FILE_EDITOR_ID = 'workbench.editors.files.textFileEditor';
 
+/**
+ * File editor input id.
+ */
+export const FILE_EDITOR_INPUT_ID = 'workbench.editors.files.fileEditorInput';
+
 /**
  * Binary file editor id.
  */
 export const BINARY_FILE_EDITOR_ID = 'workbench.editors.files.binaryFileEditor';
 
+
 export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEditorConfiguration {
 	explorer: {
 		openEditors: {
@@ -151,7 +157,7 @@ export class FileOnDiskContentProvider implements ITextModelContentProvider {
 			// Make sure to keep contents on disk up to date when it changes
 			if (!this.fileWatcher) {
 				this.fileWatcher = this.fileService.onFileChanges(changes => {
-					if (changes.contains(fileOnDiskResource, FileChangeType.UPDATED)) { //
+					if (changes.contains(fileOnDiskResource, FileChangeType.UPDATED)) {
 						this.resolveEditorModel(resource, false /* do not create if missing */).done(null, onUnexpectedError); // update model when resource changes
 					}
 				});
diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
index 714e365c394..fe8a56d8938 100644
--- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
+++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts
@@ -10,7 +10,6 @@ import { localize } from 'vs/nls';
 import { IActionRunner } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as DOM from 'vs/base/browser/dom';
-import { Builder } from 'vs/base/browser/builder';
 import { VIEWLET_ID, ExplorerViewletVisibleContext, IFilesConfiguration, OpenEditorsVisibleContext, OpenEditorsVisibleCondition, IExplorerViewlet } from 'vs/workbench/parts/files/common/files';
 import { PersistentViewsViewlet, IViewletViewOptions, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
@@ -171,11 +170,10 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer
 		this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea()));
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		const el = parent.getHTMLElement();
-		DOM.addClass(el, 'explorer-viewlet');
+		DOM.addClass(parent, 'explorer-viewlet');
 	}
 
 	private isOpenEditorsVisible(): boolean {
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index 0056fa9eb60..5e58cd18646 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -13,6 +13,7 @@ import { sequence, ITask, always } from 'vs/base/common/async';
 import * as paths from 'vs/base/common/paths';
 import * as resources from 'vs/base/common/resources';
 import URI from 'vs/base/common/uri';
+import { posix } from 'path';
 import * as errors from 'vs/base/common/errors';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import * as strings from 'vs/base/common/strings';
@@ -103,11 +104,12 @@ export class BaseErrorReportingAction extends Action {
 	}
 
 	protected onErrorWithRetry(error: any, retry: () => TPromise<any>): void {
-		this._notificationService.prompt(Severity.Error, toErrorMessage(error, false), [nls.localize('retry', "Retry")]).then(choice => {
-			if (choice === 0) {
-				retry();
-			}
-		});
+		this._notificationService.prompt(Severity.Error, toErrorMessage(error, false),
+			[{
+				label: nls.localize('retry', "Retry"),
+				run: () => retry()
+			}]
+		);
 	}
 }
 
@@ -158,7 +160,15 @@ class TriggerRenameFileAction extends BaseFileAction {
 		this._updateEnablement();
 	}
 
-	public validateFileName(parent: ExplorerItem, name: string): string {
+	public validateFileName(name: string): string {
+		const names: string[] = name.split(/[\\/]/).filter(part => !!part);
+		if (names.length > 1) {	// error only occurs on multi-path
+			const comparer = isLinux ? strings.compare : strings.compareIgnoreCase;
+			if (comparer(names[0], this.element.name) === 0) {
+				return nls.localize('renameWhenSourcePathIsParentOfTargetError', "Please use the 'New Folder' or 'New File' command to add children to an existing folder");
+			}
+		}
+
 		return this.renameAction.validateFileName(this.element.parent, name);
 	}
 
@@ -180,7 +190,7 @@ class TriggerRenameFileAction extends BaseFileAction {
 		viewletState.setEditable(stat, {
 			action: this.renameAction,
 			validator: (value) => {
-				const message = this.validateFileName(this.element.parent, value);
+				const message = this.validateFileName(value);
 
 				if (!message) {
 					return null;
@@ -381,6 +391,10 @@ export class BaseNewAction extends BaseFileAction {
 		if (!folder) {
 			return TPromise.wrapError(new Error('Invalid parent folder to create.'));
 		}
+		if (!!folder.getChild(NewStatPlaceholder.NAME)) {
+			// Do not allow to creatae a new file/folder while in the process of creating a new file/folder #47606
+			return TPromise.as(new Error('Parent folder is already in the process of creating a file'));
+		}
 
 		return this.tree.reveal(folder, 0.5).then(() => {
 			return this.tree.expand(folder).then(() => {
@@ -631,9 +645,8 @@ class BaseDeleteFileAction extends BaseFileAction {
 
 			// Confirm for moving to trash
 			else if (this.useTrash) {
-				const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource))
-					: distinctElements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name)
-						: nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name);
+				const message = this.getMoveToTrashMessage(distinctElements);
+
 				confirmDeletePromise = this.dialogService.confirm({
 					message,
 					detail: isWindows ? nls.localize('undoBin', "You can restore from the Recycle Bin.") : nls.localize('undoTrash', "You can restore from the Trash."),
@@ -647,9 +660,7 @@ class BaseDeleteFileAction extends BaseFileAction {
 
 			// Confirm for deleting permanently
 			else {
-				const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource))
-					: distinctElements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name)
-						: nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name);
+				const message = this.getDeleteMessage(distinctElements);
 				confirmDeletePromise = this.dialogService.confirm({
 					message,
 					detail: nls.localize('irreversible', "This action is irreversible!"),
@@ -722,10 +733,57 @@ class BaseDeleteFileAction extends BaseFileAction {
 			});
 		});
 	}
+
+	private getMoveToTrashMessage(distinctElements: ExplorerItem[]): string {
+		if (this.containsBothDirectoryAndFile(distinctElements)) {
+			return getConfirmMessage(nls.localize('confirmMoveTrashMessageFilesAndDirectories', "Are you sure you want to delete the following {0} files/directories and its contents?", distinctElements.length), distinctElements.map(e => e.resource));
+		}
+
+		if (distinctElements.length > 1) {
+			if (distinctElements[0].isDirectory) {
+				return getConfirmMessage(nls.localize('confirmMoveTrashMessageMultipleDirectories', "Are you sure you want to delete the following {0} directories and its contents?", distinctElements.length), distinctElements.map(e => e.resource));
+			}
+
+			return getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource));
+		}
+
+		if (distinctElements[0].isDirectory) {
+			return nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name);
+		}
+
+		return nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name);
+	}
+
+	private getDeleteMessage(distinctElements: ExplorerItem[]): string {
+		if (this.containsBothDirectoryAndFile(distinctElements)) {
+			return getConfirmMessage(nls.localize('confirmDeleteMessageFilesAndDirectories', "Are you sure you want to permanently delete the following {0} files/directories and its contents?", distinctElements.length), distinctElements.map(e => e.resource));
+		}
+
+		if (distinctElements.length > 1) {
+			if (distinctElements[0].isDirectory) {
+				return getConfirmMessage(nls.localize('confirmDeleteMessageMultipleDirectories', "Are you sure you want to permanently delete the following {0} directories and its contents?", distinctElements.length), distinctElements.map(e => e.resource));
+			}
+
+			return getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource));
+		}
+
+		if (distinctElements[0].isDirectory) {
+			return nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name);
+		}
+
+		return nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name);
+	}
+
+	private containsBothDirectoryAndFile(distinctElements: ExplorerItem[]): boolean {
+		const directories = distinctElements.filter(element => element.isDirectory);
+		const files = distinctElements.filter(element => !element.isDirectory);
+
+		return directories.length > 0 && files.length > 0;
+	}
 }
 
-/* Import File */
-export class ImportFileAction extends BaseFileAction {
+/* Add File */
+export class AddFilesAction extends BaseFileAction {
 
 	private tree: ITree;
 
@@ -739,7 +797,7 @@ export class ImportFileAction extends BaseFileAction {
 		@INotificationService notificationService: INotificationService,
 		@ITextFileService textFileService: ITextFileService
 	) {
-		super('workbench.files.action.importFile', nls.localize('importFiles', "Import Files"), fileService, notificationService, textFileService);
+		super('workbench.files.action.addFile', nls.localize('addFiles', "Add Files"), fileService, notificationService, textFileService);
 
 		this.tree = tree;
 		this.element = element;
@@ -752,10 +810,10 @@ export class ImportFileAction extends BaseFileAction {
 	}
 
 	public run(resources: URI[]): TPromise<any> {
-		const importPromise = TPromise.as(null).then(() => {
+		const addPromise = TPromise.as(null).then(() => {
 			if (resources && resources.length > 0) {
 
-				// Find parent for import
+				// Find parent to add to
 				let targetElement: ExplorerItem;
 				if (this.element) {
 					targetElement = this.element;
@@ -796,15 +854,15 @@ export class ImportFileAction extends BaseFileAction {
 							return void 0;
 						}
 
-						// Run import in sequence
-						const importPromisesFactory: ITask<TPromise<void>>[] = [];
+						// Run add in sequence
+						const addPromisesFactory: ITask<TPromise<void>>[] = [];
 						resources.forEach(resource => {
-							importPromisesFactory.push(() => {
+							addPromisesFactory.push(() => {
 								const sourceFile = resource;
 								const targetFile = targetElement.resource.with({ path: paths.join(targetElement.resource.path, paths.basename(sourceFile.path)) });
 
 								// if the target exists and is dirty, make sure to revert it. otherwise the dirty contents
-								// of the target file would replace the contents of the imported file. since we already
+								// of the target file would replace the contents of the added file. since we already
 								// confirmed the overwrite before, this is OK.
 								let revertPromise = TPromise.wrap(null);
 								if (this.textFileService.isDirty(targetFile)) {
@@ -812,18 +870,19 @@ export class ImportFileAction extends BaseFileAction {
 								}
 
 								return revertPromise.then(() => {
-									return this.fileService.importFile(sourceFile, targetElement.resource).then(res => {
+									const target = targetElement.resource.with({ path: posix.join(targetElement.resource.path, posix.basename(sourceFile.path)) });
+									return this.fileService.copyFile(sourceFile, target, true).then(stat => {
 
-										// if we only import one file, just open it directly
+										// if we only add one file, just open it directly
 										if (resources.length === 1) {
-											this.editorService.openEditor({ resource: res.stat.resource, options: { pinned: true } }).done(null, errors.onUnexpectedError);
+											this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } }).done(null, errors.onUnexpectedError);
 										}
 									}, error => this.onError(error));
 								});
 							});
 						});
 
-						return sequence(importPromisesFactory);
+						return sequence(addPromisesFactory);
 					});
 				});
 			}
@@ -831,7 +890,7 @@ export class ImportFileAction extends BaseFileAction {
 			return void 0;
 		});
 
-		return importPromise.then(() => {
+		return addPromise.then(() => {
 			this.tree.clearHighlight();
 		}, (error: any) => {
 			this.onError(error);
@@ -1352,25 +1411,22 @@ export function validateFileName(parent: ExplorerItem, name: string, allowOverwr
 		return nls.localize('emptyFileNameError', "A file or folder name must be provided.");
 	}
 
+	// Relative paths only
+	if (name[0] === '/' || name[0] === '\\') {
+		return nls.localize('fileNameStartsWithSlashError', "A file or folder name cannot start with a slash.");
+	}
+
 	const names: string[] = name.split(/[\\/]/).filter(part => !!part);
+	const analyzedPath = analyzePath(parent, names);
 
 	// Do not allow to overwrite existing file
-	if (!allowOverwriting) {
-		let p = parent;
-		const alreadyExisting = names.every((folderName) => {
-			let { exists, child } = alreadyExists(p, folderName);
+	if (!allowOverwriting && analyzedPath.fullPathAlreadyExists) {
+		return nls.localize('fileNameExistsError', "A file or folder **{0}** already exists at this location. Please choose a different name.", name);
+	}
 
-			if (!exists) {
-				return false;
-			} else {
-				p = child;
-				return true;
-			}
-		});
-
-		if (alreadyExisting) {
-			return nls.localize('fileNameExistsError', "A file or folder **{0}** already exists at this location. Please choose a different name.", name);
-		}
+	// A file must always be a leaf
+	if (analyzedPath.lastExistingPathSegment.isFile) {
+		return nls.localize('fileUsedAsFolderError', "**{0}** is a file and cannot have any descendants.", analyzedPath.lastExistingPathSegment.name);
 	}
 
 	// Invalid File name
@@ -1389,6 +1445,24 @@ export function validateFileName(parent: ExplorerItem, name: string, allowOverwr
 	return null;
 }
 
+function analyzePath(parent: ExplorerItem, pathNames: string[]): { fullPathAlreadyExists: boolean; lastExistingPathSegment: { isFile: boolean; name: string; } } {
+	let lastExistingPathSegment = { isFile: false, name: '' };
+
+	for (const name of pathNames) {
+		const { exists, child } = alreadyExists(parent, name);
+
+		if (exists) {
+			lastExistingPathSegment = { isFile: !child.isDirectory, name };
+			parent = child;
+		} else {
+			return { fullPathAlreadyExists: false, lastExistingPathSegment };
+		}
+	}
+
+	return { fullPathAlreadyExists: true, lastExistingPathSegment };
+}
+
+
 function alreadyExists(parent: ExplorerItem, name: string): { exists: boolean, child: ExplorerItem | undefined } {
 	let duplicateChild: ExplorerItem;
 
@@ -1413,13 +1487,12 @@ export function getWellFormedFileName(filename: string): string {
 		return filename;
 	}
 
-	// Trim whitespaces
-	filename = strings.trim(strings.trim(filename, ' '), '\t');
+	// Trim tabs
+	filename = strings.trim(filename, '\t');
 
-	// Remove trailing dots
+	// Remove trailing dots, slashes, and spaces
 	filename = strings.rtrim(filename, '.');
-
-	// Remove trailing slashes
+	filename = strings.rtrim(filename, ' ');
 	filename = strings.rtrim(filename, '/');
 	filename = strings.rtrim(filename, '\\');
 
diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index f19b8205f14..06a87609635 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -322,7 +322,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			const name = paths.basename(uri.fsPath);
 			const editorLabel = nls.localize('modifiedLabel', "{0} (on disk) ↔ {1}", name, name);
 
-			return editorService.openEditor({ leftResource: URI.from({ scheme: COMPARE_WITH_SAVED_SCHEMA, path: uri.fsPath }), rightResource: resource, label: editorLabel }).then(() => void 0);
+			return editorService.openEditor({ leftResource: URI.from({ scheme: COMPARE_WITH_SAVED_SCHEMA, path: uri.fsPath }), rightResource: uri, label: editorLabel }).then(() => void 0);
 		}
 
 		return TPromise.as(true);
@@ -386,9 +386,11 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, notificationService: INotificationService): void {
+function revealResourcesInOS(resources: URI[], windowsService: IWindowsService, notificationService: INotificationService, workspaceContextService: IWorkspaceContextService): void {
 	if (resources.length) {
 		sequence(resources.map(r => () => windowsService.showItemInFolder(paths.normalize(r.fsPath, true))));
+	} else if (workspaceContextService.getWorkspace().folders.length) {
+		windowsService.showItemInFolder(paths.normalize(workspaceContextService.getWorkspace().folders[0].uri.fsPath, true));
 	} else {
 		notificationService.info(nls.localize('openFileToReveal', "Open a file first to reveal"));
 	}
@@ -396,14 +398,14 @@ function revealResourcesInOS(resources: URI[], windowsService: IWindowsService,
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: REVEAL_IN_OS_COMMAND_ID,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: ExplorerFocusCondition,
+	when: undefined,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_R,
 	win: {
 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_R
 	},
 	handler: (accessor: ServicesAccessor, resource: URI | object) => {
 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService));
-		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService));
+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
 	}
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -415,7 +417,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const activeInput = editorService.getActiveEditorInput();
 		const resources = activeInput && activeInput.getResource() ? [activeInput.getResource()] : [];
-		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService));
+		revealResourcesInOS(resources, accessor.get(IWindowsService), accessor.get(INotificationService), accessor.get(IWorkspaceContextService));
 	}
 });
 
@@ -430,7 +432,7 @@ function resourcesToClipboard(resources: URI[], clipboardService: IClipboardServ
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
-	when: ExplorerFocusCondition,
+	when: undefined,
 	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
 	win: {
 		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
diff --git a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
index 69e208012e1..1da4ee90a94 100644
--- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts
@@ -15,7 +15,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IEditorInputFactory, EditorInput, IFileEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { AutoSaveConfiguration, HotExitConfiguration, SUPPORTED_ENCODINGS } from 'vs/platform/files/common/files';
-import { FILE_EDITOR_INPUT_ID, VIEWLET_ID, SortOrderConfiguration } from 'vs/workbench/parts/files/common/files';
+import { VIEWLET_ID, SortOrderConfiguration, FILE_EDITOR_INPUT_ID } from 'vs/workbench/parts/files/common/files';
 import { FileEditorTracker } from 'vs/workbench/parts/files/browser/editors/fileEditorTracker';
 import { SaveErrorHandler } from 'vs/workbench/parts/files/electron-browser/saveErrorHandler';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
@@ -286,7 +286,7 @@ configurationRegistry.registerConfiguration({
 		'files.maxMemoryForLargeFilesMB': {
 			'type': 'number',
 			'default': 4096,
-			'description': nls.localize('maxMemoryForLargeFilesMB', "The new limit on memory in MB to be used by the application when relaunching to open large files. If you wish to start with a higher limit, you can launch the application from command line with --max-memory=NEWSIZE.")
+			'description': nls.localize('maxMemoryForLargeFilesMB', "Controls the memory available to VS Code after restart when trying to open large files. Same affect as specifying --max-memory=NEWSIZE on the command line.")
 		}
 	}
 });
diff --git a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
index 9cd2408fa2c..eb657380a67 100644
--- a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
+++ b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css
@@ -109,7 +109,6 @@
 .monaco-workbench.linux .explorer-viewlet .explorer-item .monaco-inputbox,
 .monaco-workbench.mac .explorer-viewlet .explorer-item .monaco-inputbox {
 	height: 22px;
-	margin-left: -1px;
 }
 
 .explorer-viewlet .explorer-item .monaco-inputbox > .wrapper > .input {
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index 56bf6d7a656..8ddc5c94b45 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -102,7 +102,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 	private onFileSavedOrReverted(resource: URI): void {
 		const messageHandle = this.messages.get(resource);
 		if (messageHandle) {
-			messageHandle.dispose();
+			messageHandle.close();
 			this.messages.delete(resource);
 		}
 	}
@@ -179,7 +179,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 
 		// Show message and keep function to hide in case the file gets saved/reverted
 		const handle = this.notificationService.notify({ severity: Severity.Error, message, actions });
-		once(handle.onDidDispose)(() => dispose(...actions.primary, ...actions.secondary));
+		once(handle.onDidClose)(() => dispose(...actions.primary, ...actions.secondary));
 		this.messages.set(model.getResource(), handle);
 	}
 
@@ -193,7 +193,7 @@ export class SaveErrorHandler implements ISaveErrorHandler, IWorkbenchContributi
 const pendingResolveSaveConflictMessages: INotificationHandle[] = [];
 function clearPendingResolveSaveConflictMessages(): void {
 	while (pendingResolveSaveConflictMessages.length > 0) {
-		pendingResolveSaveConflictMessages.pop().dispose();
+		pendingResolveSaveConflictMessages.pop().close();
 	}
 }
 
@@ -265,7 +265,7 @@ class ResolveSaveConflictAction extends Action {
 				actions.secondary.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
 
 				const handle = this.notificationService.notify({ severity: Severity.Info, message: conflictEditorHelp, actions });
-				once(handle.onDidDispose)(() => dispose(...actions.primary, ...actions.secondary));
+				once(handle.onDidClose)(() => dispose(...actions.primary, ...actions.secondary));
 				pendingResolveSaveConflictMessages.push(handle);
 			});
 		}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
index e2253c98749..f0430ac6ed2 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts
@@ -56,7 +56,7 @@ export class EmptyView extends ViewsViewletPanel {
 
 		let section = $('div.section').appendTo(container);
 
-		this.button = new Button(section);
+		this.button = new Button(section.getHTMLElement());
 		attachButtonStyler(this.button, this.themeService);
 
 		this.disposables.push(this.button.onDidClick(() => {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
index c5ed9e10afd..dcbb387a155 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerDecorationsProvider.ts
@@ -22,7 +22,7 @@ export class ExplorerDecorationsProvider implements IDecorationsProvider {
 		@IWorkspaceContextService contextService: IWorkspaceContextService
 	) {
 		contextService.onDidChangeWorkspaceFolders(e => {
-			this._onDidChange.fire(e.changed.map(wf => wf.uri));
+			this._onDidChange.fire(e.changed.concat(e.added).map(wf => wf.uri));
 		});
 	}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
index 5ee30960d13..ea60112f840 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -6,7 +6,6 @@
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
 import URI from 'vs/base/common/uri';
 import { ThrottledDelayer, Delayer } from 'vs/base/common/async';
 import * as errors from 'vs/base/common/errors';
@@ -160,7 +159,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 
 	public renderBody(container: HTMLElement): void {
 		this.treeContainer = DOM.append(container, DOM.$('.explorer-folders-view'));
-		this.tree = this.createViewer($(this.treeContainer));
+		this.tree = this.createViewer(this.treeContainer);
 
 		if (this.toolbar) {
 			this.toolbar.setActions(this.getActions(), this.getSecondaryActions())();
@@ -227,7 +226,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			this.settings[ExplorerView.MEMENTO_LAST_ACTIVE_FILE_RESOURCE] = activeFile.toString();
 
 			// Select file if input is inside workspace
-			if (this.isVisible() && this.contextService.isInsideWorkspace(activeFile)) {
+			if (this.isVisible() && !this.isDisposed && this.contextService.isInsideWorkspace(activeFile)) {
 				const selection = this.hasSingleSelection(activeFile);
 				if (!selection) {
 					this.select(activeFile).done(null, errors.onUnexpectedError);
@@ -394,7 +393,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		return model;
 	}
 
-	private createViewer(container: Builder): WorkbenchTree {
+	private createViewer(container: HTMLElement): WorkbenchTree {
 		const dataSource = this.instantiationService.createInstance(FileDataSource);
 		const renderer = this.instantiationService.createInstance(FileRenderer, this.viewletState);
 		const controller = this.instantiationService.createInstance(FileController);
@@ -406,7 +405,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		const dnd = this.instantiationService.createInstance(FileDragAndDrop);
 		const accessibilityProvider = this.instantiationService.createInstance(FileAccessibilityProvider);
 
-		this.explorerViewer = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, container.getHTMLElement(), {
+		this.explorerViewer = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, container, {
 			dataSource,
 			renderer,
 			controller,
@@ -471,7 +470,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		}
 
 		// Add
-		if (e.operation === FileOperation.CREATE || e.operation === FileOperation.IMPORT || e.operation === FileOperation.COPY) {
+		if (e.operation === FileOperation.CREATE || e.operation === FileOperation.COPY) {
 			const addedElement = e.target;
 			const parentResource = resources.dirname(addedElement.resource);
 			const parents = this.model.findAll(parentResource);
@@ -611,24 +610,21 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	}
 
 	private shouldRefreshFromEvent(e: FileChangesEvent): boolean {
-
-		// Filter to the ones we care
-		e = this.filterFileEvents(e);
-
 		if (!this.isCreated) {
 			return false;
 		}
 
-		if (e.gotAdded()) {
-			const added = e.getAdded();
+		// Filter to the ones we care
+		e = this.filterToViewRelevantEvents(e);
+
+		// Handle added files/folders
+		const added = e.getAdded();
+		if (added.length) {
 
 			// Check added: Refresh if added file/folder is not part of resolved root and parent is part of it
 			const ignoredPaths: { [resource: string]: boolean } = <{ [resource: string]: boolean }>{};
 			for (let i = 0; i < added.length; i++) {
 				const change = added[i];
-				if (!this.contextService.isInsideWorkspace(change.resource)) {
-					continue; // out of workspace file
-				}
 
 				// Find parent
 				const parent = resources.dirname(change.resource);
@@ -651,15 +647,13 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			}
 		}
 
-		if (e.gotDeleted()) {
-			const deleted = e.getDeleted();
+		// Handle deleted files/folders
+		const deleted = e.getDeleted();
+		if (deleted.length) {
 
 			// Check deleted: Refresh if deleted file/folder part of resolved root
 			for (let j = 0; j < deleted.length; j++) {
 				const del = deleted[j];
-				if (!this.contextService.isInsideWorkspace(del.resource)) {
-					continue; // out of workspace file
-				}
 
 				if (this.model.findClosest(del.resource)) {
 					return true;
@@ -667,15 +661,13 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 			}
 		}
 
-		if (this.sortOrder === SortOrderConfiguration.MODIFIED && e.gotUpdated()) {
+		// Handle updated files/folders if we sort by modified
+		if (this.sortOrder === SortOrderConfiguration.MODIFIED) {
 			const updated = e.getUpdated();
 
 			// Check updated: Refresh if updated file/folder part of resolved root
 			for (let j = 0; j < updated.length; j++) {
 				const upd = updated[j];
-				if (!this.contextService.isInsideWorkspace(upd.resource)) {
-					continue; // out of workspace file
-				}
 
 				if (this.model.findClosest(upd.resource)) {
 					return true;
@@ -686,8 +678,12 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		return false;
 	}
 
-	private filterFileEvents(e: FileChangesEvent): FileChangesEvent {
+	private filterToViewRelevantEvents(e: FileChangesEvent): FileChangesEvent {
 		return new FileChangesEvent(e.changes.filter(change => {
+			if (change.type === FileChangeType.UPDATED && this.sortOrder !== SortOrderConfiguration.MODIFIED) {
+				return false; // we only are about updated if we sort by modified time
+			}
+
 			if (!this.contextService.isInsideWorkspace(change.resource)) {
 				return false; // exclude changes for resources outside of workspace
 			}
@@ -701,7 +697,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 	}
 
 	private refreshFromEvent(newRoots: IWorkspaceFolder[] = []): void {
-		if (this.isVisible()) {
+		if (this.isVisible() && !this.isDisposed) {
 			this.explorerRefreshDelayer.trigger(() => {
 				if (!this.explorerViewer.getHighlight()) {
 					return this.doRefresh(newRoots.map(r => r.uri)).then(() => {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
index 9b412ed7155..1a418a43fc5 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -8,6 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import * as objects from 'vs/base/common/objects';
 import * as DOM from 'vs/base/browser/dom';
+import * as path from 'path';
 import URI from 'vs/base/common/uri';
 import { once } from 'vs/base/common/functional';
 import * as paths from 'vs/base/common/paths';
@@ -23,8 +24,7 @@ import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/l
 import { IFilesConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { FileOperationError, FileOperationResult, IFileService, FileKind } from 'vs/platform/files/common/files';
-import { ResourceMap } from 'vs/base/common/map';
-import { DuplicateFileAction, ImportFileAction, IEditableData, IFileViewletState, FileCopiedContext } from 'vs/workbench/parts/files/electron-browser/fileActions';
+import { DuplicateFileAction, AddFilesAction, IEditableData, IFileViewletState, FileCopiedContext } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { IDataSource, ITree, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY, DRAG_OVER_ACCEPT_BUBBLE_UP, DRAG_OVER_ACCEPT_BUBBLE_UP_COPY, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree';
 import { DesktopDragAndDropData, ExternalElementsDragAndDropData } from 'vs/base/parts/tree/browser/treeDnd';
 import { ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
@@ -49,7 +49,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { extractResources, SimpleFileResourceDragAndDrop, CodeDataTransfers, fillResourceDataTransfers } from 'vs/workbench/browser/dnd';
-import { relative } from 'path';
 import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { DataTransfers } from 'vs/base/browser/dnd';
@@ -76,7 +75,7 @@ export class FileDataSource implements IDataSource {
 	}
 
 	public hasChildren(tree: ITree, stat: ExplorerItem | Model): boolean {
-		return stat instanceof Model || (stat instanceof ExplorerItem && stat.isDirectory);
+		return stat instanceof Model || (stat instanceof ExplorerItem && (stat.isDirectory || stat.isRoot));
 	}
 
 	public getChildren(tree: ITree, stat: ExplorerItem | Model): TPromise<ExplorerItem[]> {
@@ -99,9 +98,12 @@ export class FileDataSource implements IDataSource {
 				const modelDirStat = ExplorerItem.create(dirStat, stat.root);
 
 				// Add children to folder
-				modelDirStat.getChildrenArray().forEach(child => {
-					stat.addChild(child);
-				});
+				const children = modelDirStat.getChildrenArray();
+				if (children) {
+					children.forEach(child => {
+						stat.addChild(child);
+					});
+				}
 
 				stat.isDirectoryResolved = true;
 
@@ -144,24 +146,24 @@ export class FileDataSource implements IDataSource {
 }
 
 export class FileViewletState implements IFileViewletState {
-	private editableStats: ResourceMap<IEditableData>;
+	private editableStats: Map<ExplorerItem, IEditableData>;
 
 	constructor() {
-		this.editableStats = new ResourceMap<IEditableData>();
+		this.editableStats = new Map<ExplorerItem, IEditableData>();
 	}
 
 	public getEditableData(stat: ExplorerItem): IEditableData {
-		return this.editableStats.get(stat.resource);
+		return this.editableStats.get(stat);
 	}
 
 	public setEditable(stat: ExplorerItem, editableData: IEditableData): void {
 		if (editableData) {
-			this.editableStats.set(stat.resource, editableData);
+			this.editableStats.set(stat, editableData);
 		}
 	}
 
 	public clearEditable(stat: ExplorerItem): void {
-		this.editableStats.delete(stat.resource);
+		this.editableStats.delete(stat);
 	}
 }
 
@@ -226,6 +228,7 @@ export class FileRenderer implements IRenderer {
 	}
 
 	public disposeTemplate(tree: ITree, templateId: string, templateData: IFileTemplateData): void {
+		templateData.elementDisposable.dispose();
 		templateData.label.dispose();
 	}
 
@@ -323,12 +326,12 @@ export class FileRenderer implements IRenderer {
 				}
 			}),
 			DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_UP, (e: IKeyboardEvent) => {
-				const initialRelPath: string = relative(stat.root.resource.fsPath, stat.parent.resource.fsPath);
+				const initialRelPath: string = path.relative(stat.root.resource.path, stat.parent.resource.path);
 				let projectFolderName: string = '';
 				if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
-					projectFolderName = paths.basename(stat.root.resource.fsPath);	// show root folder name in multi-folder project
+					projectFolderName = paths.basename(stat.root.resource.path);	// show root folder name in multi-folder project
 				}
-				this.displayCurrentPath(inputBox, initialRelPath, fileKind, projectFolderName);
+				this.displayCurrentPath(inputBox, initialRelPath, projectFolderName, editableData.action.id);
 			}),
 			DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => {
 				done(inputBox.isInputValid(), true);
@@ -338,20 +341,39 @@ export class FileRenderer implements IRenderer {
 		];
 	}
 
-	private displayCurrentPath(inputBox: InputBox, initialRelPath: string, fileKind: FileKind, projectFolderName: string = '') {
+	private displayCurrentPath(inputBox: InputBox, initialRelPath: string, projectFolderName: string = '', actionID: string) {
 		if (inputBox.validate()) {
 			const value = inputBox.value;
-			if (value && value.search(/[\\/]/) !== -1) {	// only show if there's a slash
-				let newPath = paths.normalize(paths.join(initialRelPath, value), true);
-				newPath = rtrim(newPath, paths.nativeSep);
-				const fileType: string = FileKind[fileKind].toLowerCase();
+			if (value && /.[\\/]./.test(value)) {	// only show if there's at least one slash enclosed in the string
+				let displayPath = path.normalize(path.join(projectFolderName, initialRelPath, value));
+				displayPath = rtrim(displayPath, paths.nativeSep);
+
+				const indexLastSlash: number = displayPath.lastIndexOf(paths.nativeSep);
+				const name: string = displayPath.substring(indexLastSlash + 1);
+				const leadingPathPart: string = displayPath.substring(0, indexLastSlash);
+
+				let msg: string;
+				switch (actionID) {
+					case 'workbench.files.action.createFileFromExplorer':
+						msg = nls.localize('createFileFromExplorerInfoMessage', "Create file **{0}** in **{1}**", name, leadingPathPart);
+						break;
+					case 'workbench.files.action.renameFile':
+						msg = nls.localize('renameFileFromExplorerInfoMessage', "Move and rename to **{0}**", displayPath);
+						break;
+					case 'workbench.files.action.createFolderFromExplorer':	// fallthrough
+					default:
+						msg = nls.localize('createFolderFromExplorerInfoMessage', "Create folder **{0}** in **{1}**", name, leadingPathPart);
+				}
 
 				inputBox.showMessage({
 					type: MessageType.INFO,
-					content: nls.localize('constructedPath', "Create {0} in **{1}**", fileType, newPath),
+					content: msg,
 					formatContent: true
 				});
 			}
+			else {	// fixes #46744: inputbox hides again if all slashes are removed
+				inputBox.hideMessage();
+			}
 		}
 	}
 }
@@ -693,15 +715,17 @@ export class FileFilter implements IFilter {
 		}
 
 		// Workaround for O(N^2) complexity (https://github.com/Microsoft/vscode/issues/9962)
-		let siblingNames = stat.parent && stat.parent.getChildrenNames();
-		if (siblingNames && siblingNames.length > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
-			siblingNames = void 0;
+		let siblingsFn: () => string[];
+		let siblingCount = stat.parent && stat.parent.getChildrenCount();
+		if (siblingCount && siblingCount > FileFilter.MAX_SIBLINGS_FILTER_THRESHOLD) {
+			siblingsFn = () => void 0;
+		} else {
+			siblingsFn = () => stat.parent ? stat.parent.getChildrenNames() : void 0;
 		}
 
 		// Hide those that match Hidden Patterns
-		const siblingsFn = () => siblingNames;
 		const expression = this.hiddenExpressionPerRoot.get(stat.root.resource.toString()) || Object.create(null);
-		if (glob.match(expression, paths.normalize(relative(stat.root.resource.fsPath, stat.resource.fsPath), true), siblingsFn)) {
+		if (glob.match(expression, paths.normalize(path.relative(stat.root.resource.path, stat.resource.path), true), siblingsFn)) {
 			return false; // hidden through pattern
 		}
 
@@ -918,9 +942,9 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 
 			// Handle dropped files (only support FileStat as target)
 			else if (target instanceof ExplorerItem) {
-				const importAction = this.instantiationService.createInstance(ImportFileAction, tree, target, null);
+				const addFilesAction = this.instantiationService.createInstance(AddFilesAction, tree, target, null);
 
-				return importAction.run(droppedResources.map(res => res.resource));
+				return addFilesAction.run(droppedResources.map(res => res.resource));
 			}
 
 			return void 0;
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
index cf5fde01cd2..0d34ce79868 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -174,6 +174,18 @@ suite('Files - FileEditorInput', () => {
 		});
 	});
 
+	test('resolve handles too large files', function () {
+		const input = instantiationService.createInstance(FileEditorInput, toResource(this, '/foo/bar/updatefile.js'), void 0);
+
+		accessor.textFileService.setResolveTextContentErrorOnce(new FileOperationError('error', FileOperationResult.FILE_TOO_LARGE));
+
+		return input.resolve(true).then(resolved => {
+			assert.ok(resolved);
+
+			resolved.dispose();
+		});
+	});
+
 	test('disposes model when not open anymore', function () {
 		const resource = toResource(this, '/path/index.txt');
 
diff --git a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
index 19cf2bf26c1..10791cfd06d 100644
--- a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
+++ b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts
@@ -194,11 +194,6 @@ suite('Files - View Model', () => {
 		assert(validateFileName(s, '') !== null);
 		assert(validateFileName(s, '  ') !== null);
 		assert(validateFileName(s, 'Read Me') === null, 'name containing space');
-		assert(validateFileName(s, 'foo/bar') === null);
-		assert(validateFileName(s, 'foo\\bar') === null);
-		assert(validateFileName(s, 'all/slashes/are/same') === null);
-		assert(validateFileName(s, 'theres/one/different\\slash') === null);
-		assert(validateFileName(s, '/slashAtBeginning') === null);
 
 		if (isWindows) {
 			assert(validateFileName(s, 'foo:bar') !== null);
@@ -236,6 +231,38 @@ suite('Files - View Model', () => {
 		assert(validateFileName(s, 'foo') === null);
 	});
 
+	test('Validate Multi-Path File Names', function () {
+		const d = new Date().getTime();
+		const wsFolder = createStat('/', 'workspaceFolder', true, false, 8096, d);
+
+		assert(validateFileName(wsFolder, 'foo/bar') === null);
+		assert(validateFileName(wsFolder, 'foo\\bar') === null);
+		assert(validateFileName(wsFolder, 'all/slashes/are/same') === null);
+		assert(validateFileName(wsFolder, 'theres/one/different\\slash') === null);
+		assert(validateFileName(wsFolder, '/slashAtBeginning') !== null);
+
+		// validation should detect if user tries to add a child to a file
+		const fileInRoot = createStat('/fileInRoot', 'fileInRoot', false, false, 8096, d);
+		wsFolder.addChild(fileInRoot);
+		assert(validateFileName(wsFolder, 'fileInRoot/aChild') !== null);
+		wsFolder.removeChild(fileInRoot);
+
+		// attempting to add a child to a deeply nested file
+		const s1 = createStat('/path', 'path', true, false, 8096, d);
+		const s2 = createStat('/path/to', 'to', true, false, 8096, d);
+		const s3 = createStat('/path/to/stat', 'stat', true, false, 8096, d);
+		wsFolder.addChild(s1);
+		s1.addChild(s2);
+		s2.addChild(s3);
+		const fileDeeplyNested = createStat('/path/to/stat/fileNested', 'fileNested', false, false, 8096, d);
+		s3.addChild(fileDeeplyNested);
+		assert(validateFileName(wsFolder, '/path/to/stat/fileNested/aChild') !== null);
+
+		// detect if path already exists
+		assert(validateFileName(wsFolder, '/path/to/stat/fileNested') !== null);
+		assert(validateFileName(wsFolder, '/path/to/stat/') !== null);
+	});
+
 	test('Merge Local with Disk', function () {
 		const d = new Date().toUTCString();
 
diff --git a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
index 1d7f0a29cac..d94d09a13a7 100644
--- a/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
+++ b/src/vs/workbench/parts/html/electron-browser/html.contribution.ts
@@ -18,8 +18,6 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 
-import './webview.contribution';
-
 function getActivePreviewsForResource(accessor: ServicesAccessor, resource: URI | string) {
 	const uri = resource instanceof URI ? resource : URI.parse(resource);
 	return accessor.get(IWorkbenchEditorService).getVisibleEditors()
diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
index 7829900176f..344fef08a76 100644
--- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
+++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts
@@ -8,9 +8,8 @@
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModel } from 'vs/editor/common/model';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { empty as EmptyDisposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
-import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorInput, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { Position } from 'vs/platform/editor/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
@@ -21,13 +20,12 @@ import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/r
 import { Parts, IPartService } from 'vs/workbench/services/part/common/partService';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-
-import { Webview, WebviewOptions } from './webview';
 import { IStorageService } from 'vs/platform/storage/common/storage';
-import { BaseWebviewEditor } from './baseWebviewEditor';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import URI from 'vs/base/common/uri';
 import { Scope } from 'vs/workbench/common/memento';
+import { Dimension } from 'vs/base/browser/dom';
+import { BaseWebviewEditor } from 'vs/workbench/parts/webview/electron-browser/baseWebviewEditor';
+import { WebviewElement, WebviewOptions } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
 
 export interface HtmlPreviewEditorViewState {
 	scrollYPercentage: number;
@@ -51,6 +49,8 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 	private _content: HTMLElement;
 	private _scrollYPercentage: number = 0;
 
+	private editorViewStateMemento: EditorViewStateMemento<HtmlPreviewEditorViewState>;
+
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
@@ -59,10 +59,12 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IPartService private readonly _partService: IPartService,
-		@IStorageService private readonly _storageService: IStorageService,
+		@IStorageService readonly _storageService: IStorageService,
 		@ITextModelService private readonly _textModelResolverService: ITextModelService
 	) {
 		super(HtmlPreviewPart.ID, telemetryService, themeService, contextKeyService);
+
+		this.editorViewStateMemento = new EditorViewStateMemento<HtmlPreviewEditorViewState>(this.getMemento(_storageService, Scope.WORKSPACE), this.viewStateStorageKey);
 	}
 
 	dispose(): void {
@@ -78,21 +80,21 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		super.dispose();
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 		this._content = document.createElement('div');
 		this._content.style.position = 'absolute';
 		this._content.classList.add(HtmlPreviewPart.class);
-		parent.getHTMLElement().appendChild(this._content);
+		parent.appendChild(this._content);
 	}
 
-	private get webview(): Webview {
+	private get webview(): WebviewElement {
 		if (!this._webview) {
 			let webviewOptions: WebviewOptions = {};
 			if (this.input && this.input instanceof HtmlInput) {
 				webviewOptions = this.input.options;
 			}
 
-			this._webview = new Webview(
+			this._webview = new WebviewElement(
 				this._partService.getContainer(Parts.EDITOR_PART),
 				this.themeService,
 				this._environmentService,
@@ -106,7 +108,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 			this._webview.mountTo(this._content);
 
 			if (this.input && this.input instanceof HtmlInput) {
-				const state = this.loadViewState(this.input.getResource());
+				const state = this.loadHTMLPreviewViewState(this.input);
 				this._scrollYPercentage = state ? state.scrollYPercentage : 0;
 				this.webview.initialScrollProgress = this._scrollYPercentage;
 
@@ -168,7 +170,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	public clearInput(): void {
 		if (this.input instanceof HtmlInput) {
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -179,7 +181,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 	public shutdown(): void {
 		if (this.input instanceof HtmlInput) {
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -200,7 +202,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 
 		if (this.input instanceof HtmlInput) {
 			oldOptions = this.input.options;
-			this.saveViewState(this.input.getResource(), {
+			this.saveHTMLPreviewViewState(this.input, {
 				scrollYPercentage: this._scrollYPercentage
 			});
 		}
@@ -237,7 +239,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 						this.webview.contents = this.model.getLinesContent().join('\n');
 					}
 				});
-				const state = this.loadViewState(resourceUri);
+				const state = this.loadHTMLPreviewViewState(input);
 				this._scrollYPercentage = state ? state.scrollYPercentage : 0;
 				this.webview.baseUrl = resourceUri.toString(true);
 				this.webview.options = input.options;
@@ -253,34 +255,19 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
 		return this.getId() + '.editorViewState';
 	}
 
-	protected saveViewState(resource: URI | string, editorViewState: HtmlPreviewEditorViewState): void {
-		const memento = this.getMemento(this._storageService, Scope.WORKSPACE);
-		let editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey];
-		if (!editorViewStateMemento) {
-			editorViewStateMemento = Object.create(null);
-			memento[this.viewStateStorageKey] = editorViewStateMemento;
-		}
-
-		let fileViewState = editorViewStateMemento[resource.toString()];
-		if (!fileViewState) {
-			fileViewState = Object.create(null);
-			editorViewStateMemento[resource.toString()] = fileViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			fileViewState[this.position] = editorViewState;
-		}
+	private saveHTMLPreviewViewState(input: HtmlInput, editorViewState: HtmlPreviewEditorViewState): void {
+		this.editorViewStateMemento.saveState(input, this.position, editorViewState);
 	}
 
-	protected loadViewState(resource: URI | string): HtmlPreviewEditorViewState | null {
-		const memento = this.getMemento(this._storageService, Scope.WORKSPACE);
-		const editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey];
-		if (editorViewStateMemento) {
-			const fileViewState = editorViewStateMemento[resource.toString()];
-			if (fileViewState) {
-				return fileViewState[this.position];
-			}
-		}
-		return null;
+	private loadHTMLPreviewViewState(input: HtmlInput): HtmlPreviewEditorViewState {
+		return this.editorViewStateMemento.loadState(input, this.position);
+	}
+
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
 	}
 }
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts
deleted file mode 100644
index f6697f659f6..00000000000
--- a/src/vs/workbench/parts/html/electron-browser/webview.contribution.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { ContextKeyExpr, } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-
-import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
-import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
-import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ShowWebViewEditorFindTermCommand, HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
-
-const webviewDeveloperCategory = nls.localize('developer', "Developer");
-
-const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-
-const showNextFindWdigetCommand = new ShowWebViewEditorFindWidgetCommand({
-	id: ShowWebViewEditorFindWidgetCommand.ID,
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-	kbOpts: {
-		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindWdigetCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showNextFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.DownArrow
-	}
-}, true);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
-	id: 'editor.action.webvieweditor.showPreviousFindTerm',
-	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
-	kbOpts: {
-		primary: KeyMod.Alt | KeyCode.UpArrow
-	}
-}, false);
-KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-const hideCommand = new HideWebViewEditorFindCommand({
-	id: HideWebViewEditorFindCommand.Id,
-	precondition: ContextKeyExpr.and(
-		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
-		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
-	kbOpts: {
-		primary: KeyCode.Escape
-	}
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
-
-
-actionRegistry.registerWorkbenchAction(
-	new SyncActionDescriptor(OpenWebviewDeveloperToolsAction, OpenWebviewDeveloperToolsAction.ID, OpenWebviewDeveloperToolsAction.LABEL),
-	'Webview Tools',
-	webviewDeveloperCategory);
-
-actionRegistry.registerWorkbenchAction(
-	new SyncActionDescriptor(ReloadWebviewAction, ReloadWebviewAction.ID, ReloadWebviewAction.LABEL),
-	'Reload Webview',
-	webviewDeveloperCategory);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts b/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
index 4d111bf50d3..1c89acd7c6f 100644
--- a/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
+++ b/src/vs/workbench/parts/localizations/browser/localizations.contribution.ts
@@ -64,17 +64,25 @@ export class LocalizationWorkbenchContribution extends Disposable implements IWo
 		if (!this.storageService.getBoolean(donotAskUpdateKey) && e.local && e.local.manifest.contributes && e.local.manifest.contributes.localizations && e.local.manifest.contributes.localizations.length) {
 			const locale = e.local.manifest.contributes.localizations[0].languageId;
 			if (language !== locale) {
-				const updateLocaleMessage = localize('updateLocale', "Would you like to change VS Code's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId);
-				this.notificationService.prompt(Severity.Info, updateLocaleMessage, [localize('yes', "Yes"), localize('no', "No"), localize('doNotAskAgain', "Do not ask me again")])
-					.then(option => {
-						if (option === 0) {
+				this.notificationService.prompt(
+					Severity.Info,
+					localize('updateLocale', "Would you like to change VS Code's UI language to {0} and restart?", e.local.manifest.contributes.localizations[0].languageName || e.local.manifest.contributes.localizations[0].languageId),
+					[{
+						label: localize('yes', "Yes"),
+						run: () => {
 							const file = URI.file(join(this.environmentService.appSettingsHome, 'locale.json'));
 							this.jsonEditingService.write(file, { key: 'locale', value: locale }, true)
 								.then(() => this.windowsService.relaunch({}), e => this.notificationService.error(e));
-						} else if (option === 2) {
-							this.storageService.store(donotAskUpdateKey, true);
 						}
-					});
+					}, {
+						label: localize('no', "No"),
+						run: () => { }
+					}, {
+						label: localize('neverAgain', "Don't Show Again"),
+						isSecondary: true,
+						run: () => this.storageService.store(donotAskUpdateKey, true)
+					}]
+				);
 			}
 		}
 	}
diff --git a/src/vs/workbench/parts/markers/electron-browser/constants.ts b/src/vs/workbench/parts/markers/electron-browser/constants.ts
index b69836eaca0..88d963e3b64 100644
--- a/src/vs/workbench/parts/markers/electron-browser/constants.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/constants.ts
@@ -9,8 +9,10 @@ export default {
 	MARKERS_PANEL_ID: 'workbench.panel.markers',
 	MARKER_COPY_ACTION_ID: 'problems.action.copy',
 	MARKER_COPY_MESSAGE_ACTION_ID: 'problems.action.copyMessage',
+	RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID: 'problems.action.copyRelatedInformationMessage',
 	MARKER_OPEN_SIDE_ACTION_ID: 'problems.action.openToSide',
 	MARKER_SHOW_PANEL_ID: 'workbench.action.showErrorsWarnings',
 
-	MarkerFocusContextKey: new RawContextKey<boolean>('problemFocus', true)
+	MarkerFocusContextKey: new RawContextKey<boolean>('problemFocus', true),
+	RelatedInformationFocusContextKey: new RawContextKey<boolean>('relatedInformationFocus', true)
 };
diff --git a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
index 2c1ecca2c3f..789c79ff77b 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markers.contribution.ts
@@ -13,7 +13,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { KeybindingsRegistry, IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
-import { Marker } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { Marker, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
 import { MarkersPanel } from 'vs/workbench/parts/markers/electron-browser/markersPanel';
 import { MenuId, MenuRegistry, SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
@@ -101,7 +101,7 @@ registerAction({
 });
 registerAction({
 	id: Constants.MARKER_COPY_MESSAGE_ACTION_ID,
-	title: localize('copyMarkerMessage', "Copy Message"),
+	title: localize('copyMessage', "Copy Message"),
 	handler(accessor) {
 		copyMessage(accessor.get(IPanelService));
 	},
@@ -111,6 +111,18 @@ registerAction({
 		group: 'navigation'
 	}
 });
+registerAction({
+	id: Constants.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID,
+	title: localize('copyMessage', "Copy Message"),
+	handler(accessor) {
+		copyRelatedInformationMessage(accessor.get(IPanelService));
+	},
+	menu: {
+		menuId: MenuId.ProblemsPanelContext,
+		when: Constants.RelatedInformationFocusContextKey,
+		group: 'navigation'
+	}
+});
 
 
 function copyMarker(panelService: IPanelService) {
@@ -133,6 +145,16 @@ function copyMessage(panelService: IPanelService) {
 	}
 }
 
+function copyRelatedInformationMessage(panelService: IPanelService) {
+	const activePanel = panelService.getActivePanel();
+	if (activePanel instanceof MarkersPanel) {
+		const element = (<MarkersPanel>activePanel).getFocusElement();
+		if (element instanceof RelatedInformation) {
+			clipboard.writeText(element.raw.message);
+		}
+	}
+}
+
 interface IActionDescriptor {
 	id: string;
 	handler: ICommandHandler;
diff --git a/src/vs/workbench/parts/markers/electron-browser/markers.ts b/src/vs/workbench/parts/markers/electron-browser/markers.ts
index a15da7a99e9..2c104743afd 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markers.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markers.ts
@@ -13,16 +13,26 @@ import Constants from './constants';
 import URI from 'vs/base/common/uri';
 import { Event, Emitter } from 'vs/base/common/event';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { deepClone, mixin } from 'vs/base/common/objects';
+import { IExpression, getEmptyExpression } from 'vs/base/common/glob';
+import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { join, isAbsolute } from 'vs/base/common/paths';
 
 export const IMarkersWorkbenchService = createDecorator<IMarkersWorkbenchService>('markersWorkbenchService');
 
+export interface IFilter {
+	filterText: string;
+	useFilesExclude: boolean;
+}
+
 export interface IMarkersWorkbenchService {
 	_serviceBrand: any;
 
-	readonly onDidChangeMarkersForResources: Event<URI[]>;
+	readonly onDidChange: Event<URI[]>;
 	readonly markersModel: MarkersModel;
 
-	filter(filter: string): void;
+	filter(filter: IFilter): void;
 }
 
 export class MarkersWorkbenchService extends Disposable implements IMarkersWorkbenchService {
@@ -30,21 +40,30 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
 
 	readonly markersModel: MarkersModel;
 
-	private readonly _onDidChangeMarkersForResources: Emitter<URI[]> = this._register(new Emitter<URI[]>());
-	readonly onDidChangeMarkersForResources: Event<URI[]> = this._onDidChangeMarkersForResources.event;
+	private readonly _onDidChange: Emitter<URI[]> = this._register(new Emitter<URI[]>());
+	readonly onDidChange: Event<URI[]> = this._onDidChange.event;
+
+	private useFilesExclude: boolean = false;
 
 	constructor(
 		@IMarkerService private markerService: IMarkerService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
 		@IActivityService private activityService: IActivityService
 	) {
 		super();
 		this.markersModel = this._register(new MarkersModel(this.readMarkers()));
 		this._register(markerService.onMarkerChanged(resources => this.onMarkerChanged(resources)));
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (this.useFilesExclude && e.affectsConfiguration('files.exclude')) {
+				this.doFilter(this.markersModel.filterOptions.filter, this.getExcludeExpression());
+			}
+		}));
 	}
 
-	filter(filter: string): void {
-		this.markersModel.updateFilterOptions(new FilterOptions(filter));
-		this.refreshBadge();
+	filter(filter: IFilter): void {
+		this.useFilesExclude = filter.useFilesExclude;
+		this.doFilter(filter.filterText, this.getExcludeExpression());
 	}
 
 	private onMarkerChanged(resources: URI[]): void {
@@ -54,19 +73,61 @@ export class MarkersWorkbenchService extends Disposable implements IMarkersWorkb
 			}
 		});
 		this.refreshBadge();
-		this._onDidChangeMarkersForResources.fire(resources);
+		this._onDidChange.fire(resources);
 	}
 
 	private readMarkers(resource?: URI): IMarker[] {
 		return this.markerService.read({ resource, severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
 	}
 
+	private getExcludeExpression(): IExpression {
+		if (this.useFilesExclude) {
+			const workspaceFolders = this.workspaceContextService.getWorkspace().folders;
+			if (workspaceFolders.length) {
+				const result = getEmptyExpression();
+				for (const workspaceFolder of workspaceFolders) {
+					mixin(result, this.getExcludesForFolder(workspaceFolder));
+				}
+				return result;
+			} else {
+				return this.getFilesExclude();
+			}
+		}
+		return {};
+	}
+
+	private doFilter(filterText: string, filesExclude: IExpression): void {
+		this.markersModel.updateFilterOptions(new FilterOptions(filterText, filesExclude));
+		this.refreshBadge();
+		this._onDidChange.fire([]);
+	}
+
 	private refreshBadge(): void {
-		const { total, filtered } = this.markersModel.stats();
-		const message = total === filtered ? localize('totalProblems', 'Total {0} Problems', total) : localize('filteredProblems', 'Showing {0} of {1} Problems', filtered, total);
-		this.activityService.showActivity(Constants.MARKERS_PANEL_ID, new NumberBadge(filtered, () => message));
+		const { total } = this.markersModel.stats();
+		const message = localize('totalProblems', 'Total {0} Problems', total);
+		this.activityService.showActivity(Constants.MARKERS_PANEL_ID, new NumberBadge(total, () => message));
+	}
+
+	private getExcludesForFolder(workspaceFolder: IWorkspaceFolder): IExpression {
+		const expression = this.getFilesExclude(workspaceFolder.uri);
+		return this.getAbsoluteExpression(expression, workspaceFolder.uri.fsPath);
+	}
+
+	private getFilesExclude(resource?: URI): IExpression {
+		return deepClone(this.configurationService.getValue('files.exclude', { resource })) || {};
+	}
+
+	private getAbsoluteExpression(expr: IExpression, root: string): IExpression {
+		return Object.keys(expr)
+			.reduce((absExpr: IExpression, key: string) => {
+				if (expr[key] && !isAbsolute(key)) {
+					const absPattern = join(root, key);
+					absExpr[absPattern] = expr[key];
+				}
+
+				return absExpr;
+			}, Object.create(null));
 	}
 }
 
-
-registerSingleton(IMarkersWorkbenchService, MarkersWorkbenchService);
+registerSingleton(IMarkersWorkbenchService, MarkersWorkbenchService);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
index d0dbabbde75..652e9c08a5b 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersModel.ts
@@ -13,6 +13,8 @@ import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import { Schemas } from 'vs/base/common/network';
 import { groupBy, isFalsyOrEmpty, flatten } from 'vs/base/common/arrays';
 import { values } from 'vs/base/common/map';
+import * as glob from 'vs/base/common/glob';
+import * as strings from 'vs/base/common/strings';
 
 function compareUris(a: URI, b: URI) {
 	if (a.toString() < b.toString()) {
@@ -34,7 +36,9 @@ export class ResourceMarkers extends NodeWithId {
 	private _path: string = null;
 
 	readonly markers: Marker[];
-	filteredCount: number = 0;
+	isExcluded: boolean = false;
+	isIncluded: boolean = false;
+	filteredCount: number;
 	uriMatches: IMatch[] = [];
 
 	constructor(
@@ -96,14 +100,11 @@ export class Marker extends NodeWithId {
 	}
 
 	public toString(): string {
-		return [
-			`file: '${this.raw.resource}'`,
-			`severity: '${MarkerSeverity.toString(this.raw.severity)}'`,
-			`message: '${this.raw.message}'`,
-			`at: '${this.raw.startLineNumber},${this.raw.startColumn}'`,
-			`source: '${this.raw.source ? this.raw.source : ''}'`,
-			`code: '${this.raw.code ? this.raw.code : ''}'`
-		].join('\n');
+		return JSON.stringify({
+			...this.raw,
+			resource: this.raw.resource.path,
+			relatedInformation: this.resourceRelatedInformation.length ? this.resourceRelatedInformation.map(r => ({ ...r.raw, resource: r.raw.resource.path })) : void 0
+		}, null, '\t');
 	}
 
 	static compare(a: Marker, b: Marker): number {
@@ -130,21 +131,48 @@ export class FilterOptions {
 	readonly filterErrors: boolean = false;
 	readonly filterWarnings: boolean = false;
 	readonly filterInfos: boolean = false;
-	readonly filter: string = '';
-	readonly completeFilter: string = '';
+	readonly excludePattern: glob.ParsedExpression = null;
+	readonly includePattern: glob.ParsedExpression = null;
+	readonly textFilter: string = '';
 
-	constructor(filter: string = '') {
-		if (filter) {
-			this.completeFilter = filter;
-			this.filter = filter.trim();
-			this.filterErrors = this.matches(this.filter, Messages.MARKERS_PANEL_FILTER_ERRORS);
-			this.filterWarnings = this.matches(this.filter, Messages.MARKERS_PANEL_FILTER_WARNINGS);
-			this.filterInfos = this.matches(this.filter, Messages.MARKERS_PANEL_FILTER_INFOS);
+	constructor(readonly filter: string = '', excludePatterns: glob.IExpression = {}) {
+		filter = filter.trim();
+		for (const key of Object.keys(excludePatterns)) {
+			if (excludePatterns[key]) {
+				this.setPattern(excludePatterns, key);
+			}
+			delete excludePatterns[key];
 		}
+		const includePatterns: glob.IExpression = glob.getEmptyExpression();
+		if (filter) {
+			const filters = glob.splitGlobAware(filter, ',').map(s => s.trim()).filter(s => !!s.length);
+			for (const f of filters) {
+				this.filterErrors = this.filterErrors || this.matches(f, Messages.MARKERS_PANEL_FILTER_ERRORS);
+				this.filterWarnings = this.filterWarnings || this.matches(f, Messages.MARKERS_PANEL_FILTER_WARNINGS);
+				this.filterInfos = this.filterInfos || this.matches(f, Messages.MARKERS_PANEL_FILTER_INFOS);
+				if (strings.startsWith(f, '!')) {
+					this.setPattern(excludePatterns, strings.ltrim(f, '!'));
+				} else {
+					this.setPattern(includePatterns, f);
+					this.textFilter += ` ${f}`;
+				}
+			}
+		}
+		if (Object.keys(excludePatterns).length) {
+			this.excludePattern = glob.parse(excludePatterns);
+		}
+		if (Object.keys(includePatterns).length) {
+			this.includePattern = glob.parse(includePatterns);
+		}
+		this.textFilter = this.textFilter.trim();
 	}
 
-	public hasFilters(): boolean {
-		return !!this.filter;
+	private setPattern(expression: glob.IExpression, pattern: string) {
+		if (pattern[0] === '.') {
+			pattern = '*' + pattern; // convert ".js" to "*.js"
+		}
+		expression[`**/${pattern}/**`] = true;
+		expression[`**/${pattern}`] = true;
 	}
 
 	private matches(prefix: string, word: string): boolean {
@@ -232,89 +260,90 @@ export class MarkersModel {
 
 	public updateFilterOptions(filterOptions: FilterOptions): void {
 		this._filterOptions = filterOptions;
-		if (!this._filterOptions.hasFilters()) {
-			// reset all filters/matches
-			this._markersByResource.forEach(resource => {
-				resource.filteredCount = resource.markers.length;
-				resource.uriMatches = [];
-
-				for (const marker of resource.markers) {
-					marker.isSelected = true;
-					marker.messageMatches = [];
-					marker.sourceMatches = [];
-					marker.resourceRelatedInformation.forEach(r => {
-						r.uriMatches = [];
-						r.messageMatches = [];
-					});
-				}
-			});
-		} else {
-			// update properly
-			this._markersByResource.forEach(resource => {
-
-				resource.uriMatches = this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, paths.basename(resource.uri.fsPath)) : [];
-				resource.filteredCount = 0;
-
-				for (const marker of resource.markers) {
-					marker.messageMatches = this._filterOptions.hasFilters() ? FilterOptions._fuzzyFilter(this._filterOptions.filter, marker.raw.message) : [];
-					marker.sourceMatches = marker.raw.source && this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, marker.raw.source) : [];
-					marker.isSelected = this.filterMarker(marker.raw);
-					if (marker.isSelected) {
-						resource.filteredCount += 1;
-					}
-					marker.resourceRelatedInformation.forEach(r => {
-						r.uriMatches = this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, paths.basename(r.raw.resource.fsPath)) : [];
-						r.messageMatches = this._filterOptions.hasFilters() ? FilterOptions._fuzzyFilter(this._filterOptions.filter, r.raw.message) : [];
-					});
-				}
-			});
-		}
+		this._markersByResource.forEach(resource => {
+			this.updateResource(resource);
+			for (const marker of resource.markers) {
+				this.updateMarker(marker, resource);
+			}
+			this.updateFilteredCount(resource);
+		});
 	}
 
 	private createResource(uri: URI, rawMarkers: IMarker[]): ResourceMarkers {
 
 		let markers: Marker[] = [];
-		let filteredCount = 0;
-		for (let i = 0; i < rawMarkers.length; i++) {
-			let marker = this.createMarker(rawMarkers[i], i, uri.toString());
-			markers.push(marker);
-			if (marker.isSelected) {
-				filteredCount += 1;
-			}
-		}
-
 		const resource = new ResourceMarkers(uri, markers);
-		resource.filteredCount = filteredCount;
-		resource.uriMatches = this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, paths.basename(uri.fsPath)) : [];
+		this.updateResource(resource);
+
+		rawMarkers.forEach((rawMarker, index) => {
+			const marker = new Marker(uri.toString() + index, rawMarker);
+			if (rawMarker.relatedInformation) {
+				const groupedByResource = groupBy(rawMarker.relatedInformation, MarkersModel._compareMarkersByUri);
+				groupedByResource.sort((a, b) => compareUris(a[0].resource, b[0].resource));
+				marker.resourceRelatedInformation = flatten(groupedByResource).map((r, index) => new RelatedInformation(marker.id + index, r));
+			}
+			this.updateMarker(marker, resource);
+			markers.push(marker);
+		});
+
+		this.updateFilteredCount(resource);
 
 		return resource;
 	}
 
-	private createMarker(rawMarker: IMarker, index: number, uri: string): Marker {
-		const marker = new Marker(uri + index, rawMarker);
-		marker.messageMatches = this._filterOptions.hasFilters() ? FilterOptions._fuzzyFilter(this._filterOptions.filter, rawMarker.message) : [];
-		marker.sourceMatches = rawMarker.source && this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, rawMarker.source) : [];
-		marker.isSelected = this.filterMarker(rawMarker);
-		if (rawMarker.relatedInformation) {
-			const groupedByResource = groupBy(rawMarker.relatedInformation, MarkersModel._compareMarkersByUri);
-			groupedByResource.sort((a, b) => compareUris(a[0].resource, b[0].resource));
-			marker.resourceRelatedInformation = flatten(groupedByResource).map((r, index) => {
-				const relatedInformation = new RelatedInformation(marker.id + index, r);
-				relatedInformation.uriMatches = this._filterOptions.hasFilters() ? FilterOptions._filter(this._filterOptions.filter, paths.basename(r.resource.fsPath)) : [];
-				relatedInformation.messageMatches = this._filterOptions.hasFilters() ? FilterOptions._fuzzyFilter(this._filterOptions.filter, r.message) : [];
-				return relatedInformation;
-			});
-		}
-		return marker;
+	private updateResource(resource: ResourceMarkers): void {
+		resource.isExcluded = this.isResourceExcluded(resource);
+		resource.isIncluded = this.isResourceIncluded(resource);
+		resource.uriMatches = this._filterOptions.textFilter ? FilterOptions._filter(this._filterOptions.textFilter, paths.basename(resource.uri.fsPath)) : [];
 	}
 
-	private filterMarker(marker: IMarker): boolean {
-		if (!this._filterOptions.hasFilters()) {
+	private updateFilteredCount(resource: ResourceMarkers): void {
+		if (resource.isExcluded) {
+			resource.filteredCount = 0;
+		} else if (resource.isIncluded) {
+			resource.filteredCount = resource.markers.length;
+		} else {
+			resource.filteredCount = resource.markers.filter(m => m.isSelected).length;
+		}
+	}
+
+	private updateMarker(marker: Marker, resource: ResourceMarkers): void {
+		marker.messageMatches = !resource.isExcluded && this._filterOptions.textFilter ? FilterOptions._fuzzyFilter(this._filterOptions.textFilter, marker.raw.message) : [];
+		marker.sourceMatches = !resource.isExcluded && marker.raw.source && this._filterOptions.textFilter ? FilterOptions._filter(this._filterOptions.textFilter, marker.raw.source) : [];
+		marker.resourceRelatedInformation.forEach(r => {
+			r.uriMatches = !resource.isExcluded && this._filterOptions.textFilter ? FilterOptions._filter(this._filterOptions.textFilter, paths.basename(r.raw.resource.fsPath)) : [];
+			r.messageMatches = !resource.isExcluded && this._filterOptions.textFilter ? FilterOptions._fuzzyFilter(this._filterOptions.textFilter, r.raw.message) : [];
+		});
+		marker.isSelected = this.isMarkerSelected(marker.raw, resource);
+	}
+
+	private isResourceExcluded(resource: ResourceMarkers): boolean {
+		if (resource.uri.scheme === Schemas.walkThrough || resource.uri.scheme === Schemas.walkThroughSnippet) {
 			return true;
 		}
-		if (marker.resource.scheme === Schemas.walkThrough || marker.resource.scheme === Schemas.walkThroughSnippet) {
+		if (this.filterOptions.excludePattern && !!this.filterOptions.excludePattern(resource.uri.fsPath)) {
+			return true;
+		}
+		return false;
+	}
+
+	private isResourceIncluded(resource: ResourceMarkers): boolean {
+		if (this.filterOptions.includePattern && this.filterOptions.includePattern(resource.uri.fsPath)) {
+			return true;
+		}
+		if (this._filterOptions.textFilter && !!FilterOptions._filter(this._filterOptions.textFilter, paths.basename(resource.uri.fsPath))) {
+			return true;
+		}
+		return false;
+	}
+
+	private isMarkerSelected(marker: IMarker, resource: ResourceMarkers): boolean {
+		if (resource.isExcluded) {
 			return false;
 		}
+		if (resource.isIncluded) {
+			return true;
+		}
 		if (this._filterOptions.filterErrors && MarkerSeverity.Error === marker.severity) {
 			return true;
 		}
@@ -324,18 +353,18 @@ export class MarkersModel {
 		if (this._filterOptions.filterInfos && MarkerSeverity.Info === marker.severity) {
 			return true;
 		}
-		if (!!FilterOptions._fuzzyFilter(this._filterOptions.filter, marker.message)) {
+		if (!this._filterOptions.textFilter) {
 			return true;
 		}
-		if (!!FilterOptions._filter(this._filterOptions.filter, paths.basename(marker.resource.fsPath))) {
+		if (!!FilterOptions._fuzzyFilter(this._filterOptions.textFilter, marker.message)) {
 			return true;
 		}
-		if (!!marker.source && !!FilterOptions._filter(this._filterOptions.filter, marker.source)) {
+		if (!!marker.source && !!FilterOptions._filter(this._filterOptions.textFilter, marker.source)) {
 			return true;
 		}
 		if (!!marker.relatedInformation && marker.relatedInformation.some(r =>
-			!!FilterOptions._filter(this._filterOptions.filter, paths.basename(r.resource.fsPath)) || !
-			!FilterOptions._filter(this._filterOptions.filter, r.message))) {
+			!!FilterOptions._filter(this._filterOptions.textFilter, paths.basename(r.resource.fsPath)) || !
+			!FilterOptions._filter(this._filterOptions.textFilter, r.message))) {
 			return true;
 		}
 		return false;
@@ -344,16 +373,4 @@ export class MarkersModel {
 	public dispose(): void {
 		this._markersByResource.clear();
 	}
-
-	public getMessage(): string {
-		if (this.hasFilteredResources()) {
-			return '';
-		}
-		if (this.hasResources()) {
-			if (this._filterOptions.hasFilters()) {
-				return Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
-			}
-		}
-		return Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT;
-	}
 }
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
index 913ce14a873..7c11d749c64 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanel.ts
@@ -10,9 +10,7 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Delayer } from 'vs/base/common/async';
 import * as dom from 'vs/base/browser/dom';
-import * as builder from 'vs/base/browser/builder';
-import { IAction, Action } from 'vs/base/common/actions';
-import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { IAction, IActionItem } from 'vs/base/common/actions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { Panel } from 'vs/workbench/browser/panel';
@@ -22,7 +20,7 @@ import { Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/
 import { Controller } from 'vs/workbench/parts/markers/electron-browser/markersTreeController';
 import * as Viewer from 'vs/workbench/parts/markers/electron-browser/markersTreeViewer';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { CollapseAllAction, FilterAction, FilterInputBoxActionItem } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
+import { CollapseAllAction, MarkersFilterActionItem, MarkersFilterAction } from 'vs/workbench/parts/markers/electron-browser/markersPanelActions';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
@@ -32,6 +30,9 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IMarkersWorkbenchService } from 'vs/workbench/parts/markers/electron-browser/markers';
 import { SimpleFileResourceDragAndDrop } from 'vs/workbench/browser/dnd';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { Scope } from 'vs/workbench/common/memento';
+import { localize } from 'vs/nls';
 
 export class MarkersPanel extends Panel {
 
@@ -45,12 +46,12 @@ export class MarkersPanel extends Panel {
 	private rangeHighlightDecorations: RangeHighlightDecorations;
 
 	private actions: IAction[];
-	private filterAction: FilterAction;
 	private collapseAllAction: IAction;
+	private filterInputActionItem: MarkersFilterActionItem;
 
 	private treeContainer: HTMLElement;
 	private messageBoxContainer: HTMLElement;
-	private messageBox: HTMLElement;
+	private panelSettings: any;
 
 	private currentResourceGotAddedToMarkersData: boolean = false;
 
@@ -61,28 +62,32 @@ export class MarkersPanel extends Panel {
 		@IConfigurationService private configurationService: IConfigurationService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
-		@IMarkersWorkbenchService private markersWorkbenchService: IMarkersWorkbenchService
+		@IMarkersWorkbenchService private markersWorkbenchService: IMarkersWorkbenchService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super(Constants.MARKERS_PANEL_ID, telemetryService, themeService);
 		this.delayedRefresh = new Delayer<void>(500);
 		this.autoExpanded = new Set<string>();
+		this.panelSettings = this.getMemento(storageService, Scope.WORKSPACE);
 	}
 
-	public create(parent: builder.Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
 		this.rangeHighlightDecorations = this.instantiationService.createInstance(RangeHighlightDecorations);
 		this.toUnbind.push(this.rangeHighlightDecorations);
 
-		dom.addClass(parent.getHTMLElement(), 'markers-panel');
+		dom.addClass(parent, 'markers-panel');
 
-		let container = dom.append(parent.getHTMLElement(), dom.$('.markers-panel-container'));
+		let container = dom.append(parent, dom.$('.markers-panel-container'));
 
 		this.createMessageBox(container);
 		this.createTree(container);
-
+		this.createActions();
 		this.createListeners();
 
+		this.updateFilter();
+
 		return this.render();
 	}
 
@@ -90,8 +95,10 @@ export class MarkersPanel extends Panel {
 		return Messages.MARKERS_PANEL_TITLE_PROBLEMS;
 	}
 
-	public layout(dimension: builder.Dimension): void {
-		this.tree.layout(dimension.height);
+	public layout(dimension: dom.Dimension): void {
+		this.treeContainer.style.height = `${dimension.height}px`;
+		this.tree.layout(dimension.height, dimension.width);
+		this.filterInputActionItem.toggleLayout(dimension.width < 1200);
 	}
 
 	public focus(): void {
@@ -107,7 +114,7 @@ export class MarkersPanel extends Panel {
 			this.highlightCurrentSelectedMarkerRange();
 			this.autoReveal(true);
 		} else {
-			this.messageBox.focus();
+			this.messageBoxContainer.focus();
 		}
 	}
 
@@ -127,9 +134,8 @@ export class MarkersPanel extends Panel {
 
 	public getActions(): IAction[] {
 		if (!this.actions) {
-			this.actions = this.createActions();
+			this.createActions();
 		}
-		this.collapseAllAction.enabled = this.markersWorkbenchService.markersModel.hasFilteredResources();
 		return this.actions;
 	}
 
@@ -173,17 +179,13 @@ export class MarkersPanel extends Panel {
 		return TPromise.as(null);
 	}
 
-	public updateFilter(filter: string) {
-		this.markersWorkbenchService.filter(filter);
+	private updateFilter() {
 		this.autoExpanded = new Set<string>();
-		this.refreshPanel();
-		this.autoReveal();
+		this.markersWorkbenchService.filter({ filterText: this.filterInputActionItem.getFilterText(), useFilesExclude: this.filterInputActionItem.useFilesExclude });
 	}
 
 	private createMessageBox(parent: HTMLElement): void {
 		this.messageBoxContainer = dom.append(parent, dom.$('.message-box-container'));
-		this.messageBox = dom.append(this.messageBoxContainer, dom.$('span'));
-		this.messageBox.setAttribute('tabindex', '0');
 	}
 
 	private createTree(parent: HTMLElement): void {
@@ -204,7 +206,17 @@ export class MarkersPanel extends Panel {
 				ariaLabel: Messages.MARKERS_PANEL_ARIA_LABEL_PROBLEMS_TREE
 			});
 
-		Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
+		const markerFocusContextKey = Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
+		const relatedInformationFocusContextKey = Constants.RelatedInformationFocusContextKey.bindTo(this.tree.contextKeyService);
+		this._register(this.tree.onDidChangeFocus((e: { focus: any }) => {
+			markerFocusContextKey.set(e.focus instanceof Marker);
+			relatedInformationFocusContextKey.set(e.focus instanceof RelatedInformation);
+		}));
+		const focusTracker = this._register(dom.trackFocus(this.tree.getHTMLElement()));
+		this._register(focusTracker.onDidBlur(() => {
+			markerFocusContextKey.set(false);
+			relatedInformationFocusContextKey.set(false);
+		}));
 
 		const markersNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
 		this._register(debounceEvent(markersNavigator.openResource, (last, event) => event, 75, true)(options => {
@@ -212,28 +224,24 @@ export class MarkersPanel extends Panel {
 		}));
 	}
 
-	private createActions(): IAction[] {
+	private createActions(): void {
 		this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, true);
-		this.filterAction = new FilterAction();
-		const actions = [
-			this.filterAction,
-			this.collapseAllAction
-		];
-		actions.forEach(a => {
-			this.toUnbind.push(a);
-		});
-		return actions;
+		const filterAction = this.instantiationService.createInstance(MarkersFilterAction);
+		this.filterInputActionItem = this.instantiationService.createInstance(MarkersFilterActionItem, { filterText: this.panelSettings['filter'] || '', filterHistory: this.panelSettings['filterHistory'] || [], useFilesExclude: !!this.panelSettings['useFilesExclude'] }, filterAction);
+		this.actions = [filterAction, this.collapseAllAction];
 	}
 
 	private createListeners(): void {
-		this.toUnbind.push(this.markersWorkbenchService.onDidChangeMarkersForResources(this.onMarkerChanged, this));
+		this.toUnbind.push(this.markersWorkbenchService.onDidChange(resources => this.onDidChange(resources)));
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(this.onEditorsChanged, this));
 		this.toUnbind.push(this.tree.onDidChangeSelection(() => this.onSelected()));
+		this.toUnbind.push(this.filterInputActionItem.onDidChange(() => this.updateFilter()));
+		this.actions.forEach(a => this.toUnbind.push(a));
 	}
 
-	private onMarkerChanged(changedResources: URI[]) {
-		this.currentResourceGotAddedToMarkersData = this.currentResourceGotAddedToMarkersData || this.isCurrentResourceGotAddedToMarkersData(changedResources);
-		this.updateResources(changedResources);
+	private onDidChange(resources: URI[]) {
+		this.currentResourceGotAddedToMarkersData = this.currentResourceGotAddedToMarkersData || this.isCurrentResourceGotAddedToMarkersData(resources);
+		this.updateResources(resources);
 		this.delayedRefresh.trigger(() => {
 			this.refreshPanel();
 			this.updateRangeHighlights();
@@ -286,8 +294,44 @@ export class MarkersPanel extends Panel {
 	}
 
 	private renderMessage(): void {
-		this.messageBox.textContent = this.markersWorkbenchService.markersModel.getMessage();
-		dom.toggleClass(this.messageBoxContainer, 'hidden', this.markersWorkbenchService.markersModel.hasFilteredResources());
+		const markersModel = this.markersWorkbenchService.markersModel;
+		const hasFilteredResources = markersModel.hasFilteredResources();
+		dom.clearNode(this.messageBoxContainer);
+		dom.toggleClass(this.messageBoxContainer, 'hidden', hasFilteredResources);
+		if (!hasFilteredResources) {
+			if (markersModel.hasResources()) {
+				if (markersModel.filterOptions.filter) {
+					this.renderFilteredByFilterMessage(this.messageBoxContainer);
+				} else {
+					this.renderFilteredByFilesExcludeMessage(this.messageBoxContainer);
+				}
+			} else {
+				this.renderNoProblemsMessage(this.messageBoxContainer);
+			}
+		}
+	}
+
+	private renderFilteredByFilesExcludeMessage(container: HTMLElement) {
+		const span1 = dom.append(container, dom.$('span'));
+		span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER;
+		const link = dom.append(container, dom.$('a.messageAction'));
+		link.textContent = localize('disableFilesExclude', "Disable Files Exclude.");
+		link.setAttribute('tabIndex', '0');
+		dom.addDisposableListener(link, dom.EventType.CLICK, () => this.filterInputActionItem.useFilesExclude = false);
+	}
+
+	private renderFilteredByFilterMessage(container: HTMLElement) {
+		const span1 = dom.append(container, dom.$('span'));
+		span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
+		const link = dom.append(container, dom.$('a.messageAction'));
+		link.textContent = localize('clearFilter', "Clear Filter.");
+		link.setAttribute('tabIndex', '0');
+		dom.addDisposableListener(link, dom.EventType.CLICK, () => this.filterInputActionItem.clear());
+	}
+
+	private renderNoProblemsMessage(container: HTMLElement) {
+		const span = dom.append(container, dom.$('span'));
+		span.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT;
 	}
 
 	private autoExpand(): void {
@@ -366,15 +410,24 @@ export class MarkersPanel extends Panel {
 		}
 	}
 
-	public getActionItem(action: Action): IActionItem {
-		if (action.id === FilterAction.ID) {
-			return this.instantiationService.createInstance(FilterInputBoxActionItem, this, action);
+	public getFocusElement(): ResourceMarkers | Marker {
+		return this.tree.getFocus();
+	}
+
+	public getActionItem(action: IAction): IActionItem {
+		if (action.id === MarkersFilterAction.ID) {
+			return this.filterInputActionItem;
 		}
 		return super.getActionItem(action);
 	}
 
-	public getFocusElement(): ResourceMarkers | Marker {
-		return this.tree.getFocus();
+	public shutdown(): void {
+		// store memento
+		this.panelSettings['filter'] = this.filterInputActionItem.getFilterText();
+		this.panelSettings['filterHistory'] = this.filterInputActionItem.getFilterHistory();
+		this.panelSettings['useFilesExclude'] = this.filterInputActionItem.useFilesExclude;
+
+		super.shutdown();
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
index 29fa7d076cc..074b2b70348 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersPanelActions.ts
@@ -5,10 +5,8 @@
 
 import { Delayer } from 'vs/base/common/async';
 import * as DOM from 'vs/base/browser/dom';
-import * as lifecycle from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IAction, Action } from 'vs/base/common/actions';
-import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Action, IAction } from 'vs/base/common/actions';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -16,15 +14,21 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView
 import { TogglePanelAction } from 'vs/workbench/browser/panel';
 import Messages from 'vs/workbench/parts/markers/electron-browser/messages';
 import Constants from 'vs/workbench/parts/markers/electron-browser/constants';
-import { MarkersPanel } from 'vs/workbench/parts/markers/electron-browser/markersPanel';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults';
 import * as Tree from 'vs/base/parts/tree/browser/tree';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
+import { attachInputBoxStyler, attachStylerCallback, attachCheckboxStyler } from 'vs/platform/theme/common/styler';
 import { IMarkersWorkbenchService } from 'vs/workbench/parts/markers/electron-browser/markers';
+import { Event, Emitter } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { HistoryNavigator } from 'vs/base/common/history';
+import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
+import { badgeBackground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
+import { localize } from 'vs/nls';
+import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
 
 export class ToggleMarkersPanelAction extends TogglePanelAction {
 
@@ -34,8 +38,10 @@ export class ToggleMarkersPanelAction extends TogglePanelAction {
 	constructor(id: string, label: string,
 		@IPartService partService: IPartService,
 		@IPanelService panelService: IPanelService,
+		@IMarkersWorkbenchService markersWorkbenchService: IMarkersWorkbenchService
 	) {
 		super(id, label, Constants.MARKERS_PANEL_ID, panelService, partService);
+		this.enabled = markersWorkbenchService.markersModel.hasFilteredResources();
 	}
 }
 
@@ -62,51 +68,211 @@ export class CollapseAllAction extends TreeCollapseAction {
 	}
 }
 
-export class FilterAction extends Action {
+export class MarkersFilterAction extends Action {
 
 	public static readonly ID: string = 'workbench.actions.problems.filter';
 
 	constructor() {
-		super(FilterAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER, 'markers-panel-action-filter', true);
+		super(MarkersFilterAction.ID, Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER, 'markers-panel-action-filter', true);
 	}
 
 }
 
-export class FilterInputBoxActionItem extends BaseActionItem {
 
-	protected toDispose: lifecycle.IDisposable[];
+export interface IMarkersFilterActionItemOptions {
+	filterText: string;
+	filterHistory: string[];
+	useFilesExclude: boolean;
+}
+
+export class MarkersFilterActionItem extends BaseActionItem {
+
+	private _toDispose: IDisposable[] = [];
+
+	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
 
 	private delayedFilterUpdate: Delayer<void>;
+	private container: HTMLElement;
+	private filterInputBox: InputBox;
+	private filterHistory: HistoryNavigator<string>;
+	private controlsContainer: HTMLInputElement;
+	private filterBadge: HTMLInputElement;
+	private filesExcludeFilter: Checkbox;
 
-	constructor(private markersPanel: MarkersPanel, action: IAction,
+	constructor(
+		private itemOptions: IMarkersFilterActionItemOptions,
+		action: IAction,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IThemeService private themeService: IThemeService,
 		@IMarkersWorkbenchService private markersWorkbenchService: IMarkersWorkbenchService,
-		@ITelemetryService private telemetryService: ITelemetryService) {
-		super(markersPanel, action);
-		this.toDispose = [];
+		@ITelemetryService private telemetryService: ITelemetryService
+	) {
+		super(null, action);
 		this.delayedFilterUpdate = new Delayer<void>(500);
+		this.filterHistory = new HistoryNavigator<string>(itemOptions.filterHistory || []);
 	}
 
-	public render(container: HTMLElement): void {
-		DOM.addClass(container, 'markers-panel-action-filter');
-		let filterInputBox = new InputBox(container, this.contextViewService, {
+	render(container: HTMLElement): void {
+		this.container = container;
+		DOM.addClass(this.container, 'markers-panel-action-filter');
+		this.createInput(this.container);
+		this.createControls(this.container);
+		this.adjustInputBox();
+	}
+
+	clear(): void {
+		this.filterInputBox.value = '';
+	}
+
+	getFilterText(): string {
+		return this.filterInputBox ? this.filterInputBox.value : this.itemOptions.filterText;
+	}
+
+	getFilterHistory(): string[] {
+		return this.filterHistory.getHistory();
+	}
+
+	get useFilesExclude(): boolean {
+		return this.filesExcludeFilter ? this.filesExcludeFilter.checked : this.itemOptions.useFilesExclude;
+	}
+
+	set useFilesExclude(useFilesExclude: boolean) {
+		if (this.filesExcludeFilter) {
+			if (this.filesExcludeFilter.checked !== useFilesExclude) {
+				this.filesExcludeFilter.checked = useFilesExclude;
+				this._onDidChange.fire();
+			}
+		}
+	}
+
+	toggleLayout(small: boolean) {
+		if (this.container) {
+			DOM.toggleClass(this.container, 'small', small);
+			DOM.toggleClass(this.filterBadge, 'small', small);
+		}
+	}
+
+	private createInput(container: HTMLElement): void {
+		this.filterInputBox = new InputBox(container, this.contextViewService, {
 			placeholder: Messages.MARKERS_PANEL_FILTER_PLACEHOLDER,
-			ariaLabel: Messages.MARKERS_PANEL_FILTER_PLACEHOLDER
+			ariaLabel: Messages.MARKERS_PANEL_FILTER_ARIA_LABEL
 		});
-		this.toDispose.push(attachInputBoxStyler(filterInputBox, this.themeService));
-		filterInputBox.value = this.markersWorkbenchService.markersModel.filterOptions.completeFilter;
-		this.toDispose.push(filterInputBox.onDidChange(filter => this.delayedFilterUpdate.trigger(() => this.updateFilter(filter))));
-		this.toDispose.push(DOM.addStandardDisposableListener(filterInputBox.inputElement, 'keyup', (keyboardEvent) => this.onInputKeyUp(keyboardEvent, filterInputBox)));
-		this.toDispose.push(DOM.addStandardDisposableListener(container, 'keydown', this.handleKeyboardEvent));
-		this.toDispose.push(DOM.addStandardDisposableListener(container, 'keyup', this.handleKeyboardEvent));
+		this._register(attachInputBoxStyler(this.filterInputBox, this.themeService));
+		this.filterInputBox.value = this.itemOptions.filterText;
+		this._register(this.filterInputBox.onDidChange(filter => this.delayedFilterUpdate.trigger(() => this.onDidInputChange())));
+		this._register(DOM.addStandardDisposableListener(this.filterInputBox.inputElement, 'keydown', (keyboardEvent) => this.onInputKeyDown(keyboardEvent, this.filterInputBox)));
+		this._register(DOM.addStandardDisposableListener(container, 'keydown', this.handleKeyboardEvent));
+		this._register(DOM.addStandardDisposableListener(container, 'keyup', this.handleKeyboardEvent));
 	}
 
-	private updateFilter(filter: string) {
-		this.markersPanel.updateFilter(filter);
+	private createControls(container: HTMLElement): void {
+		this.controlsContainer = DOM.append(container, DOM.$('.markers-panel-filter-controls'));
+		this.createBadge(this.controlsContainer);
+		this.createFilesExcludeCheckbox(this.controlsContainer);
+	}
+
+	private createBadge(container: HTMLElement): void {
+		this.filterBadge = DOM.append(container, DOM.$('.markers-panel-filter-badge'));
+		this._register(attachStylerCallback(this.themeService, { badgeBackground, contrastBorder }, colors => {
+			const background = colors.badgeBackground ? colors.badgeBackground.toString() : null;
+			const border = colors.contrastBorder ? colors.contrastBorder.toString() : null;
+
+			this.filterBadge.style.backgroundColor = background;
+
+			this.filterBadge.style.borderWidth = border ? '1px' : null;
+			this.filterBadge.style.borderStyle = border ? 'solid' : null;
+			this.filterBadge.style.borderColor = border;
+		}));
+		this.updateBadge();
+		this._register(this.markersWorkbenchService.onDidChange(() => this.updateBadge()));
+	}
+
+	private createFilesExcludeCheckbox(container: HTMLElement): void {
+		this.filesExcludeFilter = new Checkbox({
+			actionClassName: 'markers-panel-filter-filesExclude',
+			title: this.itemOptions.useFilesExclude ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE,
+			isChecked: this.itemOptions.useFilesExclude,
+			onChange: () => {
+				this.filesExcludeFilter.domNode.title = this.filesExcludeFilter.checked ? Messages.MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE : Messages.MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE;
+				this._onDidChange.fire();
+			}
+		});
+		this._register(attachCheckboxStyler(this.filesExcludeFilter, this.themeService));
+		container.appendChild(this.filesExcludeFilter.domNode);
+	}
+
+	private onDidInputChange() {
+		const filterText = this.filterInputBox.value;
+		if (filterText && filterText !== this.filterHistory.current()) {
+			this.filterHistory.add(this.getFilterText());
+		}
+		this._onDidChange.fire();
 		this.reportFilteringUsed();
 	}
 
+	private updateBadge(): void {
+		const { total, filtered } = this.markersWorkbenchService.markersModel.stats();
+		DOM.toggleClass(this.filterBadge, 'hidden', total === filtered || filtered === 0);
+		this.filterBadge.textContent = localize('showing filtered problems', "Showing {0} of {1}", filtered, total);
+		this.adjustInputBox();
+	}
+
+	private adjustInputBox(): void {
+		this.filterInputBox.inputElement.style.paddingRight = (DOM.getTotalWidth(this.controlsContainer) || 20) + 'px';
+	}
+
+	// Action toolbar is swallowing some keys for action items which should not be for an input box
+	private handleKeyboardEvent(e: IKeyboardEvent) {
+		switch (e.keyCode) {
+			case KeyCode.Space:
+			case KeyCode.LeftArrow:
+			case KeyCode.RightArrow:
+			case KeyCode.Escape:
+				e.stopPropagation();
+				break;
+		}
+	}
+
+	private showNextFilter() {
+		let next = this.filterHistory.next();
+		if (next) {
+			this.filterInputBox.value = next;
+		}
+	}
+
+	private showPreviousFilter() {
+		let previous = this.filterHistory.previous();
+		if (this.filterInputBox.value) {
+			this.filterHistory.addIfNotPresent(this.filterInputBox.value);
+		}
+		if (previous) {
+			this.filterInputBox.value = previous;
+		}
+	}
+
+	private onInputKeyDown(keyboardEvent: IKeyboardEvent, filterInputBox: InputBox) {
+		let handled = false;
+		switch (keyboardEvent.keyCode) {
+			case KeyCode.Escape:
+				filterInputBox.value = '';
+				handled = true;
+				break;
+			case KeyCode.UpArrow:
+				this.showPreviousFilter();
+				handled = true;
+				break;
+			case KeyCode.DownArrow:
+				this.showNextFilter();
+				handled = true;
+				break;
+		}
+		if (handled) {
+			keyboardEvent.stopPropagation();
+			keyboardEvent.preventDefault();
+		}
+	}
+
 	private reportFilteringUsed(): void {
 		let data = {};
 		data['errors'] = this.markersWorkbenchService.markersModel.filterOptions.filterErrors;
@@ -122,30 +288,8 @@ export class FilterInputBoxActionItem extends BaseActionItem {
 		this.telemetryService.publicLog('problems.filter', data);
 	}
 
-	public dispose(): void {
-		this.toDispose = lifecycle.dispose(this.toDispose);
-		super.dispose();
+	private _register<T extends IDisposable>(t: T): T {
+		this._toDispose.push(t);
+		return t;
 	}
-
-	// Action toolbar is swallowing some keys for action items which should not be for an input box
-	private handleKeyboardEvent(e: IKeyboardEvent) {
-		switch (e.keyCode) {
-			case KeyCode.Space:
-			case KeyCode.LeftArrow:
-			case KeyCode.RightArrow:
-			case KeyCode.Escape:
-				e.stopPropagation();
-				break;
-		}
-	}
-
-	private onInputKeyUp(keyboardEvent: IKeyboardEvent, filterInputBox: InputBox) {
-		switch (keyboardEvent.keyCode) {
-			case KeyCode.Escape:
-				filterInputBox.value = '';
-				return;
-			default:
-				return;
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
index bc55f39e66a..55577952d80 100644
--- a/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
@@ -205,12 +205,13 @@ export class Renderer implements IRenderer {
 	private renderMarkerElement(tree: ITree, element: Marker, templateData: IMarkerTemplateData) {
 		let marker = element.raw;
 		templateData.icon.className = 'icon ' + Renderer.iconClassNameFor(marker);
+
+		templateData.source.set(marker.source, element.sourceMatches);
+		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
+
 		templateData.description.set(marker.message, element.messageMatches);
 		templateData.description.element.title = marker.message;
 
-		dom.toggleClass(templateData.source.element, 'marker-source', !!marker.source);
-		templateData.source.set(marker.source, element.sourceMatches);
-
 		templateData.lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
 	}
 
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings-dark.svg b/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings-dark.svg
new file mode 100755
index 00000000000..3eeedcb41c6
--- /dev/null
+++ b/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2b282e}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 10.015l-.258.043c.155.455.258.935.258 1.442 0 2.481-2.019 4.5-4.5 4.5-.508 0-.988-.103-1.444-.259l-.043.259H5.986l-.373-2.237-1.846 1.317-2.848-2.847 1.319-1.847L0 10.013V5.986l2.238-.373L.919 3.767 3.768.919l1.846 1.319L5.986 0h4.028l.372 2.238L12.233.919l2.847 2.848-1.318 1.846L16 5.986v4.029z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M7 11.5c0-.501.101-.975.253-1.426A2.207 2.207 0 0 1 8 5.788c.958 0 1.767.613 2.074 1.466A4.417 4.417 0 0 1 11.5 7c1.421 0 2.675.675 3.5 1.706V6.834l-2.121-.354a5.14 5.14 0 0 0-.354-.854l1.25-1.75-1.65-1.65-1.752 1.251c-.137-.072-.262-.159-.408-.219-.147-.061-.296-.088-.444-.134L9.167 1H6.834L6.48 3.121c-.295.092-.581.21-.854.354l-1.75-1.25-1.65 1.65 1.252 1.752c-.073.137-.16.263-.221.409-.06.145-.087.295-.133.443L1 6.833v2.333l2.121.354c.092.295.21.581.354.854l-1.25 1.75 1.65 1.65 1.752-1.251c.137.072.262.159.408.219.146.06.296.087.444.133L6.833 15h1.873C7.675 14.175 7 12.921 7 11.5z" id="iconBg"/><path class="icon-vs-bg" d="M11.5 8a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7zM9 12v-1h5v1H9z" id="notificationBg"/><g id="notificationFg"><path class="icon-vs-fg" d="M9 11h5v1H9z" style="display: none;"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings.svg b/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings.svg
new file mode 100755
index 00000000000..79decb032b1
--- /dev/null
+++ b/src/vs/workbench/parts/markers/electron-browser/media/excludeSettings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 10.015l-.258.043c.155.455.258.935.258 1.442 0 2.481-2.019 4.5-4.5 4.5-.508 0-.988-.103-1.444-.259l-.043.259H5.986l-.373-2.237-1.846 1.317-2.848-2.847 1.319-1.847L0 10.013V5.986l2.238-.373L.919 3.767 3.768.919l1.846 1.319L5.986 0h4.028l.372 2.238L12.233.919l2.847 2.848-1.318 1.846L16 5.986v4.029z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M7 11.5c0-.501.101-.975.253-1.426A2.207 2.207 0 0 1 8 5.788c.958 0 1.767.613 2.074 1.466A4.417 4.417 0 0 1 11.5 7c1.421 0 2.675.675 3.5 1.706V6.834l-2.121-.354a5.14 5.14 0 0 0-.354-.854l1.25-1.75-1.65-1.65-1.752 1.251c-.137-.072-.262-.159-.408-.219-.147-.061-.296-.088-.444-.134L9.167 1H6.834L6.48 3.121c-.295.092-.581.21-.854.354l-1.75-1.25-1.65 1.65 1.252 1.752c-.073.137-.16.263-.221.409-.06.145-.087.295-.133.443L1 6.833v2.333l2.121.354c.092.295.21.581.354.854l-1.25 1.75 1.65 1.65 1.752-1.251c.137.072.262.159.408.219.146.06.296.087.444.133L6.833 15h1.873C7.675 14.175 7 12.921 7 11.5z" id="iconBg"/><path class="icon-vs-bg" d="M11.5 8a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7zM9 12v-1h5v1H9z" id="notificationBg"/><g id="notificationFg"><path class="icon-vs-fg" d="M9 11h5v1H9z" style="display: none;"/></g></svg>
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/media/markers.css b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
index ace241621a5..27d64078e01 100644
--- a/src/vs/workbench/parts/markers/electron-browser/media/markers.css
+++ b/src/vs/workbench/parts/markers/electron-browser/media/markers.css
@@ -4,11 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-action-bar .action-item.markers-panel-action-filter {
-	max-width: 400px;
-	min-width: 150px;
-	flex: 1;
 	cursor: default;
 	margin: 4px 10px 0 0;
+	min-width: 150px;
+	max-width: 500px;
+}
+
+.monaco-action-bar .action-item.markers-panel-action-filter {
+	flex: 0.7;
+}
+
+.monaco-action-bar .action-item.markers-panel-action-filter.small {
+	flex: 0.5;
 }
 
 .monaco-action-bar .action-item.markers-panel-action-filter .monaco-inputbox {
@@ -20,6 +27,37 @@
 	border: 1px solid #ddd;
 }
 
+.markers-panel-action-filter > .markers-panel-filter-controls {
+	position: absolute;
+	top: 0px;
+	right: 4px;
+	display: flex;
+}
+
+.markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge {
+	margin: 4px 0px;
+	padding: 0px 8px;
+	border-radius: 2px;
+}
+
+.markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge.hidden,
+.markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-badge.small {
+	display: none;
+}
+
+.markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
+	margin: 3px 0 0 3px;
+}
+
+.vs .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
+	background: url('excludeSettings.svg') center center no-repeat;
+}
+
+.vs-dark .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude,
+.hc-black .markers-panel-action-filter > .markers-panel-filter-controls > .markers-panel-filter-filesExclude {
+	background: url('excludeSettings-dark.svg') center center no-repeat;
+}
+
 .markers-panel .markers-panel-container {
 	height: 100%;
 }
@@ -29,18 +67,16 @@
 	padding-left: 20px;
 }
 
-.markers-panel .markers-panel-container .message-box-container span:focus {
-	outline: none;
+.markers-panel .markers-panel-container .message-box-container .messageAction {
+	margin-left: 4px;
+	cursor: pointer;
+	text-decoration: underline;
 }
 
 .markers-panel  .markers-panel-container .hidden {
 	display: none;
 }
 
-.markers-panel .markers-panel-container .tree-container {
-	height: 100%;
-}
-
 .markers-panel .markers-panel-container .tree-container.hidden,
 .markers-panel .markers-panel-container .message-box-container.hidden {
 	display: none;
@@ -71,6 +107,10 @@
 	overflow: hidden;
 }
 
+.markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source {
+	margin-right: 5px;
+}
+
 .markers-panel .markers-panel-container .tree-container .markers-panel-tree-entry .marker-source:before {
 	content: '[';
 }
@@ -118,4 +158,4 @@
 
 .vs-dark .markers-panel .icon.info {
 	background: url('status-info-inverse.svg') center center no-repeat;
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/markers/electron-browser/messages.ts b/src/vs/workbench/parts/markers/electron-browser/messages.ts
index 03bc507f5d7..7368df79ae4 100644
--- a/src/vs/workbench/parts/markers/electron-browser/messages.ts
+++ b/src/vs/workbench/parts/markers/electron-browser/messages.ts
@@ -22,10 +22,14 @@ export default class Messages {
 	public static MARKERS_PANEL_ARIA_LABEL_PROBLEMS_TREE: string = nls.localize('markers.panel.aria.label.problems.tree', "Problems grouped by files");
 
 	public static MARKERS_PANEL_NO_PROBLEMS_BUILT: string = nls.localize('markers.panel.no.problems.build', "No problems have been detected in the workspace so far.");
-	public static MARKERS_PANEL_NO_PROBLEMS_FILTERS: string = nls.localize('markers.panel.no.problems.filters', "No results found with provided filter criteria");
+	public static MARKERS_PANEL_NO_PROBLEMS_FILTERS: string = nls.localize('markers.panel.no.problems.filters', "No results found with provided filter criteria.");
+	public static MARKERS_PANEL_NO_PROBLEMS_FILE_EXCLUSIONS_FILTER: string = nls.localize('markers.panel.no.problems.file.exclusions', "All problems are hidden because files exclude filter is enabled.");
 
+	public static MARKERS_PANEL_ACTION_TOOLTIP_USE_FILES_EXCLUDE: string = nls.localize('markers.panel.action.useFilesExclude', "Filter using Files Exclude Setting");
+	public static MARKERS_PANEL_ACTION_TOOLTIP_DO_NOT_USE_FILES_EXCLUDE: string = nls.localize('markers.panel.action.donotUseFilesExclude', "Do not use Files Exclude Setting");
 	public static MARKERS_PANEL_ACTION_TOOLTIP_FILTER: string = nls.localize('markers.panel.action.filter', "Filter Problems");
-	public static MARKERS_PANEL_FILTER_PLACEHOLDER: string = nls.localize('markers.panel.filter.placeholder', "Filter by type or text");
+	public static MARKERS_PANEL_FILTER_ARIA_LABEL: string = nls.localize('markers.panel.filter.ariaLabel', "Filter Problems");
+	public static MARKERS_PANEL_FILTER_PLACEHOLDER: string = nls.localize('markers.panel.filter.placeholder', "Filter. Eg: text, **/*.ts, !**/node_modules/**");
 	public static MARKERS_PANEL_FILTER_ERRORS: string = nls.localize('markers.panel.filter.errors', "errors");
 	public static MARKERS_PANEL_FILTER_WARNINGS: string = nls.localize('markers.panel.filter.warnings', "warnings");
 	public static MARKERS_PANEL_FILTER_INFOS: string = nls.localize('markers.panel.filter.infos', "infos");
diff --git a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
index 043b5f9c536..9e2176bb7b6 100644
--- a/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
+++ b/src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
@@ -7,8 +7,8 @@
 
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
-import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
-import { MarkersModel, Marker, ResourceMarkers } from 'vs/workbench/parts/markers/electron-browser/markersModel';
+import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
+import { MarkersModel, Marker, ResourceMarkers, RelatedInformation } from 'vs/workbench/parts/markers/electron-browser/markersModel';
 
 class TestMarkersModel extends MarkersModel {
 
@@ -139,12 +139,23 @@ suite('MarkersModel Test', () => {
 	});
 
 	test('toString()', function () {
-		const res1Marker = aMarker('a/res1');
-		res1Marker.code = '1234';
-		assert.equal(`file: 'file:///a/res1'\nseverity: 'Error'\nmessage: 'some message'\nat: '10,5'\nsource: 'tslint'\ncode: '1234'`, new Marker('', res1Marker).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: 'Warning'\nmessage: 'some message'\nat: '10,5'\nsource: 'tslint'\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Warning)).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: 'Info'\nmessage: 'Info'\nat: '1,2'\nsource: ''\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Info, 1, 2, 1, 8, 'Info', '')).toString());
-		assert.equal(`file: 'file:///a/res2'\nseverity: ''\nmessage: 'Ignore message'\nat: '1,2'\nsource: 'Ignore'\ncode: ''`, new Marker('', aMarker('a/res2', MarkerSeverity.Hint, 1, 2, 1, 8, 'Ignore message', 'Ignore')).toString());
+		let marker = aMarker('a/res1');
+		marker.code = '1234';
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Warning);
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Info, 1, 2, 1, 8, 'Info', '');
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Hint, 1, 2, 1, 8, 'Ignore message', 'Ignore');
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path }, null, '\t'), new Marker('', marker).toString());
+
+		marker = aMarker('a/res2', MarkerSeverity.Warning, 1, 2, 1, 8, 'Warning message', '', [{ startLineNumber: 2, startColumn: 5, endLineNumber: 2, endColumn: 10, message: 'some info', resource: URI.file('a/res3') }]);
+		const testObject = new Marker('', marker);
+		testObject.resourceRelatedInformation = marker.relatedInformation.map(r => new RelatedInformation('', r));
+		assert.equal(JSON.stringify({ ...marker, resource: marker.resource.path, relatedInformation: marker.relatedInformation.map(r => ({ ...r, resource: r.resource.path })) }, null, '\t'), testObject.toString());
 	});
 
 	function hasMarker(markers: Marker[], marker: IMarker): boolean {
@@ -200,7 +211,8 @@ suite('MarkersModel Test', () => {
 		endLineNumber: number = startLineNumber + 1,
 		endColumn: number = startColumn + 5,
 		message: string = 'some message',
-		source: string = 'tslint'
+		source: string = 'tslint',
+		relatedInformation?: IRelatedInformation[]
 	): IMarker {
 		return {
 			owner: 'someOwner',
@@ -211,7 +223,8 @@ suite('MarkersModel Test', () => {
 			startColumn,
 			endLineNumber,
 			endColumn,
-			source
+			source,
+			relatedInformation
 		};
 	}
 });
diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts
index ef5827ccc68..c73e611e656 100644
--- a/src/vs/workbench/parts/output/browser/outputActions.ts
+++ b/src/vs/workbench/parts/output/browser/outputActions.ts
@@ -42,15 +42,13 @@ export class ClearOutputAction extends Action {
 
 	constructor(
 		id: string, label: string,
-		@IOutputService private outputService: IOutputService,
-		@IPanelService private panelService: IPanelService
+		@IOutputService private outputService: IOutputService
 	) {
 		super(id, label, 'output-action clear-output');
 	}
 
 	public run(): TPromise<boolean> {
 		this.outputService.getActiveChannel().clear();
-		this.panelService.getActivePanel().focus();
 
 		return TPromise.as(true);
 	}
diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts
index 36673ad91e0..35afc6d3e48 100644
--- a/src/vs/workbench/parts/output/browser/outputPanel.ts
+++ b/src/vs/workbench/parts/output/browser/outputPanel.ts
@@ -7,7 +7,6 @@ import 'vs/css!./media/output';
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder } from 'vs/base/browser/builder';
 import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -121,9 +120,9 @@ export class OutputPanel extends AbstractTextResourceEditor {
 		super.clearInput();
 	}
 
-	protected createEditor(parent: Builder): void {
+	protected createEditor(parent: HTMLElement): void {
 		// First create the scoped instantation service and only then construct the editor using the scoped service
-		const scopedContextKeyService = this.contextKeyService.createScoped(parent.getHTMLElement());
+		const scopedContextKeyService = this.contextKeyService.createScoped(parent);
 		this.toUnbind.push(scopedContextKeyService);
 		this.scopedInstantiationService = this.instantiationService.createChild(new ServiceCollection([IContextKeyService, scopedContextKeyService]));
 		super.createEditor(parent);
diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
index 9fd70a0a2f6..aac872844cb 100644
--- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -5,7 +5,6 @@
 
 import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
-import * as strings from 'vs/base/common/strings';
 import * as extfs from 'vs/base/node/extfs';
 import * as fs from 'fs';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -16,7 +15,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorOptions } from 'vs/workbench/common/editor';
-import { IOutputChannelIdentifier, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, MAX_OUTPUT_LENGTH, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
+import { IOutputChannelIdentifier, IOutputChannel, IOutputService, Extensions, OUTPUT_PANEL_ID, IOutputChannelRegistry, OUTPUT_SCHEME, OUTPUT_MIME, LOG_SCHEME, LOG_MIME, CONTEXT_ACTIVE_LOG_OUTPUT } from 'vs/workbench/parts/output/common/output';
 import { OutputPanel } from 'vs/workbench/parts/output/browser/outputPanel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -36,8 +35,6 @@ import { RotatingLogger } from 'spdlog';
 import { toLocalISOString } from 'vs/base/common/date';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ILogService } from 'vs/platform/log/common/log';
-import { binarySearch } from 'vs/base/common/arrays';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Schemas } from 'vs/base/common/network';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -437,7 +434,6 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		@ITextModelService textModelResolverService: ITextModelService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IWindowService windowService: IWindowService,
-		@ITelemetryService private telemetryService: ITelemetryService,
 		@ILogService private logService: ILogService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
@@ -472,7 +468,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 	}
 
 	provideTextContent(resource: URI): TPromise<ITextModel> {
-		const channel = <OutputChannel>this.getChannel(resource.fsPath);
+		const channel = <OutputChannel>this.getChannel(resource.path);
 		if (channel) {
 			return channel.loadModel();
 		}
@@ -570,16 +566,9 @@ export class OutputService extends Disposable implements IOutputService, ITextMo
 		}
 
 		const uri = URI.from({ scheme: OUTPUT_SCHEME, path: id });
-		if (channelData && channelData.file) {
-			return this.instantiationService.createInstance(FileOutputChannel, channelData, uri);
-		}
-		try {
-			return this.instantiationService.createInstance(OutputChannelBackedByFile, { id, label: channelData ? channelData.label : '' }, this.outputDir, uri);
-		} catch (e) {
-			this.logService.error(e);
-			this.telemetryService.publicLog('output.used.bufferedChannel');
-			return this.instantiationService.createInstance(BufferredOutputChannel, { id, label: channelData ? channelData.label : '' });
-		}
+		return channelData && channelData.file
+			? this.instantiationService.createInstance(FileOutputChannel, channelData, uri)
+			: this.instantiationService.createInstance(OutputChannelBackedByFile, { id, label: channelData ? channelData.label : '' }, this.outputDir, uri);
 	}
 
 	private doShowChannel(channel: IOutputChannel, preserveFocus: boolean): TPromise<void> {
@@ -647,145 +636,4 @@ export class LogContentProvider {
 		}
 		return channel;
 	}
-}
-
-// Remove this channel when there are no issues using Output channel backed by file
-class BufferredOutputChannel extends Disposable implements OutputChannel {
-
-	readonly id: string;
-	readonly label: string;
-	readonly file: URI = null;
-	scrollLock: boolean = false;
-
-	protected _onDidAppendedContent: Emitter<void> = new Emitter<void>();
-	readonly onDidAppendedContent: Event<void> = this._onDidAppendedContent.event;
-
-	private readonly _onDispose: Emitter<void> = new Emitter<void>();
-	readonly onDispose: Event<void> = this._onDispose.event;
-
-	private modelUpdater: RunOnceScheduler;
-	private model: ITextModel;
-	private readonly bufferredContent: BufferedContent;
-	private lastReadId: number = void 0;
-
-	constructor(
-		protected readonly outputChannelIdentifier: IOutputChannelIdentifier,
-		@IModelService private modelService: IModelService,
-		@IModeService private modeService: IModeService
-	) {
-		super();
-
-		this.id = outputChannelIdentifier.id;
-		this.label = outputChannelIdentifier.label;
-
-		this.modelUpdater = new RunOnceScheduler(() => this.updateModel(), 300);
-		this._register(toDisposable(() => this.modelUpdater.cancel()));
-
-		this.bufferredContent = new BufferedContent();
-		this._register(toDisposable(() => this.bufferredContent.clear()));
-	}
-
-	append(output: string) {
-		this.bufferredContent.append(output);
-		if (!this.modelUpdater.isScheduled()) {
-			this.modelUpdater.schedule();
-		}
-	}
-
-	clear(): void {
-		if (this.modelUpdater.isScheduled()) {
-			this.modelUpdater.cancel();
-		}
-		if (this.model) {
-			this.model.setValue('');
-		}
-		this.bufferredContent.clear();
-		this.lastReadId = void 0;
-	}
-
-	loadModel(): TPromise<ITextModel> {
-		const { value, id } = this.bufferredContent.getDelta(this.lastReadId);
-		if (this.model) {
-			this.model.setValue(value);
-		} else {
-			this.model = this.createModel(value);
-		}
-		this.lastReadId = id;
-		return TPromise.as(this.model);
-	}
-
-	private createModel(content: string): ITextModel {
-		const model = this.modelService.createModel(content, this.modeService.getOrCreateMode(OUTPUT_MIME), URI.from({ scheme: OUTPUT_SCHEME, path: this.id }));
-		const disposables: IDisposable[] = [];
-		disposables.push(model.onWillDispose(() => {
-			this.model = null;
-			dispose(disposables);
-		}));
-		return model;
-	}
-
-	private updateModel(): void {
-		if (this.model) {
-			const { value, id } = this.bufferredContent.getDelta(this.lastReadId);
-			this.lastReadId = id;
-			const lastLine = this.model.getLineCount();
-			const lastLineMaxColumn = this.model.getLineMaxColumn(lastLine);
-			this.model.applyEdits([EditOperation.insert(new Position(lastLine, lastLineMaxColumn), value)]);
-			this._onDidAppendedContent.fire();
-		}
-	}
-
-	dispose(): void {
-		this._onDispose.fire();
-		super.dispose();
-	}
-}
-
-class BufferedContent {
-
-	private data: string[] = [];
-	private dataIds: number[] = [];
-	private idPool = 0;
-	private length = 0;
-
-	public append(content: string): void {
-		this.data.push(content);
-		this.dataIds.push(++this.idPool);
-		this.length += content.length;
-		this.trim();
-	}
-
-	public clear(): void {
-		this.data.length = 0;
-		this.dataIds.length = 0;
-		this.length = 0;
-	}
-
-	private trim(): void {
-		if (this.length < MAX_OUTPUT_LENGTH * 1.2) {
-			return;
-		}
-
-		while (this.length > MAX_OUTPUT_LENGTH) {
-			this.dataIds.shift();
-			const removed = this.data.shift();
-			this.length -= removed.length;
-		}
-	}
-
-	public getDelta(previousId?: number): { value: string, id: number } {
-		let idx = -1;
-		if (previousId !== void 0) {
-			idx = binarySearch(this.dataIds, previousId, (a, b) => a - b);
-		}
-
-		const id = this.idPool;
-		if (idx >= 0) {
-			const value = strings.removeAnsiEscapeCodes(this.data.slice(idx + 1).join(''));
-			return { value, id };
-		} else {
-			const value = strings.removeAnsiEscapeCodes(this.data.join(''));
-			return { value, id };
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
index 788fd9dbc1d..237f4d4efa9 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingWidgets.ts
@@ -17,7 +17,6 @@ import { InputBox, IInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { Dimension } from 'vs/base/browser/builder';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
@@ -189,7 +188,7 @@ export class DefineKeybindingWidget extends Widget {
 		});
 	}
 
-	layout(layout: Dimension): void {
+	layout(layout: dom.Dimension): void {
 		let top = Math.round((layout.height - DefineKeybindingWidget.HEIGHT) / 2);
 		this._domNode.setTop(top);
 
@@ -290,7 +289,7 @@ export class DefineKeybindingOverlayWidget extends Disposable implements IOverla
 	public start(): TPromise<string> {
 		this._editor.revealPositionInCenterIfOutsideViewport(this._editor.getPosition(), ScrollType.Smooth);
 		const layoutInfo = this._editor.getLayoutInfo();
-		this._widget.layout(new Dimension(layoutInfo.width, layoutInfo.height));
+		this._widget.layout(new dom.Dimension(layoutInfo.width, layoutInfo.height));
 		return this._widget.define();
 	}
 }
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index a19ef06edf6..9511b94d628 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -11,22 +11,21 @@ import * as DOM from 'vs/base/browser/dom';
 import { OS } from 'vs/base/common/platform';
 import { dispose } from 'vs/base/common/lifecycle';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
-import { Builder, Dimension } from 'vs/base/browser/builder';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { IAction } from 'vs/base/common/actions';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
+import { EditorOptions } from 'vs/workbench/common/editor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID, KEYBINDING_HEADER_TEMPLATE_ID } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel, IKeybindingItemEntry, IListEntry, KEYBINDING_ENTRY_TEMPLATE_ID, KEYBINDING_HEADER_TEMPLATE_ID } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { SearchWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { DefineKeybindingWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets';
 import {
-	IPreferencesService, IKeybindingsEditor, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_COPY,
+	IKeybindingsEditor, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_COPY,
 	KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS,
 	KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
 } from 'vs/workbench/parts/preferences/common/preferences';
@@ -43,36 +42,11 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
 import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
+import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 
 let $ = DOM.$;
 
-export class KeybindingsEditorInput extends EditorInput {
-
-	public static readonly ID: string = 'workbench.input.keybindings';
-	public readonly keybindingsModel: KeybindingsEditorModel;
-
-	constructor(@IInstantiationService instantiationService: IInstantiationService) {
-		super();
-		this.keybindingsModel = instantiationService.createInstance(KeybindingsEditorModel, OS);
-	}
-
-	getTypeId(): string {
-		return KeybindingsEditorInput.ID;
-	}
-
-	getName(): string {
-		return localize('keybindingsInputName', "Keyboard Shortcuts");
-	}
-
-	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
-		return TPromise.as(this.keybindingsModel);
-	}
-
-	matches(otherInput: any): boolean {
-		return otherInput instanceof KeybindingsEditorInput;
-	}
-}
-
 export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor {
 
 	public static readonly ID: string = 'workbench.editor.keybindings';
@@ -90,7 +64,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	private listEntries: IListEntry[];
 	private keybindingsList: List<IListEntry>;
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 	private delayedFiltering: Delayer<void>;
 	private latestEmptyFilters: string[] = [];
 	private delayedFilterLogging: Delayer<void>;
@@ -122,16 +96,14 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this.delayedFilterLogging = new Delayer<void>(1000);
 	}
 
-	createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-
-		const keybindingsEditorElement = DOM.append(parentElement, $('div', { class: 'keybindings-editor' }));
+	createEditor(parent: HTMLElement): void {
+		const keybindingsEditorElement = DOM.append(parent, $('div', { class: 'keybindings-editor' }));
 
 		this.createOverlayContainer(keybindingsEditorElement);
 		this.createHeader(keybindingsEditorElement);
 		this.createBody(keybindingsEditorElement);
 
-		const focusTracker = this._register(DOM.trackFocus(parentElement));
+		const focusTracker = this._register(DOM.trackFocus(parent));
 		this._register(focusTracker.onDidFocus(() => this.keybindingsEditorContextKey.set(true)));
 		this._register(focusTracker.onDidBlur(() => this.keybindingsEditorContextKey.reset()));
 	}
@@ -152,7 +124,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		this.keybindingFocusContextKey.reset();
 	}
 
-	layout(dimension: Dimension): void {
+	layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.searchWidget.layout(dimension);
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
index 0399b803ed0..da2948671a3 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesActions.ts
@@ -11,7 +11,7 @@ import { Action } from 'vs/base/common/actions';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IQuickOpenService, IPickOpenEntry, IFilePickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands';
@@ -34,6 +34,24 @@ export class OpenRawDefaultSettingsAction extends Action {
 	}
 }
 
+export class OpenSettingsAction extends Action {
+
+	public static readonly ID = 'workbench.action.openSettings';
+	public static readonly LABEL = nls.localize('openSettings', "Open Settings");
+
+	constructor(
+		id: string,
+		label: string,
+		@IPreferencesService private preferencesService: IPreferencesService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		return this.preferencesService.openSettings();
+	}
+}
+
 export class OpenGlobalSettingsAction extends Action {
 
 	public static readonly ID = 'workbench.action.openGlobalSettings';
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 266ea2a1400..7e9a04f3ab4 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -11,24 +11,25 @@ import { onUnexpectedError, isPromiseCanceledError, getErrorMessage } from 'vs/b
 import * as DOM from 'vs/base/browser/dom';
 import { Delayer, ThrottledDelayer } from 'vs/base/common/async';
 import * as arrays from 'vs/base/common/arrays';
-import { Dimension, Builder } from 'vs/base/browser/builder';
 import { ArrayNavigator } from 'vs/base/common/iterator';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
-import { SideBySideEditorInput, EditorOptions, EditorInput, PREFERENCES_EDITOR_ID } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
-import { IEditorControl, Position, Verbosity } from 'vs/platform/editor/common/editor';
-import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
+import { IEditorControl, Position } from 'vs/platform/editor/common/editor';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import {
-	IPreferencesService, ISettingsGroup, ISetting, IFilterResult, IPreferencesSearchService,
-	CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_SEARCH, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, ISettingsEditorModel, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, ISearchProvider, ISearchResult, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
+	IPreferencesSearchService,
+	CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, SETTINGS_EDITOR_COMMAND_SEARCH, SETTINGS_EDITOR_COMMAND_FOCUS_FILE, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING, SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING, ISearchProvider, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
 } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import {
+	IPreferencesService, ISettingsGroup, ISetting, IFilterResult, ISettingsEditorModel, ISearchResult
+} from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { SearchWidget, SettingsTargetsWidget, SettingsTarget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { ContextKeyExpr, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
@@ -38,7 +39,6 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { VSash } from 'vs/base/browser/ui/sash/sash';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { IPreferencesRenderer, DefaultSettingsRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer, FolderSettingsRenderer } from 'vs/workbench/parts/preferences/browser/preferencesRenderers';
@@ -57,51 +57,11 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { MessageController } from 'vs/editor/contrib/message/messageController';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { IHashService } from 'vs/workbench/services/hash/common/hashService';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ILogService } from 'vs/platform/log/common/log';
-
-export class PreferencesEditorInput extends SideBySideEditorInput {
-	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
-
-	getTypeId(): string {
-		return PreferencesEditorInput.ID;
-	}
-
-	public supportsSplitEditor(): boolean {
-		return true;
-	}
-
-	public getTitle(verbosity: Verbosity): string {
-		return this.master.getTitle(verbosity);
-	}
-}
-
-export class DefaultPreferencesEditorInput extends ResourceEditorInput {
-	public static readonly ID = 'workbench.editorinputs.defaultpreferences';
-	constructor(defaultSettingsResource: URI,
-		@ITextModelService textModelResolverService: ITextModelService,
-		@IHashService hashService: IHashService
-	) {
-		super(nls.localize('settingsEditorName', "Default Settings"), '', defaultSettingsResource, textModelResolverService, hashService);
-	}
-
-	getTypeId(): string {
-		return DefaultPreferencesEditorInput.ID;
-	}
-
-	matches(other: any): boolean {
-		if (other instanceof DefaultPreferencesEditorInput) {
-			return true;
-		}
-		if (!super.matches(other)) {
-			return false;
-		}
-		return true;
-	}
-}
+import { PreferencesEditorInput, DefaultPreferencesEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { PREFERENCES_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 
 export class PreferencesEditor extends BaseEditor {
 
@@ -138,11 +98,10 @@ export class PreferencesEditor extends BaseEditor {
 		this.remoteSearchThrottle = new ThrottledDelayer(200);
 	}
 
-	public createEditor(parent: Builder): void {
-		const parentElement = parent.getHTMLElement();
-		DOM.addClass(parentElement, 'preferences-editor');
+	public createEditor(parent: HTMLElement): void {
+		DOM.addClass(parent, 'preferences-editor');
 
-		this.headerContainer = DOM.append(parentElement, DOM.$('.preferences-header'));
+		this.headerContainer = DOM.append(parent, DOM.$('.preferences-header'));
 
 		this.searchWidget = this._register(this.instantiationService.createInstance(SearchWidget, this.headerContainer, {
 			ariaLabel: nls.localize('SearchSettingsWidget.AriaLabel', "Search settings"),
@@ -154,7 +113,7 @@ export class PreferencesEditor extends BaseEditor {
 		this._register(this.searchWidget.onFocus(() => this.lastFocusedWidget = this.searchWidget));
 		this.lastFocusedWidget = this.searchWidget;
 
-		const editorsContainer = DOM.append(parentElement, DOM.$('.preferences-editors-container'));
+		const editorsContainer = DOM.append(parent, DOM.$('.preferences-editors-container'));
 		this.sideBySidePreferencesWidget = this._register(this.instantiationService.createInstance(SideBySidePreferencesWidget, editorsContainer));
 		this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget));
 		this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target)));
@@ -192,11 +151,11 @@ export class PreferencesEditor extends BaseEditor {
 		return super.setInput(newInput, options).then(() => this.updateInput(oldInput, newInput, options));
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		DOM.toggleClass(this.headerContainer, 'vertical-layout', dimension.width < 700);
 		this.searchWidget.layout(dimension);
 		const headerHeight = DOM.getTotalHeight(this.headerContainer);
-		this.sideBySidePreferencesWidget.layout(new Dimension(dimension.width, dimension.height - headerHeight));
+		this.sideBySidePreferencesWidget.layout(new DOM.Dimension(dimension.width, dimension.height - headerHeight));
 	}
 
 	public getControl(): IEditorControl {
@@ -230,6 +189,10 @@ export class PreferencesEditor extends BaseEditor {
 		super.clearInput();
 	}
 
+	public supportsCenteredLayout(): boolean {
+		return false;
+	}
+
 	protected setEditorVisible(visible: boolean, position: Position): void {
 		this.sideBySidePreferencesWidget.setEditorVisible(visible, position);
 		super.setEditorVisible(visible, position);
@@ -772,7 +735,7 @@ class PreferencesRenderersController extends Disposable {
 
 class SideBySidePreferencesWidget extends Widget {
 
-	private dimension: Dimension;
+	private dimension: DOM.Dimension;
 
 	private defaultPreferencesHeader: HTMLElement;
 	private defaultPreferencesEditor: DefaultPreferencesEditor;
@@ -817,7 +780,7 @@ class SideBySidePreferencesWidget extends Widget {
 		this.defaultPreferencesHeader.textContent = nls.localize('defaultSettings', "Default Settings");
 
 		this.defaultPreferencesEditor = this._register(this.instantiationService.createInstance(DefaultPreferencesEditor));
-		this.defaultPreferencesEditor.create(new Builder(this.defaultPreferencesEditorContainer));
+		this.defaultPreferencesEditor.create(this.defaultPreferencesEditorContainer);
 		this.defaultPreferencesEditor.setVisible(true);
 		(<CodeEditor>this.defaultPreferencesEditor.getControl()).onDidFocusEditor(() => this.lastFocusedEditor = this.defaultPreferencesEditor);
 
@@ -850,16 +813,28 @@ class SideBySidePreferencesWidget extends Widget {
 		return TPromise.join([this.updateInput(this.defaultPreferencesEditor, defaultPreferencesEditorInput, DefaultSettingsEditorContribution.ID, editablePreferencesEditorInput.getResource(), options),
 		this.updateInput(this.editablePreferencesEditor, editablePreferencesEditorInput, SettingsEditorContribution.ID, defaultPreferencesEditorInput.getResource(), options)])
 			.then(([defaultPreferencesRenderer, editablePreferencesRenderer]) => {
-				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && (<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).configurationScope === ConfigurationScope.RESOURCE ? nls.localize('defaultFolderSettings', "Default Folder Settings") : nls.localize('defaultSettings', "Default Settings");
+				this.defaultPreferencesHeader.textContent = defaultPreferencesRenderer && this.getDefaultPreferencesHeaderText((<DefaultSettingsEditorModel>defaultPreferencesRenderer.preferencesModel).target);
 				return { defaultPreferencesRenderer, editablePreferencesRenderer };
 			});
 	}
 
+	private getDefaultPreferencesHeaderText(target: ConfigurationTarget): string {
+		switch (target) {
+			case ConfigurationTarget.USER:
+				return nls.localize('defaultUserSettings', "Default User Settings");
+			case ConfigurationTarget.WORKSPACE:
+				return nls.localize('defaultWorkspaceSettings', "Default Workspace Settings");
+			case ConfigurationTarget.WORKSPACE_FOLDER:
+				return nls.localize('defaultFolderSettings', "Default Folder Settings");
+		}
+		return '';
+	}
+
 	public setResultCount(settingsTarget: SettingsTarget, count: number): void {
 		this.settingsTargetsWidget.setResultCount(settingsTarget, count);
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		this.dimension = dimension;
 		this.sash.setDimenesion(this.dimension);
 	}
@@ -902,7 +877,7 @@ class SideBySidePreferencesWidget extends Widget {
 		const descriptor = Registry.as<IEditorRegistry>(EditorExtensions.Editors).getEditor(editorInput);
 		const editor = descriptor.instantiate(this.instantiationService);
 		this.editablePreferencesEditor = editor;
-		this.editablePreferencesEditor.create(new Builder(this.editablePreferencesEditorContainer));
+		this.editablePreferencesEditor.create(this.editablePreferencesEditorContainer);
 		this.editablePreferencesEditor.setVisible(true);
 		(<CodeEditor>this.editablePreferencesEditor.getControl()).onDidFocusEditor(() => this.lastFocusedEditor = this.editablePreferencesEditor);
 		this.lastFocusedEditor = this.editablePreferencesEditor;
@@ -935,8 +910,8 @@ class SideBySidePreferencesWidget extends Widget {
 		this.editablePreferencesEditorContainer.style.height = `${this.dimension.height}px`;
 		this.editablePreferencesEditorContainer.style.left = `${splitPoint}px`;
 
-		this.defaultPreferencesEditor.layout(new Dimension(detailsEditorWidth, this.dimension.height - 34 /* height of header container */));
-		this.editablePreferencesEditor.layout(new Dimension(masterEditorWidth, this.dimension.height - 34 /* height of header container */));
+		this.defaultPreferencesEditor.layout(new DOM.Dimension(detailsEditorWidth, this.dimension.height - 34 /* height of header container */));
+		this.editablePreferencesEditor.layout(new DOM.Dimension(masterEditorWidth, this.dimension.height - 34 /* height of header container */));
 	}
 
 	private getSettingsTarget(resource: URI): SettingsTarget {
@@ -990,8 +965,8 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		super(DefaultPreferencesEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
 	}
 
-	public createEditorControl(parent: Builder, configuration: IEditorOptions): editorCommon.IEditor {
-		const editor = this.instantiationService.createInstance(DefaultPreferencesCodeEditor, parent.getHTMLElement(), configuration);
+	public createEditorControl(parent: HTMLElement, configuration: IEditorOptions): editorCommon.IEditor {
+		const editor = this.instantiationService.createInstance(DefaultPreferencesCodeEditor, parent, configuration);
 
 		// Inform user about editor being readonly if user starts type
 		this.toUnbind.push(editor.onDidType(() => this.showReadonlyHint(editor)));
@@ -1042,10 +1017,14 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
 		super.clearInput();
 	}
 
-	public layout(dimension: Dimension) {
+	public layout(dimension: DOM.Dimension) {
 		this.getControl().layout(dimension);
 	}
 
+	public supportsCenteredLayout(): boolean {
+		return false;
+	}
+
 	protected getAriaLabel(): string {
 		return nls.localize('preferencesAriaLabel', "Default preferences. Readonly text editor.");
 	}
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 45f83466767..4a11f390a57 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -18,18 +18,16 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { Range, IRange } from 'vs/editor/common/core/range';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IWorkbenchSettingsConfiguration, IExtensionSetting, IScoredResults } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IExtensionSetting, IScoredResults } from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { SettingsGroupTitleWidget, EditPreferenceWidget, SettingsHeaderWidget, DefaultSettingsHeaderWidget, FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
-import { IMarkerService, IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import { MarkdownString } from 'vs/base/common/htmlContent';
 import { overrideIdentifierFromKey, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModel, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
@@ -42,6 +40,7 @@ import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ContextSubMenu } from 'vs/base/browser/contextmenu';
+import { IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
 
 export interface IPreferencesRenderer<T> extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel<T>;
@@ -188,7 +187,6 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 
 export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements IPreferencesRenderer<ISetting> {
 
-	private unsupportedSettingsRenderer: UnsupportedSettingsRenderer;
 	private workspaceConfigurationRenderer: WorkspaceConfigurationRenderer;
 
 	constructor(editor: ICodeEditor, preferencesModel: SettingsEditorModel,
@@ -198,7 +196,6 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		super(editor, preferencesModel, preferencesService, configurationService, instantiationService);
-		this.unsupportedSettingsRenderer = this._register(instantiationService.createInstance(UnsupportedSettingsRenderer, editor, preferencesModel));
 		this.workspaceConfigurationRenderer = this._register(instantiationService.createInstance(WorkspaceConfigurationRenderer, editor, preferencesModel));
 	}
 
@@ -213,15 +210,12 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 
 	public render(): void {
 		super.render();
-		this.unsupportedSettingsRenderer.render();
 		this.workspaceConfigurationRenderer.render(this.getAssociatedPreferencesModel());
 	}
 }
 
 export class FolderSettingsRenderer extends UserSettingsRenderer implements IPreferencesRenderer<ISetting> {
 
-	private unsupportedSettingsRenderer: UnsupportedSettingsRenderer;
-
 	constructor(editor: ICodeEditor, preferencesModel: SettingsEditorModel,
 		@IPreferencesService preferencesService: IPreferencesService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -229,17 +223,12 @@ export class FolderSettingsRenderer extends UserSettingsRenderer implements IPre
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		super(editor, preferencesModel, preferencesService, configurationService, instantiationService);
-		this.unsupportedSettingsRenderer = this._register(instantiationService.createInstance(UnsupportedSettingsRenderer, editor, preferencesModel));
 	}
 
 	protected createHeader(): void {
 		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyFolderSettingsHeader', "Place your folder settings here to overwrite those from the Workspace Settings."));
 	}
 
-	public render(): void {
-		super.render();
-		this.unsupportedSettingsRenderer.render();
-	}
 }
 
 export class DefaultSettingsRenderer extends Disposable implements IPreferencesRenderer<ISetting> {
@@ -273,7 +262,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	) {
 		super();
 		this.settingHighlighter = this._register(instantiationService.createInstance(SettingHighlighter, editor, this._onFocusPreference, this._onClearFocusPreference));
-		this.settingsHeaderRenderer = this._register(instantiationService.createInstance(DefaultSettingsHeaderRenderer, editor, preferencesModel.configurationScope));
+		this.settingsHeaderRenderer = this._register(instantiationService.createInstance(DefaultSettingsHeaderRenderer, editor));
 		this.settingsGroupTitleRenderer = this._register(instantiationService.createInstance(SettingsGroupTitleRenderer, editor));
 		this.filteredMatchesRenderer = this._register(instantiationService.createInstance(FilteredMatchesRenderer, editor));
 		this.editSettingActionRenderer = this._register(instantiationService.createInstance(EditSettingRenderer, editor, preferencesModel, this.settingHighlighter));
@@ -467,7 +456,7 @@ class DefaultSettingsHeaderRenderer extends Disposable {
 	private settingsHeaderWidget: DefaultSettingsHeaderWidget;
 	public readonly onClick: Event<void>;
 
-	constructor(editor: ICodeEditor, scope: ConfigurationScope) {
+	constructor(editor: ICodeEditor) {
 		super();
 		this.settingsHeaderWidget = this._register(new DefaultSettingsHeaderWidget(editor, ''));
 		this.onClick = this.settingsHeaderWidget.onClick;
@@ -879,29 +868,27 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	public render(result: IFilterResult, allSettingsGroups: ISettingsGroup[]): void {
 		const model = this.editor.getModel();
 		this.hiddenAreas = [];
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
-		});
 		if (result) {
 			this.hiddenAreas = this.computeHiddenRanges(result.filteredGroups, result.allGroups, model);
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
-			});
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model)));
 		} else {
 			this.hiddenAreas = this.computeHiddenRanges(null, allSettingsGroups, model);
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		}
 	}
 
 	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
 		return {
 			range,
-			options: {
-				stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-				className: 'findMatch'
-			}
+			options: FilteredMatchesRenderer._FIND_MATCH
 		};
 	}
 
+	private static readonly _FIND_MATCH = ModelDecorationOptions.register({
+		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		className: 'findMatch'
+	});
+
 	private computeHiddenRanges(filteredGroups: ISettingsGroup[], allSettingsGroups: ISettingsGroup[], model: ITextModel): IRange[] {
 		// Hide the contents of hidden groups
 		const notMatchesRanges: IRange[] = [];
@@ -920,11 +907,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -940,14 +923,7 @@ export class HighlightMatchesRenderer extends Disposable {
 
 	public render(matches: IRange[]): void {
 		const model = this.editor.getModel();
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []) || [];
-		});
-		if (matches.length) {
-			this.editor.changeDecorations(changeAccessor => {
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model))) || [];
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, matches.map(match => this.createDecoration(match, model)));
 	}
 
 	private static readonly _FIND_MATCH = ModelDecorationOptions.register({
@@ -963,11 +939,7 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 
 	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			}) || [];
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
@@ -1329,104 +1301,6 @@ class SettingHighlighter extends Disposable {
 	}
 }
 
-class UnsupportedSettingsRenderer extends Disposable {
-
-	private decorationIds: string[] = [];
-	private renderingDelayer: Delayer<void> = new Delayer<void>(200);
-
-	constructor(
-		private editor: ICodeEditor,
-		private settingsEditorModel: SettingsEditorModel,
-		@IMarkerService private markerService: IMarkerService,
-		@IEnvironmentService private environmentService: IEnvironmentService
-	) {
-		super();
-		this._register(this.editor.getModel().onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render())));
-	}
-
-	public render(): void {
-		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
-		const ranges: IRange[] = [];
-		const markerData: IMarkerData[] = [];
-		for (const settingsGroup of this.settingsEditorModel.settingsGroups) {
-			for (const section of settingsGroup.sections) {
-				for (const setting of section.settings) {
-					if (this.settingsEditorModel.configurationTarget === ConfigurationTarget.WORKSPACE || this.settingsEditorModel.configurationTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
-						// Show warnings for executable settings
-						if (configurationRegistry[setting.key] && configurationRegistry[setting.key].isExecutable) {
-							markerData.push({
-								severity: MarkerSeverity.Warning,
-								startLineNumber: setting.keyRange.startLineNumber,
-								startColumn: setting.keyRange.startColumn,
-								endLineNumber: setting.keyRange.endLineNumber,
-								endColumn: setting.keyRange.endColumn,
-								message: this.getMarkerMessage(setting.key)
-							});
-						}
-					}
-					if (this.settingsEditorModel.configurationTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
-						// Dim and show information for window settings
-						if (configurationRegistry[setting.key] && configurationRegistry[setting.key].scope === ConfigurationScope.WINDOW) {
-							ranges.push({
-								startLineNumber: setting.keyRange.startLineNumber,
-								startColumn: setting.keyRange.startColumn - 1,
-								endLineNumber: setting.valueRange.endLineNumber,
-								endColumn: setting.valueRange.endColumn
-							});
-						}
-					}
-				}
-			}
-		}
-		if (markerData.length) {
-			this.markerService.changeOne('preferencesEditor', this.settingsEditorModel.uri, markerData);
-		} else {
-			this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
-		}
-		this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
-	}
-
-	private createDecoration(range: IRange, model: ITextModel): IModelDeltaDecoration {
-		return {
-			range,
-			options: !this.environmentService.isBuilt || this.environmentService.isExtensionDevelopment ? UnsupportedSettingsRenderer._DIM_CONFIGUARATION_DEV_MODE : UnsupportedSettingsRenderer._DIM_CONFIGUARATION_
-		};
-	}
-
-	private getMarkerMessage(settingKey: string): string {
-		switch (settingKey) {
-			case 'php.validate.executablePath':
-				return nls.localize('unsupportedPHPExecutablePathSetting', "This setting must be a User Setting. To configure PHP for the workspace, open a PHP file and click on 'PHP Path' in the status bar.");
-			default:
-				return nls.localize('unsupportedWorkspaceSetting', "This setting must be a User Setting.");
-		}
-	}
-
-	public dispose(): void {
-		this.markerService.remove('preferencesEditor', [this.settingsEditorModel.uri]);
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
-		super.dispose();
-	}
-
-	private static readonly _DIM_CONFIGUARATION_ = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		inlineClassName: 'dim-configuration',
-		beforeContentClassName: 'unsupportedWorkbenhSettingInfo',
-		hoverMessage: new MarkdownString().appendText(nls.localize('unsupportedWorkbenchSetting', "This setting cannot be applied now. It will be applied when you open this folder directly."))
-	});
-
-	private static readonly _DIM_CONFIGUARATION_DEV_MODE = ModelDecorationOptions.register({
-		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		inlineClassName: 'dim-configuration',
-		beforeContentClassName: 'unsupportedWorkbenhSettingInfo',
-		hoverMessage: new MarkdownString().appendText(nls.localize('unsupportedWorkbenchSettingDevMode', "This setting cannot be applied now. It will be applied if you define it's scope as 'resource' while registering, or when you open this folder directly."))
-	});
-}
-
 class WorkspaceConfigurationRenderer extends Disposable {
 
 	private decorationIds: string[] = [];
@@ -1444,8 +1318,6 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		this.associatedSettingsEditorModel = associatedSettingsEditorModel;
 		// Dim other configurations in workspace configuration file only in the context of Settings Editor
 		if (this.associatedSettingsEditorModel && this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []));
-
 			const ranges: IRange[] = [];
 			for (const settingsGroup of this.workspaceSettingsEditorModel.configurationGroups) {
 				for (const section of settingsGroup.sections) {
@@ -1461,7 +1333,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 					}
 				}
 			}
-			this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel()))));
+			this.decorationIds = this.editor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())));
 		}
 	}
 
@@ -1478,11 +1350,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 	}
 
 	public dispose(): void {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
-		}
+		this.decorationIds = this.editor.deltaDecorations(this.decorationIds, []);
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
index eb553335292..d9d49c7586b 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -5,7 +5,7 @@
 
 import { localize } from 'vs/nls';
 import URI from 'vs/base/common/uri';
-import { Dimension, $ } from 'vs/base/browser/builder';
+import { $ } from 'vs/base/browser/builder';
 import * as DOM from 'vs/base/browser/dom';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -17,7 +17,7 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPosit
 import { InputBox, IInputOptions } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ISettingsGroup } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IAction, Action } from 'vs/base/common/actions';
@@ -649,7 +649,7 @@ export class SearchWidget extends Widget {
 		this.countElement.style.color = color ? color.toString() : null;
 	}
 
-	public layout(dimension: Dimension) {
+	public layout(dimension: DOM.Dimension) {
 		if (dimension.width < 400) {
 			if (this.countElement) {
 				DOM.addClass(this.countElement, 'hide');
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index 17f2dae6ffb..556403aa562 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -3,21 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from 'vs/nls';
-import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEditor, Position, IEditorOptions } from 'vs/platform/editor/common/editor';
-import { ITextModel } from 'vs/editor/common/model';
-import { IKeybindingItemEntry } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
-import { IRange } from 'vs/editor/common/core/range';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { join } from 'vs/base/common/paths';
-import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { Event } from 'vs/base/common/event';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ISettingsEditorModel, ISearchResult } from 'vs/workbench/services/preferences/common/preferences';
+import { IEditor } from 'vs/platform/editor/common/editor';
+import { IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 
 export interface IWorkbenchSettingsConfiguration {
 	workbench: {
@@ -33,164 +25,6 @@ export interface IWorkbenchSettingsConfiguration {
 	};
 }
 
-export interface ISettingsGroup {
-	id: string;
-	range: IRange;
-	title: string;
-	titleRange: IRange;
-	sections: ISettingsSection[];
-}
-
-export interface ISettingsSection {
-	titleRange?: IRange;
-	title?: string;
-	settings: ISetting[];
-}
-
-export interface ISetting {
-	range: IRange;
-	key: string;
-	keyRange: IRange;
-	value: any;
-	valueRange: IRange;
-	description: string[];
-	descriptionRanges: IRange[];
-	overrides?: ISetting[];
-	overrideOf?: ISetting;
-}
-
-export interface IExtensionSetting extends ISetting {
-	extensionName: string;
-	extensionPublisher: string;
-}
-
-export interface ISearchResult {
-	filterMatches: ISettingMatch[];
-	metadata?: IFilterMetadata;
-}
-
-export interface ISearchResultGroup {
-	id: string;
-	label: string;
-	result: ISearchResult;
-	order: number;
-}
-
-export interface IFilterResult {
-	query?: string;
-	filteredGroups: ISettingsGroup[];
-	allGroups: ISettingsGroup[];
-	matches: IRange[];
-	metadata?: IStringDictionary<IFilterMetadata>;
-}
-
-export interface ISettingMatch {
-	setting: ISetting;
-	matches: IRange[];
-	score: number;
-}
-
-export interface IScoredResults {
-	[key: string]: IRemoteSetting;
-}
-
-export interface IRemoteSetting {
-	score: number;
-	key: string;
-	id: string;
-	defaultValue: string;
-	description: string;
-	packageId: string;
-	extensionName?: string;
-	extensionPublisher?: string;
-}
-
-export interface IFilterMetadata {
-	requestUrl: string;
-	requestBody: string;
-	timestamp: number;
-	duration: number;
-	scoredResults: IScoredResults;
-	extensions?: ILocalExtension[];
-
-	/** The number of requests made, since requests are split by number of filters */
-	requestCount?: number;
-
-	/** The name of the server that actually served the request */
-	context: string;
-}
-
-export interface IPreferencesEditorModel<T> {
-	uri: URI;
-	getPreference(key: string): T;
-	dispose(): void;
-}
-
-export type IGroupFilter = (group: ISettingsGroup) => boolean;
-export type ISettingMatcher = (setting: ISetting, group: ISettingsGroup) => { matches: IRange[], score: number };
-
-export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting> {
-	readonly onDidChangeGroups: Event<void>;
-	settingsGroups: ISettingsGroup[];
-	filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[];
-	findValueMatches(filter: string, setting: ISetting): IRange[];
-	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult;
-}
-
-export interface IKeybindingsEditorModel<T> extends IPreferencesEditorModel<T> {
-}
-
-export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
-
-export interface IPreferencesService {
-	_serviceBrand: any;
-
-	userSettingsResource: URI;
-	workspaceSettingsResource: URI;
-	getFolderSettingsResource(resource: URI): URI;
-
-	resolveModel(uri: URI): TPromise<ITextModel>;
-	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
-
-	openRawDefaultSettings(): TPromise<void>;
-	openGlobalSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	openWorkspaceSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	openFolderSettings(folder: URI, options?: IEditorOptions, position?: Position): TPromise<IEditor>;
-	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>;
-	openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
-
-	configureSettingsForLanguage(language: string): void;
-}
-
-
-export interface IKeybindingsEditor extends IEditor {
-
-	activeKeybindingEntry: IKeybindingItemEntry;
-
-	search(filter: string): void;
-	clearSearchResults(): void;
-	focusKeybindings(): void;
-	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	removeKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	resetKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	copyKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
-}
-
-export function getSettingsTargetName(target: ConfigurationTarget, resource: URI, workspaceContextService: IWorkspaceContextService): string {
-	switch (target) {
-		case ConfigurationTarget.USER:
-			return localize('userSettingsTarget', "User Settings");
-		case ConfigurationTarget.WORKSPACE:
-			return localize('workspaceSettingsTarget', "Workspace Settings");
-		case ConfigurationTarget.WORKSPACE_FOLDER:
-			const folder = workspaceContextService.getWorkspaceFolder(resource);
-			return folder ? folder.name : '';
-	}
-	return '';
-}
-
 export interface IEndpointDetails {
 	urlBase: string;
 	key?: string;
@@ -209,6 +43,21 @@ export interface ISearchProvider {
 	searchModel(preferencesModel: ISettingsEditorModel): TPromise<ISearchResult>;
 }
 
+export interface IKeybindingsEditor extends IEditor {
+
+	activeKeybindingEntry: IKeybindingItemEntry;
+
+	search(filter: string): void;
+	clearSearchResults(): void;
+	focusKeybindings(): void;
+	defineKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	removeKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	resetKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	copyKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+	showSimilarKeybindings(keybindingEntry: IKeybindingItemEntry): TPromise<any>;
+}
+
 export const CONTEXT_SETTINGS_EDITOR = new RawContextKey<boolean>('inSettingsEditor', false);
 export const CONTEXT_SETTINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inSettingsSearch', false);
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
index adf1fc4a589..09d6aa2c742 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
@@ -13,7 +13,7 @@ import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonCo
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import { IPreferencesService, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { endsWith } from 'vs/base/common/strings';
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
index 50c0e829378..aa1599d77e3 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import 'vs/css!../browser/media/preferences';
 import * as nls from 'vs/nls';
 import URI from 'vs/base/common/uri';
 import { Registry } from 'vs/platform/registry/common/platform';
@@ -14,14 +15,14 @@ import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { DefaultPreferencesEditorInput, PreferencesEditor, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
-import { KeybindingsEditor, KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
-import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
+import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
+import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
+import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
+import { OpenRawDefaultSettingsAction, OpenSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND, OpenGlobalKeybindingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
 import {
-	IPreferencesService, IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
+	IKeybindingsEditor, IPreferencesSearchService, CONTEXT_KEYBINDING_FOCUS, CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_SEARCH,
 	KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
 } from 'vs/workbench/parts/preferences/common/preferences';
-import { PreferencesService } from 'vs/workbench/parts/preferences/browser/preferencesService';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { PreferencesContribution } from 'vs/workbench/parts/preferences/common/preferencesContribution';
@@ -31,8 +32,8 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { PreferencesSearchService } from 'vs/workbench/parts/preferences/electron-browser/preferencesSearch';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 
-registerSingleton(IPreferencesService, PreferencesService);
 registerSingleton(IPreferencesSearchService, PreferencesSearchService);
 
 Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
@@ -165,7 +166,8 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
 const category = nls.localize('preferences', "Preferences");
 const registry = Registry.as<IWorkbenchActionRegistry>(Extensions.WorkbenchActions);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenRawDefaultSettingsAction, OpenRawDefaultSettingsAction.ID, OpenRawDefaultSettingsAction.LABEL), 'Preferences: Open Raw Default Settings', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open User Settings', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenSettingsAction, OpenSettingsAction.ID, OpenSettingsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_COMMA }), 'Preferences: Open Settings', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalSettingsAction, OpenGlobalSettingsAction.ID, OpenGlobalSettingsAction.LABEL), 'Preferences: Open User Settings', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsAction, OpenGlobalKeybindingsAction.ID, OpenGlobalKeybindingsAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_S) }), 'Preferences: Open Keyboard Shortcuts', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(OpenGlobalKeybindingsFileAction, OpenGlobalKeybindingsFileAction.ID, OpenGlobalKeybindingsFileAction.LABEL, { primary: null }), 'Preferences: Open Keyboard Shortcuts File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureLanguageBasedSettingsAction, ConfigureLanguageBasedSettingsAction.ID, ConfigureLanguageBasedSettingsAction.LABEL), 'Preferences: Configure Language Specific Settings...', category);
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index aa9985fa576..3b40c62f656 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ISettingsEditorModel, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, ISearchResult, ISearchProvider, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, IFilterMetadata, ISearchResult, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/services/preferences/common/preferences';
 import { IRange } from 'vs/editor/common/core/range';
 import { distinct, top } from 'vs/base/common/arrays';
 import * as strings from 'vs/base/common/strings';
@@ -20,6 +20,7 @@ import { asJson } from 'vs/base/node/request';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IPreferencesSearchService, ISearchProvider, IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
 
 export interface IEndpointDetails {
 	urlBase: string;
@@ -45,7 +46,7 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 			// Filter to enabled extensions that have settings
 			return exts
 				.filter(ext => this.extensionEnablementService.isEnabled(ext))
-				.filter(ext => ext.manifest.contributes && ext.manifest.contributes.configuration)
+				.filter(ext => ext.manifest && ext.manifest.contributes && ext.manifest.contributes.configuration)
 				.filter(ext => !!ext.identifier.uuid);
 		});
 	}
diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
index 6c164a8125b..d349a73809e 100644
--- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts
@@ -21,9 +21,6 @@ import { fuzzyContains, stripWildcards } from 'vs/base/common/strings';
 import { matchesFuzzy } from 'vs/base/common/filters';
 import { ViewsRegistry, ViewLocation, IViewsViewlet } from 'vs/workbench/common/views';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/parts/files/common/files';
-import { VIEWLET_ID as DEBUG_VIEWLET_ID } from 'vs/workbench/parts/debug/common/debug';
-import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions';
 import { ViewletDescriptor } from 'vs/workbench/browser/viewlet';
 
 export const VIEW_PICKER_PREFIX = 'view ';
@@ -146,11 +143,7 @@ export class ViewPickerHandler extends QuickOpenHandler {
 
 		// Views
 		viewlets.forEach((viewlet, index) => {
-			const viewLocation: ViewLocation = viewlet.id === EXPLORER_VIEWLET_ID ? ViewLocation.Explorer
-				: viewlet.id === DEBUG_VIEWLET_ID ? ViewLocation.Debug
-					: viewlet.id === EXTENSIONS_VIEWLET_ID ? ViewLocation.Extensions
-						: null;
-
+			const viewLocation: ViewLocation = ViewLocation.get(viewlet.id);
 			if (viewLocation) {
 				const viewEntriesForViewlet: ViewEntry[] = getViewEntriesForViewlet(viewlet, viewLocation);
 				viewEntries.push(...viewEntriesForViewlet);
diff --git a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
index 0b63e5adb18..9981d15cb98 100644
--- a/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
+++ b/src/vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts
@@ -17,15 +17,17 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
 import { RunOnceScheduler } from 'vs/base/common/async';
 import URI from 'vs/base/common/uri';
 import { isEqual } from 'vs/base/common/resources';
-import { isLinux } from 'vs/base/common/platform';
+import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { equals } from 'vs/base/common/objects';
 
 interface IConfiguration extends IWindowsConfiguration {
 	update: { channel: string; };
 	telemetry: { enableCrashReporter: boolean };
 	keyboard: { touchbar: { enabled: boolean } };
 	workbench: { tree: { horizontalScrolling: boolean } };
+	files: { useExperimentalFileWatcher: boolean, watcherExclude: object };
 }
 
 export class SettingsChangeRelauncher implements IWorkbenchContribution {
@@ -34,11 +36,14 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 
 	private titleBarStyle: 'native' | 'custom';
 	private nativeTabs: boolean;
+	private clickThroughInactive: boolean;
 	private updateChannel: string;
 	private enableCrashReporter: boolean;
 	private touchbarEnabled: boolean;
 	private treeHorizontalScrolling: boolean;
 	private windowsSmoothScrollingWorkaround: boolean;
+	private experimentalFileWatcher: boolean;
+	private fileWatcherExclude: object;
 
 	private firstFolderResource: URI;
 	private extensionHostRestarter: RunOnceScheduler;
@@ -72,18 +77,24 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 	private onConfigurationChange(config: IConfiguration, notify: boolean): void {
 		let changed = false;
 
-		// Titlebar style
-		if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
+		// macOS: Titlebar style
+		if (isMacintosh && config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
 			this.titleBarStyle = config.window.titleBarStyle;
 			changed = true;
 		}
 
-		// Native tabs
-		if (config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {
+		// macOS: Native tabs
+		if (isMacintosh && config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {
 			this.nativeTabs = config.window.nativeTabs;
 			changed = true;
 		}
 
+		// macOS: Click through (accept first mouse)
+		if (isMacintosh && config.window && typeof config.window.clickThroughInactive === 'boolean' && config.window.clickThroughInactive !== this.clickThroughInactive) {
+			this.clickThroughInactive = config.window.clickThroughInactive;
+			changed = true;
+		}
+
 		// Update channel
 		if (config.update && typeof config.update.channel === 'string' && config.update.channel !== this.updateChannel) {
 			this.updateChannel = config.update.channel;
@@ -96,8 +107,22 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 			changed = true;
 		}
 
-		// Touchbar config
-		if (config.keyboard && config.keyboard.touchbar && typeof config.keyboard.touchbar.enabled === 'boolean' && config.keyboard.touchbar.enabled !== this.touchbarEnabled) {
+		// Experimental File Watcher
+		if (config.files && typeof config.files.useExperimentalFileWatcher === 'boolean' && config.files.useExperimentalFileWatcher !== this.experimentalFileWatcher) {
+			this.experimentalFileWatcher = config.files.useExperimentalFileWatcher;
+			changed = true;
+		}
+
+		// File Watcher Excludes (only if in folder workspace mode)
+		if (!this.experimentalFileWatcher && this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+			if (config.files && typeof config.files.watcherExclude === 'object' && !equals(config.files.watcherExclude, this.fileWatcherExclude)) {
+				this.fileWatcherExclude = config.files.watcherExclude;
+				changed = true;
+			}
+		}
+
+		// macOS: Touchbar config
+		if (isMacintosh && config.keyboard && config.keyboard.touchbar && typeof config.keyboard.touchbar.enabled === 'boolean' && config.keyboard.touchbar.enabled !== this.touchbarEnabled) {
 			this.touchbarEnabled = config.keyboard.touchbar.enabled;
 			changed = true;
 		}
@@ -109,7 +134,7 @@ export class SettingsChangeRelauncher implements IWorkbenchContribution {
 		}
 
 		// Windows: smooth scrolling workaround
-		if (config.window && typeof config.window.smoothScrollingWorkaround === 'boolean' && config.window.smoothScrollingWorkaround !== this.windowsSmoothScrollingWorkaround) {
+		if (isWindows && config.window && typeof config.window.smoothScrollingWorkaround === 'boolean' && config.window.smoothScrollingWorkaround !== this.windowsSmoothScrollingWorkaround) {
 			this.windowsSmoothScrollingWorkaround = config.window.smoothScrollingWorkaround;
 			changed = true;
 		}
diff --git a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
index 9b3b978ffcf..95bc4991d0f 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scm.contribution.ts
@@ -39,7 +39,7 @@ const viewletDescriptor = new ViewletDescriptor(
 	VIEWLET_ID,
 	localize('source control', "Source Control"),
 	'scm',
-	36
+	2
 );
 
 Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets)
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index b320d1e7db5..17c764c629e 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -8,14 +8,13 @@
 import 'vs/css!./media/scmViewlet';
 import { localize } from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { Event, Emitter, chain, mapEvent, anyEvent, filterEvent } from 'vs/base/common/event';
+import { Event, Emitter, chain, mapEvent, anyEvent, filterEvent, latch } from 'vs/base/common/event';
 import { domEvent, stop } from 'vs/base/browser/event';
 import { basename } from 'vs/base/common/paths';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { IDisposable, dispose, combinedDisposable, empty as EmptyDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { Builder, Dimension } from 'vs/base/browser/builder';
 import { PanelViewlet, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet';
-import { append, $, addClass, toggleClass, trackFocus } from 'vs/base/browser/dom';
+import { append, $, addClass, toggleClass, trackFocus, Dimension, addDisposableListener } from 'vs/base/browser/dom';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListEvent } from 'vs/base/browser/ui/list/list';
@@ -58,6 +57,10 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ThrottledDelayer } from 'vs/base/common/async';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
+import { IViewDescriptorRef, PersistentContributableViewsModel, IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/contributableViews';
+import { ViewLocation, IViewDescriptor } from 'vs/workbench/common/views';
+import { ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet';
+import { IPanelDndController, Panel } from '../../../../base/browser/ui/splitview/panelview';
 
 export interface ISpliceEvent<T> {
 	index: number;
@@ -1024,6 +1027,17 @@ class InstallAdditionalSCMProvidersAction extends Action {
 	}
 }
 
+class SCMPanelDndController implements IPanelDndController {
+
+	canDrag(panel: Panel): boolean {
+		return !(panel instanceof MainPanel) && !(panel instanceof RepositoryPanel);
+	}
+
+	canDrop(panel: Panel, overPanel: Panel): boolean {
+		return !(overPanel instanceof MainPanel) && !(overPanel instanceof RepositoryPanel);
+	}
+}
+
 export class SCMViewlet extends PanelViewlet implements IViewModel {
 
 	private el: HTMLElement;
@@ -1048,6 +1062,9 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 	get repositories(): ISCMRepository[] { return this._repositories; }
 	get selectedRepositories(): ISCMRepository[] { return this.repositoryPanels.map(p => p.repository); }
 
+	private contributedViews: PersistentContributableViewsModel;
+	private contributedViewDisposables: IDisposable[] = [];
+
 	constructor(
 		@IPartService partService: IPartService,
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -1067,19 +1084,22 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		@IExtensionService extensionService: IExtensionService,
 		@IConfigurationService private configurationService: IConfigurationService,
 	) {
-		super(VIEWLET_ID, { showHeaderInTitleWhenSingleView: true }, partService, contextMenuService, telemetryService, themeService);
+		super(VIEWLET_ID, { showHeaderInTitleWhenSingleView: true, dnd: new SCMPanelDndController() }, partService, contextMenuService, telemetryService, themeService);
 
 		this.menus = instantiationService.createInstance(SCMMenus, undefined);
 		this.menus.onDidChangeTitle(this.updateTitleArea, this, this.disposables);
+
+		this.contributedViews = new PersistentContributableViewsModel(ViewLocation.SCM, 'scm.views', contextKeyService, storageService, contextService);
+		this.disposables.push(this.contributedViews);
 	}
 
-	async create(parent: Builder): TPromise<void> {
+	async create(parent: HTMLElement): TPromise<void> {
 		await super.create(parent);
 
-		this.el = parent.getHTMLElement();
+		this.el = parent;
 		addClass(this.el, 'scm-viewlet');
 		addClass(this.el, 'empty');
-		append(parent.getHTMLElement(), $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
+		append(parent, $('div.empty-message', null, localize('no open repo', "There are no active source control providers.")));
 
 		this.scmService.onDidAddRepository(this.onDidAddRepository, this, this.disposables);
 		this.scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
@@ -1089,6 +1109,19 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		onDidUpdateConfiguration(this.onDidChangeRepositories, this, this.disposables);
 
 		this.onDidChangeRepositories();
+
+		this.contributedViews.onDidAdd(this.onDidAddContributedView, this, this.disposables);
+		this.contributedViews.onDidRemove(this.onDidRemoveContributedView, this, this.disposables);
+
+		let index = this.getContributedViewsStartIndex();
+		for (const viewDescriptor of this.contributedViews.visibleViewDescriptors) {
+			const size = this.contributedViews.getSize(viewDescriptor.id);
+			const collapsed = this.contributedViews.isCollapsed(viewDescriptor.id);
+
+			this.onDidAddContributedView({ viewDescriptor, index: index++, size, collapsed });
+		}
+
+		this.onDidSashChange(this.saveContributedViewSizes, this, this.disposables);
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
@@ -1130,13 +1163,13 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 
 		if (shouldMainPanelBeVisible) {
 			this.mainPanel = this.instantiationService.createInstance(MainPanel, this);
-			this.addPanel(this.mainPanel, this.mainPanel.minimumSize, 0);
+			this.addPanels([{ panel: this.mainPanel, size: this.mainPanel.minimumSize, index: 0 }]);
 
 			const selectionChangeDisposable = this.mainPanel.onSelectionChange(this.onSelectionChange, this);
 			this.onSelectionChange(this.mainPanel.getSelection());
 
 			this.mainPanelDisposable = toDisposable(() => {
-				this.removePanel(this.mainPanel);
+				this.removePanels([this.mainPanel]);
 				selectionChangeDisposable.dispose();
 				this.mainPanel.dispose();
 			});
@@ -1147,15 +1180,28 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		}
 	}
 
+	private getContributedViewsStartIndex(): number {
+		return (this.mainPanel ? 1 : 0) + this.repositoryPanels.length;
+	}
+
 	setVisible(visible: boolean): TPromise<void> {
-		const result = super.setVisible(visible);
+		const promises: TPromise<any>[] = [];
+		promises.push(super.setVisible(visible));
 
 		if (!visible) {
 			this.cachedMainPanelHeight = this.getPanelSize(this.mainPanel);
 		}
 
 		this._onDidChangeVisibility.fire(visible);
-		return result;
+
+		const start = this.getContributedViewsStartIndex();
+
+		for (let i = 0; i < this.contributedViews.viewDescriptors.length; i++) {
+			const panel = this.panels[start + i] as ViewsViewletPanel;
+			promises.push(panel.setVisible(visible));
+		}
+
+		return TPromise.join(promises) as TPromise<any>;
 	}
 
 	getOptimalWidth(): number {
@@ -1175,8 +1221,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 
 	getActions(): IAction[] {
 		if (this.isSingleView()) {
-			const [panel] = this.repositoryPanels;
-			return panel.getActions();
+			return this.panels[0].getActions();
 		}
 
 		return this.menus.getTitleActions();
@@ -1186,7 +1231,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		let result: IAction[];
 
 		if (this.isSingleView()) {
-			const [panel] = this.repositoryPanels;
+			const [panel] = this.panels;
 
 			result = [
 				...panel.getSecondaryActions(),
@@ -1213,13 +1258,33 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		return new ContextAwareMenuItemActionItem(action, this.keybindingService, this.notificationService, this.contextMenuService);
 	}
 
+	private didLayout = false;
 	layout(dimension: Dimension): void {
 		super.layout(dimension);
 		this._height = dimension.height;
+
+		if (this.didLayout) {
+			// 	this.saveViewSizes();
+		} else {
+			this.didLayout = true;
+			this.restoreContributedViewSizes();
+		}
+	}
+
+	movePanel(from: ViewletPanel, to: ViewletPanel): void {
+		const start = this.getContributedViewsStartIndex();
+		const fromIndex = firstIndex(this.panels, panel => panel === from) - start;
+		const toIndex = firstIndex(this.panels, panel => panel === to) - start;
+		const fromViewDescriptor = this.contributedViews.viewDescriptors[fromIndex];
+		const toViewDescriptor = this.contributedViews.viewDescriptors[toIndex];
+
+		super.movePanel(from, to);
+		this.contributedViews.move(fromViewDescriptor.id, toViewDescriptor.id);
 	}
 
 	private onSelectionChange(repositories: ISCMRepository[]): void {
 		const wasSingleView = this.isSingleView();
+		const contributableViewsHeight = this.getContributableViewsSize();
 
 		// Collect unselected panels
 		const panelsToRemove = this.repositoryPanels
@@ -1235,14 +1300,15 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 			.map(r => this.instantiationService.createInstance(RepositoryPanel, r, this));
 
 		// Add new selected panels
+		let index = repositoryPanels.length + (this.mainPanel ? 1 : 0);
 		this.repositoryPanels = [...repositoryPanels, ...newRepositoryPanels];
 		newRepositoryPanels.forEach(panel => {
-			this.addPanel(panel, panel.minimumSize, this.length);
+			this.addPanels([{ panel, size: panel.minimumSize, index: index++ }]);
 			panel.repository.focus();
 		});
 
 		// Remove unselected panels
-		panelsToRemove.forEach(panel => this.removePanel(panel));
+		this.removePanels(panelsToRemove);
 
 		// Restore main panel height
 		if (this.isVisible() && typeof this.cachedMainPanelHeight === 'number') {
@@ -1253,11 +1319,14 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		// Resize all panels equally
 		const height = typeof this.height === 'number' ? this.height : 1000;
 		const mainPanelHeight = this.getPanelSize(this.mainPanel);
-		const size = (height - mainPanelHeight) / repositories.length;
+		const size = (height - mainPanelHeight - contributableViewsHeight) / repositories.length;
 		for (const panel of this.repositoryPanels) {
 			this.resizePanel(panel, size);
 		}
 
+		// Resize contributed view sizes
+		this.restoreContributedViewSizes();
+
 		// React to menu changes for single view mode
 		if (wasSingleView !== this.isSingleView()) {
 			this.singleRepositoryPanelTitleActionsDisposable.dispose();
@@ -1270,8 +1339,123 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		}
 	}
 
+	private getContributableViewsSize(): number {
+		let value = 0;
+
+		for (let i = this.getContributedViewsStartIndex(); i < this.length; i++) {
+			value += this.getPanelSize(this.panels[i]);
+		}
+
+		return value;
+	}
+
+	onDidAddContributedView({ viewDescriptor, index, size, collapsed }: IAddedViewDescriptorRef): void {
+		const start = this.getContributedViewsStartIndex();
+		const panel = this.instantiationService.createInstance(viewDescriptor.ctor, {
+			id: viewDescriptor.id,
+			name: viewDescriptor.name,
+			actionRunner: this.getActionRunner(),
+			expanded: !collapsed,
+			viewletSettings: {} // what is this
+		}) as ViewsViewletPanel;
+
+		this.addPanels([{ panel, size: size || panel.minimumSize, index: start + index }]);
+		panel.setVisible(true);
+
+		const contextMenuDisposable = addDisposableListener(panel.draggableElement, 'contextmenu', e => {
+			e.stopPropagation();
+			e.preventDefault();
+			this.onViewHeaderContextMenu(new StandardMouseEvent(e), viewDescriptor);
+		});
+
+		const collapseDisposable = latch(mapEvent(panel.onDidChange, () => !panel.isExpanded()))(collapsed => {
+			this.contributedViews.setCollapsed(viewDescriptor.id, collapsed);
+		});
+
+		this.contributedViewDisposables.splice(index, 0, combinedDisposable([contextMenuDisposable, collapseDisposable]));
+	}
+
+	private onViewHeaderContextMenu(event: StandardMouseEvent, viewDescriptor: IViewDescriptor): void {
+		const actions: IAction[] = [];
+		actions.push(<IAction>{
+			id: `${viewDescriptor.id}.removeView`,
+			label: localize('hideView', "Hide"),
+			enabled: viewDescriptor.canToggleVisibility,
+			run: () => this.contributedViews.setVisible(viewDescriptor.id, !this.contributedViews.isVisible(viewDescriptor.id))
+		});
+
+		const otherActions = this.getContextMenuActions();
+		if (otherActions.length) {
+			actions.push(...[new Separator(), ...otherActions]);
+		}
+
+		let anchor: { x: number, y: number } = { x: event.posx, y: event.posy };
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => anchor,
+			getActions: () => TPromise.as(actions)
+		});
+	}
+
+	getContextMenuActions(): IAction[] {
+		const result: IAction[] = [];
+		const viewToggleActions = this.contributedViews.viewDescriptors.map(viewDescriptor => (<IAction>{
+			id: `${viewDescriptor.id}.toggleVisibility`,
+			label: viewDescriptor.name,
+			checked: this.contributedViews.isVisible(viewDescriptor.id),
+			enabled: viewDescriptor.canToggleVisibility,
+			run: () => this.contributedViews.setVisible(viewDescriptor.id, !this.contributedViews.isVisible(viewDescriptor.id))
+		}));
+
+		result.push(...viewToggleActions);
+		const parentActions = super.getContextMenuActions();
+		if (viewToggleActions.length && parentActions.length) {
+			result.push(new Separator());
+		}
+		result.push(...parentActions);
+		return result;
+	}
+
+	onDidRemoveContributedView({ viewDescriptor, index }: IViewDescriptorRef): void {
+		const start = this.getContributedViewsStartIndex();
+		const panel = this.panels[start + index];
+
+		this.removePanels([panel]);
+
+		const [disposable] = this.contributedViewDisposables.splice(index, 1);
+		disposable.dispose();
+	}
+
+	private saveContributedViewSizes(): void {
+		const start = this.getContributedViewsStartIndex();
+
+		for (let i = 0; i < this.contributedViews.viewDescriptors.length; i++) {
+			const viewDescriptor = this.contributedViews.viewDescriptors[i];
+			const size = this.getPanelSize(this.panels[start + i]);
+
+			this.contributedViews.setSize(viewDescriptor.id, size);
+		}
+	}
+
+	private restoreContributedViewSizes(): void {
+		if (!this.didLayout) {
+			return;
+		}
+
+		const start = this.getContributedViewsStartIndex();
+
+		for (let i = 0; i < this.contributedViews.viewDescriptors.length; i++) {
+			const panel = this.panels[start + i];
+			const viewDescriptor = this.contributedViews.viewDescriptors[i];
+			const size = this.contributedViews.getSize(viewDescriptor.id);
+
+			if (typeof size === 'number') {
+				this.resizePanel(panel, size);
+			}
+		}
+	}
+
 	protected isSingleView(): boolean {
-		return super.isSingleView() && this.repositoryPanels.length === 1;
+		return super.isSingleView() && this.repositoryPanels.length + this.contributedViews.visibleViewDescriptors.length === 1;
 	}
 
 	hide(repository: ISCMRepository): void {
@@ -1282,8 +1466,14 @@ export class SCMViewlet extends PanelViewlet implements IViewModel {
 		this.mainPanel.hide(repository);
 	}
 
+	shutdown(): void {
+		this.contributedViews.saveViewsStates();
+		super.shutdown();
+	}
+
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
+		this.contributedViewDisposables = dispose(this.contributedViewDisposables);
 		this.mainPanelDisposable.dispose();
 		super.dispose();
 	}
diff --git a/src/vs/workbench/parts/search/browser/media/searchview.css b/src/vs/workbench/parts/search/browser/media/searchview.css
index f8c247cb778..11d4a566ac9 100644
--- a/src/vs/workbench/parts/search/browser/media/searchview.css
+++ b/src/vs/workbench/parts/search/browser/media/searchview.css
@@ -179,10 +179,15 @@
 	padding: 0;
 }
 
-.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .foldermatch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row.focused .foldermatch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .filematch .monaco-icon-label,
-.search-view .monaco-tree .monaco-tree-row.focused .filematch .monaco-icon-label {
+.search-view:not(.wide) .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .filematch .monaco-icon-label {
+	flex: 1;
+}
+
+.search-view:not(.wide) .monaco-tree .monaco-tree-row:hover:not(.highlighted) .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row.focused .foldermatch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row:hover:not(.highlighted) .filematch .monaco-icon-label,
+.search-view:not(.wide) .monaco-tree .monaco-tree-row.focused .filematch .monaco-icon-label {
 	flex: 1;
 }
 
@@ -193,8 +198,8 @@
 	margin-left: 0.8em;
 }
 
-.search-view .foldermatch .badge,
-.search-view .filematch .badge {
+.search-view.wide .foldermatch .badge,
+.search-view.wide .filematch .badge {
 	margin-left: 10px;
 }
 
@@ -277,15 +282,24 @@
 	margin-right: 12px;
 }
 
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
-.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .filematch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
-.search-view > .results > .monaco-tree.focused .monaco-tree-row.focused .content .linematch .monaco-count-badge {
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
+.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
 	display: none;
 }
 
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .badge,
+.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .badge {
+	flex: 1;
+}
+
 .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove,
 .vs-dark .monaco-workbench .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove {
 	background: url("action-remove-focus.svg") center center no-repeat;
diff --git a/src/vs/workbench/parts/search/browser/patternInputWidget.ts b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
index c83d533c470..2b900f9f3c9 100644
--- a/src/vs/workbench/parts/search/browser/patternInputWidget.ts
+++ b/src/vs/workbench/parts/search/browser/patternInputWidget.ts
@@ -5,7 +5,6 @@
 
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox';
 import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview';
@@ -73,7 +72,7 @@ export class PatternInputWidget extends Widget {
 		switch (eventType) {
 			case 'keydown':
 			case 'keyup':
-				$(this.inputBox.inputElement).on(eventType, handler);
+				this._register(dom.addDisposableListener(this.inputBox.inputElement, eventType, handler));
 				break;
 			case PatternInputWidget.OPTION_CHANGE:
 				this.onOptionChange = handler;
@@ -158,7 +157,7 @@ export class PatternInputWidget extends Widget {
 	private render(): void {
 		this.domNode = document.createElement('div');
 		this.domNode.style.width = this.width + 'px';
-		$(this.domNode).addClass('monaco-findInput');
+		dom.addClass(this.domNode, 'monaco-findInput');
 
 		this.inputBox = new InputBox(this.domNode, this.contextViewProvider, {
 			placeholder: this.placeholder || '',
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index 8dcb979e257..af43ddcccf4 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -11,22 +11,27 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { INavigator } from 'vs/base/common/iterator';
 import { SearchView } from 'vs/workbench/parts/search/browser/searchView';
-import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch } from 'vs/workbench/parts/search/common/searchModel';
+import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch, SearchResult } from 'vs/workbench/parts/search/common/searchModel';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
 import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ResolvedKeybinding, createKeybinding } from 'vs/base/common/keyCodes';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { OS } from 'vs/base/common/platform';
+import { OS, isWindows } from 'vs/base/common/platform';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { VIEW_ID } from 'vs/platform/search/common/search';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { ICommandHandler } from 'vs/platform/commands/common/commands';
+import { Schemas } from 'vs/base/common/network';
+import { getPathLabel } from 'vs/base/common/labels';
+import URI from 'vs/base/common/uri';
 
 export function isSearchViewFocused(viewletService: IViewletService, panelService: IPanelService): boolean {
 	let searchView = getSearchView(viewletService, panelService);
 	let activeElement = document.activeElement;
-	return searchView && activeElement && DOM.isAncestor(activeElement, searchView.getContainer().getHTMLElement());
+	return searchView && activeElement && DOM.isAncestor(activeElement, searchView.getContainer());
 }
 
 export function appendKeyBindingLabel(label: string, keyBinding: number | ResolvedKeybinding, keyBindingService2: IKeybindingService): string {
@@ -121,6 +126,48 @@ export class ShowPreviousSearchIncludeAction extends Action {
 	}
 }
 
+export class ShowNextSearchExcludeAction extends Action {
+
+	public static readonly ID = 'search.history.showNextExcludePattern';
+	public static readonly LABEL = nls.localize('nextSearchExcludePattern', "Show Next Search Exclude Pattern");
+
+	constructor(id: string, label: string,
+		@IViewletService private viewletService: IViewletService,
+		@IPanelService private panelService: IPanelService,
+		@IContextKeyService private contextKeyService: IContextKeyService
+	) {
+		super(id, label);
+		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
+	}
+
+	public run(): TPromise<any> {
+		const searchView = getSearchView(this.viewletService, this.panelService);
+		searchView.searchExcludePattern.showNextTerm();
+		return TPromise.as(null);
+	}
+}
+
+export class ShowPreviousSearchExcludeAction extends Action {
+
+	public static readonly ID = 'search.history.showPreviousExcludePattern';
+	public static readonly LABEL = nls.localize('previousSearchExcludePattern', "Show Previous Search Exclude Pattern");
+
+	constructor(id: string, label: string,
+		@IViewletService private viewletService: IViewletService,
+		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IPanelService private panelService: IPanelService
+	) {
+		super(id, label);
+		this.enabled = this.contextKeyService.contextMatchesRules(Constants.SearchViewVisibleKey);
+	}
+
+	public run(): TPromise<any> {
+		const searchView = getSearchView(this.viewletService, this.panelService);
+		searchView.searchExcludePattern.showPreviousTerm();
+		return TPromise.as(null);
+	}
+}
+
 export class ShowNextSearchTermAction extends Action {
 
 	public static readonly ID = 'search.history.showNext';
@@ -216,21 +263,16 @@ export abstract class FindOrReplaceInFilesAction extends Action {
 	}
 
 	public run(): TPromise<any> {
-		const searchView = getSearchView(this.viewletService, this.panelService);
 		return openSearchView(this.viewletService, this.panelService, true).then(openedView => {
-			if (!searchView || this.expandSearchReplaceWidget) {
-				const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
-				searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
-				// Focus replace only when there is text in the searchInput box
-				const focusReplace = this.focusReplace && searchAndReplaceWidget.searchInput.getValue();
-				searchAndReplaceWidget.focus(this.selectWidgetText, !!focusReplace);
-			}
+			const searchAndReplaceWidget = openedView.searchAndReplaceWidget;
+			searchAndReplaceWidget.toggleReplace(this.expandSearchReplaceWidget);
+			// Focus replace only when there is text in the searchInput box
+			const focusReplace = this.focusReplace && searchAndReplaceWidget.searchInput.getValue();
+			searchAndReplaceWidget.focus(this.selectWidgetText, !!focusReplace);
 		});
 	}
 }
 
-export const SHOW_SEARCH_LABEL = nls.localize('showSearchViewlet', "Show Search");
-
 export class FindInFilesAction extends FindOrReplaceInFilesAction {
 
 	public static readonly LABEL = nls.localize('findInFiles', "Find in Files");
@@ -474,8 +516,10 @@ export abstract class AbstractSearchAndReplaceAction extends Action {
 
 export class RemoveAction extends AbstractSearchAndReplaceAction {
 
+	public static LABEL = nls.localize('RemoveAction.label', "Dismiss");
+
 	constructor(private viewer: ITree, private element: RenderableMatch) {
-		super('remove', nls.localize('RemoveAction.label', "Dismiss"), 'action-remove');
+		super('remove', RemoveAction.LABEL, 'action-remove');
 	}
 
 	public run(): TPromise<any> {
@@ -508,9 +552,11 @@ export class RemoveAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('file.replaceAll.label', "Replace All");
+
 	constructor(private viewer: ITree, private fileMatch: FileMatch, private viewlet: SearchView,
 		@IKeybindingService keyBindingService: IKeybindingService) {
-		super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(nls.localize('file.replaceAll.label', "Replace All"), keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all');
+		super(Constants.ReplaceAllInFileActionId, appendKeyBindingLabel(ReplaceAllAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFileActionId), keyBindingService), 'action-replace-all');
 	}
 
 	public run(): TPromise<any> {
@@ -527,10 +573,12 @@ export class ReplaceAllAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('file.replaceAll.label', "Replace All");
+
 	constructor(private viewer: ITree, private folderMatch: FolderMatch,
 		@IKeybindingService keyBindingService: IKeybindingService
 	) {
-		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(nls.localize('file.replaceAll.label', "Replace All"), keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
+		super(Constants.ReplaceAllInFolderActionId, appendKeyBindingLabel(ReplaceAllInFolderAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceAllInFolderActionId), keyBindingService), 'action-replace-all');
 	}
 
 	public async run(): TPromise<any> {
@@ -546,11 +594,13 @@ export class ReplaceAllInFolderAction extends AbstractSearchAndReplaceAction {
 
 export class ReplaceAction extends AbstractSearchAndReplaceAction {
 
+	public static readonly LABEL = nls.localize('match.replace.label', "Replace");
+
 	constructor(private viewer: ITree, private element: Match, private viewlet: SearchView,
 		@IReplaceService private replaceService: IReplaceService,
 		@IKeybindingService keyBindingService: IKeybindingService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
-		super(Constants.ReplaceActionId, appendKeyBindingLabel(nls.localize('match.replace.label', "Replace"), keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace');
+		super(Constants.ReplaceActionId, appendKeyBindingLabel(ReplaceAction.LABEL, keyBindingService.lookupKeybinding(Constants.ReplaceActionId), keyBindingService), 'action-replace');
 	}
 
 	public run(): TPromise<any> {
@@ -622,3 +672,92 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 		return false;
 	}
 }
+
+function uriToClipboardString(resource: URI): string {
+	return resource.scheme === Schemas.file ? getPathLabel(resource) : resource.toString();
+}
+
+export const copyPathCommand: ICommandHandler = (accessor, fileMatch: FileMatch | FolderMatch) => {
+	const clipboardService = accessor.get(IClipboardService);
+
+	const text = uriToClipboardString(fileMatch.resource());
+	clipboardService.writeText(text);
+};
+
+function matchToString(match: Match): string {
+	return `${match.range().startLineNumber},${match.range().startColumn}: ${match.text()}`;
+}
+
+const lineDelimiter = isWindows ? '\r\n' : '\n';
+function fileMatchToString(fileMatch: FileMatch, maxMatches: number): { text: string, count: number } {
+	const matchTextRows = fileMatch.matches()
+		.slice(0, maxMatches)
+		.map(matchToString)
+		.map(matchText => '  ' + matchText);
+
+	return {
+		text: `${uriToClipboardString(fileMatch.resource())}${lineDelimiter}${matchTextRows.join(lineDelimiter)}`,
+		count: matchTextRows.length
+	};
+}
+
+function folderMatchToString(folderMatch: FolderMatch, maxMatches: number): { text: string, count: number } {
+	const fileResults: string[] = [];
+	let numMatches = 0;
+
+	for (let i = 0; i < folderMatch.fileCount() && numMatches < maxMatches; i++) {
+		const fileResult = fileMatchToString(folderMatch.matches()[i], maxMatches - numMatches);
+		numMatches += fileResult.count;
+		fileResults.push(fileResult.text);
+	}
+
+	return {
+		text: fileResults.join(lineDelimiter + lineDelimiter),
+		count: numMatches
+	};
+}
+
+const maxClipboardMatches = 1e4;
+export const copyMatchCommand: ICommandHandler = (accessor, match: RenderableMatch) => {
+	const clipboardService = accessor.get(IClipboardService);
+
+	let text: string;
+	if (match instanceof Match) {
+		text = matchToString(match);
+	} else if (match instanceof FileMatch) {
+		text = fileMatchToString(match, maxClipboardMatches).text;
+	} else if (match instanceof FolderMatch) {
+		text = folderMatchToString(match, maxClipboardMatches).text;
+	}
+
+	if (text) {
+		clipboardService.writeText(text);
+	}
+};
+
+function allFolderMatchesToString(folderMatches: FolderMatch[], maxMatches: number): string {
+	const folderResults: string[] = [];
+	let numMatches = 0;
+
+	for (let i = 0; i < folderMatches.length && numMatches < maxMatches; i++) {
+		const folderResult = folderMatchToString(folderMatches[i], maxMatches - numMatches);
+		if (folderResult.count) {
+			numMatches += folderResult.count;
+			folderResults.push(folderResult.text);
+		}
+	}
+
+	return folderResults.join(lineDelimiter + lineDelimiter);
+}
+
+export const copyAllCommand: ICommandHandler = (accessor) => {
+	const viewletService = accessor.get(IViewletService);
+	const panelService = accessor.get(IPanelService);
+	const clipboardService = accessor.get(IClipboardService);
+
+	const searchView = getSearchView(viewletService, panelService);
+	const root: SearchResult = searchView.getControl().getInput();
+
+	const text = allFolderMatchesToString(root.folderMatches(), maxClipboardMatches);
+	clipboardService.writeText(text);
+};
diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts
index 188f2c1c147..4515d7d943d 100644
--- a/src/vs/workbench/parts/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts
@@ -12,7 +12,7 @@ import { IAction, IActionRunner } from 'vs/base/common/actions';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { FileLabel } from 'vs/workbench/browser/labels';
-import { ITree, IDataSource, ISorter, IAccessibilityProvider, IFilter, IRenderer } from 'vs/base/parts/tree/browser/tree';
+import { ITree, IDataSource, ISorter, IAccessibilityProvider, IFilter, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
 import { Match, SearchResult, FileMatch, FileMatchOrMatch, SearchModel, FolderMatch } from 'vs/workbench/parts/search/common/searchModel';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { Range } from 'vs/editor/common/core/range';
@@ -23,6 +23,11 @@ import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { getPathLabel } from 'vs/base/common/labels';
 import { FileKind } from 'vs/platform/files/common/files';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions';
+import { WorkbenchTreeController, WorkbenchTree } from 'vs/platform/list/browser/listService';
+import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem';
 
 export class SearchDataSource implements IDataSource {
 
@@ -339,10 +344,12 @@ export class SearchAccessibilityProvider implements IAccessibilityProvider {
 			const replace = searchModel.isReplaceActive() && !!searchModel.replaceString;
 			const matchString = match.getMatchString();
 			const range = match.range();
+			const matchText = match.text().substr(0, range.endColumn + 150);
 			if (replace) {
-				return nls.localize('replacePreviewResultAria', "Replace term {0} with {1} at column position {2} in line with text {3}", matchString, match.replaceString, range.startColumn + 1, match.text());
+				return nls.localize('replacePreviewResultAria', "Replace term {0} with {1} at column position {2} in line with text {3}", matchString, match.replaceString, range.startColumn + 1, matchText);
 			}
-			return nls.localize('searchResultAria', "Found term {0} at column position {1} in line with text {2}", matchString, range.startColumn + 1, match.text());
+
+			return nls.localize('searchResultAria', "Found term {0} at column position {1} in line with text {2}", matchString, range.startColumn + 1, matchText);
 		}
 		return undefined;
 	}
@@ -354,3 +361,38 @@ export class SearchFilter implements IFilter {
 		return !(element instanceof FileMatch || element instanceof FolderMatch) || element.matches().length > 0;
 	}
 }
+
+export class SearchTreeController extends WorkbenchTreeController {
+	private contextMenu: IMenu;
+
+	constructor(
+		@IContextMenuService private contextMenuService: IContextMenuService,
+		@IMenuService private menuService: IMenuService,
+		@IConfigurationService configurationService: IConfigurationService
+	) {
+		super({}, configurationService);
+	}
+
+	public onContextMenu(tree: WorkbenchTree, element: any, event: ContextMenuEvent): boolean {
+		if (!this.contextMenu) {
+			this.contextMenu = this.menuService.createMenu(MenuId.SearchContext, tree.contextKeyService);
+		}
+
+		tree.setFocus(element);
+
+		const anchor = { x: event.posx, y: event.posy };
+		this.contextMenuService.showContextMenu({
+			getAnchor: () => anchor,
+
+			getActions: () => {
+				const actions: IAction[] = [];
+				fillInActions(this.contextMenu, { shouldForwardArgs: true }, actions, this.contextMenuService);
+				return TPromise.as(actions);
+			},
+
+			getActionsContext: () => element
+		});
+
+		return true;
+	}
+}
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
index f6b01d6a0f2..f367e4aae41 100644
--- a/src/vs/workbench/parts/search/browser/searchView.ts
+++ b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -19,11 +19,11 @@ import * as paths from 'vs/base/common/paths';
 import * as dom from 'vs/base/browser/dom';
 import { IAction } from 'vs/base/common/actions';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { Dimension, Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { FindInput } from 'vs/base/browser/ui/findinput/findInput';
 import { ITree, IFocusEvent } from 'vs/base/parts/tree/browser/tree';
 import { Scope } from 'vs/workbench/common/memento';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 import { Match, FileMatch, SearchModel, FileMatchOrMatch, IChangeEvent, ISearchWorkbenchService, FolderMatch } from 'vs/workbench/parts/search/common/searchModel';
@@ -41,7 +41,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { PatternInputWidget, ExcludePatternInputWidget } from 'vs/workbench/parts/search/browser/patternInputWidget';
-import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProvider, SearchFilter } from 'vs/workbench/parts/search/browser/searchResultsView';
+import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProvider, SearchFilter, SearchTreeController } from 'vs/workbench/parts/search/browser/searchResultsView';
 import { SearchWidget, ISearchWidgetOptions } from 'vs/workbench/parts/search/browser/searchWidget';
 import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction, CancelSearchAction } from 'vs/workbench/parts/search/browser/searchActions';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
@@ -62,13 +62,15 @@ import { IPanel } from 'vs/workbench/common/panel';
 import { IViewlet } from 'vs/workbench/common/viewlet';
 import { Viewlet } from 'vs/workbench/browser/viewlet';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { splitGlobAware } from 'vs/base/common/glob';
 
 export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 	private static readonly MAX_TEXT_RESULTS = 10000;
 	private static readonly SHOW_REPLACE_STORAGE_KEY = 'vs.search.show.replace';
 
+	private static readonly WIDE_CLASS_NAME = 'wide';
+	private static readonly WIDE_VIEW_SIZE = 600;
+
 	private isDisposed: boolean;
 
 	private queryBuilder: QueryBuilder;
@@ -77,12 +79,15 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private viewletVisible: IContextKey<boolean>;
 	private inputBoxFocused: IContextKey<boolean>;
 	private inputPatternIncludesFocused: IContextKey<boolean>;
+	private inputPatternExclusionsFocused: IContextKey<boolean>;
 	private firstMatchFocused: IContextKey<boolean>;
 	private fileMatchOrMatchFocused: IContextKey<boolean>;
+	private fileMatchOrFolderMatchFocus: IContextKey<boolean>;
 	private fileMatchFocused: IContextKey<boolean>;
 	private folderMatchFocused: IContextKey<boolean>;
 	private matchFocused: IContextKey<boolean>;
 	private hasSearchResultsKey: IContextKey<boolean>;
+
 	private searchSubmitted: boolean;
 	private searching: boolean;
 
@@ -92,9 +97,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	private messages: Builder;
 	private searchWidgetsContainer: Builder;
 	private searchWidget: SearchWidget;
-	private size: Dimension;
+	private size: dom.Dimension;
 	private queryDetails: HTMLElement;
-	private inputPatternIncludes: ExcludePatternInputWidget;
+	private inputPatternExcludes: ExcludePatternInputWidget;
+	private inputPatternIncludes: PatternInputWidget;
 	private results: Builder;
 
 	private currentSelectedFileMatch: FileMatch;
@@ -131,8 +137,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.viewletVisible = Constants.SearchViewVisibleKey.bindTo(contextKeyService);
 		this.inputBoxFocused = Constants.InputBoxFocusedKey.bindTo(this.contextKeyService);
 		this.inputPatternIncludesFocused = Constants.PatternIncludesFocusedKey.bindTo(this.contextKeyService);
+		this.inputPatternExclusionsFocused = Constants.PatternExcludesFocusedKey.bindTo(this.contextKeyService);
 		this.firstMatchFocused = Constants.FirstMatchFocusKey.bindTo(contextKeyService);
 		this.fileMatchOrMatchFocused = Constants.FileMatchOrMatchFocusKey.bindTo(contextKeyService);
+		this.fileMatchOrFolderMatchFocus = Constants.FileMatchOrFolderMatchFocusKey.bindTo(contextKeyService);
 		this.fileMatchFocused = Constants.FileFocusKey.bindTo(contextKeyService);
 		this.folderMatchFocused = Constants.FolderFocusKey.bindTo(contextKeyService);
 		this.matchFocused = Constants.MatchFocusKey.bindTo(this.contextKeyService);
@@ -158,12 +166,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 	}
 
-	public create(parent: Builder): TPromise<void> {
+	public create(parent: HTMLElement): TPromise<void> {
 		super.create(parent);
 
 		this.viewModel = this.searchWorkbenchService.searchModel;
 		let builder: Builder;
-		parent.div({
+		$(parent).div({
 			'class': 'search-view'
 		}, (div) => {
 			builder = div;
@@ -175,14 +183,43 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.createSearchWidget(this.searchWidgetsContainer);
 
 		const filePatterns = this.viewletSettings['query.filePatterns'] || '';
-		const patternExclusions = this.viewletSettings['query.folderExclusions'] || '';
-		delete this.viewletSettings['query.folderExclusions']; // Migrating from versions that have dedicated exclusions persisted
-		const patternIncludes = this.viewletSettings['query.folderIncludes'] || '';
-		const patternIncludesHistory = this.viewletSettings['query.folderIncludesHistory'] || [];
+		let patternExclusions = this.viewletSettings['query.folderExclusions'] || '';
+		const patternExclusionsHistory: string[] = this.viewletSettings['query.folderExclusionsHistory'] || [];
+		let patternIncludes = this.viewletSettings['query.folderIncludes'] || '';
+		let patternIncludesHistory: string[] = this.viewletSettings['query.folderIncludesHistory'] || [];
 		const queryDetailsExpanded = this.viewletSettings['query.queryDetailsExpanded'] || '';
 		const useExcludesAndIgnoreFiles = typeof this.viewletSettings['query.useExcludesAndIgnoreFiles'] === 'boolean' ?
 			this.viewletSettings['query.useExcludesAndIgnoreFiles'] : true;
 
+		// Transition history from 1.22 combined include+exclude, to split include/exclude histories
+		const patternIncludesHistoryWithoutExcludes: string[] = [];
+		const patternExcludesHistoryFromIncludes: string[] = [];
+		patternIncludesHistory.forEach(historyEntry => {
+			const includeExclude = this.queryBuilder.parseIncludeExcludePattern(historyEntry);
+			if (includeExclude.includePattern) {
+				patternIncludesHistoryWithoutExcludes.push(includeExclude.includePattern);
+			}
+
+			if (includeExclude.excludePattern) {
+				patternExcludesHistoryFromIncludes.push(includeExclude.excludePattern);
+			}
+		});
+
+		patternIncludesHistory = patternIncludesHistoryWithoutExcludes;
+		patternExclusionsHistory.push(...patternExcludesHistoryFromIncludes);
+
+		// Split combined include/exclude to split include/exclude boxes
+		const includeExclude = this.queryBuilder.parseIncludeExcludePattern(patternIncludes);
+		patternIncludes = includeExclude.includePattern || '';
+
+		if (includeExclude.excludePattern) {
+			if (patternExclusions) {
+				patternExclusions += ', ' + includeExclude.excludePattern;
+			} else {
+				patternExclusions = includeExclude.excludePattern;
+			}
+		}
+
 		this.queryDetails = this.searchWidgetsContainer.div({ 'class': ['query-details'] }, (builder) => {
 			builder.div({ 'class': 'more', 'tabindex': 0, 'role': 'button', 'title': nls.localize('moreSearch', "Toggle Search Details") })
 				.on(dom.EventType.CLICK, (e) => {
@@ -198,32 +235,16 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				});
 
 			//folder includes list
-			builder.div({ 'class': 'file-types' }, (builder) => {
-				let title = nls.localize('searchIncludeExclude.label', "files to include/exclude");
+			builder.div({ 'class': 'file-types includes' }, (builder) => {
+				let title = nls.localize('searchScope.includes', "files to include");
 				builder.element('h4', { text: title });
 
-				this.inputPatternIncludes = new ExcludePatternInputWidget(builder.getContainer(), this.contextViewService, this.themeService, {
-					ariaLabel: nls.localize('searchIncludeExclude.ariaLabel', 'Search Include/Exclude Patterns'),
-					placeholder: nls.localize('searchIncludeExclude.placeholder', "Examples: src, !*.ts, test/**/*.log")
+				this.inputPatternIncludes = new PatternInputWidget(builder.getContainer(), this.contextViewService, this.themeService, {
+					ariaLabel: nls.localize('label.includes', 'Search Include Patterns')
 				});
 
-				// For migrating from versions that have dedicated exclusions persisted
-				let mergedIncludeExcludes = patternIncludes;
-				if (patternExclusions) {
-					if (mergedIncludeExcludes) {
-						mergedIncludeExcludes += ', ';
-					}
-
-					mergedIncludeExcludes += splitGlobAware(patternExclusions, ',')
-						.map(s => s.trim())
-						.filter(s => !!s.length)
-						.map(s => '!' + s)
-						.join(', ');
-				}
-
-				this.inputPatternIncludes.setValue(mergedIncludeExcludes);
+				this.inputPatternIncludes.setValue(patternIncludes);
 				this.inputPatternIncludes.setHistory(patternIncludesHistory);
-				this.inputPatternIncludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
 
 				this.inputPatternIncludes
 					.on(FindInput.OPTION_CHANGE, (e) => {
@@ -234,6 +255,30 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				this.inputPatternIncludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
 				this.trackInputBox(this.inputPatternIncludes.inputFocusTracker, this.inputPatternIncludesFocused);
 			});
+
+			//pattern exclusion list
+			builder.div({ 'class': 'file-types excludes' }, (builder) => {
+				let title = nls.localize('searchScope.excludes', "files to exclude");
+				builder.element('h4', { text: title });
+
+				this.inputPatternExcludes = new ExcludePatternInputWidget(builder.getContainer(), this.contextViewService, this.themeService, {
+					ariaLabel: nls.localize('label.excludes', 'Search Exclude Patterns')
+				});
+
+				this.inputPatternExcludes.setValue(patternExclusions);
+				this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(useExcludesAndIgnoreFiles);
+				this.inputPatternExcludes.setHistory(patternExclusionsHistory);
+
+				this.inputPatternExcludes
+					.on(FindInput.OPTION_CHANGE, (e) => {
+						this.onQueryChanged(false);
+					});
+
+				this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
+				this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
+				this.inputPatternExcludes.onCancel(() => this.viewModel.cancelSearch()); // Cancel search without focusing the search widget
+				this.trackInputBox(this.inputPatternExcludes.inputFocusTracker, this.inputPatternExclusionsFocused);
+			});
 		}).getHTMLElement();
 
 		this.messages = builder.div({ 'class': 'messages' }).hide().clone();
@@ -266,6 +311,10 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		return this.inputPatternIncludes;
 	}
 
+	public get searchExcludePattern(): PatternInputWidget {
+		return this.inputPatternExcludes;
+	}
+
 	private updateActions(): void {
 		for (const action of this.actions) {
 			action.update();
@@ -322,7 +371,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.toUnbind.push(inputFocusTracker.onDidBlur(() => {
 			this.inputBoxFocused.set(this.searchWidget.searchInputHasFocus()
 				|| this.searchWidget.replaceInputHasFocus()
-				|| this.inputPatternIncludes.inputHasFocus());
+				|| this.inputPatternIncludes.inputHasFocus()
+				|| this.inputPatternExcludes.inputHasFocus());
 			if (contextKey) {
 				contextKey.set(false);
 			}
@@ -493,6 +543,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				renderer: renderer,
 				sorter: new SearchSorter(),
 				filter: new SearchFilter(),
+				controller: this.instantiationService.createInstance(SearchTreeController),
 				accessibilityProvider: this.instantiationService.createInstance(SearchAccessibilityProvider),
 				dnd
 			}, {
@@ -526,10 +577,11 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				if (treeHasFocus) {
 					const focus = e.focus;
 					this.firstMatchFocused.set(this.tree.getNavigator().first() === focus);
-					this.fileMatchOrMatchFocused.set(true);
+					this.fileMatchOrMatchFocused.set(!!focus);
 					this.fileMatchFocused.set(focus instanceof FileMatch);
 					this.folderMatchFocused.set(focus instanceof FolderMatch);
 					this.matchFocused.set(focus instanceof Match);
+					this.fileMatchOrFolderMatchFocus.set(focus instanceof FileMatch || focus instanceof FolderMatch);
 				}
 			}));
 
@@ -540,9 +592,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				this.fileMatchFocused.reset();
 				this.folderMatchFocused.reset();
 				this.matchFocused.reset();
+				this.fileMatchOrFolderMatchFocus.reset();
 			}));
-
-
 		});
 	}
 
@@ -699,6 +750,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 
 		if (this.inputPatternIncludes.inputHasFocus()) {
+			this.inputPatternExcludes.focus();
+			this.inputPatternExcludes.select();
+			return;
+		}
+
+		if (this.inputPatternExcludes.inputHasFocus()) {
 			this.selectTreeIfNotSelected();
 			return;
 		}
@@ -727,6 +784,12 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			return;
 		}
 
+		if (this.inputPatternExcludes.inputHasFocus()) {
+			this.inputPatternIncludes.focus();
+			this.inputPatternIncludes.select();
+			return;
+		}
+
 		if (this.tree.isDOMFocused()) {
 			this.moveFocusFromResults();
 			return;
@@ -735,7 +798,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 	private moveFocusFromResults(): void {
 		if (this.showsFileTypes()) {
-			this.toggleQueryDetails(true, true, false);
+			this.toggleQueryDetails(true, true, false, true);
 		} else {
 			this.searchWidget.focus(true, true);
 		}
@@ -746,8 +809,15 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			return;
 		}
 
+		if (this.size.width >= SearchView.WIDE_VIEW_SIZE) {
+			dom.addClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
+		} else {
+			dom.removeClass(this.getContainer(), SearchView.WIDE_CLASS_NAME);
+		}
+
 		this.searchWidget.setWidth(this.size.width - 28 /* container margin */);
 
+		this.inputPatternExcludes.setWidth(this.size.width - 28 /* container margin */);
 		this.inputPatternIncludes.setWidth(this.size.width - 28 /* container margin */);
 
 		const messagesSize = this.messages.isHidden() ? 0 : dom.getTotalHeight(this.messages.getHTMLElement());
@@ -760,7 +830,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.tree.layout(searchResultContainerSize);
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		this.size = dimension;
 		this.reLayout();
 	}
@@ -868,7 +938,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.onQueryChanged(true, true);
 	}
 
-	public toggleQueryDetails(moveFocus?: boolean, show?: boolean, skipLayout?: boolean): void {
+	public toggleQueryDetails(moveFocus?: boolean, show?: boolean, skipLayout?: boolean, reverse?: boolean): void {
 		let cls = 'more';
 		show = typeof show === 'undefined' ? !dom.hasClass(this.queryDetails, cls) : Boolean(show);
 		this.viewletSettings['query.queryDetailsExpanded'] = show;
@@ -877,8 +947,13 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		if (show) {
 			dom.addClass(this.queryDetails, cls);
 			if (moveFocus) {
-				this.inputPatternIncludes.focus();
-				this.inputPatternIncludes.select();
+				if (reverse) {
+					this.inputPatternExcludes.focus();
+					this.inputPatternExcludes.select();
+				} else {
+					this.inputPatternIncludes.focus();
+					this.inputPatternIncludes.select();
+				}
 			}
 		} else {
 			dom.removeClass(this.queryDetails, cls);
@@ -946,7 +1021,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		const isWholeWords = this.searchWidget.searchInput.getWholeWords();
 		const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
 		const contentPattern = this.searchWidget.searchInput.getValue();
-		const useExcludesAndIgnoreFiles = this.inputPatternIncludes.useExcludesAndIgnoreFiles();
+		const excludePatternText = this.inputPatternExcludes.getValue().trim();
+		const includePatternText = this.inputPatternIncludes.getValue().trim();
+		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
 
 		if (!rerunQuery) {
 			return;
@@ -979,8 +1056,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			isSmartCase: this.configurationService.getValue<ISearchConfiguration>().search.smartCase
 		};
 
-		const includeExcludePattern = this.inputPatternIncludes.getValue().trim();
-		const { includePattern, excludePattern } = this.queryBuilder.parseIncludeExcludePattern(includeExcludePattern);
+		const excludePattern = this.inputPatternExcludes.getValue();
+		const includePattern = this.inputPatternIncludes.getValue();
 
 		const options: IQueryOptions = {
 			extraFileResources: getOutOfWorkspaceEditorResources(this.editorGroupService, this.contextService),
@@ -1006,7 +1083,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		}
 
 		this.validateQuery(query).then(() => {
-			this.onQueryTriggered(query, excludePattern, includePattern);
+			this.onQueryTriggered(query, excludePatternText, includePatternText);
 
 			if (!preserveFocus) {
 				this.searchWidget.focus(false); // focus back to input field
@@ -1037,6 +1114,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 	}
 
 	private onQueryTriggered(query: ISearchQuery, excludePatternText: string, includePatternText: string): void {
+		this.inputPatternExcludes.onSearchSubmit();
 		this.inputPatternIncludes.onSearchSubmit();
 
 		this.viewModel.cancelSearch();
@@ -1097,8 +1175,8 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 			}
 
 			if (!hasResults) {
-				let hasExcludes = !!query.excludePattern;
-				let hasIncludes = !!query.includePattern;
+				let hasExcludes = !!excludePatternText;
+				let hasIncludes = !!includePatternText;
 				let message: string;
 
 				if (!completed) {
@@ -1138,6 +1216,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 					}).on(dom.EventType.CLICK, (e: MouseEvent) => {
 						dom.EventHelper.stop(e, false);
 
+						this.inputPatternExcludes.setValue('');
 						this.inputPatternIncludes.setValue('');
 
 						this.onQueryChanged(true);
@@ -1426,9 +1505,11 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		const isWholeWords = this.searchWidget.searchInput.getWholeWords();
 		const isCaseSensitive = this.searchWidget.searchInput.getCaseSensitive();
 		const contentPattern = this.searchWidget.searchInput.getValue();
+		const patternExcludes = this.inputPatternExcludes.getValue().trim();
 		const patternIncludes = this.inputPatternIncludes.getValue().trim();
-		const useExcludesAndIgnoreFiles = this.inputPatternIncludes.useExcludesAndIgnoreFiles();
+		const useExcludesAndIgnoreFiles = this.inputPatternExcludes.useExcludesAndIgnoreFiles();
 		const searchHistory = this.searchWidget.getHistory();
+		const patternExcludesHistory = this.inputPatternExcludes.getHistory();
 		const patternIncludesHistory = this.inputPatternIncludes.getHistory();
 
 		// store memento
@@ -1437,7 +1518,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 		this.viewletSettings['query.regex'] = isRegex;
 		this.viewletSettings['query.wholeWords'] = isWholeWords;
 		this.viewletSettings['query.caseSensitive'] = isCaseSensitive;
+		this.viewletSettings['query.folderExclusions'] = patternExcludes;
 		this.viewletSettings['query.folderIncludes'] = patternIncludes;
+		this.viewletSettings['query.folderExclusionsHistory'] = patternExcludesHistory;
 		this.viewletSettings['query.folderIncludesHistory'] = patternIncludesHistory;
 		this.viewletSettings['query.useExcludesAndIgnoreFiles'] = useExcludesAndIgnoreFiles;
 
@@ -1453,6 +1536,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 
 		this.searchWidget.dispose();
 		this.inputPatternIncludes.dispose();
+		this.inputPatternExcludes.dispose();
 
 		this.viewModel.dispose();
 
@@ -1478,16 +1562,16 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 
 	const diffInsertedOutlineColor = theme.getColor(diffInsertedOutline);
 	if (diffInsertedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replaceMatch:not(:empty) { border: 1px dashed ${diffInsertedOutlineColor}; }`);
+		collector.addRule(`.monaco-workbench .search-view .replaceMatch:not(:empty) { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${diffInsertedOutlineColor}; }`);
 	}
 
 	const diffRemovedOutlineColor = theme.getColor(diffRemovedOutline);
 	if (diffRemovedOutlineColor) {
-		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { border: 1px dashed ${diffRemovedOutlineColor}; }`);
+		collector.addRule(`.monaco-workbench .search-view .replace.findInFileMatch { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${diffRemovedOutlineColor}; }`);
 	}
 
 	const findMatchHighlightBorder = theme.getColor(editorFindMatchHighlightBorder);
 	if (findMatchHighlightBorder) {
-		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { border: 1px dashed ${findMatchHighlightBorder}; }`);
+		collector.addRule(`.monaco-workbench .search-view .findInFileMatch { border: 1px ${theme.type === 'hc' ? 'dashed' : 'solid'} ${findMatchHighlightBorder}; }`);
 	}
 });
diff --git a/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts b/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
index a7bc8a9babd..851e30dc4e5 100644
--- a/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
@@ -30,7 +30,6 @@ export class SearchViewLocationUpdater implements IWorkbenchContribution {
 		configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('search.location')) {
 				updateSearchViewLocation();
-
 			}
 		});
 
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index 1c9a877bd20..b8ca4a9aa84 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -12,6 +12,9 @@ export const FocusSearchFromResults = 'search.action.focusSearchFromResults';
 export const OpenMatchToSide = 'search.action.openResultToSide';
 export const CancelActionId = 'search.action.cancel';
 export const RemoveActionId = 'search.action.remove';
+export const CopyPathCommandId = 'search.action.copyPath';
+export const CopyMatchCommandId = 'search.action.copyMatch';
+export const CopyAllCommandId = 'search.action.copyAll';
 export const ReplaceActionId = 'search.action.replace';
 export const ReplaceAllInFileActionId = 'search.action.replaceAllInFile';
 export const ReplaceAllInFolderActionId = 'search.action.replaceAllInFolder';
@@ -20,6 +23,8 @@ export const ToggleCaseSensitiveCommandId = 'toggleSearchCaseSensitive';
 export const ToggleWholeWordCommandId = 'toggleSearchWholeWord';
 export const ToggleRegexCommandId = 'toggleSearchRegex';
 
+export const ToggleSearchViewPositionCommandId = 'search.action.toggleSearchViewPosition';
+
 export const SearchViewVisibleKey = new RawContextKey<boolean>('searchViewletVisible', true);
 export const InputBoxFocusedKey = new RawContextKey<boolean>('inputBoxFocus', false);
 export const SearchInputBoxFocusedKey = new RawContextKey<boolean>('searchInputBoxFocus', false);
@@ -30,7 +35,8 @@ export const ReplaceActiveKey = new RawContextKey<boolean>('replaceActive', fals
 export const HasSearchResults = new RawContextKey<boolean>('hasSearchResult', false);
 
 export const FirstMatchFocusKey = new RawContextKey<boolean>('firstMatchFocus', false);
-export const FileMatchOrMatchFocusKey = new RawContextKey<boolean>('fileMatchOrMatchFocus', false);
+export const FileMatchOrMatchFocusKey = new RawContextKey<boolean>('fileMatchOrMatchFocus', false); // This is actually, Match or File or Folder
+export const FileMatchOrFolderMatchFocusKey = new RawContextKey<boolean>('fileMatchOrFolderMatchFocus', false);
 export const FileFocusKey = new RawContextKey<boolean>('fileMatchFocus', false);
 export const FolderFocusKey = new RawContextKey<boolean>('folderMatchFocus', false);
 export const MatchFocusKey = new RawContextKey<boolean>('matchFocus', false);
diff --git a/src/vs/workbench/parts/search/common/searchModel.ts b/src/vs/workbench/parts/search/common/searchModel.ts
index ac9827a3d67..6084c48c45d 100644
--- a/src/vs/workbench/parts/search/common/searchModel.ts
+++ b/src/vs/workbench/parts/search/common/searchModel.ts
@@ -95,6 +95,7 @@ export class FileMatch extends Disposable {
 
 	private static readonly _CURRENT_FIND_MATCH = ModelDecorationOptions.register({
 		stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+		zIndex: 13,
 		className: 'currentFindMatch',
 		overviewRuler: {
 			color: themeColorFromId(overviewRulerFindMatchForeground),
diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
index e38d72e2114..b575b602528 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -16,7 +16,7 @@ import { Action } from 'vs/base/common/actions';
 import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/files/common/files';
-import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
+import { SyncActionDescriptor, MenuRegistry, MenuId, ICommandAction } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions } from 'vs/workbench/browser/quickopen';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -53,16 +53,19 @@ import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/file
 import { Schemas } from 'vs/base/common/network';
 import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction } from 'vs/workbench/parts/search/browser/searchActions';
-import { VIEW_ID } from 'vs/platform/search/common/search';
+import { openSearchView, getSearchView, ReplaceAllInFolderAction, ReplaceAllAction, CloseReplaceAction, FocusNextInputAction, FocusPreviousInputAction, FocusNextSearchResultAction, FocusPreviousSearchResultAction, ReplaceInFilesAction, FindInFilesAction, FocusActiveEditorCommand, toggleCaseSensitiveCommand, ShowNextSearchTermAction, ShowPreviousSearchTermAction, toggleRegexCommand, ShowPreviousSearchIncludeAction, ShowNextSearchIncludeAction, CollapseDeepestExpandedLevelAction, toggleWholeWordCommand, RemoveAction, ReplaceAction, ClearSearchResultsAction, copyPathCommand, copyMatchCommand, copyAllCommand, ShowNextSearchExcludeAction, ShowPreviousSearchExcludeAction } from 'vs/workbench/parts/search/browser/searchActions';
+import { VIEW_ID, ISearchConfigurationProperties } from 'vs/platform/search/common/search';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { SearchViewLocationUpdater } from 'vs/workbench/parts/search/browser/searchViewLocationUpdater';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 registerSingleton(ISearchWorkbenchService, SearchWorkbenchService);
 replaceContributions();
 searchWidgetContributions();
 
+const category = nls.localize('search', "Search");
+
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'workbench.action.search.toggleQueryDetails',
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
@@ -130,8 +133,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.MatchFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
-	secondary: [KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1],
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();
@@ -143,7 +145,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFileActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FileFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
+	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();
@@ -155,7 +158,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: Constants.ReplaceAllInFolderActionId,
 	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 	when: ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.ReplaceActiveKey, Constants.FolderFocusKey),
-	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
+	primary: KeyMod.Shift | KeyMod.CtrlCmd | KeyCode.KEY_1,
+	secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter],
 	handler: (accessor, args: any) => {
 		const searchView = getSearchView(accessor.get(IViewletService), accessor.get(IPanelService));
 		const tree: ITree = searchView.getControl();
@@ -193,6 +197,125 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceActionId,
+		title: ReplaceAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.MatchFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFolderActionId,
+		title: ReplaceAllInFolderAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FolderFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.ReplaceAllInFileActionId,
+		title: ReplaceAllAction.LABEL
+	},
+	when: ContextKeyExpr.and(Constants.ReplaceActiveKey, Constants.FileFocusKey),
+	group: 'search',
+	order: 1
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.RemoveActionId,
+		title: RemoveAction.LABEL
+	},
+	when: Constants.FileMatchOrMatchFocusKey,
+	group: 'search',
+	order: 2
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: Constants.CopyMatchCommandId,
+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	when: Constants.FileMatchOrMatchFocusKey,
+	primary: KeyMod.CtrlCmd | KeyCode.KEY_C,
+	handler: copyMatchCommand
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyMatchCommandId,
+		title: nls.localize('copyMatchLabel', "Copy")
+	},
+	when: Constants.FileMatchOrMatchFocusKey,
+	group: 'search_2',
+	order: 1
+});
+
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: Constants.CopyPathCommandId,
+	weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
+	when: Constants.FileMatchOrFolderMatchFocusKey,
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_C,
+	win: {
+		primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C
+	},
+	handler: copyPathCommand
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyPathCommandId,
+		title: nls.localize('copyPathLabel', "Copy Path")
+	},
+	when: Constants.FileMatchOrFolderMatchFocusKey,
+	group: 'search_2',
+	order: 2
+});
+
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: {
+		id: Constants.CopyAllCommandId,
+		title: nls.localize('copyAllLabel', "Copy All")
+	},
+	when: Constants.HasSearchResults,
+	group: 'search_2',
+	order: 3
+});
+
+CommandsRegistry.registerCommand({
+	id: Constants.CopyAllCommandId,
+	handler: copyAllCommand
+});
+
+CommandsRegistry.registerCommand({
+	id: Constants.ToggleSearchViewPositionCommandId,
+	handler: (accessor) => {
+		const configurationService = accessor.get(IConfigurationService);
+		const currentValue = configurationService.getValue<ISearchConfigurationProperties>('search').location;
+		const toggleValue = currentValue === 'sidebar' ? 'panel' : 'sidebar';
+
+		configurationService.updateValue('search.location', toggleValue);
+	}
+});
+
+const toggleSearchViewPositionLabel = nls.localize('toggleSearchViewPositionLabel', "Toggle Search View Position");
+const ToggleSearchViewPositionCommand: ICommandAction = {
+	id: Constants.ToggleSearchViewPositionCommandId,
+	title: toggleSearchViewPositionLabel,
+	category
+};
+MenuRegistry.addCommand(ToggleSearchViewPositionCommand);
+MenuRegistry.appendMenuItem(MenuId.SearchContext, {
+	command: ToggleSearchViewPositionCommand,
+	when: Constants.SearchViewVisibleKey,
+	group: 'search_9',
+	order: 1
+});
+
 const FIND_IN_FOLDER_ID = 'filesExplorer.findInFolder';
 CommandsRegistry.registerCommand({
 	id: FIND_IN_FOLDER_ID,
@@ -297,7 +420,7 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	VIEW_ID,
 	nls.localize('name', "Search"),
 	'search',
-	10
+	1
 ));
 
 Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescriptor(
@@ -313,7 +436,6 @@ Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).regi
 
 // Actions
 const registry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
-const category = nls.localize('search', "Search");
 
 registry.registerWorkbenchAction(new SyncActionDescriptor(FindInFilesAction, VIEW_ID, nls.localize('showSearchViewl', "Show Search"), { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_F },
 	Constants.SearchViewVisibleKey.toNegated()), 'View: Show Search', nls.localize('view', "View"));
@@ -361,6 +483,9 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchTerm
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextSearchIncludeAction, ShowNextSearchIncludeAction.ID, ShowNextSearchIncludeAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternIncludesFocusedKey)), 'Search: Show Next Search Include Pattern', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchIncludeAction, ShowPreviousSearchIncludeAction.ID, ShowPreviousSearchIncludeAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternIncludesFocusedKey)), 'Search: Show Previous Search Include Pattern', category);
 
+registry.registerWorkbenchAction(new SyncActionDescriptor(ShowNextSearchExcludeAction, ShowNextSearchExcludeAction.ID, ShowNextSearchExcludeAction.LABEL, ShowNextFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternExcludesFocusedKey)), 'Search: Show Next Search Exclude Pattern', category);
+registry.registerWorkbenchAction(new SyncActionDescriptor(ShowPreviousSearchExcludeAction, ShowPreviousSearchExcludeAction.ID, ShowPreviousSearchExcludeAction.LABEL, ShowPreviousFindTermKeybinding, ContextKeyExpr.and(Constants.SearchViewVisibleKey, Constants.PatternExcludesFocusedKey)), 'Search: Show Previous Search Exclude Pattern', category);
+
 registry.registerWorkbenchAction(new SyncActionDescriptor(CollapseDeepestExpandedLevelAction, CollapseDeepestExpandedLevelAction.ID, CollapseDeepestExpandedLevelAction.LABEL), 'Search: Collapse All', category);
 
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowAllSymbolsAction, ShowAllSymbolsAction.ID, ShowAllSymbolsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_T }), 'Go to Symbol in Workspace...');
@@ -461,7 +586,7 @@ configurationRegistry.registerConfiguration({
 		'search.location': {
 			enum: ['sidebar', 'panel'],
 			default: 'sidebar',
-			description: nls.localize('search.location', "Preview: controls if the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space. Next release search in panel will have improved horizontal layout and this will no longer be a preview."),
+			description: nls.localize('search.location', "Controls if the search will be shown as a view in the sidebar or as a panel in the panel area for more horizontal space. Next release search in panel will have improved horizontal layout and this will no longer be a preview."),
 		},
 	}
 });
diff --git a/src/vs/workbench/parts/stats/node/workspaceStats.ts b/src/vs/workbench/parts/stats/node/workspaceStats.ts
index 71c6572e0b9..686fea24971 100644
--- a/src/vs/workbench/parts/stats/node/workspaceStats.ts
+++ b/src/vs/workbench/parts/stats/node/workspaceStats.ts
@@ -359,7 +359,7 @@ export class WorkspaceStats implements IWorkbenchContribution {
 			set.forEach(item => list.push(item));
 			/* __GDPR__
 				"workspace.remotes" : {
-					"domains" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }
+					"domains" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
 			this.telemetryService.publicLog('workspace.remotes', { domains: list.sort() });
diff --git a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
index e4f90adef38..df9e5b138ce 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts
@@ -12,12 +12,12 @@ import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import pkg from 'vs/platform/node/package';
 import product, { ISurveyData } from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
+import { ITextFileService, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
 
 class LanguageSurvey {
 
@@ -27,8 +27,8 @@ class LanguageSurvey {
 		storageService: IStorageService,
 		notificationService: INotificationService,
 		telemetryService: ITelemetryService,
-		fileService: IFileService,
-		modelService: IModelService
+		modelService: IModelService,
+		textFileService: ITextFileService
 	) {
 		const SESSION_COUNT_KEY = `${data.surveyId}.sessionCount`;
 		const LAST_SESSION_DATE_KEY = `${data.surveyId}.lastSessionDate`;
@@ -44,9 +44,9 @@ class LanguageSurvey {
 		const date = new Date().toDateString();
 
 		if (storageService.getInteger(EDITED_LANGUAGE_COUNT_KEY, StorageScope.GLOBAL, 0) < data.editCount) {
-			fileService.onFileChanges(e => {
-				e.getUpdated().forEach(event => {
-					if (event.type === FileChangeType.UPDATED) {
+			textFileService.models.onModelsSaved(e => {
+				e.forEach(event => {
+					if (event.kind === StateChange.SAVED) {
 						const model = modelService.getModel(event.resource);
 						if (model && model.getModeId() === data.languageId && date !== storageService.get(EDITED_LANGUAGE_DATE_KEY, StorageScope.GLOBAL)) {
 							const editedCount = storageService.getInteger(EDITED_LANGUAGE_COUNT_KEY, StorageScope.GLOBAL, 0) + 1;
@@ -87,30 +87,36 @@ class LanguageSurvey {
 		// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
 		telemetryService.publicLog(`${data.surveyId}.survey/userAsked`);
 
-		const choices: PromptOption[] = [nls.localize('takeShortSurvey', "Take Short Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
-		notificationService.prompt(Severity.Info, nls.localize('helpUs', "Help us improve our support for {0}", data.languageId), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Take Survey */:
+		notificationService.prompt(
+			Severity.Info,
+			nls.localize('helpUs', "Help us improve our support for {0}", data.languageId),
+			[{
+				label: nls.localize('takeShortSurvey', "Take Short Survey"),
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
 					telemetryService.getTelemetryInfo().then(info => {
 						window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
 						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
 					});
-					break;
-				case 1 /* Remind Later */:
+				}
+			}, {
+				label: nls.localize('remindLater', "Remind Me later"),
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
 					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-					break;
-				case 2 /* Never show again */:
+				}
+			}, {
+				label: nls.localize('neverAgain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
 					telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
 					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-					break;
-			}
-		});
+				}
+			}]
+		);
 	}
-
 }
 
 class LanguageSurveysContribution implements IWorkbenchContribution {
@@ -120,15 +126,15 @@ class LanguageSurveysContribution implements IWorkbenchContribution {
 		@IStorageService storageService: IStorageService,
 		@INotificationService notificationService: INotificationService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IFileService fileService: IFileService,
-		@IModelService modelService: IModelService
+		@IModelService modelService: IModelService,
+		@ITextFileService textFileService: ITextFileService
 	) {
 		product.surveys.filter(surveyData => surveyData.surveyId && surveyData.editCount && surveyData.languageId && surveyData.surveyUrl && surveyData.userProbability).map(surveyData =>
-			new LanguageSurvey(surveyData, instantiationService, storageService, notificationService, telemetryService, fileService, modelService));
+			new LanguageSurvey(surveyData, instantiationService, storageService, notificationService, telemetryService, modelService, textFileService));
 	}
 }
 
 if (language === 'en' && product.surveys && product.surveys.length) {
 	const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 	workbenchRegistry.registerWorkbenchContribution(LanguageSurveysContribution, LifecyclePhase.Running);
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
index 74d76dfd627..5313485e412 100644
--- a/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
+++ b/src/vs/workbench/parts/surveys/electron-browser/nps.contribution.ts
@@ -15,7 +15,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vs/platform/notification/common/notification';
 
 const PROBABILITY = 0.15;
 const SESSION_COUNT_KEY = 'nps/sessionCount';
@@ -62,25 +62,30 @@ class NPSContribution implements IWorkbenchContribution {
 			return;
 		}
 
-		const choices: PromptOption[] = [nls.localize('takeSurvey', "Take Survey"), nls.localize('remindLater', "Remind Me later"), { label: nls.localize('neverAgain', "Don't Show Again") }];
-		notificationService.prompt(Severity.Info, nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?"), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Take Survey */:
+		notificationService.prompt(
+			Severity.Info,
+			nls.localize('surveyQuestion', "Do you mind taking a quick feedback survey?"),
+			[{
+				label: nls.localize('takeSurvey', "Take Survey"),
+				run: () => {
 					telemetryService.getTelemetryInfo().then(info => {
 						window.open(`${product.npsSurveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
 						storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 						storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
 					});
-					break;
-				case 1 /* Remind Later */:
-					storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
-					break;
-				case 2 /* Never show again */:
+				}
+			}, {
+				label: nls.localize('remindLater', "Remind Me later"),
+				run: () => storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL)
+			}, {
+				label: nls.localize('neverAgain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
 					storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 					storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
-					break;
-			}
-		});
+				}
+			}]
+		);
 	}
 }
 
diff --git a/src/vs/workbench/parts/tasks/common/problemMatcher.ts b/src/vs/workbench/parts/tasks/common/problemMatcher.ts
index 5a137c0ad71..9ff40a2baf6 100644
--- a/src/vs/workbench/parts/tasks/common/problemMatcher.ts
+++ b/src/vs/workbench/parts/tasks/common/problemMatcher.ts
@@ -302,6 +302,9 @@ abstract class AbstractLineMatcher implements ILineMatcher {
 	}
 
 	private getLocation(data: ProblemData): Location {
+		if (data.kind === ProblemLocationKind.File) {
+			return this.createLocation(0, 0, 0, 0);
+		}
 		if (data.location) {
 			return this.parseLocationInfo(data.location);
 		}
@@ -383,7 +386,7 @@ class SingleLineMatcher extends AbstractLineMatcher {
 	public handle(lines: string[], start: number = 0): HandleResult {
 		Assert.ok(lines.length - start === 1);
 		let data: ProblemData = Object.create(null);
-		if (this.pattern.kind) {
+		if (this.pattern.kind !== void 0) {
 			data.kind = this.pattern.kind;
 		}
 		let matches = this.pattern.regexp.exec(lines[start]);
diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts
index 53aad958232..4a889b479eb 100644
--- a/src/vs/workbench/parts/tasks/common/taskService.ts
+++ b/src/vs/workbench/parts/tasks/common/taskService.ts
@@ -32,6 +32,11 @@ export interface CustomizationProperties {
 	isBackground?: boolean;
 }
 
+export interface TaskFilter {
+	version?: string;
+	type?: string;
+}
+
 export interface ITaskService {
 	_serviceBrand: any;
 	onDidStateChange: Event<TaskEvent>;
@@ -45,7 +50,7 @@ export interface ITaskService {
 	restart(task: Task): void;
 	terminate(task: Task): TPromise<TaskTerminateResponse>;
 	terminateAll(): TPromise<TaskTerminateResponse[]>;
-	tasks(): TPromise<Task[]>;
+	tasks(filter?: TaskFilter): TPromise<Task[]>;
 	/**
 	 * @param alias The task's name, label or defined identifier.
 	 */
diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts
index b5a93a7cb63..8fd3e0fc004 100644
--- a/src/vs/workbench/parts/tasks/common/tasks.ts
+++ b/src/vs/workbench/parts/tasks/common/tasks.ts
@@ -34,6 +34,9 @@ export enum ShellQuoting {
 
 export namespace ShellQuoting {
 	export function from(this: void, value: string): ShellQuoting {
+		if (!value) {
+			return ShellQuoting.Strong;
+		}
 		switch (value.toLowerCase()) {
 			case 'escape':
 				return ShellQuoting.Escape;
@@ -611,25 +614,6 @@ export namespace Task {
 		}
 	}
 
-	export function getTaskItem(task: Task): TaskItem {
-		let folder: IWorkspaceFolder = Task.getWorkspaceFolder(task);
-		let definition: TaskIdentifier;
-		if (ContributedTask.is(task)) {
-			definition = task.defines;
-		} else if (CustomTask.is(task) && task.command !== void 0) {
-			definition = CustomTask.getDefinition(task);
-		} else {
-			return undefined;
-		}
-		let result: TaskItem = {
-			id: task._id,
-			label: task._label,
-			definition: definition,
-			workspaceFolder: folder
-		};
-		return result;
-	}
-
 	export function getTaskDefinition(task: Task): TaskIdentifier {
 		if (ContributedTask.is(task)) {
 			return task.defines;
@@ -642,21 +626,16 @@ export namespace Task {
 
 	export function getTaskExecution(task: Task): TaskExecution {
 		let result: TaskExecution = {
-			id: task._id
+			id: task._id,
+			task: task
 		};
 		return result;
 	}
 }
 
-export interface TaskItem {
-	id: string;
-	label: string;
-	definition: TaskIdentifier;
-	workspaceFolder: IWorkspaceFolder;
-}
-
 export interface TaskExecution {
 	id: string;
+	task: Task;
 }
 
 export enum ExecutionEngine {
diff --git a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
index 8c340e0a9f8..191204144ef 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
@@ -156,6 +156,7 @@ const command: IJSONSchema = {
 		},
 		{
 			type: 'object',
+			required: ['value', 'quoting'],
 			properties: {
 				value: {
 					type: 'string',
@@ -188,6 +189,7 @@ const args: IJSONSchema = {
 			},
 			{
 				type: 'object',
+				required: ['value', 'quoting'],
 				properties: {
 					value: {
 						type: 'string',
diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
index 6ce2cb1fe71..64b8acbae0d 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -7,6 +7,7 @@
 import 'vs/css!./media/task.contribution';
 
 import * as nls from 'vs/nls';
+import * as semver from 'semver';
 
 import { QuickOpenHandler } from 'vs/workbench/parts/tasks/browser/taskQuickOpen';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -17,8 +18,7 @@ import { IStringDictionary } from 'vs/base/common/collections';
 import { Action } from 'vs/base/common/actions';
 import * as Dom from 'vs/base/browser/dom';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Event, Emitter, once } from 'vs/base/common/event';
-import * as Builder from 'vs/base/browser/builder';
+import { Event, Emitter } from 'vs/base/common/event';
 import * as Types from 'vs/base/common/types';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { TerminateResponseCode } from 'vs/base/common/processes';
@@ -74,9 +74,9 @@ import { ITaskSystem, ITaskResolver, ITaskSummary, TaskExecuteKind, TaskError, T
 import {
 	Task, CustomTask, ConfiguringTask, ContributedTask, InMemoryTask, TaskEvent,
 	TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind,
-	TaskIdentifier, TaskSorter, TaskItem
+	TaskIdentifier, TaskSorter
 } from 'vs/workbench/parts/tasks/common/tasks';
-import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties } from 'vs/workbench/parts/tasks/common/taskService';
+import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService';
 import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
 
 import * as TaskConfig from '../node/taskConfiguration';
@@ -88,7 +88,6 @@ import { QuickOpenActionContributor } from '../browser/quickOpen';
 import { Themable, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND } from 'vs/workbench/common/theme';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
-let $ = Builder.$;
 let tasksCategory = nls.localize('tasksCategory', "Tasks");
 
 namespace ConfigureTaskAction {
@@ -146,6 +145,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 		const infoTitle = n => nls.localize('totalInfos', "{0} Infos", n);
 
 		Dom.addClass(element, 'task-statusbar-item');
+		element.title = nls.localize('problems', "Problems");
 
 		Dom.addClass(label, 'task-statusbar-item-label');
 		element.appendChild(label);
@@ -174,17 +174,16 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 		Dom.addClass(infoIcon, 'mask-icon');
 		label.appendChild(infoIcon);
 		this.icons.push(infoIcon);
-		$(infoIcon).hide();
+		Dom.hide(infoIcon);
 
 		Dom.addClass(info, 'task-statusbar-item-label-counter');
 		label.appendChild(info);
-		$(info).hide();
+		Dom.hide(info);
 
 		Dom.addClass(building, 'task-statusbar-item-building');
 		element.appendChild(building);
 		building.innerHTML = nls.localize('building', 'Building...');
-		$(building).hide();
-
+		Dom.hide(building);
 
 		callOnDispose.push(Dom.addDisposableListener(label, 'click', (e: MouseEvent) => {
 			const panel = this.panelService.getActivePanel();
@@ -205,11 +204,11 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 			if (stats.infos > 0) {
 				info.innerHTML = packNumber(stats.infos);
 				info.title = infoIcon.title = infoTitle(stats.infos);
-				$(info).show();
-				$(infoIcon).show();
+				Dom.show(info);
+				Dom.show(infoIcon);
 			} else {
-				$(info).hide();
-				$(infoIcon).hide();
+				Dom.hide(info);
+				Dom.hide(infoIcon);
 			}
 		};
 
@@ -225,7 +224,7 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 				case TaskEventKind.Active:
 					this.activeCount++;
 					if (this.activeCount === 1) {
-						$(building).show();
+						Dom.show(building);
 					}
 					break;
 				case TaskEventKind.Inactive:
@@ -234,13 +233,13 @@ class BuildStatusBarItem extends Themable implements IStatusbarItem {
 					if (this.activeCount > 0) {
 						this.activeCount--;
 						if (this.activeCount === 0) {
-							$(building).hide();
+							Dom.hide(building);
 						}
 					}
 					break;
 				case TaskEventKind.Terminated:
 					if (this.activeCount !== 0) {
-						$(building).hide();
+						Dom.hide(building);
 						this.activeCount = 0;
 					}
 					break;
@@ -298,7 +297,7 @@ class TaskStatusBarItem extends Themable implements IStatusbarItem {
 		let label = new OcticonLabel(labelElement);
 		label.title = nls.localize('runningTasks', "Show Running Tasks");
 
-		$(element).hide();
+		Dom.hide(element);
 
 		callOnDispose.push(Dom.addDisposableListener(labelElement, 'click', (e: MouseEvent) => {
 			(this.taskService as TaskService).runShowTasks();
@@ -307,10 +306,10 @@ class TaskStatusBarItem extends Themable implements IStatusbarItem {
 		let updateStatus = (): void => {
 			this.taskService.getActiveTasks().then(tasks => {
 				if (tasks.length === 0) {
-					$(element).hide();
+					Dom.hide(element);
 				} else {
 					label.text = `$(tools) ${tasks.length}`;
-					$(element).show();
+					Dom.show(element);
 				}
 			});
 		};
@@ -497,14 +496,17 @@ class TaskService implements ITaskService {
 			let folderSetup = this.computeWorkspaceFolderSetup();
 			if (this.executionEngine !== folderSetup[2]) {
 				if (this._taskSystem && this._taskSystem.getActiveTasks().length > 0) {
-					this.notificationService.prompt(Severity.Info, nls.localize(
-						'TaskSystem.noHotSwap',
-						'Changing the task execution engine with an active task running requires to reload the Window'
-					), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-						if (choice === 0) {
-							this._windowService.reloadWindow();
-						}
-					});
+					this.notificationService.prompt(
+						Severity.Info,
+						nls.localize(
+							'TaskSystem.noHotSwap',
+							'Changing the task execution engine with an active task running requires to reload the Window'
+						),
+						[{
+							label: nls.localize('reloadWindow', "Reload Window"),
+							run: () => this._windowService.reloadWindow()
+						}]
+					);
 					return;
 				} else {
 					this.disposeTaskSystemListeners();
@@ -579,19 +581,6 @@ class TaskService implements ITaskService {
 		CommandsRegistry.registerCommand('workbench.action.tasks.showTasks', () => {
 			this.runShowTasks();
 		});
-
-		CommandsRegistry.registerCommand('_executeTaskProvider', (accessor, args) => {
-			return this.tasks().then((tasks) => {
-				let result: TaskItem[] = [];
-				for (let task of tasks) {
-					let item = Task.getTaskItem(task);
-					if (item) {
-						result.push(item);
-					}
-				}
-				return result;
-			});
-		});
 	}
 
 	private get workspaceFolders(): IWorkspaceFolder[] {
@@ -693,8 +682,28 @@ class TaskService implements ITaskService {
 		});
 	}
 
-	public tasks(): TPromise<Task[]> {
-		return this.getGroupedTasks().then(result => result.all());
+	public tasks(filter?: TaskFilter): TPromise<Task[]> {
+		let range = filter && filter.version ? filter.version : undefined;
+		let engine = this.executionEngine;
+
+		if (range && ((semver.satisfies('0.1.0', range) && engine === ExecutionEngine.Terminal) || (semver.satisfies('2.0.0', range) && engine === ExecutionEngine.Process))) {
+			return TPromise.as<Task[]>([]);
+		}
+		return this.getGroupedTasks().then((map) => {
+			if (!filter || !filter.type) {
+				return map.all();
+			}
+			let result: Task[] = [];
+			map.forEach((tasks) => {
+				for (let task of tasks) {
+					let definition = Task.getTaskDefinition(task);
+					if (definition && definition.type === filter.type) {
+						result.push(task);
+					}
+				}
+			});
+			return result;
+		});
 	}
 
 	public createSorter(): TaskSorter {
@@ -1166,11 +1175,22 @@ class TaskService implements ITaskService {
 				if (executeResult.kind === TaskExecuteKind.Active) {
 					let active = executeResult.active;
 					if (active.same) {
+						let message;
 						if (active.background) {
-							this.notificationService.info(nls.localize('TaskSystem.activeSame.background', 'The task \'{0}\' is already active and in background mode. To terminate it use \'Terminate Task...\' from the Tasks menu.', Task.getQualifiedLabel(task)));
+							message = nls.localize('TaskSystem.activeSame.background', 'The task \'{0}\' is already active and in background mode.', Task.getQualifiedLabel(task));
 						} else {
-							this.notificationService.info(nls.localize('TaskSystem.activeSame.noBackground', 'The task \'{0}\' is already active. To terminate it use \'Terminate Task...\' from the Tasks menu.', Task.getQualifiedLabel(task)));
+							message = nls.localize('TaskSystem.activeSame.noBackground', 'The task \'{0}\' is already active.', Task.getQualifiedLabel(task));
 						}
+						this.notificationService.prompt(Severity.Info, message,
+							[{
+								label: nls.localize('terminateTask', "Terminate Task"),
+								run: () => this.terminate(task)
+							},
+							{
+								label: nls.localize('restartTask', "Restart Task"),
+								run: () => this.restart(task)
+							}]
+						);
 					} else {
 						throw new TaskError(Severity.Warning, nls.localize('TaskSystem.active', 'There is already a task running. Terminate it first before executing another task.'), TaskErrors.RunningTask);
 					}
@@ -1617,15 +1637,6 @@ class TaskService implements ITaskService {
 		};
 	}
 
-	private configureBuildTask(): Action {
-		let run = () => { this.runConfigureTasks(); return TPromise.as(undefined); };
-		return new class extends Action {
-			constructor() {
-				super(ConfigureTaskAction.ID, ConfigureTaskAction.TEXT, undefined, true, run);
-			}
-		};
-	}
-
 	public beforeShutdown(): boolean | TPromise<boolean> {
 		if (!this._taskSystem) {
 			return false;
@@ -1685,15 +1696,6 @@ class TaskService implements ITaskService {
 		});
 	}
 
-	private getConfigureAction(code: TaskErrors): Action {
-		switch (code) {
-			case TaskErrors.NoBuildTask:
-				return this.configureBuildTask();
-			default:
-				return this.configureAction();
-		}
-	}
-
 	private handleError(err: any): void {
 		let showOutput = true;
 		if (err instanceof TaskError) {
@@ -1701,14 +1703,16 @@ class TaskService implements ITaskService {
 			let needsConfig = buildError.code === TaskErrors.NotConfigured || buildError.code === TaskErrors.NoBuildTask || buildError.code === TaskErrors.NoTestTask;
 			let needsTerminate = buildError.code === TaskErrors.RunningTask;
 			if (needsConfig || needsTerminate) {
-				let action: Action = needsConfig
-					? this.getConfigureAction(buildError.code)
-					: new Action(
-						'workbench.action.tasks.terminate',
-						nls.localize('TerminateAction.label', "Terminate Task"),
-						undefined, true, () => { this.runTerminateCommand(); return TPromise.wrap<void>(undefined); });
-				let handle = this.notificationService.notify({ severity: buildError.severity, message: buildError.message, actions: { primary: [action] } });
-				once(handle.onDidDispose)(() => action.dispose());
+				this.notificationService.prompt(buildError.severity, buildError.message, [{
+					label: needsConfig ? ConfigureTaskAction.TEXT : nls.localize('TerminateAction.label', "Terminate Task"),
+					run: () => {
+						if (needsConfig) {
+							this.runConfigureTasks();
+						} else {
+							this.runTerminateCommand();
+						}
+					}
+				}]);
 			} else {
 				this.notificationService.notify({ severity: buildError.severity, message: buildError.message });
 			}
@@ -1849,24 +1853,18 @@ class TaskService implements ITaskService {
 			return TPromise.as(undefined);
 		}
 
-		const action = new Action('dontShowAgain', nls.localize('TaskService.notAgain', 'Don\'t Show Again'), null, true, (notification: IDisposable) => {
-			this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
-			this.__showIgnoreMessage = false;
-
-			// Hide notification
-			notification.dispose();
-
-			return TPromise.as(true);
-		});
-
-		const handle = this.notificationService.notify({
-			severity: Severity.Info,
-			message: nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: {0}', this.ignoredWorkspaceFolders.map(f => f.name).join(', ')),
-			actions: {
-				secondary: [action]
-			}
-		});
-		once(handle.onDidDispose)(() => action.dispose());
+		this.notificationService.prompt(
+			Severity.Info,
+			nls.localize('TaskService.ignoredFolder', 'The following workspace folders are ignored since they use task version 0.1.0: {0}', this.ignoredWorkspaceFolders.map(f => f.name).join(', ')),
+			[{
+				label: nls.localize('TaskService.notAgain', 'Don\'t Show Again'),
+				isSecondary: true,
+				run: () => {
+					this.storageService.store(TaskService.IgnoreTask010DonotShowAgain_key, true, StorageScope.WORKSPACE);
+					this.__showIgnoreMessage = false;
+				}
+			}]
+		);
 
 		return TPromise.as(undefined);
 	}
diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
index 17de814f26e..584292e76c0 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts
@@ -62,18 +62,24 @@ export class TerminalTaskSystem implements ITaskSystem {
 		'powershell': {
 			escape: {
 				escapeChar: '`',
-				charsToEscape: ` ()`
+				charsToEscape: ' "\'()'
 			},
 			strong: '\'',
 			weak: '"'
 		},
 		'bash': {
-			escape: '\\',
+			escape: {
+				escapeChar: '\\',
+				charsToEscape: ' "\''
+			},
 			strong: '\'',
 			weak: '"'
 		},
 		'zsh': {
-			escape: '\\',
+			escape: {
+				escapeChar: '\\',
+				charsToEscape: ' "\''
+			},
 			strong: '\'',
 			weak: '"'
 		}
@@ -374,8 +380,8 @@ export class TerminalTaskSystem implements ITaskSystem {
 		if (!terminal) {
 			return TPromise.wrapError<ITaskSummary>(new Error(`Failed to create terminal for task ${task._label}`));
 		}
-		this.terminalService.setActiveInstance(terminal);
 		if (task.command.presentation.reveal === RevealKind.Always || (task.command.presentation.reveal === RevealKind.Silent && task.problemMatchers.length === 0)) {
+			this.terminalService.setActiveInstance(terminal);
 			this.terminalService.showPanel(task.command.presentation.focus);
 		}
 		this.activeTasks[Task.getMapKey(task)] = { terminal, task, promise };
@@ -503,7 +509,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			let cwd = options && options.cwd ? options.cwd : process.cwd();
 			// On Windows executed process must be described absolute. Since we allowed command without an
 			// absolute path (e.g. "command": "node") we need to find the executable in the CWD or PATH.
-			let executable = Platform.isWindows && !isShellCommand ? this.findExecutable(commandExecutable, cwd) : commandExecutable;
+			let executable = Platform.isWindows && !isShellCommand ? this.findExecutable(commandExecutable, cwd, options) : commandExecutable;
 
 			// When we have a process task there is no need to quote arguments. So we go ahead and take the string value.
 			shellLaunchConfig = {
@@ -565,7 +571,7 @@ export class TerminalTaskSystem implements ITaskSystem {
 			return [terminalToReuse.terminal, commandExecutable];
 		}
 
-		const result = this.terminalService.createInstance(shellLaunchConfig);
+		const result = this.terminalService.createTerminal(shellLaunchConfig);
 		const terminalKey = result.id.toString();
 		result.onDisposed((terminal) => {
 			let terminalData = this.terminals[terminalKey];
@@ -682,23 +688,39 @@ export class TerminalTaskSystem implements ITaskSystem {
 		return { command, args };
 	}
 
-	private findExecutable(command: string, cwd: string): string {
+	private findExecutable(command: string, cwd: string, options: CommandOptions): string {
 		// If we have an absolute path then we take it.
 		if (path.isAbsolute(command)) {
 			return command;
 		}
 		let dir = path.dirname(command);
 		if (dir !== '.') {
-			// We have a directory. Make the path absolute
-			// to the current working directory
+			// We have a directory and the directory is relative (see above). Make the path absolute
+			// to the current working directory.
+			return path.join(cwd, command);
+		}
+		let paths: string[] = undefined;
+		// The options can override the PATH. So consider that PATH if present.
+		if (options && options.env) {
+			// Path can be named in many different ways and for the execution it doesn't matter
+			for (let key of Object.keys(options.env)) {
+				if (key.toLowerCase() === 'path') {
+					if (Types.isString(options.env[key])) {
+						paths = options.env[key].split(path.delimiter);
+					}
+					break;
+				}
+			}
+		}
+		if (paths === void 0 && Types.isString(process.env.PATH)) {
+			paths = process.env.PATH.split(path.delimiter);
+		}
+		// No PATH environment. Make path absolute to the cwd.
+		if (paths === void 0 || paths.length === 0) {
 			return path.join(cwd, command);
 		}
 		// We have a simple file name. We get the path variable from the env
 		// and try to find the executable on the path.
-		if (!process.env.PATH) {
-			return command;
-		}
-		let paths: string[] = (process.env.PATH as string).split(path.delimiter);
 		for (let pathEntry of paths) {
 			// The path entry is absolute.
 			let fullPath: string;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts
similarity index 100%
rename from src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts
rename to src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts
diff --git a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
index 984073baa7c..38ef49d495a 100644
--- a/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalQuickOpen.ts
@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as nls from 'vs/nls';
 import { TPromise } from 'vs/base/common/winjs.base';
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts b/src/vs/workbench/parts/terminal/browser/terminalTab.ts
similarity index 92%
rename from src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
rename to src/vs/workbench/parts/terminal/browser/terminalTab.ts
index aaf35637304..81d906b9fc2 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts
+++ b/src/vs/workbench/parts/terminal/browser/terminalTab.ts
@@ -3,11 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
+import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITerminalService, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
 import { Event, Emitter, anyEvent } from 'vs/base/common/event';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { SplitView, Orientation, IView } from 'vs/base/browser/ui/splitview/splitview';
@@ -149,22 +146,16 @@ class SplitPaneContainer {
 	}
 
 	public layout(width: number, height: number): void {
-		const resizeCallback = () => {
-			this._width = width;
-			this._height = height;
-			if (this.orientation === Orientation.HORIZONTAL) {
-				this._children.forEach(c => c.orthogonalLayout(height));
-				this._splitView.layout(width);
-			} else {
-				this._children.forEach(c => c.orthogonalLayout(width));
-				this._splitView.layout(height);
-			}
-		};
-
-		if (this._isManuallySized) {
-			resizeCallback();
+		this._width = width;
+		this._height = height;
+		if (this.orientation === Orientation.HORIZONTAL) {
+			this._children.forEach(c => c.orthogonalLayout(height));
+			this._splitView.layout(width);
 		} else {
-			this._withDisabledLayout(resizeCallback);
+			this._children.forEach(c => c.orthogonalLayout(width));
+			this._splitView.layout(height);
+		}
+		if (!this._isManuallySized) {
 			this.resetSize();
 		}
 	}
@@ -261,10 +252,9 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 	constructor(
 		terminalFocusContextKey: IContextKey<boolean>,
-		configHelper: TerminalConfigHelper,
+		configHelper: ITerminalConfigHelper,
 		private _container: HTMLElement,
 		shellLaunchConfig: IShellLaunchConfig,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITerminalService private readonly _terminalService: ITerminalService,
 		@IPartService private readonly _partService: IPartService
 	) {
@@ -272,11 +262,12 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 		this._onDisposed = new Emitter<ITerminalTab>();
 		this._onInstancesChanged = new Emitter<void>();
 
-		const instance = this._instantiationService.createInstance(TerminalInstance,
+		const instance = this._terminalService.createInstance(
 			terminalFocusContextKey,
 			configHelper,
 			undefined,
-			shellLaunchConfig);
+			shellLaunchConfig,
+			true);
 		this._terminalInstances.push(instance);
 		this._initInstanceListeners(instance);
 		this._activeInstanceIndex = 0;
@@ -398,14 +389,15 @@ export class TerminalTab extends Disposable implements ITerminalTab {
 
 	public split(
 		terminalFocusContextKey: IContextKey<boolean>,
-		configHelper: TerminalConfigHelper,
+		configHelper: ITerminalConfigHelper,
 		shellLaunchConfig: IShellLaunchConfig
 	): ITerminalInstance {
-		const instance = this._instantiationService.createInstance(TerminalInstance,
+		const instance = this._terminalService.createInstance(
 			terminalFocusContextKey,
 			configHelper,
 			undefined,
-			shellLaunchConfig);
+			shellLaunchConfig,
+			true);
 		this._terminalInstances.splice(this._activeInstanceIndex + 1, 0, instance);
 		this._initInstanceListeners(instance);
 		this._setActiveInstance(instance);
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 62dc8f0a702..dfe9d89cc12 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -104,26 +103,35 @@ export interface ITerminalFont {
 }
 
 export interface IShellLaunchConfig {
-	/** The name of the terminal, if this is not set the name of the process will be used. */
+	/**
+	 * The name of the terminal, if this is not set the name of the process will be used.
+	 */
 	name?: string;
-	/** The shell executable (bash, cmd, etc.). */
+
+	/**
+	 * The shell executable (bash, cmd, etc.).
+	 */
 	executable?: string;
+
 	/**
 	 * The CLI arguments to use with executable, a string[] is in argv format and will be escaped,
 	 * a string is in "CommandLine" pre-escaped format and will be used as is. The string option is
 	 * only supported on Windows and will throw an exception if used on macOS or Linux.
 	 */
 	args?: string[] | string;
+
 	/**
 	 * The current working directory of the terminal, this overrides the `terminal.integrated.cwd`
 	 * settings key.
 	 */
 	cwd?: string;
+
 	/**
 	 * A custom environment for the terminal, if this is not set the environment will be inherited
 	 * from the VS Code process.
 	 */
 	env?: { [key: string]: string };
+
 	/**
 	 * Whether to ignore a custom cwd from the `terminal.integrated.cwd` settings key (eg. if the
 	 * shell is being launched by an extension).
@@ -149,14 +157,26 @@ export interface ITerminalService {
 	configHelper: ITerminalConfigHelper;
 	onActiveTabChanged: Event<void>;
 	onTabDisposed: Event<ITerminalTab>;
+	onInstanceCreated: Event<ITerminalInstance>;
 	onInstanceDisposed: Event<ITerminalInstance>;
 	onInstanceProcessIdReady: Event<ITerminalInstance>;
+	onInstanceRequestExtHostProcess: Event<ITerminalProcessExtHostRequest>;
 	onInstancesChanged: Event<void>;
 	onInstanceTitleChanged: Event<string>;
 	terminalInstances: ITerminalInstance[];
 	terminalTabs: ITerminalTab[];
 
-	createInstance(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+	/**
+	 * Creates a terminal.
+	 * @param shell The shell launch configuration to use.
+	 * @param wasNewTerminalAction Whether this was triggered by a new terminal action, if so a
+	 * default shell selection dialog may display.
+	 */
+	createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+	/**
+	 * Creates a raw terminal instance, this should not be used outside of the terminal part.
+	 */
+	createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance;
 	getInstanceFromId(terminalId: number): ITerminalInstance;
 	getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
 	getTabLabels(): string[];
@@ -164,7 +184,7 @@ export interface ITerminalService {
 	setActiveInstance(terminalInstance: ITerminalInstance): void;
 	setActiveInstanceByIndex(terminalIndex: number): void;
 	getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance;
-	splitInstance(instance: ITerminalInstance): void;
+	splitInstance(instance: ITerminalInstance, shell?: IShellLaunchConfig): void;
 
 	getActiveTab(): ITerminalTab;
 	setActiveTabToNext(): void;
@@ -181,6 +201,8 @@ export interface ITerminalService {
 	setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
 	selectDefaultWindowsShell(): TPromise<string>;
 	setWorkspaceShellAllowed(isAllowed: boolean): void;
+
+	requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): void;
 }
 
 export const enum Direction {
@@ -216,9 +238,10 @@ export interface ITerminalInstance {
 	id: number;
 
 	/**
-	 * The process ID of the shell process.
+	 * The process ID of the shell process, this is undefined when there is no process associated
+	 * with this terminal.
 	 */
-	processId: number;
+	processId: number | undefined;
 
 	/**
 	 * An event that fires when the terminal instance's title changes.
@@ -234,6 +257,10 @@ export interface ITerminalInstance {
 
 	onProcessIdReady: Event<ITerminalInstance>;
 
+	onRequestExtHostProcess: Event<ITerminalInstance>;
+
+	processReady: TPromise<void>;
+
 	/**
 	 * The title of the terminal. This is either title or the process currently running or an
 	 * explicit name given to the terminal instance through the extension API.
@@ -448,8 +475,65 @@ export interface ITerminalInstance {
 }
 
 export interface ITerminalCommandTracker {
-	focusPreviousCommand(): void;
-	focusNextCommand(): void;
+	scrollToPreviousCommand(): void;
+	scrollToNextCommand(): void;
 	selectToPreviousCommand(): void;
 	selectToNextCommand(): void;
+}
+
+export interface ITerminalProcessManager extends IDisposable {
+	readonly processState: ProcessState;
+	readonly ptyProcessReady: TPromise<void>;
+	readonly shellProcessId: number;
+	readonly initialCwd: string;
+
+	readonly onProcessReady: Event<void>;
+	readonly onProcessData: Event<string>;
+	readonly onProcessTitle: Event<string>;
+	readonly onProcessExit: Event<number>;
+
+	addDisposable(disposable: IDisposable);
+	createProcess(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number);
+	write(data: string): void;
+	setDimensions(cols: number, rows: number): void;
+}
+
+export enum ProcessState {
+	// The process has not been initialized yet.
+	UNINITIALIZED,
+	// The process is currently launching, the process is marked as launching
+	// for a short duration after being created and is helpful to indicate
+	// whether the process died as a result of bad shell and args.
+	LAUNCHING,
+	// The process is running normally.
+	RUNNING,
+	// The process was killed during launch, likely as a result of bad shell and
+	// args.
+	KILLED_DURING_LAUNCH,
+	// The process was killed by the user (the event originated from VS Code).
+	KILLED_BY_USER,
+	// The process was killed by itself, for example the shell crashed or `exit`
+	// was run.
+	KILLED_BY_PROCESS
+}
+
+
+export interface ITerminalProcessExtHostProxy extends IDisposable {
+	readonly terminalId: number;
+
+	emitData(data: string): void;
+	emitTitle(title: string): void;
+	emitPid(pid: number): void;
+	emitExit(exitCode: number): void;
+
+	onInput(listener: (data: string) => void): void;
+	onResize(listener: (cols: number, rows: number) => void): void;
+	onShutdown(listener: () => void): void;
+}
+
+export interface ITerminalProcessExtHostRequest {
+	proxy: ITerminalProcessExtHostProxy;
+	shellLaunchConfig: IShellLaunchConfig;
+	cols: number;
+	rows: number;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts b/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
similarity index 99%
rename from src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
rename to src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
index fc8a72b6980..0d5fb389afa 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts
@@ -165,5 +165,4 @@ export function registerColors(): void {
 		let colorName = id.substring(13);
 		ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, nls.localize('terminal.ansiColor', '\'{0}\' ANSI color in the terminal.', colorName));
 	}
-
 }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalCommands.ts b/src/vs/workbench/parts/terminal/common/terminalCommands.ts
similarity index 100%
rename from src/vs/workbench/parts/terminal/electron-browser/terminalCommands.ts
rename to src/vs/workbench/parts/terminal/common/terminalCommands.ts
diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts
index 104182733c6..e294388516b 100644
--- a/src/vs/workbench/parts/terminal/common/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/common/terminalService.ts
@@ -9,7 +9,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID, ITerminalTab, ITerminalProcessExtHostProxy, ITerminalProcessExtHostRequest } from 'vs/workbench/parts/terminal/common/terminal';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 
@@ -22,27 +22,32 @@ export abstract class TerminalService implements ITerminalService {
 	protected _terminalFocusContextKey: IContextKey<boolean>;
 	protected _findWidgetVisible: IContextKey<boolean>;
 	protected _terminalContainer: HTMLElement;
-	protected _onInstancesChanged: Emitter<void>;
-	protected _onTabDisposed: Emitter<ITerminalTab>;
-	protected _onInstanceDisposed: Emitter<ITerminalInstance>;
-	protected _onInstanceProcessIdReady: Emitter<ITerminalInstance>;
-	protected _onInstanceTitleChanged: Emitter<string>;
 	protected _terminalTabs: ITerminalTab[];
 	protected abstract _terminalInstances: ITerminalInstance[];
 
 	private _activeTabIndex: number;
-	private readonly _onActiveTabChanged: Emitter<void>;
 
 	public get activeTabIndex(): number { return this._activeTabIndex; }
-	public get onActiveTabChanged(): Event<void> { return this._onActiveTabChanged.event; }
-	public get onTabDisposed(): Event<ITerminalTab> { return this._onTabDisposed.event; }
-	public get onInstanceDisposed(): Event<ITerminalInstance> { return this._onInstanceDisposed.event; }
-	public get onInstanceProcessIdReady(): Event<ITerminalInstance> { return this._onInstanceProcessIdReady.event; }
-	public get onInstanceTitleChanged(): Event<string> { return this._onInstanceTitleChanged.event; }
-	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
 	public get terminalInstances(): ITerminalInstance[] { return this._terminalInstances; }
 	public get terminalTabs(): ITerminalTab[] { return this._terminalTabs; }
 
+	private readonly _onActiveTabChanged: Emitter<void> = new Emitter<void>();
+	public get onActiveTabChanged(): Event<void> { return this._onActiveTabChanged.event; }
+	protected readonly _onInstanceCreated: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onInstanceCreated(): Event<ITerminalInstance> { return this._onInstanceCreated.event; }
+	protected readonly _onInstanceDisposed: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onInstanceDisposed(): Event<ITerminalInstance> { return this._onInstanceDisposed.event; }
+	protected readonly _onInstanceProcessIdReady: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onInstanceProcessIdReady(): Event<ITerminalInstance> { return this._onInstanceProcessIdReady.event; }
+	protected readonly _onInstanceRequestExtHostProcess: Emitter<ITerminalProcessExtHostRequest> = new Emitter<ITerminalProcessExtHostRequest>();
+	public get onInstanceRequestExtHostProcess(): Event<ITerminalProcessExtHostRequest> { return this._onInstanceRequestExtHostProcess.event; }
+	protected readonly _onInstancesChanged: Emitter<void> = new Emitter<void>();
+	public get onInstancesChanged(): Event<void> { return this._onInstancesChanged.event; }
+	protected readonly _onInstanceTitleChanged: Emitter<string> = new Emitter<string>();
+	public get onInstanceTitleChanged(): Event<string> { return this._onInstanceTitleChanged.event; }
+	protected readonly _onTabDisposed: Emitter<ITerminalTab> = new Emitter<ITerminalTab>();
+	public get onTabDisposed(): Event<ITerminalTab> { return this._onTabDisposed.event; }
+
 	public abstract get configHelper(): ITerminalConfigHelper;
 
 	constructor(
@@ -55,13 +60,6 @@ export abstract class TerminalService implements ITerminalService {
 		this._activeTabIndex = 0;
 		this._isShuttingDown = false;
 
-		this._onActiveTabChanged = new Emitter<void>();
-		this._onTabDisposed = new Emitter<ITerminalTab>();
-		this._onInstanceDisposed = new Emitter<ITerminalInstance>();
-		this._onInstanceProcessIdReady = new Emitter<ITerminalInstance>();
-		this._onInstanceTitleChanged = new Emitter<string>();
-		this._onInstancesChanged = new Emitter<void>();
-
 		lifecycleService.onWillShutdown(event => event.veto(this._onWillShutdown()));
 		lifecycleService.onShutdown(() => this._onShutdown());
 		this._terminalFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_FOCUS.bindTo(this._contextKeyService);
@@ -72,10 +70,12 @@ export abstract class TerminalService implements ITerminalService {
 	}
 
 	protected abstract _showTerminalCloseConfirmation(): TPromise<boolean>;
-	public abstract createInstance(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+	public abstract createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
+	public abstract createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance;
 	public abstract getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance;
 	public abstract selectDefaultWindowsShell(): TPromise<string>;
 	public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
+	public abstract requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): void;
 
 	private _restoreTabs(): void {
 		if (!this.configHelper.config.experimentalRestore) {
@@ -93,7 +93,7 @@ export abstract class TerminalService implements ITerminalService {
 		}
 
 		tabConfigs.forEach(tabConfig => {
-			const instance = this.createInstance(tabConfig.instances[0]);
+			const instance = this.createTerminal(tabConfig.instances[0]);
 			for (let i = 1; i < tabConfig.instances.length; i++) {
 				this.splitInstance(instance, tabConfig.instances[i]);
 			}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
index 036f94033e1..d148d55861b 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -11,14 +11,14 @@ import * as debugActions from 'vs/workbench/parts/debug/browser/debugActions';
 import * as nls from 'vs/nls';
 import * as panel from 'vs/workbench/browser/panel';
 import * as platform from 'vs/base/common/platform';
-import * as terminalCommands from 'vs/workbench/parts/terminal/electron-browser/terminalCommands';
+import * as terminalCommands from 'vs/workbench/parts/terminal/common/terminalCommands';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
-import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle } from 'vs/workbench/parts/terminal/common/terminal';
-import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE } from 'vs/workbench/parts/terminal/common/terminal';
+import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/node/terminal';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KillTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, FocusPreviousCommandAction, FocusNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
+import { KillTerminalAction, ClearSelectionTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, CreateNewInActiveWorkspaceTerminalAction, FocusActiveTerminalAction, FocusNextTerminalAction, FocusPreviousTerminalAction, SelectDefaultShellWindowsTerminalAction, RunSelectedTextInTerminalAction, RunActiveFileInTerminalAction, ScrollDownTerminalAction, ScrollDownPageTerminalAction, ScrollToBottomTerminalAction, ScrollUpTerminalAction, ScrollUpPageTerminalAction, ScrollToTopTerminalAction, TerminalPasteAction, ToggleTerminalAction, ClearTerminalAction, AllowWorkspaceShellTerminalCommand, DisallowWorkspaceShellTerminalCommand, RenameTerminalAction, SelectAllTerminalAction, FocusTerminalFindWidgetAction, HideTerminalFindWidgetAction, ShowNextFindTermTerminalFindWidgetAction, ShowPreviousFindTermTerminalFindWidgetAction, DeleteWordLeftTerminalAction, DeleteWordRightTerminalAction, QuickOpenActionTermContributor, QuickOpenTermAction, TERMINAL_PICKER_PREFIX, MoveToLineStartTerminalAction, MoveToLineEndTerminalAction, SplitTerminalAction, SplitInActiveWorkspaceTerminalAction, FocusPreviousPaneTerminalAction, FocusNextPaneTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, ResizePaneDownTerminalAction, ScrollToPreviousCommandAction, ScrollToNextCommandAction, SelectToPreviousCommandAction, SelectToNextCommandAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -28,7 +28,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusSecondGroupAction, FocusThirdGroupAction } from 'vs/workbench/browser/parts/editor/editorActions';
 import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { registerColors } from './terminalColorRegistry';
+import { registerColors } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
 import { NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction } from 'vs/workbench/electron-browser/actions';
 import { QUICKOPEN_ACTION_ID, getQuickNavigateHandler, QUICKOPEN_FOCUS_SECONDARY_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen';
 import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
@@ -244,6 +244,7 @@ configurationRegistry.registerConfiguration({
 				ScrollUpPageTerminalAction.ID,
 				ScrollToTopTerminalAction.ID,
 				ClearTerminalAction.ID,
+				ClearSelectionTerminalAction.ID,
 				debugActions.StartAction.ID,
 				debugActions.StopAction.ID,
 				debugActions.RunAction.ID,
@@ -274,14 +275,15 @@ configurationRegistry.registerConfiguration({
 				TogglePanelAction.ID,
 				'workbench.action.quickOpenView',
 				SplitTerminalAction.ID,
+				SplitInActiveWorkspaceTerminalAction.ID,
 				FocusPreviousPaneTerminalAction.ID,
 				FocusNextPaneTerminalAction.ID,
 				ResizePaneLeftTerminalAction.ID,
 				ResizePaneRightTerminalAction.ID,
 				ResizePaneUpTerminalAction.ID,
 				ResizePaneDownTerminalAction.ID,
-				FocusPreviousCommandAction.ID,
-				FocusNextCommandAction.ID,
+				ScrollToPreviousCommandAction.ID,
+				ScrollToNextCommandAction.ID,
 				SelectToPreviousCommandAction.ID,
 				SelectToNextCommandAction.ID
 			].sort()
@@ -346,6 +348,10 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewTermina
 	primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKTICK,
 	mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_BACKTICK }
 }), 'Terminal: Create New Integrated Terminal', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearSelectionTerminalAction, ClearSelectionTerminalAction.ID, ClearSelectionTerminalAction.LABEL, {
+	primary: KeyCode.Escape,
+	linux: { primary: KeyCode.Escape }
+}, ContextKeyExpr.and(KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE)), 'Terminal: Escape selection', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(CreateNewInActiveWorkspaceTerminalAction, CreateNewInActiveWorkspaceTerminalAction.ID, CreateNewInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Create New Integrated Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusActiveTerminalAction, FocusActiveTerminalAction.ID, FocusActiveTerminalAction.LABEL), 'Terminal: Focus Terminal', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), 'Terminal: Focus Next Terminal', category);
@@ -372,7 +378,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleTerminalAc
 	mac: { primary: KeyMod.WinCtrl | KeyCode.US_BACKTICK }
 }), 'View: Toggle Integrated Terminal', nls.localize('viewCategory', "View"));
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollDownTerminalAction, ScrollDownTerminalAction.ID, ScrollDownTerminalAction.LABEL, {
-	primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
 	linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow }
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Scroll Down (Line)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollDownPageTerminalAction, ScrollDownPageTerminalAction.ID, ScrollDownPageTerminalAction.LABEL, {
@@ -384,7 +390,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollToBottomTe
 	linux: { primary: KeyMod.Shift | KeyCode.End }
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Scroll to Bottom', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollUpTerminalAction, ScrollUpTerminalAction.ID, ScrollUpTerminalAction.LABEL, {
-	primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+	primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
 	linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow },
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Scroll Up (Line)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollUpPageTerminalAction, ScrollUpPageTerminalAction.ID, ScrollUpPageTerminalAction.LABEL, {
@@ -442,6 +448,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SplitTerminalAct
 		secondary: [KeyMod.WinCtrl | KeyMod.Shift | KeyCode.KEY_5]
 	}
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Split', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SplitInActiveWorkspaceTerminalAction, SplitInActiveWorkspaceTerminalAction.ID, SplitInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Split Terminal (In Active Workspace)', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousPaneTerminalAction, FocusPreviousPaneTerminalAction.ID, FocusPreviousPaneTerminalAction.LABEL, {
 	primary: KeyMod.Alt | KeyCode.LeftArrow,
 	secondary: [KeyMod.Alt | KeyCode.UpArrow],
@@ -478,14 +485,14 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ResizePaneDownTe
 	linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow },
 	mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow }
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Down', category);
-actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousCommandAction, FocusPreviousCommandAction.ID, FocusPreviousCommandAction.LABEL, {
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollToPreviousCommandAction, ScrollToPreviousCommandAction.ID, ScrollToPreviousCommandAction.LABEL, {
 	primary: null,
 	mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow }
-}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Previous Command', category);
-actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextCommandAction, FocusNextCommandAction.ID, FocusNextCommandAction.LABEL, {
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Scroll To Previous Command', category);
+actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ScrollToNextCommandAction, ScrollToNextCommandAction.ID, ScrollToNextCommandAction.LABEL, {
 	primary: null,
 	mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow }
-}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Next Command', category);
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Scroll To Next Command', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectToPreviousCommandAction, SelectToPreviousCommandAction.ID, SelectToPreviousCommandAction.LABEL, {
 	primary: null,
 	mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow }
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 42065e46e6e..6ceee359222 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -46,7 +46,7 @@ export class ToggleTerminalAction extends TogglePanelAction {
 		if (this.terminalService.terminalInstances.length === 0) {
 			// If there is not yet an instance attempt to create it here so that we can suggest a
 			// new shell on Windows (and not do so when the panel is restored on reload).
-			const newTerminalInstance = this.terminalService.createInstance(undefined, true);
+			const newTerminalInstance = this.terminalService.createTerminal(undefined, true);
 			const toDispose = newTerminalInstance.onProcessIdReady(() => {
 				newTerminalInstance.focus();
 				toDispose.dispose();
@@ -258,7 +258,7 @@ export class CreateNewTerminalAction extends Action {
 		if (folders.length <= 1) {
 			// Allow terminal service to handle the path when there is only a
 			// single root
-			instancePromise = TPromise.as(this.terminalService.createInstance(undefined, true));
+			instancePromise = TPromise.as(this.terminalService.createTerminal(undefined, true));
 		} else {
 			const options: IPickOptions = {
 				placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
@@ -268,7 +268,7 @@ export class CreateNewTerminalAction extends Action {
 					// Don't create the instance if the workspace picker was canceled
 					return null;
 				}
-				return this.terminalService.createInstance({ cwd: workspace.uri.fsPath }, true);
+				return this.terminalService.createTerminal({ cwd: workspace.uri.fsPath }, true);
 			});
 		}
 
@@ -295,7 +295,7 @@ export class CreateNewInActiveWorkspaceTerminalAction extends Action {
 	}
 
 	public run(event?: any): TPromise<any> {
-		const instance = this.terminalService.createInstance(undefined, true);
+		const instance = this.terminalService.createTerminal(undefined, true);
 		if (!instance) {
 			return TPromise.as(void 0);
 		}
@@ -310,11 +310,57 @@ export class SplitTerminalAction extends Action {
 
 	constructor(
 		id: string, label: string,
-		@ITerminalService private readonly _terminalService: ITerminalService
+		@ITerminalService private readonly _terminalService: ITerminalService,
+		@ICommandService private commandService: ICommandService,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
 	) {
 		super(id, label, 'terminal-action split');
 	}
 
+	public run(event?: any): TPromise<any> {
+		const instance = this._terminalService.getActiveInstance();
+		if (!instance) {
+			return TPromise.as(void 0);
+		}
+
+		const folders = this.workspaceContextService.getWorkspace().folders;
+
+		let pathPromise: TPromise<any> = TPromise.as({});
+		if (folders.length > 1) {
+			// Only choose a path when there's more than 1 folder
+			const options: IPickOptions = {
+				placeHolder: nls.localize('workbench.action.terminal.newWorkspacePlaceholder', "Select current working directory for new terminal")
+			};
+			pathPromise = this.commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]).then(workspace => {
+				if (!workspace) {
+					// Don't split the instance if the workspace picker was canceled
+					return null;
+				}
+				return TPromise.as({ cwd: workspace.uri.fsPath });
+			});
+		}
+
+		return pathPromise.then(path => {
+			if (!path) {
+				return TPromise.as(void 0);
+			}
+			this._terminalService.splitInstance(instance, path);
+			return this._terminalService.showPanel(true);
+		});
+	}
+}
+
+export class SplitInActiveWorkspaceTerminalAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.splitInActiveWorkspace';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.splitInActiveWorkspace', "Split Terminal (In Active Workspace)");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private readonly _terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
 	public run(event?: any): TPromise<any> {
 		const instance = this._terminalService.getActiveInstance();
 		if (!instance) {
@@ -787,6 +833,27 @@ export class ClearTerminalAction extends Action {
 	}
 }
 
+export class ClearSelectionTerminalAction extends Action {
+
+	public static readonly ID = 'workbench.action.terminal.clearSelection';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.clearSelection', "Clear Selection");
+
+	constructor(
+		id: string, label: string,
+		@ITerminalService private terminalService: ITerminalService
+	) {
+		super(id, label);
+	}
+
+	public run(event?: any): TPromise<any> {
+		let terminalInstance = this.terminalService.getActiveInstance();
+		if (terminalInstance && terminalInstance.hasSelection()) {
+			terminalInstance.clearSelection();
+		}
+		return TPromise.as(void 0);
+	}
+}
+
 export class AllowWorkspaceShellTerminalCommand extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.allowWorkspaceShell';
@@ -982,9 +1049,9 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction {
 	}
 }
 
-export class FocusPreviousCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.focusPreviousCommand';
-	public static readonly LABEL = nls.localize('workbench.action.terminal.focusPreviousCommand', "Focus Previous Command");
+export class ScrollToPreviousCommandAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.scrollToPreviousCommand';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToPreviousCommand', "Scroll To Previous Command");
 
 	constructor(
 		id: string, label: string,
@@ -996,15 +1063,16 @@ export class FocusPreviousCommandAction extends Action {
 	public run(): TPromise<any> {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
-			instance.commandTracker.focusPreviousCommand();
+			instance.commandTracker.scrollToPreviousCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
 }
 
-export class FocusNextCommandAction extends Action {
-	public static readonly ID = 'workbench.action.terminal.focusNextCommand';
-	public static readonly LABEL = nls.localize('workbench.action.terminal.focusNextCommand', "Focus Next Command");
+export class ScrollToNextCommandAction extends Action {
+	public static readonly ID = 'workbench.action.terminal.scrollToNextCommand';
+	public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToNextCommand', "Scroll To Next Command");
 
 	constructor(
 		id: string, label: string,
@@ -1016,7 +1084,8 @@ export class FocusNextCommandAction extends Action {
 	public run(): TPromise<any> {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
-			instance.commandTracker.focusNextCommand();
+			instance.commandTracker.scrollToNextCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
@@ -1037,6 +1106,7 @@ export class SelectToPreviousCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.selectToPreviousCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
@@ -1057,6 +1127,7 @@ export class SelectToNextCommandAction extends Action {
 		const instance = this.terminalService.getActiveInstance();
 		if (instance) {
 			instance.commandTracker.selectToNextCommand();
+			instance.focus();
 		}
 		return TPromise.as(void 0);
 	}
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
index 314511a4e90..a8e3f9ecbae 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
@@ -12,7 +12,7 @@ import { IWorkspaceConfigurationService } from 'vs/workbench/services/configurat
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, TERMINAL_CONFIG_SECTION } from 'vs/workbench/parts/terminal/common/terminal';
 import Severity from 'vs/base/common/severity';
-import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { isFedora } from 'vs/workbench/parts/terminal/node/terminal';
 import { Terminal as XTermTerminal } from 'vscode-xterm';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 
@@ -163,18 +163,16 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 			} else { // if (shellArgsConfigValue.workspace !== undefined)
 				changeString = `shellArgs: ${argsString}`;
 			}
-			const message = nls.localize('terminal.integrated.allowWorkspaceShell', "Do you allow {0} (defined as a workspace setting) to be launched in the terminal?", changeString);
-			const options = [nls.localize('allow', "Allow"), nls.localize('disallow', "Disallow")];
-			this._notificationService.prompt(Severity.Info, message, options).then(choice => {
-				switch (choice) {
-					case 0:  /* Allow */
-						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE);
-						break;
-					case 1:  /* Disallow */
-						this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+			this._notificationService.prompt(Severity.Info, nls.localize('terminal.integrated.allowWorkspaceShell', "Do you allow {0} (defined as a workspace setting) to be launched in the terminal?", changeString),
+				[{
+					label: nls.localize('allow', "Allow"),
+					run: () => this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, true, StorageScope.WORKSPACE)
+				},
+				{
+					label: nls.localize('disallow', "Disallow"),
+					run: () => this._storageService.store(IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, false, StorageScope.WORKSPACE)
+				}]
+			);
 		}
 
 		shell.executable = (isWorkspaceShellAllowed ? shellConfigValue.value : shellConfigValue.user) || shellConfigValue.default;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 21ec8a5ea72..0459ce481c8 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -3,23 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as cp from 'child_process';
-import * as os from 'os';
-import * as path from 'path';
 import * as lifecycle from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
 import * as platform from 'vs/base/common/platform';
 import * as dom from 'vs/base/browser/dom';
+import * as paths from 'vs/base/common/paths';
 import { Event, Emitter } from 'vs/base/common/event';
-import Uri from 'vs/base/common/uri';
-import { WindowsShellHelper } from 'vs/workbench/parts/terminal/electron-browser/windowsShellHelper';
+import { WindowsShellHelper } from 'vs/workbench/parts/terminal/node/windowsShellHelper';
 import { Terminal as XTermTerminal } from 'vscode-xterm';
-import { Dimension } from 'vs/base/browser/builder';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { ITerminalInstance, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalInstance, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, IShellLaunchConfig, ITerminalProcessManager, ProcessState } from 'vs/workbench/parts/terminal/common/terminal';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { TabFocus } from 'vs/editor/common/config/commonEditorConfig';
@@ -30,155 +25,110 @@ import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService }
 import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import pkg from 'vs/platform/node/package';
-import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
+import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
 import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ILogService } from 'vs/platform/log/common/log';
 import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/terminalCommandTracker';
-
-/** The amount of time to consider terminal errors to be related to the launch */
-const LAUNCHING_DURATION = 500;
+import { TerminalProcessManager } from './terminalProcessManager';
 
 let Terminal: typeof XTermTerminal;
 
-enum ProcessState {
-	// The process has not been initialized yet.
-	UNINITIALIZED,
-	// The process is currently launching, the process is marked as launching
-	// for a short duration after being created and is helpful to indicate
-	// whether the process died as a result of bad shell and args.
-	LAUNCHING,
-	// The process is running normally.
-	RUNNING,
-	// The process was killed during launch, likely as a result of bad shell and
-	// args.
-	KILLED_DURING_LAUNCH,
-	// The process was killed by the user (the event originated from VS Code).
-	KILLED_BY_USER,
-	// The process was killed by itself, for example the shell crashed or `exit`
-	// was run.
-	KILLED_BY_PROCESS
-}
-
 export class TerminalInstance implements ITerminalInstance {
 	private static readonly EOL_REGEX = /\r?\n/g;
 
-	private static _lastKnownDimensions: Dimension = null;
+	private static _lastKnownDimensions: dom.Dimension = null;
 	private static _idCounter = 1;
 
+	private _processManager: ITerminalProcessManager | undefined;
+
 	private _id: number;
 	private _isExiting: boolean;
 	private _hadFocusOnExit: boolean;
 	private _isVisible: boolean;
-	private _processState: ProcessState;
-	private _processReady: TPromise<void>;
 	private _isDisposed: boolean;
-	private readonly _onDisposed: Emitter<ITerminalInstance>;
-	private readonly _onFocused: Emitter<ITerminalInstance>;
-	private readonly _onProcessIdReady: Emitter<ITerminalInstance>;
-	private readonly _onTitleChanged: Emitter<string>;
-	private _process: cp.ChildProcess;
-	private _processId: number;
 	private _skipTerminalCommands: string[];
 	private _title: string;
-	private _instanceDisposables: lifecycle.IDisposable[];
-	private _processDisposables: lifecycle.IDisposable[];
 	private _wrapperElement: HTMLDivElement;
 	private _xterm: XTermTerminal;
 	private _xtermElement: HTMLDivElement;
 	private _terminalHasTextContextKey: IContextKey<boolean>;
 	private _cols: number;
 	private _rows: number;
-	private _messageTitleListener: (message: { type: string, content: string }) => void;
-	private _preLaunchInputQueue: string;
-	private _initialCwd: string;
 	private _windowsShellHelper: WindowsShellHelper;
 	private _onLineDataListeners: ((lineData: string) => void)[];
 	private _xtermReadyPromise: TPromise<void>;
 
+	private _disposables: lifecycle.IDisposable[];
+	private _messageTitleDisposable: lifecycle.IDisposable;
+
 	private _widgetManager: TerminalWidgetManager;
 	private _linkHandler: TerminalLinkHandler;
 	private _commandTracker: TerminalCommandTracker;
 
 	public disableLayout: boolean;
 	public get id(): number { return this._id; }
-	public get processId(): number { return this._processId; }
-	public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }
-	public get onFocused(): Event<ITerminalInstance> { return this._onFocused.event; }
-	public get onProcessIdReady(): Event<ITerminalInstance> { return this._onProcessIdReady.event; }
-	public get onTitleChanged(): Event<string> { return this._onTitleChanged.event; }
+	// TODO: Ideally processId would be merged into processReady
+	public get processId(): number | undefined { return this._processManager ? this._processManager.shellProcessId : undefined; }
+	// TODO: How does this work with detached processes?
+	// TODO: Should this be an event as it can fire twice?
+	public get processReady(): TPromise<void> { return this._processManager ? this._processManager.ptyProcessReady : TPromise.as(void 0); }
 	public get title(): string { return this._title; }
 	public get hadFocusOnExit(): boolean { return this._hadFocusOnExit; }
-	public get isTitleSetByProcess(): boolean { return !!this._messageTitleListener; }
+	public get isTitleSetByProcess(): boolean { return !!this._messageTitleDisposable; }
 	public get shellLaunchConfig(): IShellLaunchConfig { return Object.freeze(this._shellLaunchConfig); }
 	public get commandTracker(): TerminalCommandTracker { return this._commandTracker; }
 
+
+	private readonly _onDisposed: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onDisposed(): Event<ITerminalInstance> { return this._onDisposed.event; }
+	private readonly _onFocused: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onFocused(): Event<ITerminalInstance> { return this._onFocused.event; }
+	private readonly _onProcessIdReady: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onProcessIdReady(): Event<ITerminalInstance> { return this._onProcessIdReady.event; }
+	private readonly _onTitleChanged: Emitter<string> = new Emitter<string>();
+	public get onTitleChanged(): Event<string> { return this._onTitleChanged.event; }
+	private readonly _onRequestExtHostProcess: Emitter<ITerminalInstance> = new Emitter<ITerminalInstance>();
+	public get onRequestExtHostProcess(): Event<ITerminalInstance> { return this._onRequestExtHostProcess.event; }
+
 	public constructor(
 		private _terminalFocusContextKey: IContextKey<boolean>,
 		private _configHelper: TerminalConfigHelper,
 		private _container: HTMLElement,
 		private _shellLaunchConfig: IShellLaunchConfig,
+		doCreateProcess: boolean,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IPanelService private readonly _panelService: IPanelService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IClipboardService private readonly _clipboardService: IClipboardService,
-		@IHistoryService private readonly _historyService: IHistoryService,
 		@IThemeService private readonly _themeService: IThemeService,
-		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
-		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILogService private _logService: ILogService
 	) {
-		this._instanceDisposables = [];
-		this._processDisposables = [];
+		this._disposables = [];
 		this._skipTerminalCommands = [];
 		this._onLineDataListeners = [];
 		this._isExiting = false;
 		this._hadFocusOnExit = false;
-		this._processState = ProcessState.UNINITIALIZED;
 		this._isVisible = false;
 		this._isDisposed = false;
 		this._id = TerminalInstance._idCounter++;
 		this._terminalHasTextContextKey = KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED.bindTo(this._contextKeyService);
-		this._preLaunchInputQueue = '';
 		this.disableLayout = false;
 
 		this._logService.trace(`terminalInstance#ctor (id: ${this.id})`, this._shellLaunchConfig);
 
-		this._onDisposed = new Emitter<TerminalInstance>();
-		this._onFocused = new Emitter<TerminalInstance>();
-		this._onProcessIdReady = new Emitter<TerminalInstance>();
-		this._onTitleChanged = new Emitter<string>();
-
-		// Create a promise that resolves when the pty is ready
-		this._processReady = new TPromise<void>(c => {
-			this.onProcessIdReady(() => {
-				this._logService.debug(`Terminal process ready (id: ${this.id}, processId: ${this.processId})`);
-				c(void 0);
-			});
-		});
-
 		this._initDimensions();
-		this._createProcess();
+		if (doCreateProcess) {
+			this._createProcess();
+		}
 
 		this._xtermReadyPromise = this._createXterm();
 		this._xtermReadyPromise.then(() => {
-			if (platform.isWindows) {
-				this._processReady.then(() => {
-					if (!this._isDisposed) {
-						this._windowsShellHelper = new WindowsShellHelper(this._processId, this, this._xterm);
-					}
-				});
-			}
-
 			// Only attach xterm.js to the DOM if the terminal panel has been opened before.
 			if (_container) {
 				this._attachToElement(_container);
@@ -196,7 +146,7 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public addDisposable(disposable: lifecycle.IDisposable): void {
-		this._instanceDisposables.push(disposable);
+		this._disposables.push(disposable);
 	}
 
 	private _initDimensions(): void {
@@ -246,7 +196,7 @@ export class TerminalInstance implements ITerminalInstance {
 		return dimension.width;
 	}
 
-	private _getDimension(width: number, height: number): Dimension {
+	private _getDimension(width: number, height: number): dom.Dimension {
 		// The font needs to have been initialized
 		const font = this._configHelper.getFont(this._xterm);
 		if (!font || !font.charWidth || !font.charHeight) {
@@ -278,7 +228,7 @@ export class TerminalInstance implements ITerminalInstance {
 		const innerWidth = width - marginLeft - marginRight;
 		const innerHeight = height - bottom;
 
-		TerminalInstance._lastKnownDimensions = new Dimension(innerWidth, innerHeight);
+		TerminalInstance._lastKnownDimensions = new dom.Dimension(innerWidth, innerHeight);
 		return TerminalInstance._lastKnownDimensions;
 	}
 
@@ -317,24 +267,14 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 		this._xterm.winptyCompatInit();
 		this._xterm.on('linefeed', () => this._onLineFeed());
-		this._process.on('message', (message) => this._sendPtyDataToXterm(message));
-		this._xterm.on('data', (data) => {
-			if (this._processId) {
-				// Send data if the pty is ready
-				this._process.send({
-					event: 'input',
-					data
-				});
-			} else {
-				// If the pty is not ready, queue the data received from
-				// xterm.js until the pty is ready
-				this._preLaunchInputQueue += data;
-			}
-			return false;
-		});
-		this._linkHandler = this._instantiationService.createInstance(TerminalLinkHandler, this._xterm, platform.platform, this._initialCwd);
+		if (this._processManager) {
+			this._processManager.onProcessData(data => this._sendPtyDataToXterm(data));
+			this._xterm.on('data', data => this._processManager.write(data));
+			// TODO: How does the cwd work on detached processes?
+			this._linkHandler = this._instantiationService.createInstance(TerminalLinkHandler, this._xterm, platform.platform, this._processManager.initialCwd);
+		}
 		this._commandTracker = new TerminalCommandTracker(this._xterm);
-		this._instanceDisposables.push(this._themeService.onThemeChange(theme => this._updateTheme(theme)));
+		this._disposables.push(this._themeService.onThemeChange(theme => this._updateTheme(theme)));
 	}
 
 	public reattachToElement(container: HTMLElement): void {
@@ -361,7 +301,6 @@ export class TerminalInstance implements ITerminalInstance {
 			return;
 		}
 
-		// TODO: Verify listeners still work
 		// The container changed, reattach
 		this._container.removeChild(this._wrapperElement);
 		this._container = container;
@@ -410,7 +349,7 @@ export class TerminalInstance implements ITerminalInstance {
 
 				return undefined;
 			});
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'mousedown', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'mousedown', (event: KeyboardEvent) => {
 				// We need to listen to the mouseup event on the document since the user may release
 				// the mouse button anywhere outside of _xterm.element.
 				const listener = dom.addDisposableListener(document, 'mouseup', (event: KeyboardEvent) => {
@@ -422,7 +361,7 @@ export class TerminalInstance implements ITerminalInstance {
 			}));
 
 			// xterm.js currently drops selection on keyup as we need to handle this case.
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'keyup', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'keyup', (event: KeyboardEvent) => {
 				// Wait until keyup has propagated through the DOM before evaluating
 				// the new selection state.
 				setTimeout(() => this._refreshSelectionContextKey(), 0);
@@ -432,7 +371,7 @@ export class TerminalInstance implements ITerminalInstance {
 			const focusTrap: HTMLElement = document.createElement('div');
 			focusTrap.setAttribute('tabindex', '0');
 			dom.addClass(focusTrap, 'focus-trap');
-			this._instanceDisposables.push(dom.addDisposableListener(focusTrap, 'focus', (event: FocusEvent) => {
+			this._disposables.push(dom.addDisposableListener(focusTrap, 'focus', (event: FocusEvent) => {
 				let currentElement = focusTrap;
 				while (!dom.hasClass(currentElement, 'part')) {
 					currentElement = currentElement.parentElement;
@@ -442,31 +381,34 @@ export class TerminalInstance implements ITerminalInstance {
 			}));
 			xtermHelper.insertBefore(focusTrap, this._xterm.textarea);
 
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'focus', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.textarea, 'focus', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.set(true);
 				this._onFocused.fire(this);
 			}));
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'blur', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.textarea, 'blur', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.reset();
 				this._refreshSelectionContextKey();
 			}));
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'focus', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'focus', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.set(true);
 			}));
-			this._instanceDisposables.push(dom.addDisposableListener(this._xterm.element, 'blur', (event: KeyboardEvent) => {
+			this._disposables.push(dom.addDisposableListener(this._xterm.element, 'blur', (event: KeyboardEvent) => {
 				this._terminalFocusContextKey.reset();
 				this._refreshSelectionContextKey();
 			}));
 
 			this._wrapperElement.appendChild(this._xtermElement);
-			this._widgetManager = new TerminalWidgetManager(this._wrapperElement);
-			this._linkHandler.setWidgetManager(this._widgetManager);
 			this._container.appendChild(this._wrapperElement);
 
+			if (this._processManager) {
+				this._widgetManager = new TerminalWidgetManager(this._wrapperElement);
+				this._linkHandler.setWidgetManager(this._widgetManager);
+			}
+
 			const computedStyle = window.getComputedStyle(this._container);
 			const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
 			const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-			this.layout(new Dimension(width, height));
+			this.layout(new dom.Dimension(width, height));
 			this.setVisible(this._isVisible);
 			this.updateConfig();
 
@@ -498,7 +440,7 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
-	get selection(): string | undefined {
+	public get selection(): string | undefined {
 		return this.hasSelection() ? this._xterm.getSelection() : undefined;
 	}
 
@@ -547,22 +489,14 @@ export class TerminalInstance implements ITerminalInstance {
 			this._xterm.destroy();
 			this._xterm = null;
 		}
-		if (this._process) {
-			if (this._process.connected) {
-				// If the process was still connected this dispose came from
-				// within VS Code, not the process, so mark the process as
-				// killed by the user.
-				this._processState = ProcessState.KILLED_BY_USER;
-				this._process.send({ event: 'shutdown' });
-			}
-			this._process = null;
+		if (this._processManager) {
+			this._processManager.dispose();
 		}
 		if (!this._isDisposed) {
 			this._isDisposed = true;
 			this._onDisposed.fire(this);
 		}
-		this._processDisposables = lifecycle.dispose(this._processDisposables);
-		this._instanceDisposables = lifecycle.dispose(this._instanceDisposables);
+		this._disposables = lifecycle.dispose(this._disposables);
 	}
 
 	public focus(force?: boolean): void {
@@ -581,16 +515,13 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public sendText(text: string, addNewLine: boolean): void {
-		this._processReady.then(() => {
+		this._processManager.ptyProcessReady.then(() => {
 			// Normalize line endings to 'enter' press.
 			text = text.replace(TerminalInstance.EOL_REGEX, '\r');
 			if (addNewLine && text.substr(text.length - 1) !== '\r') {
 				text += '\r';
 			}
-			this._process.send({
-				event: 'input',
-				data: text
-			});
+			this._processManager.write(text);
 		});
 	}
 
@@ -613,7 +544,7 @@ export class TerminalInstance implements ITerminalInstance {
 				const computedStyle = window.getComputedStyle(this._container);
 				const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
 				const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
-				this.layout(new Dimension(width, height));
+				this.layout(new dom.Dimension(width, height));
 			}
 		}
 	}
@@ -643,7 +574,13 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public clear(): void {
-		this._xterm.clear();
+		if (this._shellLaunchConfig.executable && paths.basename(this._shellLaunchConfig.executable).match(/^(zsh|bash|bash\.exe)$/)) {
+			// If a supported shell is being used, clear xterm scrollback then clear shell (^L)
+			this._xterm.write('\x1b[3J');
+			this._processManager.write('\x0c');
+		} else {
+			this._xterm.clear();
+		}
 	}
 
 	private _refreshSelectionContextKey() {
@@ -653,149 +590,60 @@ export class TerminalInstance implements ITerminalInstance {
 		this._terminalHasTextContextKey.set(isActive && this.hasSelection());
 	}
 
-	protected _getCwd(shell: IShellLaunchConfig, root: Uri): string {
-		if (shell.cwd) {
-			return shell.cwd;
-		}
-
-		let cwd: string;
-
-		// TODO: Handle non-existent customCwd
-		if (!shell.ignoreConfigurationCwd) {
-			// Evaluate custom cwd first
-			const customCwd = this._configHelper.config.cwd;
-			if (customCwd) {
-				if (path.isAbsolute(customCwd)) {
-					cwd = customCwd;
-				} else if (root) {
-					cwd = path.normalize(path.join(root.fsPath, customCwd));
-				}
-			}
-		}
-
-		// If there was no custom cwd or it was relative with no workspace
-		if (!cwd) {
-			cwd = root ? root.fsPath : os.homedir();
-		}
-
-		return TerminalInstance._sanitizeCwd(cwd);
-	}
-
 	protected _createProcess(): void {
-		const locale = this._configHelper.config.setLocaleVariables ? platform.locale : undefined;
-		if (!this._shellLaunchConfig.executable) {
-			this._configHelper.mergeDefaultShellPathAndArgs(this._shellLaunchConfig);
-		}
-
-		const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
-		this._initialCwd = this._getCwd(this._shellLaunchConfig, lastActiveWorkspaceRootUri);
-
-		// Resolve env vars from config and shell
-		const lastActiveWorkspaceRoot = this._workspaceContextService.getWorkspaceFolder(lastActiveWorkspaceRootUri);
-		const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
-		const envFromConfig = TerminalInstance.resolveConfigurationVariables(this._configurationResolverService, { ...this._configHelper.config.env[platformKey] }, lastActiveWorkspaceRoot);
-		const envFromShell = TerminalInstance.resolveConfigurationVariables(this._configurationResolverService, { ...this._shellLaunchConfig.env }, lastActiveWorkspaceRoot);
-		this._shellLaunchConfig.env = envFromShell;
-
-		// Merge process env with the env from config
-		const parentEnv = { ...process.env };
-		TerminalInstance.mergeEnvironments(parentEnv, envFromConfig);
-
-		// Continue env initialization, merging in the env from the launch
-		// config and adding keys that are needed to create the process
-		const env = TerminalInstance.createTerminalEnv(parentEnv, this._shellLaunchConfig, this._initialCwd, locale, this._cols, this._rows);
-		this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], {
-			env,
-			cwd: Uri.parse(path.dirname(require.toUrl('../node/terminalProcess'))).fsPath
-		});
-		this._processState = ProcessState.LAUNCHING;
+		this._processManager = this._instantiationService.createInstance(TerminalProcessManager, this._id, this._configHelper);
+		this._processManager.onProcessReady(() => this._onProcessIdReady.fire(this));
+		this._processManager.onProcessExit(exitCode => this._onProcessExit(exitCode));
+		this._processManager.createProcess(this._shellLaunchConfig, this._cols, this._rows);
 
 		if (this._shellLaunchConfig.name) {
 			this.setTitle(this._shellLaunchConfig.name, false);
 		} else {
 			// Only listen for process title changes when a name is not provided
 			this.setTitle(this._shellLaunchConfig.executable, true);
-			this._messageTitleListener = (message) => {
-				if (message.type === 'title') {
-					this.setTitle(message.content ? message.content : '', true);
-				}
-			};
-			this._process.on('message', this._messageTitleListener);
+			this._messageTitleDisposable = this._processManager.onProcessTitle(title => this.setTitle(title ? title : '', true));
 		}
-		this._process.on('message', (message) => {
-			if (message.type === 'pid') {
-				this._processId = message.content;
 
-				// Send any queued data that's waiting
-				if (this._preLaunchInputQueue.length > 0) {
-					this._process.send({
-						event: 'input',
-						data: this._preLaunchInputQueue
-					});
-					this._preLaunchInputQueue = null;
-				}
-				this._onProcessIdReady.fire(this);
-			}
-		});
-		this._process.on('exit', exitCode => this._onPtyProcessExit(exitCode));
-		setTimeout(() => {
-			if (this._processState === ProcessState.LAUNCHING) {
-				this._processState = ProcessState.RUNNING;
-			}
-		}, LAUNCHING_DURATION);
-	}
-
-	// TODO: Should be protected
-	private static resolveConfigurationVariables(configurationResolverService: IConfigurationResolverService, env: IStringDictionary<string>, lastActiveWorkspaceRoot: IWorkspaceFolder): IStringDictionary<string> {
-		Object.keys(env).forEach((key) => {
-			if (typeof env[key] === 'string') {
-				env[key] = configurationResolverService.resolve(lastActiveWorkspaceRoot, env[key]);
-			}
-		});
-		return env;
-	}
-
-	private _sendPtyDataToXterm(message: { type: string, content: string }): void {
-		if (message.type === 'data') {
-			if (this._widgetManager) {
-				this._widgetManager.closeMessage();
-			}
-			if (this._xterm) {
-				this._xterm.write(message.content);
-			}
+		if (platform.isWindows) {
+			this._processManager.ptyProcessReady.then(() => {
+				this._xtermReadyPromise.then(() => {
+					if (!this._isDisposed) {
+						this._windowsShellHelper = new WindowsShellHelper(this._processManager.shellProcessId, this, this._xterm);
+					}
+				});
+			});
 		}
 	}
 
-	private _onPtyProcessExit(exitCode: number): void {
+	private _sendPtyDataToXterm(data: string): void {
+		if (this._widgetManager) {
+			this._widgetManager.closeMessage();
+		}
+		if (this._xterm) {
+			this._xterm.write(data);
+		}
+	}
+
+	private _onProcessExit(exitCode: number): void {
+		this._logService.debug(`Terminal process exit (id: ${this.id}) with code ${exitCode}`);
+
 		// Prevent dispose functions being triggered multiple times
 		if (this._isExiting) {
 			return;
 		}
 
 		this._isExiting = true;
-		this._process = null;
 		let exitCodeMessage: string;
 
 		if (exitCode) {
 			exitCodeMessage = nls.localize('terminal.integrated.exitedWithCode', 'The terminal process terminated with exit code: {0}', exitCode);
 		}
 
-		// If the process is marked as launching then mark the process as killed
-		// during launch. This typically means that there is a problem with the
-		// shell and args.
-		if (this._processState === ProcessState.LAUNCHING) {
-			this._processState = ProcessState.KILLED_DURING_LAUNCH;
-		}
-
-		// If TerminalInstance did not know about the process exit then it was
-		// triggered by the process, not on VS Code's side.
-		if (this._processState === ProcessState.RUNNING) {
-			this._processState = ProcessState.KILLED_BY_PROCESS;
-		}
+		this._logService.debug(`Terminal process exit (id: ${this.id}) state ${this._processManager.processState}`);
 
 		// Only trigger wait on exit when the exit was *not* triggered by the
 		// user (via the `workbench.action.terminal.kill` command).
-		if (this._shellLaunchConfig.waitOnExit && this._processState !== ProcessState.KILLED_BY_USER) {
+		if (this._shellLaunchConfig.waitOnExit && this._processManager.processState !== ProcessState.KILLED_BY_USER) {
 			if (exitCode) {
 				this._xterm.writeln(exitCodeMessage);
 			}
@@ -813,7 +661,7 @@ export class TerminalInstance implements ITerminalInstance {
 		} else {
 			this.dispose();
 			if (exitCode) {
-				if (this._processState === ProcessState.KILLED_DURING_LAUNCH) {
+				if (this._processManager.processState === ProcessState.KILLED_DURING_LAUNCH) {
 					let args = '';
 					if (typeof this._shellLaunchConfig.args === 'string') {
 						args = this._shellLaunchConfig.args;
@@ -825,7 +673,11 @@ export class TerminalInstance implements ITerminalInstance {
 							return a;
 						}).join(' ');
 					}
-					this._notificationService.error(nls.localize('terminal.integrated.launchFailed', 'The terminal process command \'{0}{1}\' failed to launch (exit code: {2})', this._shellLaunchConfig.executable, args, exitCode));
+					if (this._shellLaunchConfig.executable) {
+						this._notificationService.error(nls.localize('terminal.integrated.launchFailed', 'The terminal process command \'{0}{1}\' failed to launch (exit code: {2})', this._shellLaunchConfig.executable, args, exitCode));
+					} else {
+						this._notificationService.error(nls.localize('terminal.integrated.launchFailedExtHost', 'The terminal process failed to launch (exit code: {0})', exitCode));
+					}
 				} else {
 					if (this._configHelper.config.showExitAlert) {
 						this._notificationService.error(exitCodeMessage);
@@ -838,23 +690,15 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	private _attachPressAnyKeyToCloseListener() {
-		this._processDisposables.push(dom.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
+		this._processManager.addDisposable(dom.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
 			this.dispose();
 			event.preventDefault();
 		}));
 	}
 
 	public reuseTerminal(shell?: IShellLaunchConfig): void {
-		// Kill and clean up old process
-		if (this._process) {
-			this._process.removeAllListeners('exit');
-			if (this._process.connected) {
-				this._process.kill();
-			}
-			this._process = null;
-		}
-		lifecycle.dispose(this._processDisposables);
-		this._processDisposables = [];
+		// Kill and clear up the process, making the process manager ready for a new process
+		this._processManager.dispose();
 
 		// Ensure new processes' output starts at start of new line
 		this._xterm.write('\n\x1b[G');
@@ -871,7 +715,7 @@ export class TerminalInstance implements ITerminalInstance {
 		if (oldTitle !== this._title) {
 			this.setTitle(this._title, true);
 		}
-		this._process.on('message', (message) => this._sendPtyDataToXterm(message));
+		this._processManager.onProcessData(data => this._sendPtyDataToXterm(data));
 
 		// Clean up waitOnExit state
 		if (this._isExiting && this._shellLaunchConfig.waitOnExit) {
@@ -883,69 +727,6 @@ export class TerminalInstance implements ITerminalInstance {
 		this._shellLaunchConfig = shell;
 	}
 
-	public static mergeEnvironments(parent: IStringDictionary<string>, other: IStringDictionary<string>) {
-		if (!other) {
-			return;
-		}
-
-		// On Windows apply the new values ignoring case, while still retaining
-		// the case of the original key.
-		if (platform.isWindows) {
-			for (let configKey in other) {
-				let actualKey = configKey;
-				for (let envKey in parent) {
-					if (configKey.toLowerCase() === envKey.toLowerCase()) {
-						actualKey = envKey;
-						break;
-					}
-				}
-				const value = other[configKey];
-				TerminalInstance._mergeEnvironmentValue(parent, actualKey, value);
-			}
-		} else {
-			Object.keys(other).forEach((key) => {
-				const value = other[key];
-				TerminalInstance._mergeEnvironmentValue(parent, key, value);
-			});
-		}
-	}
-
-	private static _mergeEnvironmentValue(env: IStringDictionary<string>, key: string, value: string | null) {
-		if (typeof value === 'string') {
-			env[key] = value;
-		} else {
-			delete env[key];
-		}
-	}
-
-	// TODO: This should be private/protected
-	public static createTerminalEnv(parentEnv: IStringDictionary<string>, shell: IShellLaunchConfig, cwd: string, locale: string, cols?: number, rows?: number): IStringDictionary<string> {
-		const env = { ...parentEnv };
-		if (shell.env) {
-			TerminalInstance.mergeEnvironments(env, shell.env);
-		}
-
-		env['PTYPID'] = process.pid.toString();
-		env['PTYSHELL'] = shell.executable;
-		env['TERM_PROGRAM'] = 'vscode';
-		env['TERM_PROGRAM_VERSION'] = pkg.version;
-		if (shell.args) {
-			if (typeof shell.args === 'string') {
-				env[`PTYSHELLCMDLINE`] = shell.args;
-			} else {
-				shell.args.forEach((arg, i) => env[`PTYSHELLARG${i}`] = arg);
-			}
-		}
-		env['PTYCWD'] = cwd;
-		env['LANG'] = TerminalInstance._getLangEnvVariable(locale);
-		if (cols && rows) {
-			env['PTYCOLS'] = cols.toString();
-			env['PTYROWS'] = rows.toString();
-		}
-		env['AMD_ENTRYPOINT'] = 'vs/workbench/parts/terminal/node/terminalProcess';
-		return env;
-	}
-
 	public onLineData(listener: (lineData: string) => void): lifecycle.IDisposable {
 		this._onLineDataListeners.push(listener);
 		return {
@@ -984,57 +765,7 @@ export class TerminalInstance implements ITerminalInstance {
 	}
 
 	public onExit(listener: (exitCode: number) => void): lifecycle.IDisposable {
-		if (this._process) {
-			this._process.on('exit', listener);
-		}
-		return {
-			dispose: () => {
-				if (this._process) {
-					this._process.removeListener('exit', listener);
-				}
-			}
-		};
-	}
-
-	private static _sanitizeCwd(cwd: string) {
-		// Make the drive letter uppercase on Windows (see #9448)
-		if (platform.platform === platform.Platform.Windows && cwd && cwd[1] === ':') {
-			return cwd[0].toUpperCase() + cwd.substr(1);
-		}
-		return cwd;
-	}
-
-	private static _getLangEnvVariable(locale?: string) {
-		const parts = locale ? locale.split('-') : [];
-		const n = parts.length;
-		if (n === 0) {
-			// Fallback to en_US to prevent possible encoding issues.
-			return 'en_US.UTF-8';
-		}
-		if (n === 1) {
-			// app.getLocale can return just a language without a variant, fill in the variant for
-			// supported languages as many shells expect a 2-part locale.
-			const languageVariants = {
-				de: 'DE',
-				en: 'US',
-				es: 'ES',
-				fi: 'FI',
-				fr: 'FR',
-				it: 'IT',
-				ja: 'JP',
-				ko: 'KR',
-				pl: 'PL',
-				ru: 'RU',
-				zh: 'CN'
-			};
-			if (parts[0] in languageVariants) {
-				parts.push(languageVariants[parts[0]]);
-			}
-		} else {
-			// Ensure the variant is uppercase
-			parts[1] = parts[1].toUpperCase();
-		}
-		return parts.join('_') + '.UTF-8';
+		return this._processManager.onProcessExit(listener);
 	}
 
 	public updateConfig(): void {
@@ -1103,7 +834,7 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: dom.Dimension): void {
 		if (this.disableLayout) {
 			return;
 		}
@@ -1147,23 +878,9 @@ export class TerminalInstance implements ITerminalInstance {
 			}
 		}
 
-		this._processReady.then(() => {
-			if (this._process && this._process.connected) {
-				// The child process could aready be terminated
-				try {
-					this._process.send({
-						event: 'resize',
-						cols: this._cols,
-						rows: this._rows
-					});
-				} catch (error) {
-					// We tried to write to a closed pipe / channel.
-					if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
-						throw (error);
-					}
-				}
-			}
-		});
+		if (this._processManager) {
+			this._processManager.ptyProcessReady.then(() => this._processManager.setDimensions(this._cols, this._rows));
+		}
 	}
 
 	public setTitle(title: string, eventFromProcess: boolean): void {
@@ -1171,7 +888,7 @@ export class TerminalInstance implements ITerminalInstance {
 			return;
 		}
 		if (eventFromProcess) {
-			title = path.basename(title);
+			title = paths.basename(title);
 			if (platform.isWindows) {
 				// Remove the .exe extension
 				title = title.split('.exe')[0];
@@ -1179,9 +896,9 @@ export class TerminalInstance implements ITerminalInstance {
 		} else {
 			// If the title has not been set by the API or the rename command, unregister the handler that
 			// automatically updates the terminal name
-			if (this._process && this._messageTitleListener) {
-				this._process.removeListener('message', this._messageTitleListener);
-				this._messageTitleListener = null;
+			if (this._messageTitleDisposable) {
+				lifecycle.dispose(this._messageTitleDisposable);
+				this._messageTitleDisposable = null;
 			}
 		}
 		const didTitleChange = title !== this._title;
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index 21926d694f0..d07fca022b7 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -3,21 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import * as platform from 'vs/base/common/platform';
+import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
 import { Action, IAction } from 'vs/base/common/actions';
-import { Builder, Dimension } from 'vs/base/browser/builder';
 import { IActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
-import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
-import { TerminalFindWidget } from './terminalFindWidget';
+import { IThemeService, ITheme, registerThemingParticipant, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { TerminalFindWidget } from 'vs/workbench/parts/terminal/browser/terminalFindWidget';
 import { editorHoverBackground, editorHoverBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { KillTerminalAction, SwitchTerminalAction, SwitchTerminalActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction, CreateNewTerminalAction, SplitTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
 import { Panel } from 'vs/workbench/browser/panel';
@@ -25,12 +23,9 @@ import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
-import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
+import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { ipcRenderer as ipc } from 'electron';
-import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
-import { whenDeleted } from 'vs/base/node/pfs';
 
 export class TerminalPanel extends Panel {
 
@@ -41,7 +36,6 @@ export class TerminalPanel extends Panel {
 	private _fontStyleElement: HTMLElement;
 	private _parentDomElement: HTMLElement;
 	private _terminalContainer: HTMLElement;
-	private _themeStyleElement: HTMLElement;
 	private _findWidget: TerminalFindWidget;
 
 	constructor(
@@ -56,11 +50,10 @@ export class TerminalPanel extends Panel {
 		super(TERMINAL_PANEL_ID, telemetryService, themeService);
 	}
 
-	public create(parent: Builder): TPromise<any> {
+	public create(parent: HTMLElement): TPromise<any> {
 		super.create(parent);
-		this._parentDomElement = parent.getHTMLElement();
+		this._parentDomElement = parent;
 		dom.addClass(this._parentDomElement, 'integrated-terminal');
-		this._themeStyleElement = document.createElement('style');
 		this._fontStyleElement = document.createElement('style');
 
 		this._terminalContainer = document.createElement('div');
@@ -68,14 +61,13 @@ export class TerminalPanel extends Panel {
 
 		this._findWidget = this._instantiationService.createInstance(TerminalFindWidget);
 
-		this._parentDomElement.appendChild(this._themeStyleElement);
 		this._parentDomElement.appendChild(this._fontStyleElement);
 		this._parentDomElement.appendChild(this._terminalContainer);
 		this._parentDomElement.appendChild(this._findWidget.getDomNode());
 
 		this._attachEventListeners();
 
-		this._terminalService.setContainers(this.getContainer().getHTMLElement(), this._terminalContainer);
+		this._terminalService.setContainers(this.getContainer(), this._terminalContainer);
 
 		this._register(this.themeService.onThemeChange(theme => this._updateTheme(theme)));
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
@@ -86,21 +78,12 @@ export class TerminalPanel extends Panel {
 		this._updateFont();
 		this._updateTheme();
 
-		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => {
-			// if the request to open files is coming in from the integrated terminal (identified though
-			// the termProgram variable) and we are instructed to wait for editors close, wait for the
-			// marker file to get deleted and then focus back to the integrated terminal.
-			if (request.termProgram === 'vscode' && request.filesToWait) {
-				whenDeleted(request.filesToWait.waitMarkerFilePath).then(() => this.focus());
-			}
-		});
-
 		// Force another layout (first is setContainers) since config has changed
-		this.layout(new Dimension(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight));
+		this.layout(new dom.Dimension(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight));
 		return TPromise.as(void 0);
 	}
 
-	public layout(dimension?: Dimension): void {
+	public layout(dimension?: dom.Dimension): void {
 		if (!dimension) {
 			return;
 		}
@@ -128,7 +111,7 @@ export class TerminalPanel extends Panel {
 								return;
 							}
 
-							const instance = this._terminalService.createInstance();
+							const instance = this._terminalService.createTerminal();
 							if (instance) {
 								this._updateFont();
 								this._updateTheme();
@@ -306,7 +289,7 @@ export class TerminalPanel extends Panel {
 				}
 
 				const terminal = this._terminalService.getActiveInstance();
-				terminal.sendText(TerminalPanel.preparePathForTerminal(path), false);
+				terminal.sendText(terminalEnvironment.preparePathForTerminal(path), false);
 			}
 		}));
 	}
@@ -316,31 +299,6 @@ export class TerminalPanel extends Panel {
 			theme = this.themeService.getTheme();
 		}
 
-		let css = '';
-
-		const backgroundColor = theme.getColor(TERMINAL_BACKGROUND_COLOR) || theme.getColor(PANEL_BACKGROUND);
-		this._terminalContainer.style.backgroundColor = backgroundColor ? backgroundColor.toString() : '';
-
-		const borderColor = theme.getColor(TERMINAL_BORDER_COLOR) || theme.getColor(PANEL_BORDER);
-		if (borderColor) {
-			css += `.monaco-workbench .panel.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`;
-		}
-
-		// Borrow the editor's hover background for now
-		let hoverBackground = theme.getColor(editorHoverBackground);
-		if (hoverBackground) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`;
-		}
-		let hoverBorder = theme.getColor(editorHoverBorder);
-		if (hoverBorder) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`;
-		}
-		let hoverForeground = theme.getColor(editorForeground);
-		if (hoverForeground) {
-			css += `.monaco-workbench .panel.integrated-terminal .terminal-message-widget { color: ${hoverForeground}; }`;
-		}
-
-		this._themeStyleElement.innerHTML = css;
 		this._findWidget.updateTheme(theme);
 	}
 
@@ -350,30 +308,30 @@ export class TerminalPanel extends Panel {
 		}
 		// TODO: Can we support ligatures?
 		// dom.toggleClass(this._parentDomElement, 'enable-ligatures', this._terminalService.configHelper.config.fontLigatures);
-		this.layout(new Dimension(this._parentDomElement.offsetWidth, this._parentDomElement.offsetHeight));
-	}
-
-	/**
-	 * Adds quotes to a path if it contains whitespaces
-	 */
-	public static preparePathForTerminal(path: string): string {
-		if (platform.isWindows) {
-			if (/\s+/.test(path)) {
-				return `"${path}"`;
-			}
-			return path;
-		}
-		path = path.replace(/(%5C|\\)/g, '\\\\');
-		const charsToEscape = [
-			' ', '\'', '"', '?', ':', ';', '!', '*', '(', ')', '{', '}', '[', ']'
-		];
-		for (let i = 0; i < path.length; i++) {
-			const indexOfChar = charsToEscape.indexOf(path.charAt(i));
-			if (indexOfChar >= 0) {
-				path = `${path.substring(0, i)}\\${path.charAt(i)}${path.substring(i + 1)}`;
-				i++; // Skip char due to escape char being added
-			}
-		}
-		return path;
+		this.layout(new dom.Dimension(this._parentDomElement.offsetWidth, this._parentDomElement.offsetHeight));
 	}
 }
+
+registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
+	const backgroundColor = theme.getColor(TERMINAL_BACKGROUND_COLOR) || theme.getColor(PANEL_BACKGROUND);
+	collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-outer-container { background-color: ${backgroundColor ? backgroundColor.toString() : ''}; }`);
+
+	const borderColor = theme.getColor(TERMINAL_BORDER_COLOR) || theme.getColor(PANEL_BORDER);
+	if (borderColor) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .split-view-view:not(:first-child) { border-color: ${borderColor.toString()}; }`);
+	}
+
+	// Borrow the editor's hover background for now
+	let hoverBackground = theme.getColor(editorHoverBackground);
+	if (hoverBackground) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { background-color: ${hoverBackground}; }`);
+	}
+	let hoverBorder = theme.getColor(editorHoverBorder);
+	if (hoverBorder) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { border: 1px solid ${hoverBorder}; }`);
+	}
+	let hoverForeground = theme.getColor(editorForeground);
+	if (hoverForeground) {
+		collector.addRule(`.monaco-workbench .panel.integrated-terminal .terminal-message-widget { color: ${hoverForeground}; }`);
+	}
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
new file mode 100644
index 00000000000..1670b248a0b
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalProcessManager.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import * as platform from 'vs/base/common/platform';
+import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
+import Uri from 'vs/base/common/uri';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { ProcessState, ITerminalProcessManager, IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IHistoryService } from 'vs/workbench/services/history/common/history';
+import { ITerminalChildProcess, IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { TerminalProcessExtHostProxy } from 'vs/workbench/parts/terminal/node/terminalProcessExtHostProxy';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+/** The amount of time to consider terminal errors to be related to the launch */
+const LAUNCHING_DURATION = 500;
+
+/**
+ * Holds all state related to the creation and management of terminal processes.
+ *
+ * Internal definitions:
+ * - Process: The process launched with the terminalProcess.ts file, or the pty as a whole
+ * - Pty Process: The pseudoterminal master process (or the winpty agent process)
+ * - Shell Process: The pseudoterminal slave process (ie. the shell)
+ */
+export class TerminalProcessManager implements ITerminalProcessManager {
+	public processState: ProcessState = ProcessState.UNINITIALIZED;
+	public ptyProcessReady: TPromise<void>;
+	public shellProcessId: number;
+	public initialCwd: string;
+
+	private _process: ITerminalChildProcess;
+	private _preLaunchInputQueue: string[] = [];
+	private _disposables: IDisposable[] = [];
+
+	private readonly _onProcessReady: Emitter<void> = new Emitter<void>();
+	public get onProcessReady(): Event<void> { return this._onProcessReady.event; }
+	private readonly _onProcessData: Emitter<string> = new Emitter<string>();
+	public get onProcessData(): Event<string> { return this._onProcessData.event; }
+	private readonly _onProcessTitle: Emitter<string> = new Emitter<string>();
+	public get onProcessTitle(): Event<string> { return this._onProcessTitle.event; }
+	private readonly _onProcessExit: Emitter<number> = new Emitter<number>();
+	public get onProcessExit(): Event<number> { return this._onProcessExit.event; }
+
+	constructor(
+		private _terminalId: number,
+		private _configHelper: ITerminalConfigHelper,
+		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
+		@IHistoryService private readonly _historyService: IHistoryService,
+		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ILogService private _logService: ILogService
+	) {
+		this.ptyProcessReady = new TPromise<void>(c => {
+			this.onProcessReady(() => {
+				this._logService.debug(`Terminal process ready (shellProcessId: ${this.shellProcessId})`);
+				c(void 0);
+			});
+		});
+	}
+
+	public dispose(): void {
+		if (this._process) {
+			if (this._process.connected) {
+				// If the process was still connected this dispose came from
+				// within VS Code, not the process, so mark the process as
+				// killed by the user.
+				this.processState = ProcessState.KILLED_BY_USER;
+				this._process.send({ event: 'shutdown' });
+			}
+			this._process = null;
+		}
+		this._disposables.forEach(d => d.dispose());
+		this._disposables.length = 0;
+	}
+
+	public addDisposable(disposable: IDisposable) {
+		this._disposables.push(disposable);
+	}
+
+	public createProcess(
+		shellLaunchConfig: IShellLaunchConfig,
+		cols: number,
+		rows: number
+	): void {
+		const extensionHostOwned = (<any>this._configHelper.config).extHostProcess;
+		if (extensionHostOwned) {
+			this._process = this._instantiationService.createInstance(TerminalProcessExtHostProxy, this._terminalId, shellLaunchConfig, cols, rows);
+		} else {
+			const locale = this._configHelper.config.setLocaleVariables ? platform.locale : undefined;
+			if (!shellLaunchConfig.executable) {
+				this._configHelper.mergeDefaultShellPathAndArgs(shellLaunchConfig);
+			}
+
+			const lastActiveWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot('file');
+			this.initialCwd = terminalEnvironment.getCwd(shellLaunchConfig, lastActiveWorkspaceRootUri, this._configHelper);
+
+			// Resolve env vars from config and shell
+			const lastActiveWorkspaceRoot = this._workspaceContextService.getWorkspaceFolder(lastActiveWorkspaceRootUri);
+			const platformKey = platform.isWindows ? 'windows' : (platform.isMacintosh ? 'osx' : 'linux');
+			const envFromConfig = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...this._configHelper.config.env[platformKey] }, lastActiveWorkspaceRoot);
+			const envFromShell = terminalEnvironment.resolveConfigurationVariables(this._configurationResolverService, { ...shellLaunchConfig.env }, lastActiveWorkspaceRoot);
+			shellLaunchConfig.env = envFromShell;
+
+			// Merge process env with the env from config
+			const parentEnv = { ...process.env };
+			terminalEnvironment.mergeEnvironments(parentEnv, envFromConfig);
+
+			// Continue env initialization, merging in the env from the launch
+			// config and adding keys that are needed to create the process
+			const env = terminalEnvironment.createTerminalEnv(parentEnv, shellLaunchConfig, this.initialCwd, locale, cols, rows);
+			const cwd = Uri.parse(require.toUrl('../node')).fsPath;
+			const options = { env, cwd };
+			this._logService.debug(`Terminal process launching`, options);
+
+			this._process = cp.fork(Uri.parse(require.toUrl('bootstrap')).fsPath, ['--type=terminal'], options);
+		}
+		this.processState = ProcessState.LAUNCHING;
+
+		this._process.on('message', message => this._onMessage(message));
+		this._process.on('exit', exitCode => this._onExit(exitCode));
+
+		setTimeout(() => {
+			if (this.processState === ProcessState.LAUNCHING) {
+				this.processState = ProcessState.RUNNING;
+			}
+		}, LAUNCHING_DURATION);
+	}
+
+	public setDimensions(cols: number, rows: number): void {
+		if (this._process && this._process.connected) {
+			// The child process could aready be terminated
+			try {
+				this._process.send({ event: 'resize', cols, rows });
+			} catch (error) {
+				// We tried to write to a closed pipe / channel.
+				if (error.code !== 'EPIPE' && error.code !== 'ERR_IPC_CHANNEL_CLOSED') {
+					throw (error);
+				}
+			}
+		}
+	}
+
+	public write(data: string): void {
+		if (this.shellProcessId) {
+			// Send data if the pty is ready
+			this._process.send({
+				event: 'input',
+				data
+			});
+		} else {
+			// If the pty is not ready, queue the data received to send later
+			this._preLaunchInputQueue.push(data);
+		}
+	}
+
+	private _onMessage(message: IMessageFromTerminalProcess): void {
+		this._logService.trace(`terminalProcessManager#_onMessage (shellProcessId: ${this.shellProcessId}`, message);
+		switch (message.type) {
+			case 'data':
+				this._onProcessData.fire(<string>message.content);
+				break;
+			case 'pid':
+				this.shellProcessId = <number>message.content;
+				this._onProcessReady.fire();
+
+				// Send any queued data that's waiting
+				if (this._preLaunchInputQueue.length > 0) {
+					this._process.send({
+						event: 'input',
+						data: this._preLaunchInputQueue.join('')
+					});
+					this._preLaunchInputQueue.length = 0;
+				}
+				break;
+			case 'title':
+				this._onProcessTitle.fire(<string>message.content);
+				break;
+		}
+	}
+
+	private _onExit(exitCode: number): void {
+		this._process = null;
+
+		// If the process is marked as launching then mark the process as killed
+		// during launch. This typically means that there is a problem with the
+		// shell and args.
+		if (this.processState === ProcessState.LAUNCHING) {
+			this.processState = ProcessState.KILLED_DURING_LAUNCH;
+		}
+
+		// If TerminalInstance did not know about the process exit then it was
+		// triggered by the process, not on VS Code's side.
+		if (this.processState === ProcessState.RUNNING) {
+			this.processState = ProcessState.KILLED_BY_PROCESS;
+		}
+
+		this._onProcessExit.fire(exitCode);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
index 54e34c38cb4..1ee8373b643 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts
@@ -6,24 +6,28 @@
 import * as nls from 'vs/nls';
 import * as pfs from 'vs/base/node/pfs';
 import * as platform from 'vs/base/common/platform';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IQuickOpenService, IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
-import { ITerminalInstance, ITerminalService, IShellLaunchConfig, ITerminalConfigHelper, NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
+import { ITerminalInstance, ITerminalService, IShellLaunchConfig, ITerminalConfigHelper, NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, TERMINAL_PANEL_ID, ITerminalProcessExtHostProxy } from 'vs/workbench/parts/terminal/common/terminal';
 import { TerminalService as AbstractTerminalService } from 'vs/workbench/parts/terminal/common/terminalService';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 import { TPromise } from 'vs/base/common/winjs.base';
 import Severity from 'vs/base/common/severity';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/node/terminal';
 import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
-import { TerminalTab } from 'vs/workbench/parts/terminal/electron-browser/terminalTab';
+import { TerminalTab } from 'vs/workbench/parts/terminal/browser/terminalTab';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { ipcRenderer as ipc } from 'electron';
+import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
+import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 
 export class TerminalService extends AbstractTerminalService implements ITerminalService {
 	private _configHelper: TerminalConfigHelper;
@@ -44,15 +48,29 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IQuickOpenService private readonly _quickOpenService: IQuickOpenService,
 		@INotificationService private readonly _notificationService: INotificationService,
-		@IDialogService private readonly _dialogService: IDialogService
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IExtensionService private readonly _extensionService: IExtensionService
 	) {
 		super(contextKeyService, panelService, partService, lifecycleService, storageService);
 
 		this._terminalTabs = [];
 		this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper);
+
+		ipc.on('vscode:openFiles', (_event: any, request: IOpenFileRequest) => {
+			// if the request to open files is coming in from the integrated terminal (identified though
+			// the termProgram variable) and we are instructed to wait for editors close, wait for the
+			// marker file to get deleted and then focus back to the integrated terminal.
+			if (request.termProgram === 'vscode' && request.filesToWait) {
+				pfs.whenDeleted(request.filesToWait.waitMarkerFilePath).then(() => {
+					if (this.terminalInstances.length > 0) {
+						this.getActiveInstance().focus();
+					}
+				});
+			}
+		});
 	}
 
-	public createInstance(shell: IShellLaunchConfig = {}, wasNewTerminalAction?: boolean): ITerminalInstance {
+	public createTerminal(shell: IShellLaunchConfig = {}, wasNewTerminalAction?: boolean): ITerminalInstance {
 		const terminalTab = this._instantiationService.createInstance(TerminalTab,
 			this._terminalFocusContextKey,
 			this._configHelper,
@@ -67,11 +85,26 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 			// It's the first instance so it should be made active automatically
 			this.setActiveInstanceByIndex(0);
 		}
+		this._onInstanceCreated.fire(instance);
 		this._onInstancesChanged.fire();
 		this._suggestShellChange(wasNewTerminalAction);
 		return instance;
 	}
 
+	public createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement, shellLaunchConfig: IShellLaunchConfig, doCreateProcess: boolean): ITerminalInstance {
+		return this._instantiationService.createInstance(TerminalInstance, terminalFocusContextKey, configHelper, container, shellLaunchConfig, true);
+	}
+
+	public requestExtHostProcess(proxy: ITerminalProcessExtHostProxy, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): void {
+		// Ensure extension host is ready before requesting a process
+		this._extensionService.whenInstalledExtensionsRegistered().then(() => {
+			// TODO: MainThreadTerminalService is not ready at this point, fix this
+			setTimeout(() => {
+				this._onInstanceRequestExtHostProcess.fire({ proxy, shellLaunchConfig, cols, rows });
+			}, 500);
+		});
+	}
+
 	public focusFindWidget(): TPromise<void> {
 		return this.showPanel(false).then(() => {
 			let panel = this._panelService.getActivePanel() as TerminalPanel;
@@ -127,17 +160,18 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 			return;
 		}
 
-		const message = nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button.");
-		const options: PromptOption[] = [nls.localize('customize', "Customize"), { label: nls.localize('never again', "Don't Show Again") }];
-		this._notificationService.prompt(Severity.Info, message, options).then(choice => {
-			switch (choice) {
-				case 0 /* Customize */:
+		this._notificationService.prompt(
+			Severity.Info,
+			nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button."),
+			[{
+				label: nls.localize('customize', "Customize"),
+				run: () => {
 					this.selectDefaultWindowsShell().then(shell => {
 						if (!shell) {
 							return TPromise.as(null);
 						}
 						// Launch a new instance with the newly selected shell
-						const instance = this.createInstance({
+						const instance = this.createTerminal({
 							executable: shell,
 							args: this._configHelper.config.shellArgs.windows
 						});
@@ -146,12 +180,14 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 						}
 						return TPromise.as(null);
 					});
-					break;
-				case 1 /* Do not show again */:
-					this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true);
-					break;
-			}
-		});
+				}
+			},
+			{
+				label: nls.localize('never again', "Don't Show Again"),
+				isSecondary: true,
+				run: () => this._storageService.store(NEVER_SUGGEST_SELECT_WINDOWS_SHELL_STORAGE_KEY, true)
+			}]
+		);
 	}
 
 	public selectDefaultWindowsShell(): TPromise<string> {
@@ -215,7 +251,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina
 
 	public getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance {
 		const activeInstance = this.getActiveInstance();
-		return activeInstance ? activeInstance : this.createInstance(undefined, wasNewTerminalAction);
+		return activeInstance ? activeInstance : this.createTerminal(undefined, wasNewTerminalAction);
 	}
 
 	protected _showTerminalCloseConfirmation(): TPromise<boolean> {
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/node/terminal.ts
similarity index 74%
rename from src/vs/workbench/parts/terminal/electron-browser/terminal.ts
rename to src/vs/workbench/parts/terminal/node/terminal.ts
index 620dcf23b9f..8cb9bc9dddd 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/terminal/node/terminal.ts
@@ -2,13 +2,37 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import * as processes from 'vs/base/node/processes';
 import { readFile, fileExists } from 'vs/base/node/pfs';
 
+export interface IMessageFromTerminalProcess {
+	type: 'pid' | 'data' | 'title';
+	content: number | string;
+}
+
+export interface IMessageToTerminalProcess {
+	event: 'resize' | 'input' | 'shutdown';
+	data?: string;
+	cols?: number;
+	rows?: number;
+}
+
+/**
+ * An interface representing a raw terminal child process, this is a subset of the
+ * child_process.ChildProcess node.js interface.
+ */
+export interface ITerminalChildProcess {
+	readonly connected: boolean;
+
+	send(message: IMessageToTerminalProcess): boolean;
+
+	on(event: 'exit', listener: (code: number) => void): this;
+	on(event: 'message', listener: (message: IMessageFromTerminalProcess) => void): this;
+}
+
 let _TERMINAL_DEFAULT_SHELL_UNIX_LIKE: string = null;
 export function getTerminalDefaultShellUnixLike(): string {
 	if (!_TERMINAL_DEFAULT_SHELL_UNIX_LIKE) {
@@ -51,4 +75,4 @@ if (platform.isLinux) {
 	});
 }
 
-export let isFedora = false;
+export let isFedora = false;
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
index f7c06906327..7229460ec01 100644
--- a/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalCommandTracker.ts
@@ -16,6 +16,11 @@ enum Boundary {
 	Bottom
 }
 
+export enum ScrollPosition {
+	Top,
+	Middle
+}
+
 export class TerminalCommandTracker implements ITerminalCommandTracker {
 	private _currentMarker: IMarker | Boundary = Boundary.Bottom;
 	private _selectionStart: IMarker | Boundary | null = null;
@@ -43,7 +48,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 	}
 
-	public focusPreviousCommand(retainSelection: boolean = false): void {
+	public scrollToPreviousCommand(scrollPosition: ScrollPosition = ScrollPosition.Top, retainSelection: boolean = false): void {
 		if (!retainSelection) {
 			this._selectionStart = null;
 		}
@@ -64,10 +69,10 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 
 		this._currentMarker = this._xterm.markers[markerIndex];
-		this._xterm.scrollToLine(this._currentMarker.line);
+		this._scrollToMarker(this._currentMarker, scrollPosition);
 	}
 
-	public focusNextCommand(retainSelection: boolean = false): void {
+	public scrollToNextCommand(scrollPosition: ScrollPosition = ScrollPosition.Top, retainSelection: boolean = false): void {
 		if (!retainSelection) {
 			this._selectionStart = null;
 		}
@@ -88,14 +93,22 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		}
 
 		this._currentMarker = this._xterm.markers[markerIndex];
-		this._xterm.scrollToLine(this._currentMarker.line);
+		this._scrollToMarker(this._currentMarker, scrollPosition);
+	}
+
+	private _scrollToMarker(marker: IMarker, position: ScrollPosition): void {
+		let line = marker.line;
+		if (position === ScrollPosition.Middle) {
+			line = Math.max(line - this._xterm.rows / 2, 0);
+		}
+		this._xterm.scrollToLine(line);
 	}
 
 	public selectToPreviousCommand(): void {
 		if (this._selectionStart === null) {
 			this._selectionStart = this._currentMarker;
 		}
-		this.focusPreviousCommand(true);
+		this.scrollToPreviousCommand(ScrollPosition.Middle, true);
 		this._selectLines(this._currentMarker, this._selectionStart);
 	}
 
@@ -103,8 +116,7 @@ export class TerminalCommandTracker implements ITerminalCommandTracker {
 		if (this._selectionStart === null) {
 			this._selectionStart = this._currentMarker;
 		}
-		this.focusNextCommand(true);
-		// if (!this._currentMarker
+		this.scrollToNextCommand(ScrollPosition.Middle, true);
 		this._selectLines(this._currentMarker, this._selectionStart);
 	}
 
diff --git a/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
new file mode 100644
index 00000000000..2c60754603d
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/node/terminalEnvironment.ts
@@ -0,0 +1,182 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as os from 'os';
+import * as paths from 'vs/base/common/paths';
+import * as platform from 'vs/base/common/platform';
+import pkg from 'vs/platform/node/package';
+import Uri from 'vs/base/common/uri';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
+
+/**
+ * This module contains utility functions related to the environment, cwd and paths.
+ */
+
+export function mergeEnvironments(parent: IStringDictionary<string>, other: IStringDictionary<string>) {
+	if (!other) {
+		return;
+	}
+
+	// On Windows apply the new values ignoring case, while still retaining
+	// the case of the original key.
+	if (platform.isWindows) {
+		for (let configKey in other) {
+			let actualKey = configKey;
+			for (let envKey in parent) {
+				if (configKey.toLowerCase() === envKey.toLowerCase()) {
+					actualKey = envKey;
+					break;
+				}
+			}
+			const value = other[configKey];
+			_mergeEnvironmentValue(parent, actualKey, value);
+		}
+	} else {
+		Object.keys(other).forEach((key) => {
+			const value = other[key];
+			_mergeEnvironmentValue(parent, key, value);
+		});
+	}
+}
+
+function _mergeEnvironmentValue(env: IStringDictionary<string>, key: string, value: string | null) {
+	if (typeof value === 'string') {
+		env[key] = value;
+	} else {
+		delete env[key];
+	}
+}
+
+export function createTerminalEnv(parentEnv: IStringDictionary<string>, shell: IShellLaunchConfig, cwd: string, locale: string, cols?: number, rows?: number): IStringDictionary<string> {
+	const env = { ...parentEnv };
+	if (shell.env) {
+		mergeEnvironments(env, shell.env);
+	}
+
+	env['PTYPID'] = process.pid.toString();
+	env['PTYSHELL'] = shell.executable;
+	env['TERM_PROGRAM'] = 'vscode';
+	env['TERM_PROGRAM_VERSION'] = pkg.version;
+	if (shell.args) {
+		if (typeof shell.args === 'string') {
+			env[`PTYSHELLCMDLINE`] = shell.args;
+		} else {
+			shell.args.forEach((arg, i) => env[`PTYSHELLARG${i}`] = arg);
+		}
+	}
+	env['PTYCWD'] = cwd;
+	env['LANG'] = _getLangEnvVariable(locale);
+	if (cols && rows) {
+		env['PTYCOLS'] = cols.toString();
+		env['PTYROWS'] = rows.toString();
+	}
+	env['AMD_ENTRYPOINT'] = 'vs/workbench/parts/terminal/node/terminalProcess';
+	return env;
+}
+
+export function resolveConfigurationVariables(configurationResolverService: IConfigurationResolverService, env: IStringDictionary<string>, lastActiveWorkspaceRoot: IWorkspaceFolder): IStringDictionary<string> {
+	Object.keys(env).forEach((key) => {
+		if (typeof env[key] === 'string') {
+			env[key] = configurationResolverService.resolve(lastActiveWorkspaceRoot, env[key]);
+		}
+	});
+	return env;
+}
+
+function _getLangEnvVariable(locale?: string) {
+	const parts = locale ? locale.split('-') : [];
+	const n = parts.length;
+	if (n === 0) {
+		// Fallback to en_US to prevent possible encoding issues.
+		return 'en_US.UTF-8';
+	}
+	if (n === 1) {
+		// app.getLocale can return just a language without a variant, fill in the variant for
+		// supported languages as many shells expect a 2-part locale.
+		const languageVariants = {
+			de: 'DE',
+			en: 'US',
+			es: 'ES',
+			fi: 'FI',
+			fr: 'FR',
+			it: 'IT',
+			ja: 'JP',
+			ko: 'KR',
+			pl: 'PL',
+			ru: 'RU',
+			zh: 'CN'
+		};
+		if (parts[0] in languageVariants) {
+			parts.push(languageVariants[parts[0]]);
+		}
+	} else {
+		// Ensure the variant is uppercase
+		parts[1] = parts[1].toUpperCase();
+	}
+	return parts.join('_') + '.UTF-8';
+}
+
+export function getCwd(shell: IShellLaunchConfig, root: Uri, configHelper: ITerminalConfigHelper): string {
+	if (shell.cwd) {
+		return shell.cwd;
+	}
+
+	let cwd: string;
+
+	// TODO: Handle non-existent customCwd
+	if (!shell.ignoreConfigurationCwd) {
+		// Evaluate custom cwd first
+		const customCwd = configHelper.config.cwd;
+		if (customCwd) {
+			if (paths.isAbsolute(customCwd)) {
+				cwd = customCwd;
+			} else if (root) {
+				cwd = paths.normalize(paths.join(root.fsPath, customCwd));
+			}
+		}
+	}
+
+	// If there was no custom cwd or it was relative with no workspace
+	if (!cwd) {
+		cwd = root ? root.fsPath : os.homedir();
+	}
+
+	return _sanitizeCwd(cwd);
+}
+
+function _sanitizeCwd(cwd: string): string {
+	// Make the drive letter uppercase on Windows (see #9448)
+	if (platform.platform === platform.Platform.Windows && cwd && cwd[1] === ':') {
+		return cwd[0].toUpperCase() + cwd.substr(1);
+	}
+	return cwd;
+}
+
+/**
+ * Adds quotes to a path if it contains whitespaces
+ */
+export function preparePathForTerminal(path: string): string {
+	if (platform.isWindows) {
+		if (/\s+/.test(path)) {
+			return `"${path}"`;
+		}
+		return path;
+	}
+	path = path.replace(/(%5C|\\)/g, '\\\\');
+	const charsToEscape = [
+		' ', '\'', '"', '?', ':', ';', '!', '*', '(', ')', '{', '}', '[', ']'
+	];
+	for (let i = 0; i < path.length; i++) {
+		const indexOfChar = charsToEscape.indexOf(path.charAt(i));
+		if (indexOfChar >= 0) {
+			path = `${path.substring(0, i)}\\${path.charAt(i)}${path.substring(i + 1)}`;
+			i++; // Skip char due to escape char being added
+		}
+	}
+	return path;
+}
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcess.ts b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
index 1bd5563acb0..e3a73831538 100644
--- a/src/vs/workbench/parts/terminal/node/terminalProcess.ts
+++ b/src/vs/workbench/parts/terminal/node/terminalProcess.ts
@@ -24,7 +24,7 @@ var cols = process.env.PTYCOLS;
 var rows = process.env.PTYROWS;
 var currentTitle = '';
 
-setupPlanB(process.env.PTYPID);
+setupPlanB(Number(process.env.PTYPID));
 cleanEnv();
 
 interface IOptions {
@@ -43,7 +43,7 @@ if (cols && rows) {
 	options.rows = parseInt(rows, 10);
 }
 
-var ptyProcess = pty.fork(shell, args, options);
+var ptyProcess = pty.spawn(shell, args, options);
 
 var closeTimeout: number;
 var exitCode: number;
@@ -91,7 +91,7 @@ process.on('message', function (message) {
 sendProcessId();
 setupTitlePolling();
 
-function getArgs() {
+function getArgs(): string | string[] {
 	if (process.env['PTYSHELLCMDLINE']) {
 		return process.env['PTYSHELLCMDLINE'];
 	}
diff --git a/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts b/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts
new file mode 100644
index 00000000000..9c842fbbfa8
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/node/terminalProcessExtHostProxy.ts
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITerminalChildProcess, IMessageToTerminalProcess, IMessageFromTerminalProcess } from 'vs/workbench/parts/terminal/node/terminal';
+import { EventEmitter } from 'events';
+import { ITerminalService, ITerminalProcessExtHostProxy, IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+
+export class TerminalProcessExtHostProxy extends EventEmitter implements ITerminalChildProcess, ITerminalProcessExtHostProxy {
+	// For ext host processes connected checks happen on the ext host
+	public connected: boolean = true;
+
+	private _disposables: IDisposable[] = [];
+
+	constructor(
+		public terminalId: number,
+		shellLaunchConfig: IShellLaunchConfig,
+		cols: number,
+		rows: number,
+		@ITerminalService private _terminalService: ITerminalService
+	) {
+		super();
+
+		// TODO: Return TPromise<boolean> indicating success? Teardown if failure?
+		this._terminalService.requestExtHostProcess(this, shellLaunchConfig, cols, rows);
+	}
+
+	public dispose(): void {
+		this._disposables.forEach(d => d.dispose());
+		this._disposables.length = 0;
+	}
+
+	public emitData(data: string): void {
+		this.emit('message', { type: 'data', content: data } as IMessageFromTerminalProcess);
+	}
+
+	public emitTitle(title: string): void {
+		this.emit('message', { type: 'title', content: title } as IMessageFromTerminalProcess);
+	}
+
+	public emitPid(pid: number): void {
+		this.emit('message', { type: 'pid', content: pid } as IMessageFromTerminalProcess);
+	}
+
+	public emitExit(exitCode: number): void {
+		this.emit('exit', exitCode);
+		this.dispose();
+	}
+
+	public send(message: IMessageToTerminalProcess): boolean {
+		switch (message.event) {
+			case 'input': this.emit('input', message.data); break;
+			case 'resize': this.emit('resize', message.cols, message.rows); break;
+			case 'shutdown': this.emit('shutdown'); break;
+		}
+		return true;
+	}
+
+	public onInput(listener: (data: string) => void): void {
+		const outerListener = (data) => listener(data);
+		this.on('input', outerListener);
+		this._disposables.push(toDisposable(() => this.removeListener('input', outerListener)));
+	}
+
+	public onResize(listener: (cols: number, rows: number) => void): void {
+		const outerListener = (cols, rows) => listener(cols, rows);
+		this.on('resize', outerListener);
+		this._disposables.push(toDisposable(() => this.removeListener('resize', outerListener)));
+	}
+
+	public onShutdown(listener: () => void): void {
+		const outerListener = () => listener();
+		this.on('shutdown', outerListener);
+		this._disposables.push(toDisposable(() => this.removeListener('shutdown', outerListener)));
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts b/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts
similarity index 98%
rename from src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
rename to src/vs/workbench/parts/terminal/node/windowsShellHelper.ts
index 803ad86dd9c..ebd8347f02f 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
+++ b/src/vs/workbench/parts/terminal/node/windowsShellHelper.ts
@@ -115,7 +115,7 @@ export class WindowsShellHelper {
 			return this._currentRequest;
 		}
 		this._currentRequest = new TPromise<string>(resolve => {
-			windowsProcessTree(this._rootProcessId, (tree) => {
+			windowsProcessTree.getProcessTree(this._rootProcessId, (tree) => {
 				const name = this.traverseTree(tree);
 				this._currentRequest = null;
 				resolve(name);
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts
index 260a3388b13..36b11b8c146 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as assert from 'assert';
 import { Extensions as ThemeingExtensions, IColorRegistry, ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { ansiColorIdentifiers, registerColors } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
+import { ansiColorIdentifiers, registerColors } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
 import { ITheme, ThemeType } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
index ebd9dbfcdaa..cc4cec690c4 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
@@ -3,12 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as assert from 'assert';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
+import { isFedora } from 'vs/workbench/parts/terminal/node/terminal';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 
 suite('Workbench - TerminalConfigHelper', () => {
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
deleted file mode 100644
index 5c569a30dfe..00000000000
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts
+++ /dev/null
@@ -1,215 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import * as os from 'os';
-import * as platform from 'vs/base/common/platform';
-import Uri from 'vs/base/common/uri';
-import { IStringDictionary } from 'vs/base/common/collections';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
-import { IShellLaunchConfig } from 'vs/workbench/parts/terminal/common/terminal';
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
-import { TestNotificationService, TestContextService, TestHistoryService } from 'vs/workbench/test/workbenchTestServices';
-import { MockContextKeyService, MockKeybindingService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IHistoryService } from 'vs/workbench/services/history/common/history';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { INotificationService } from 'vs/platform/notification/common/notification';
-import { ILogService, NullLogService } from 'vs/platform/log/common/log';
-
-class TestTerminalInstance extends TerminalInstance {
-
-	public _getCwd(shell: IShellLaunchConfig, root: Uri): string {
-		return super._getCwd(shell, root);
-	}
-
-	protected _createProcess(): void { }
-	protected _createXterm(): TPromise<void> { return TPromise.as(void 0); }
-}
-
-suite('Workbench - TerminalInstance', () => {
-
-	let instantiationService: TestInstantiationService;
-
-	setup(() => {
-		instantiationService = new TestInstantiationService();
-		instantiationService.stub(INotificationService, new TestNotificationService());
-		instantiationService.stub(IHistoryService, new TestHistoryService());
-	});
-
-	test('createTerminalEnv', function () {
-		const shell1 = {
-			executable: '/bin/foosh',
-			args: ['-bar', 'baz']
-		};
-		const parentEnv1: IStringDictionary<string> = {
-			ok: true
-		} as any;
-		const env1 = TerminalInstance.createTerminalEnv(parentEnv1, shell1, '/foo', 'en-au');
-		assert.ok(env1['ok'], 'Parent environment is copied');
-		assert.deepStrictEqual(parentEnv1, { ok: true }, 'Parent environment is unchanged');
-		assert.equal(env1['PTYPID'], process.pid.toString(), 'PTYPID is equal to the current PID');
-		assert.equal(env1['PTYSHELL'], '/bin/foosh', 'PTYSHELL is equal to the provided shell');
-		assert.equal(env1['PTYSHELLARG0'], '-bar', 'PTYSHELLARG0 is equal to the first shell argument');
-		assert.equal(env1['PTYSHELLARG1'], 'baz', 'PTYSHELLARG1 is equal to the first shell argument');
-		assert.ok(!('PTYSHELLARG2' in env1), 'PTYSHELLARG2 is unset');
-		assert.equal(env1['PTYCWD'], '/foo', 'PTYCWD is equal to requested cwd');
-		assert.equal(env1['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
-
-		const shell2: IShellLaunchConfig = {
-			executable: '/bin/foosh',
-			args: []
-		};
-		const parentEnv2: IStringDictionary<string> = {
-			LANG: 'en_US.UTF-8'
-		};
-		const env2 = TerminalInstance.createTerminalEnv(parentEnv2, shell2, '/foo', 'en-au');
-		assert.ok(!('PTYSHELLARG0' in env2), 'PTYSHELLARG0 is unset');
-		assert.equal(env2['PTYCWD'], '/foo', 'PTYCWD is equal to /foo');
-		assert.equal(env2['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
-
-		const env3 = TerminalInstance.createTerminalEnv(parentEnv1, shell1, '/', null);
-		assert.equal(env3['LANG'], 'en_US.UTF-8', 'LANG is equal to en_US.UTF-8 as fallback.'); // More info on issue #14586
-
-		const env4 = TerminalInstance.createTerminalEnv(parentEnv2, shell1, '/', null);
-		assert.equal(env4['LANG'], 'en_US.UTF-8', 'LANG is equal to the parent environment\'s LANG');
-	});
-
-	suite('mergeEnvironments', () => {
-		test('should add keys', () => {
-			const parent = {
-				a: 'b'
-			};
-			const other = {
-				c: 'd'
-			};
-			TerminalInstance.mergeEnvironments(parent, other);
-			assert.deepEqual(parent, {
-				a: 'b',
-				c: 'd'
-			});
-		});
-
-		test('should add keys ignoring case on Windows', () => {
-			if (!platform.isWindows) {
-				return;
-			}
-			const parent = {
-				a: 'b'
-			};
-			const other = {
-				A: 'c'
-			};
-			TerminalInstance.mergeEnvironments(parent, other);
-			assert.deepEqual(parent, {
-				a: 'c'
-			});
-		});
-
-		test('null values should delete keys from the parent env', () => {
-			const parent = {
-				a: 'b',
-				c: 'd'
-			};
-			const other: IStringDictionary<string> = {
-				a: null
-			};
-			TerminalInstance.mergeEnvironments(parent, other);
-			assert.deepEqual(parent, {
-				c: 'd'
-			});
-		});
-
-		test('null values should delete keys from the parent env ignoring case on Windows', () => {
-			if (!platform.isWindows) {
-				return;
-			}
-			const parent = {
-				a: 'b',
-				c: 'd'
-			};
-			const other: IStringDictionary<string> = {
-				A: null
-			};
-			TerminalInstance.mergeEnvironments(parent, other);
-			assert.deepEqual(parent, {
-				c: 'd'
-			});
-		});
-	});
-
-	suite('_getCwd', () => {
-		let instance: TestTerminalInstance;
-		let instantiationService: TestInstantiationService;
-		let configHelper: { config: { cwd: string } };
-
-		setup(() => {
-			let contextKeyService = new MockContextKeyService();
-			let keybindingService = new MockKeybindingService();
-			let terminalFocusContextKey = contextKeyService.createKey('test', false);
-			instantiationService = new TestInstantiationService();
-			instantiationService.stub(IConfigurationService, new TestConfigurationService());
-			instantiationService.stub(INotificationService, new TestNotificationService());
-			instantiationService.stub(IWorkspaceContextService, new TestContextService());
-			instantiationService.stub(IKeybindingService, keybindingService);
-			instantiationService.stub(IContextKeyService, contextKeyService);
-			instantiationService.stub(IHistoryService, new TestHistoryService());
-			instantiationService.stub(ILogService, new NullLogService());
-			configHelper = {
-				config: {
-					cwd: null
-				}
-			};
-			instance = instantiationService.createInstance(TestTerminalInstance, terminalFocusContextKey, configHelper, null, null);
-		});
-
-		// This helper checks the paths in a cross-platform friendly manner
-		function assertPathsMatch(a: string, b: string): void {
-			assert.equal(Uri.file(a).fsPath, Uri.file(b).fsPath);
-		}
-
-		test('should default to os.homedir() for an empty workspace', () => {
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, null), os.homedir());
-		});
-
-		test('should use to the workspace if it exists', () => {
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, Uri.file('/foo')), '/foo');
-		});
-
-		test('should use an absolute custom cwd as is', () => {
-			configHelper.config.cwd = '/foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, null), '/foo');
-		});
-
-		test('should normalize a relative custom cwd against the workspace path', () => {
-			configHelper.config.cwd = 'foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, Uri.file('/bar')), '/bar/foo');
-			configHelper.config.cwd = './foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, Uri.file('/bar')), '/bar/foo');
-			configHelper.config.cwd = '../foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, Uri.file('/bar'), ), '/foo');
-		});
-
-		test('should fall back for relative a custom cwd that doesn\'t have a workspace', () => {
-			configHelper.config.cwd = 'foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, null), os.homedir());
-			configHelper.config.cwd = './foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, null), os.homedir());
-			configHelper.config.cwd = '../foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [] }, null), os.homedir());
-		});
-
-		test('should ignore custom cwd when told to ignore', () => {
-			configHelper.config.cwd = '/foo';
-			assertPathsMatch(instance._getCwd({ executable: null, args: [], ignoreConfigurationCwd: true }, Uri.file('/bar')), '/bar');
-		});
-	});
-});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
index 86f24dae50d..55e629b6feb 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as assert from 'assert';
 import { Platform } from 'vs/base/common/platform';
 import { TerminalLinkHandler, LineColumnInfo } from 'vs/workbench/parts/terminal/electron-browser/terminalLinkHandler';
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts
deleted file mode 100644
index 20ca2648f1b..00000000000
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as assert from 'assert';
-import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
-import * as platform from 'vs/base/common/platform';
-
-suite('Workbench - TerminalPanel', () => {
-	test('preparePathForTerminal', function () {
-		if (platform.isWindows) {
-			assert.equal(TerminalPanel.preparePathForTerminal('C:\\foo'), 'C:\\foo');
-			assert.equal(TerminalPanel.preparePathForTerminal('C:\\foo bar'), '"C:\\foo bar"');
-			return;
-		}
-		assert.equal(TerminalPanel.preparePathForTerminal('/a/\\foo bar"\'? ;\'??  :'), '/a/\\\\foo\\ bar\\"\\\'\\?\\ \\;\\\'\\?\\?\\ \\ \\:');
-		assert.equal(TerminalPanel.preparePathForTerminal('/\\\'"?:;!*(){}[]'), '/\\\\\\\'\\"\\?\\:\\;\\!\\*\\(\\)\\{\\}\\[\\]');
-	});
-});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts b/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts
new file mode 100644
index 00000000000..e56e7f4f6aa
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/test/node/terminalCommandTracker.test.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Terminal } from 'vscode-xterm';
+import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/terminalCommandTracker';
+
+interface TestTerminal extends Terminal {
+	writeBuffer: string[];
+	_innerWrite(): void;
+}
+
+function syncWrite(term: TestTerminal, data: string): void {
+	// Terminal.write is asynchronous
+	term.writeBuffer.push(data);
+	term._innerWrite();
+}
+
+const ROWS = 10;
+const COLS = 10;
+
+suite('Workbench - TerminalCommandTracker', () => {
+	let xterm: TestTerminal;
+	let commandTracker: TerminalCommandTracker;
+
+	setup(() => {
+		xterm = (<TestTerminal>new Terminal({
+			cols: COLS,
+			rows: ROWS
+		}));
+		// Fill initial viewport
+		for (let i = 0; i < ROWS - 1; i++) {
+			syncWrite(xterm, `${i}\n`);
+		}
+		commandTracker = new TerminalCommandTracker(xterm);
+	});
+
+	suite('Command tracking', () => {
+		test('should track commands when the prompt is of sufficient size', () => {
+			assert.equal(xterm.markers.length, 0);
+			syncWrite(xterm, '\x1b[3G'); // Move cursor to column 3
+			xterm.emit('key', '\x0d');
+			assert.equal(xterm.markers.length, 1);
+		});
+		test('should not track commands when the prompt is too small', () => {
+			assert.equal(xterm.markers.length, 0);
+			syncWrite(xterm, '\x1b[2G'); // Move cursor to column 2
+			xterm.emit('key', '\x0d');
+			assert.equal(xterm.markers.length, 0);
+		});
+	});
+
+	suite('Commands', () => {
+		test('should scroll to the next and previous commands', () => {
+			syncWrite(xterm, '\x1b[3G'); // Move cursor to column 3
+			xterm.emit('key', '\x0d'); // Mark line #10
+			assert.equal(xterm.markers[0].line, 9);
+
+			for (let i = 0; i < 20; i++) {
+				syncWrite(xterm, `\r\n`);
+			}
+			assert.equal(xterm.buffer.ybase, 20);
+			assert.equal(xterm.buffer.ydisp, 20);
+
+			// Scroll to marker
+			commandTracker.scrollToPreviousCommand();
+			assert.equal(xterm.buffer.ydisp, 9);
+
+			// Scroll to top boundary
+			commandTracker.scrollToPreviousCommand();
+			assert.equal(xterm.buffer.ydisp, 0);
+
+			// Scroll to marker
+			commandTracker.scrollToNextCommand();
+			assert.equal(xterm.buffer.ydisp, 9);
+
+			// Scroll to bottom boundary
+			commandTracker.scrollToNextCommand();
+			assert.equal(xterm.buffer.ydisp, 20);
+		});
+		// test('should select to the next and previous commands', () => {
+		// 	(<any>window).matchMedia = () => {
+		// 		return { addListener: () => {} }
+		// 	};
+		// 	xterm.open(document.createElement('div'));
+
+		// 	syncWrite(xterm, '\r0');
+		// 	syncWrite(xterm, '\n\r1');
+		// 	syncWrite(xterm, '\x1b[3G'); // Move cursor to column 3
+		// 	xterm.emit('key', '\x0d'); // Mark line
+		// 	assert.equal(xterm.markers[0].line, 10);
+		// 	syncWrite(xterm, '\n\r2');
+		// 	syncWrite(xterm, '\x1b[3G'); // Move cursor to column 3
+		// 	xterm.emit('key', '\x0d'); // Mark line
+		// 	assert.equal(xterm.markers[1].line, 11);
+		// 	syncWrite(xterm, '\n\r3');
+
+		// 	assert.equal(xterm.buffer.ybase, 3);
+		// 	assert.equal(xterm.buffer.ydisp, 3);
+
+		// 	assert.equal(xterm.getSelection(), '');
+		// 	commandTracker.selectToPreviousCommand();
+		// 	assert.equal(xterm.getSelection(), '2');
+		// 	commandTracker.selectToPreviousCommand();
+		// 	assert.equal(xterm.getSelection(), '1\n2');
+		// 	commandTracker.selectToNextCommand();
+		// 	assert.equal(xterm.getSelection(), '2');
+		// 	commandTracker.selectToNextCommand();
+		// 	assert.equal(xterm.getSelection(), '\n');
+		// });
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts b/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts
new file mode 100644
index 00000000000..5fae93b3d01
--- /dev/null
+++ b/src/vs/workbench/parts/terminal/test/node/terminalEnvironment.test.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as os from 'os';
+import * as platform from 'vs/base/common/platform';
+import * as terminalEnvironment from 'vs/workbench/parts/terminal/node/terminalEnvironment';
+import Uri from 'vs/base/common/uri';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { IShellLaunchConfig, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
+
+suite('Workbench - TerminalEnvironment', () => {
+	test('createTerminalEnv', function () {
+		const shell1 = {
+			executable: '/bin/foosh',
+			args: ['-bar', 'baz']
+		};
+		const parentEnv1: IStringDictionary<string> = {
+			ok: true
+		} as any;
+		const env1 = terminalEnvironment.createTerminalEnv(parentEnv1, shell1, '/foo', 'en-au');
+		assert.ok(env1['ok'], 'Parent environment is copied');
+		assert.deepStrictEqual(parentEnv1, { ok: true }, 'Parent environment is unchanged');
+		assert.equal(env1['PTYPID'], process.pid.toString(), 'PTYPID is equal to the current PID');
+		assert.equal(env1['PTYSHELL'], '/bin/foosh', 'PTYSHELL is equal to the provided shell');
+		assert.equal(env1['PTYSHELLARG0'], '-bar', 'PTYSHELLARG0 is equal to the first shell argument');
+		assert.equal(env1['PTYSHELLARG1'], 'baz', 'PTYSHELLARG1 is equal to the first shell argument');
+		assert.ok(!('PTYSHELLARG2' in env1), 'PTYSHELLARG2 is unset');
+		assert.equal(env1['PTYCWD'], '/foo', 'PTYCWD is equal to requested cwd');
+		assert.equal(env1['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
+
+		const shell2: IShellLaunchConfig = {
+			executable: '/bin/foosh',
+			args: []
+		};
+		const parentEnv2: IStringDictionary<string> = {
+			LANG: 'en_US.UTF-8'
+		};
+		const env2 = terminalEnvironment.createTerminalEnv(parentEnv2, shell2, '/foo', 'en-au');
+		assert.ok(!('PTYSHELLARG0' in env2), 'PTYSHELLARG0 is unset');
+		assert.equal(env2['PTYCWD'], '/foo', 'PTYCWD is equal to /foo');
+		assert.equal(env2['LANG'], 'en_AU.UTF-8', 'LANG is equal to the requested locale with UTF-8');
+
+		const env3 = terminalEnvironment.createTerminalEnv(parentEnv1, shell1, '/', null);
+		assert.equal(env3['LANG'], 'en_US.UTF-8', 'LANG is equal to en_US.UTF-8 as fallback.'); // More info on issue #14586
+
+		const env4 = terminalEnvironment.createTerminalEnv(parentEnv2, shell1, '/', null);
+		assert.equal(env4['LANG'], 'en_US.UTF-8', 'LANG is equal to the parent environment\'s LANG');
+	});
+
+	suite('mergeEnvironments', () => {
+		test('should add keys', () => {
+			const parent = {
+				a: 'b'
+			};
+			const other = {
+				c: 'd'
+			};
+			terminalEnvironment.mergeEnvironments(parent, other);
+			assert.deepEqual(parent, {
+				a: 'b',
+				c: 'd'
+			});
+		});
+
+		test('should add keys ignoring case on Windows', () => {
+			if (!platform.isWindows) {
+				return;
+			}
+			const parent = {
+				a: 'b'
+			};
+			const other = {
+				A: 'c'
+			};
+			terminalEnvironment.mergeEnvironments(parent, other);
+			assert.deepEqual(parent, {
+				a: 'c'
+			});
+		});
+
+		test('null values should delete keys from the parent env', () => {
+			const parent = {
+				a: 'b',
+				c: 'd'
+			};
+			const other: IStringDictionary<string> = {
+				a: null
+			};
+			terminalEnvironment.mergeEnvironments(parent, other);
+			assert.deepEqual(parent, {
+				c: 'd'
+			});
+		});
+
+		test('null values should delete keys from the parent env ignoring case on Windows', () => {
+			if (!platform.isWindows) {
+				return;
+			}
+			const parent = {
+				a: 'b',
+				c: 'd'
+			};
+			const other: IStringDictionary<string> = {
+				A: null
+			};
+			terminalEnvironment.mergeEnvironments(parent, other);
+			assert.deepEqual(parent, {
+				c: 'd'
+			});
+		});
+	});
+
+	suite('getCwd', () => {
+		let configHelper: ITerminalConfigHelper;
+
+		setup(() => {
+			configHelper = <ITerminalConfigHelper>{
+				config: {
+					cwd: null
+				}
+			};
+		});
+
+		// This helper checks the paths in a cross-platform friendly manner
+		function assertPathsMatch(a: string, b: string): void {
+			assert.equal(Uri.file(a).fsPath, Uri.file(b).fsPath);
+		}
+
+		test('should default to os.homedir() for an empty workspace', () => {
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, null, configHelper), os.homedir());
+		});
+
+		test('should use to the workspace if it exists', () => {
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, Uri.file('/foo'), configHelper), '/foo');
+		});
+
+		test('should use an absolute custom cwd as is', () => {
+			configHelper.config.cwd = '/foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, null, configHelper), '/foo');
+		});
+
+		test('should normalize a relative custom cwd against the workspace path', () => {
+			configHelper.config.cwd = 'foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, Uri.file('/bar'), configHelper), '/bar/foo');
+			configHelper.config.cwd = './foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, Uri.file('/bar'), configHelper), '/bar/foo');
+			configHelper.config.cwd = '../foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, Uri.file('/bar'), configHelper), '/foo');
+		});
+
+		test('should fall back for relative a custom cwd that doesn\'t have a workspace', () => {
+			configHelper.config.cwd = 'foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, null, configHelper), os.homedir());
+			configHelper.config.cwd = './foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, null, configHelper), os.homedir());
+			configHelper.config.cwd = '../foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [] }, null, configHelper), os.homedir());
+		});
+
+		test('should ignore custom cwd when told to ignore', () => {
+			configHelper.config.cwd = '/foo';
+			assertPathsMatch(terminalEnvironment.getCwd({ executable: null, args: [], ignoreConfigurationCwd: true }, Uri.file('/bar'), configHelper), '/bar');
+		});
+	});
+
+	test('preparePathForTerminal', function () {
+		if (platform.isWindows) {
+			assert.equal(terminalEnvironment.preparePathForTerminal('C:\\foo'), 'C:\\foo');
+			assert.equal(terminalEnvironment.preparePathForTerminal('C:\\foo bar'), '"C:\\foo bar"');
+			return;
+		}
+		assert.equal(terminalEnvironment.preparePathForTerminal('/a/\\foo bar"\'? ;\'??  :'), '/a/\\\\foo\\ bar\\"\\\'\\?\\ \\;\\\'\\?\\?\\ \\ \\:');
+		assert.equal(terminalEnvironment.preparePathForTerminal('/\\\'"?:;!*(){}[]'), '/\\\\\\\'\\"\\?\\:\\;\\!\\*\\(\\)\\{\\}\\[\\]');
+	});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts b/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
deleted file mode 100644
index 7d2c890eafc..00000000000
--- a/src/vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as nls from 'vs/nls';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IWorkbenchContributionsRegistry, IWorkbenchContribution, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { IPreferencesService } from 'vs/workbench/parts/preferences/common/preferences';
-import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
-
-class UnsupportedWorkspaceSettingsContribution implements IWorkbenchContribution {
-
-	private static readonly storageKey = 'workspace.settings.unsupported.warning';
-	private toDispose: IDisposable[] = [];
-	private isUntrusted = false;
-
-	constructor(
-		@ILifecycleService lifecycleService: ILifecycleService,
-		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
-		@IWorkspaceConfigurationService private workspaceConfigurationService: IWorkspaceConfigurationService,
-		@IPreferencesService private preferencesService: IPreferencesService,
-		@IStorageService private storageService: IStorageService,
-		@INotificationService private notificationService: INotificationService
-	) {
-		lifecycleService.onShutdown(this.dispose, this);
-		this.toDispose.push(this.workspaceConfigurationService.onDidChangeConfiguration(e => this.checkWorkspaceSettings()));
-		this.toDispose.push(workspaceContextService.onDidChangeWorkspaceFolders(e => this.checkWorkspaceSettings()));
-	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-	}
-
-	private checkWorkspaceSettings(): void {
-		if (this.isUntrusted) {
-			return;
-		}
-
-		const configurationKeys = this.workspaceConfigurationService.getUnsupportedWorkspaceKeys();
-		this.isUntrusted = configurationKeys.length > 0;
-		if (this.isUntrusted && !this.hasShownWarning()) {
-			this.showWarning(configurationKeys);
-		}
-	}
-
-	private hasShownWarning(): boolean {
-		return this.storageService.getBoolean(UnsupportedWorkspaceSettingsContribution.storageKey, StorageScope.WORKSPACE, false);
-	}
-
-	private rememberWarningWasShown(): void {
-		this.storageService.store(UnsupportedWorkspaceSettingsContribution.storageKey, true, StorageScope.WORKSPACE);
-	}
-
-	private showWarning(unsupportedKeys: string[]): void {
-		const choices: PromptOption[] = [nls.localize('openWorkspaceSettings', 'Open Workspace Settings'), { label: nls.localize('dontShowAgain', 'Don\'t Show Again') }];
-		this.notificationService.prompt(Severity.Warning, nls.localize('unsupportedWorkspaceSettings', 'This Workspace contains settings that can only be set in User Settings ({0}). Click [here]({1}) to learn more.', unsupportedKeys.join(', '), 'https://go.microsoft.com/fwlink/?linkid=839878'), choices).then(choice => {
-			switch (choice) {
-				case 0 /* Open Workspace Settings */:
-					this.rememberWarningWasShown();
-					this.preferencesService.openWorkspaceSettings();
-					break;
-				case 1 /* Never show again */:
-					this.rememberWarningWasShown();
-					break;
-			}
-		});
-	}
-}
-
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(UnsupportedWorkspaceSettingsContribution, LifecyclePhase.Running);
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index bf6f7c9feca..30e519743fc 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -5,29 +5,29 @@
 
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
+import { onUnexpectedError } from 'vs/base/common/errors';
 import { marked } from 'vs/base/common/marked/marked';
-import { IModeService } from 'vs/editor/common/services/modeService';
-import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
+import { OS } from 'vs/base/common/platform';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { asText } from 'vs/base/node/request';
 import { IMode, TokenizationRegistry } from 'vs/editor/common/modes';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IRequestService } from 'vs/platform/request/node/request';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IPartService } from 'vs/workbench/services/part/common/partService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
-import URI from 'vs/base/common/uri';
-import { asText } from 'vs/base/node/request';
+import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
+import { IModeService } from 'vs/editor/common/services/modeService';
 import * as nls from 'vs/nls';
-import { OS } from 'vs/base/common/platform';
-import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IRequestService } from 'vs/platform/request/node/request';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
+import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
+import { Position } from 'vs/platform/editor/common/editor';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
 
 function renderBody(
 	body: string,
@@ -51,18 +51,17 @@ export class ReleaseNotesManager {
 
 	private _releaseNotesCache: { [version: string]: TPromise<string>; } = Object.create(null);
 
-	private _currentReleaseNotes: WebviewInput | undefined = undefined;
+	private _currentReleaseNotes: WebviewEditorInput | undefined = undefined;
 
 	public constructor(
-		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IModeService private readonly _modeService: IModeService,
 		@IOpenerService private readonly _openerService: IOpenerService,
-		@IPartService private readonly _partService: IPartService,
 		@IRequestService private readonly _requestService: IRequestService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
+		@IWebviewEditorService private readonly _webviewEditorService: IWebviewEditorService,
 	) { }
 
 	public async show(
@@ -73,21 +72,23 @@ export class ReleaseNotesManager {
 		const html = await this.renderBody(releaseNoteText);
 		const title = nls.localize('releaseNotesInputName', "Release Notes: {0}", version);
 
+		const activeEditor = this._editorService.getActiveEditor();
 		if (this._currentReleaseNotes) {
 			this._currentReleaseNotes.setName(title);
-			this._currentReleaseNotes.setHtml(html);
-			const activeEditor = this._editorService.getActiveEditor();
-			if (activeEditor && activeEditor.position !== this._currentReleaseNotes.position) {
-				this._editorGroupService.moveEditor(this._currentReleaseNotes, this._currentReleaseNotes.position, activeEditor.position, { preserveFocus: true });
-			} else {
-				this._editorService.openEditor(this._currentReleaseNotes, { preserveFocus: true });
-			}
+			this._currentReleaseNotes.html = html;
+			this._webviewEditorService.revealWebview(this._currentReleaseNotes, activeEditor ? activeEditor.position : undefined);
 		} else {
-			this._currentReleaseNotes = new WebviewInput(title, { tryRestoreScrollPosition: true, enableFindWidget: true }, html, {
-				onDidClickLink: uri => this.onDidClickLink(uri),
-				onDispose: () => { this._currentReleaseNotes = undefined; }
-			}, this._partService);
-			await this._editorService.openEditor(this._currentReleaseNotes, { pinned: true });
+			this._currentReleaseNotes = this._webviewEditorService.createWebview(
+				'releaseNotes',
+				title,
+				activeEditor ? activeEditor.position : Position.ONE,
+				{ tryRestoreScrollPosition: true, enableFindWidget: true },
+				undefined, {
+					onDidClickLink: uri => this.onDidClickLink(uri),
+					onDispose: () => { this._currentReleaseNotes = undefined; }
+				});
+
+			this._currentReleaseNotes.html = html;
 		}
 
 		return true;
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index e72d54cc255..07ce8b15539 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -29,15 +29,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IWindowService } from 'vs/platform/windows/common/windows';
 import { ReleaseNotesManager } from './releaseNotesEditor';
-import { once } from 'vs/base/common/event';
-
-const NotNowAction = new Action(
-	'update.later',
-	nls.localize('later', "Later"),
-	null,
-	true,
-	() => TPromise.as(true)
-);
+import { isWindows } from 'vs/base/common/platform';
 
 let releaseNotesManager: ReleaseNotesManager | undefined = undefined;
 
@@ -122,30 +114,32 @@ export class ProductContribution implements IWorkbenchContribution {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@INotificationService notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-		@IEnvironmentService environmentService: IEnvironmentService
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IOpenerService openerService: IOpenerService
 	) {
 		const lastVersion = storageService.get(ProductContribution.KEY, StorageScope.GLOBAL, '');
 
 		// was there an update? if so, open release notes
 		if (!environmentService.skipReleaseNotes && product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
-			showReleaseNotes(instantiationService, lastVersion)
+			showReleaseNotes(instantiationService, pkg.version)
 				.then(undefined, () => {
-					const action = instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
-					const handle = notificationService.notify({
-						severity: severity.Info,
-						message: nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
-						actions: { primary: [action] }
-					});
-					once(handle.onDidDispose)(() => action.dispose());
+					notificationService.prompt(
+						severity.Info,
+						nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
+						[{
+							label: nls.localize('releaseNotes', "Release Notes"),
+							run: () => {
+								const uri = URI.parse(product.releaseNotesUrl);
+								openerService.open(uri);
+							}
+						}]
+					);
 				});
 		}
 
 		// should we show the new license?
 		if (product.licenseUrl && lastVersion && semver.satisfies(lastVersion, '<1.0.0') && semver.satisfies(pkg.version, '>=1.0.0')) {
-			notificationService.notify({
-				severity: severity.Info,
-				message: nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl),
-			});
+			notificationService.info(nls.localize('licenseChanged', "Our license terms have changed, please click [here]({0}) to go through them.", product.licenseUrl));
 		}
 
 		storageService.store(ProductContribution.KEY, pkg.version, StorageScope.GLOBAL);
@@ -182,7 +176,7 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 	constructor(
 		@IStorageService storageService: IStorageService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@INotificationService private notificationService: INotificationService,
+		@INotificationService notificationService: INotificationService,
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService
 	) {
@@ -200,12 +194,18 @@ export class Win3264BitContribution implements IWorkbenchContribution {
 			? Win3264BitContribution.INSIDER_URL
 			: Win3264BitContribution.URL;
 
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available! Click [here]({1}) to learn more.", product.nameShort, url),
-			actions: { secondary: [neverShowAgain.action] }
-		});
-		once(handle.onDidDispose)(() => neverShowAgain.action.dispose());
+		notificationService.prompt(
+			severity.Info,
+			nls.localize('64bitisavailable', "{0} for 64-bit Windows is now available! Click [here]({1}) to learn more.", product.nameShort, url),
+			[{
+				label: nls.localize('neveragain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
+					neverShowAgain.action.run();
+					neverShowAgain.action.dispose();
+				}
+			}]
+		);
 	}
 }
 
@@ -223,7 +223,7 @@ class CommandAction extends Action {
 export class UpdateContribution implements IGlobalActivity {
 
 	private static readonly showCommandsId = 'workbench.action.showCommands';
-	private static readonly openSettingsId = 'workbench.action.openGlobalSettings';
+	private static readonly openSettingsId = 'workbench.action.openSettings';
 	private static readonly openKeybindingsId = 'workbench.action.openGlobalKeybindings';
 	private static readonly openUserSnippets = 'workbench.action.openSnippets';
 	private static readonly selectColorThemeId = 'workbench.action.selectTheme';
@@ -330,16 +330,24 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const downloadAction = new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
-			this.updateService.downloadUpdate());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
-			actions: { primary: [downloadAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => dispose(releaseNotesAction, downloadAction));
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('thereIsUpdateAvailable', "There is an available update."),
+			[{
+				label: nls.localize('download now', "Download Now"),
+				run: () => this.updateService.downloadUpdate()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows fast updates
@@ -348,16 +356,24 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const installUpdateAction = new Action('update.applyUpdate', nls.localize('installUpdate', "Install Update"), undefined, true, () =>
-			this.updateService.applyUpdate());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, update.productVersion),
-			actions: { primary: [installUpdateAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => dispose(installUpdateAction, releaseNotesAction));
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateAvailable', "There's an update available: {0} {1}", product.nameLong, update.productVersion),
+			[{
+				label: nls.localize('installUpdate', "Install Update"),
+				run: () => this.updateService.applyUpdate()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows fast updates
@@ -368,30 +384,44 @@ export class UpdateContribution implements IGlobalActivity {
 			return;
 		}
 
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateInstalling', "{0} {1} is being installed in the background, we'll let you know when it's done.", product.nameLong, update.productVersion),
-			actions: { secondary: [neverShowAgain.action] }
-		});
-		once(handle.onDidDispose)(() => neverShowAgain.action.dispose());
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateInstalling', "{0} {1} is being installed in the background, we'll let you know when it's done.", product.nameLong, update.productVersion),
+			[{
+				label: nls.localize('neveragain', "Don't Show Again"),
+				isSecondary: true,
+				run: () => {
+					neverShowAgain.action.run();
+					neverShowAgain.action.dispose();
+				}
+			}]
+		);
 	}
 
 	// windows and mac
 	private onUpdateReady(update: IUpdate): void {
-		if (!this.shouldShowNotification()) {
+		if (!isWindows && !this.shouldShowNotification()) {
 			return;
 		}
 
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () =>
-			this.updateService.quitAndInstall());
-
-		const handle = this.notificationService.notify({
-			severity: severity.Info,
-			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
-			actions: { primary: [applyUpdateAction, NotNowAction, releaseNotesAction] }
-		});
-		once(handle.onDidDispose)(() => applyUpdateAction, releaseNotesAction);
+		this.notificationService.prompt(
+			severity.Info,
+			nls.localize('updateAvailableAfterRestart', "Restart {0} to apply the latest update.", product.nameLong),
+			[{
+				label: nls.localize('updateNow', "Update Now"),
+				run: () => this.updateService.quitAndInstall()
+			}, {
+				label: nls.localize('later', "Later"),
+				run: () => { }
+			}, {
+				label: nls.localize('releaseNotes', "Release Notes"),
+				run: () => {
+					const action = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+					action.run();
+					action.dispose();
+				}
+			}]
+		);
 	}
 
 	private shouldShowNotification(): boolean {
diff --git a/src/vs/workbench/parts/url/electron-browser/url.contribution.ts b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
new file mode 100644
index 00000000000..edbcc48c138
--- /dev/null
+++ b/src/vs/workbench/parts/url/electron-browser/url.contribution.ts
@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
+import { IURLService } from 'vs/platform/url/common/url';
+import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Action } from 'vs/base/common/actions';
+
+export class OpenUrlAction extends Action {
+
+	static readonly ID = 'workbench.action.url.openUrl';
+	static readonly LABEL = localize('openUrl', "Open URL");
+
+	constructor(
+		id: string,
+		label: string,
+		@IURLService private urlService: IURLService,
+		@IQuickOpenService private quickOpenService: IQuickOpenService,
+	) {
+		super(id, label);
+	}
+
+	async run(): TPromise<any> {
+		const input = await this.quickOpenService.input({ prompt: 'URL to open' });
+		const uri = URI.parse(input);
+
+		this.urlService.open(uri);
+	}
+}
+
+Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions)
+	.registerWorkbenchAction(new SyncActionDescriptor(OpenUrlAction, OpenUrlAction.ID, OpenUrlAction.LABEL), 'OpenUrl', localize('developer', "Developer"));
\ No newline at end of file
diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
index e750345e23c..44449b32df2 100644
--- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
+++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts
@@ -21,7 +21,7 @@ import { OpenRecentAction } from 'vs/workbench/electron-browser/actions';
 import { GlobalNewUntitledFileAction } from 'vs/workbench/parts/files/electron-browser/fileActions';
 import { OpenFolderAction, OpenFileFolderAction, OpenFileAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ShowAllCommandsAction } from 'vs/workbench/parts/quickopen/browser/commandsHandler';
-import { Parts, IPartService, Dimension } from 'vs/workbench/services/part/common/partService';
+import { Parts, IPartService, IDimension } from 'vs/workbench/services/part/common/partService';
 import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions';
 import { FindInFilesActionId } from 'vs/workbench/parts/search/common/constants';
 import { ToggleTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
@@ -179,7 +179,7 @@ export class WatermarkContribution implements IWorkbenchContribution {
 		update();
 		this.watermark.build(container.firstElementChild as HTMLElement, 0);
 		this.toDispose.push(this.keybindingService.onDidUpdateKeybindings(update));
-		this.toDispose.push(this.partService.onEditorLayout(({ height }: Dimension) => {
+		this.toDispose.push(this.partService.onEditorLayout(({ height }: IDimension) => {
 			container.classList[height <= 478 ? 'add' : 'remove']('max-height-478px');
 		}));
 	}
diff --git a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
similarity index 92%
rename from src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
rename to src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
index c208bfaf888..8436046783d 100644
--- a/src/vs/workbench/parts/html/electron-browser/baseWebviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/baseWebviewEditor.ts
@@ -3,14 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Dimension } from 'vs/base/browser/dom';
+import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-
-import { IContextKey, RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-
-import { Webview } from './webview';
-import { Dimension } from 'vs/workbench/services/part/common/partService';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
+import { WebviewElement } from './webviewElement';
 
 /**  A context key that is set when a webview editor has focus. */
 export const KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS = new RawContextKey<boolean>('webviewEditorFocus', false);
@@ -25,7 +23,7 @@ export const KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE = new RawContextKey<
  */
 export abstract class BaseWebviewEditor extends BaseEditor {
 
-	protected _webview: Webview | undefined;
+	protected _webview: WebviewElement | undefined;
 	protected contextKey: IContextKey<boolean>;
 	protected findWidgetVisible: IContextKey<boolean>;
 	protected findInputFocusContextKey: IContextKey<boolean>;
diff --git a/src/vs/workbench/parts/html/electron-browser/webview-pre.js b/src/vs/workbench/parts/webview/electron-browser/webview-pre.js
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webview-pre.js
rename to src/vs/workbench/parts/webview/electron-browser/webview-pre.js
diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
index 4203fa20dff..c455d333963 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
@@ -3,15 +3,88 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';
-import { WebviewEditor } from './webviewEditor';
-import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { WebviewInput } from './webviewInput';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { localize } from 'vs/nls';
+import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } from 'vs/workbench/browser/editor';
+import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
+import { Extensions as EditorInputExtensions, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
+import { WebviewEditorInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory';
+import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindTermCommand, ShowWebViewEditorFindWidgetCommand } from './webviewCommands';
+import { WebviewEditor } from './webviewEditor';
+import { WebviewEditorInput } from './webviewEditorInput';
+import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService';
 
 (Registry.as<IEditorRegistry>(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(
 	WebviewEditor,
 	WebviewEditor.ID,
 	localize('webview.editor.label', "webview editor")),
-	[new SyncDescriptor(WebviewInput)]);
\ No newline at end of file
+	[new SyncDescriptor(WebviewEditorInput)]);
+
+Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(
+	WebviewEditorInputFactory.ID,
+	WebviewEditorInputFactory);
+
+registerSingleton(IWebviewEditorService, WebviewEditorService);
+
+
+const webviewDeveloperCategory = localize('developer', "Developer");
+
+const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
+
+const showNextFindWdigetCommand = new ShowWebViewEditorFindWidgetCommand({
+	id: ShowWebViewEditorFindWidgetCommand.ID,
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
+	kbOpts: {
+		primary: KeyMod.CtrlCmd | KeyCode.KEY_F
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindWdigetCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+const showNextFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showNextFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.DownArrow
+	}
+}, true);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showNextFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+const showPreviousFindTermCommand = new ShowWebViewEditorFindTermCommand({
+	id: 'editor.action.webvieweditor.showPreviousFindTerm',
+	precondition: KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED,
+	kbOpts: {
+		primary: KeyMod.Alt | KeyCode.UpArrow
+	}
+}, false);
+KeybindingsRegistry.registerCommandAndKeybindingRule(showPreviousFindTermCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+const hideCommand = new HideWebViewEditorFindCommand({
+	id: HideWebViewEditorFindCommand.ID,
+	precondition: ContextKeyExpr.and(
+		KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS,
+		KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE),
+	kbOpts: {
+		primary: KeyCode.Escape
+	}
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule(hideCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib()));
+
+
+actionRegistry.registerWorkbenchAction(
+	new SyncActionDescriptor(OpenWebviewDeveloperToolsAction, OpenWebviewDeveloperToolsAction.ID, OpenWebviewDeveloperToolsAction.LABEL),
+	'Webview Tools',
+	webviewDeveloperCategory);
+
+actionRegistry.registerWorkbenchAction(
+	new SyncActionDescriptor(ReloadWebviewAction, ReloadWebviewAction.ID, ReloadWebviewAction.LABEL),
+	'Reload Webview',
+	webviewDeveloperCategory);
\ No newline at end of file
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.html b/src/vs/workbench/parts/webview/electron-browser/webview.html
similarity index 100%
rename from src/vs/workbench/parts/html/electron-browser/webview.html
rename to src/vs/workbench/parts/webview/electron-browser/webview.html
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewCommands.ts b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
similarity index 70%
rename from src/vs/workbench/parts/html/electron-browser/webviewCommands.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
index eed860fc157..aefe8892396 100644
--- a/src/vs/workbench/parts/html/electron-browser/webviewCommands.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewCommands.ts
@@ -3,53 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-
-import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
-import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
+import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
+import * as nls from 'vs/nls';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { BaseWebviewEditor } from './baseWebviewEditor';
 
 export class ShowWebViewEditorFindWidgetCommand extends Command {
 	public static readonly ID = 'editor.action.webvieweditor.showFind';
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			webViewEditor.showFind();
 		}
-		return null;
-	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const workbenchEditorService = accessor.get(IWorkbenchEditorService);
-		const activeEditor = workbenchEditorService.getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
 	}
 }
 
 export class HideWebViewEditorFindCommand extends Command {
-	public static readonly Id = 'editor.action.webvieweditor.hideFind';
+	public static readonly ID = 'editor.action.webvieweditor.hideFind';
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			webViewEditor.hideFind();
 		}
 	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
 }
 
 export class ShowWebViewEditorFindTermCommand extends Command {
@@ -60,7 +41,7 @@ export class ShowWebViewEditorFindTermCommand extends Command {
 	}
 
 	public runCommand(accessor: ServicesAccessor, args: any): void {
-		const webViewEditor = this.getWebViewEditor(accessor);
+		const webViewEditor = getActiveWebviewEditor(accessor);
 		if (webViewEditor) {
 			if (this._next) {
 				webViewEditor.showNextFindTerm();
@@ -69,14 +50,6 @@ export class ShowWebViewEditorFindTermCommand extends Command {
 			}
 		}
 	}
-
-	private getWebViewEditor(accessor: ServicesAccessor): BaseWebviewEditor {
-		const activeEditor = accessor.get(IWorkbenchEditorService).getActiveEditor() as BaseWebviewEditor;
-		if (activeEditor.isWebviewEditor) {
-			return activeEditor;
-		}
-		return null;
-	}
 }
 
 export class OpenWebviewDeveloperToolsAction extends Action {
@@ -124,7 +97,13 @@ export class ReloadWebviewAction extends Action {
 
 	private getVisibleWebviews() {
 		return this.workbenchEditorService.getVisibleEditors()
-			.filter(c => c && (c as any).isWebviewEditor)
-			.map(e => e as BaseWebviewEditor);
+			.filter(editor => editor && (editor as BaseWebviewEditor).isWebviewEditor)
+			.map(editor => editor as BaseWebviewEditor);
 	}
+}
+
+function getActiveWebviewEditor(accessor: ServicesAccessor): BaseWebviewEditor | null {
+	const workbenchEditorService = accessor.get(IWorkbenchEditorService);
+	const activeEditor = workbenchEditorService.getActiveEditor() as BaseWebviewEditor;
+	return activeEditor.isWebviewEditor ? activeEditor : null;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
index ddbd2bc080d..aada9f588dc 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts
@@ -3,24 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as DOM from 'vs/base/browser/dom';
+import { Emitter, Event } from 'vs/base/common/event';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable, } from 'vs/base/common/lifecycle';
-import { EditorOptions } from 'vs/workbench/common/editor';
-import { Position } from 'vs/platform/editor/common/editor';
-import { BaseWebviewEditor as BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from 'vs/workbench/parts/html/electron-browser/baseWebviewEditor';
-import { Builder, Dimension } from 'vs/base/browser/builder';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { Position } from 'vs/platform/editor/common/editor';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import * as DOM from 'vs/base/browser/dom';
-import { Event, Emitter } from 'vs/base/common/event';
-import { WebviewInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput';
-import URI from 'vs/base/common/uri';
+import { EditorOptions } from 'vs/workbench/common/editor';
+import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import { BaseWebviewEditor, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor';
+import { WebviewElement } from './webviewElement';
 
 export class WebviewEditor extends BaseWebviewEditor {
 
@@ -29,10 +28,12 @@ export class WebviewEditor extends BaseWebviewEditor {
 	private editorFrame: HTMLElement;
 	private content: HTMLElement;
 	private webviewContent: HTMLElement | undefined;
-	private readonly _onDidFocusWebview: Emitter<void>;
+
 	private _webviewFocusTracker?: DOM.IFocusTracker;
 	private _webviewFocusListenerDisposable?: IDisposable;
 
+	private readonly _onDidFocusWebview = new Emitter<void>();
+
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IThemeService themeService: IThemeService,
@@ -43,18 +44,16 @@ export class WebviewEditor extends BaseWebviewEditor {
 		@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService
 	) {
 		super(WebviewEditor.ID, telemetryService, themeService, _contextKeyService);
-
-		this._onDidFocusWebview = new Emitter<void>();
 	}
 
-	protected createEditor(parent: Builder): void {
-		this.editorFrame = parent.getHTMLElement();
+	protected createEditor(parent: HTMLElement): void {
+		this.editorFrame = parent;
 		this.content = document.createElement('div');
-		parent.append(this.content);
+		parent.appendChild(this.content);
 	}
 
 	private doUpdateContainer() {
-		const webviewContainer = this.input && (this.input as WebviewInput).container;
+		const webviewContainer = this.input && (this.input as WebviewEditorInput).container;
 		if (webviewContainer && webviewContainer.parentElement) {
 			const frameRect = this.editorFrame.getBoundingClientRect();
 			const containerRect = webviewContainer.parentElement.getBoundingClientRect();
@@ -67,7 +66,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 		}
 	}
 
-	public layout(dimension: Dimension): void {
+	public layout(dimension: DOM.Dimension): void {
 		if (this._webview) {
 			this.doUpdateContainer();
 		}
@@ -103,14 +102,14 @@ export class WebviewEditor extends BaseWebviewEditor {
 	}
 
 	protected setEditorVisible(visible: boolean, position?: Position): void {
-		if (this.input && this.input instanceof WebviewInput) {
+		if (this.input && this.input instanceof WebviewEditorInput) {
 			if (visible) {
 				this.input.claimWebview(this);
 			} else {
 				this.input.releaseWebview(this);
 			}
 
-			this.updateWebview(this.input as WebviewInput);
+			this.updateWebview(this.input as WebviewEditorInput);
 		}
 
 		if (this.webviewContent) {
@@ -126,7 +125,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 	}
 
 	public clearInput() {
-		if (this.input && this.input instanceof WebviewInput) {
+		if (this.input && this.input instanceof WebviewEditorInput) {
 			this.input.releaseWebview(this);
 		}
 
@@ -136,24 +135,24 @@ export class WebviewEditor extends BaseWebviewEditor {
 		super.clearInput();
 	}
 
-	async setInput(input: WebviewInput, options: EditorOptions): TPromise<void> {
+	async setInput(input: WebviewEditorInput, options: EditorOptions): TPromise<void> {
 		if (this.input && this.input.matches(input)) {
 			return undefined;
 		}
 
 		if (this.input) {
-			(this.input as WebviewInput).releaseWebview(this);
+			(this.input as WebviewEditorInput).releaseWebview(this);
 			this._webview = undefined;
 			this.webviewContent = undefined;
 		}
-
 		await super.setInput(input, options);
 
-		input.onDidChangePosition(this.position);
+		await input.resolve();
+		await input.updatePosition(this.position);
 		this.updateWebview(input);
 	}
 
-	private updateWebview(input: WebviewInput) {
+	private updateWebview(input: WebviewEditorInput) {
 		const webview = this.getWebview(input);
 		input.claimWebview(this);
 		webview.options = {
@@ -163,7 +162,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			useSameOriginForRoot: false,
 			localResourceRoots: input.options.localResourceRoots || this.getDefaultLocalResourceRoots()
 		};
-		input.setHtml(input.html);
+		input.html = input.html;
 
 		if (this.webviewContent) {
 			this.webviewContent.style.visibility = 'visible';
@@ -174,29 +173,27 @@ export class WebviewEditor extends BaseWebviewEditor {
 
 	private getDefaultLocalResourceRoots(): URI[] {
 		const rootPaths = this._contextService.getWorkspace().folders.map(x => x.uri);
-		if ((this.input as WebviewInput).extensionFolderPath) {
-			rootPaths.push((this.input as WebviewInput).extensionFolderPath);
+		if ((this.input as WebviewEditorInput).extensionFolderPath) {
+			rootPaths.push((this.input as WebviewEditorInput).extensionFolderPath);
 		}
 		return rootPaths;
 	}
 
-	private getWebview(input: WebviewInput): Webview {
+	private getWebview(input: WebviewEditorInput): WebviewElement {
 		if (this._webview) {
 			return this._webview;
 		}
 
 		this.webviewContent = input.container;
+
+		this.trackFocus();
+
 		const existing = input.webview;
 		if (existing) {
 			this._webview = existing;
 			return existing;
 		}
 
-		this._webviewFocusTracker = DOM.trackFocus(this.webviewContent);
-		this._webviewFocusListenerDisposable = this._webviewFocusTracker.onDidFocus(() => {
-			this._onDidFocusWebview.fire();
-		});
-
 		if (input.options.enableFindWidget) {
 			this._contextKeyService = this._contextKeyService.createScoped(this.webviewContent);
 			this.contextKey = KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS.bindTo(this._contextKeyService);
@@ -204,7 +201,7 @@ export class WebviewEditor extends BaseWebviewEditor {
 			this.findWidgetVisible = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
 		}
 
-		this._webview = new Webview(
+		this._webview = new WebviewElement(
 			this._partService.getContainer(Parts.EDITOR_PART),
 			this.themeService,
 			this._environmentService,
@@ -227,5 +224,19 @@ export class WebviewEditor extends BaseWebviewEditor {
 		this.doUpdateContainer();
 		return this._webview;
 	}
+
+	private trackFocus() {
+		if (this._webviewFocusTracker) {
+			this._webviewFocusTracker.dispose();
+		}
+		if (this._webviewFocusListenerDisposable) {
+			this._webviewFocusListenerDisposable.dispose();
+		}
+
+		this._webviewFocusTracker = DOM.trackFocus(this.webviewContent);
+		this._webviewFocusListenerDisposable = this._webviewFocusTracker.onDidFocus(() => {
+			this._onDidFocusWebview.fire();
+		});
+	}
 }
 
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
similarity index 74%
rename from src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
index 0d925f614b7..516b46d3d5b 100644
--- a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
@@ -3,71 +3,61 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
-import { IEditorModel, Position, IEditorInput } from 'vs/platform/editor/common/editor';
-import { Webview } from 'vs/workbench/parts/html/electron-browser/webview';
-import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
-import * as vscode from 'vscode';
 import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IEditorInput, IEditorModel, Position } from 'vs/platform/editor/common/editor';
+import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
+import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
+import { WebviewEvents, WebviewInputOptions, WebviewReviver } from './webviewEditorService';
+import { WebviewElement } from './webviewElement';
 
-export interface WebviewEvents {
-	onMessage?(message: any): void;
-	onDidChangePosition?(newPosition: Position): void;
-	onDispose?(): void;
-	onDidClickLink?(link: URI, options: vscode.WebviewOptions): void;
-}
 
-export interface WebviewInputOptions extends vscode.WebviewOptions {
-	tryRestoreScrollPosition?: boolean;
-}
-
-export class WebviewInput extends EditorInput {
+export class WebviewEditorInput extends EditorInput {
 	private static handlePool = 0;
 
+	public static readonly typeId = 'workbench.editors.webviewInput';
+
 	private _name: string;
 	private _options: WebviewInputOptions;
-	private _html: string;
+	private _html: string = '';
 	private _currentWebviewHtml: string = '';
-	private _events: WebviewEvents | undefined;
+	public _events: WebviewEvents | undefined;
 	private _container: HTMLElement;
-	private _webview: Webview | undefined;
+	private _webview: WebviewElement | undefined;
 	private _webviewOwner: any;
 	private _webviewDisposables: IDisposable[] = [];
 	private _position?: Position;
 	private _scrollYPercentage: number = 0;
+	private _state: any;
+
+	private _revived: boolean = false;
+
 	public readonly extensionFolderPath: URI | undefined;
 
 	constructor(
+		public readonly viewType: string,
 		name: string,
 		options: WebviewInputOptions,
-		html: string,
+		state: any,
 		events: WebviewEvents,
-		partService: IPartService,
-		extensionFolderPath?: string
+		extensionFolderPath: string | undefined,
+		public readonly reviver: WebviewReviver | undefined,
+		@IPartService private readonly _partService: IPartService,
 	) {
 		super();
 		this._name = name;
 		this._options = options;
-		this._html = html;
 		this._events = events;
+		this._state = state;
 
 		if (extensionFolderPath) {
 			this.extensionFolderPath = URI.file(extensionFolderPath);
 		}
-
-		const id = WebviewInput.handlePool++;
-		this._container = document.createElement('div');
-		this._container.id = `webview-${id}`;
-
-		partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
 	}
 
 	public getTypeId(): string {
-		return 'webview';
+		return WebviewEditorInput.typeId;
 	}
 
 	public dispose() {
@@ -119,7 +109,7 @@ export class WebviewInput extends EditorInput {
 		return this._html;
 	}
 
-	public setHtml(value: string): void {
+	public set html(value: string) {
 		if (value === this._currentWebviewHtml) {
 			return;
 		}
@@ -132,6 +122,14 @@ export class WebviewInput extends EditorInput {
 		}
 	}
 
+	public get state(): any {
+		return this._state;
+	}
+
+	public set state(value: any) {
+		this._state = value;
+	}
+
 	public get options(): WebviewInputOptions {
 		return this._options;
 	}
@@ -141,6 +139,11 @@ export class WebviewInput extends EditorInput {
 	}
 
 	public resolve(refresh?: boolean): TPromise<IEditorModel, any> {
+		if (this.reviver && !this._revived) {
+			this._revived = true;
+			return this.reviver.reviveWebview(this).then(() => new EditorModel());
+		}
+
 		return TPromise.as(new EditorModel());
 	}
 
@@ -149,14 +152,20 @@ export class WebviewInput extends EditorInput {
 	}
 
 	public get container(): HTMLElement {
+		if (!this._container) {
+			const id = WebviewEditorInput.handlePool++;
+			this._container = document.createElement('div');
+			this._container.id = `webview-${id}`;
+			this._partService.getContainer(Parts.EDITOR_PART).appendChild(this._container);
+		}
 		return this._container;
 	}
 
-	public get webview(): Webview | undefined {
+	public get webview(): WebviewElement | undefined {
 		return this._webview;
 	}
 
-	public set webview(value: Webview) {
+	public set webview(value: WebviewElement) {
 		this._webviewDisposables = dispose(this._webviewDisposables);
 
 		this._webview = value;
@@ -215,10 +224,7 @@ export class WebviewInput extends EditorInput {
 		this._currentWebviewHtml = '';
 	}
 
-	public onDidChangePosition(position: Position) {
-		if (this._events && this._events.onDidChangePosition) {
-			this._events.onDidChangePosition(position);
-		}
+	public updatePosition(position: Position): void {
 		this._position = position;
 	}
 }
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
new file mode 100644
index 00000000000..476db7789b1
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IEditorInputFactory } from 'vs/workbench/common/editor';
+import { WebviewEditorInput } from './webviewEditorInput';
+import { IWebviewEditorService, WebviewInputOptions } from './webviewEditorService';
+
+interface SerializedWebview {
+	readonly viewType: string;
+	readonly title: string;
+	readonly options: WebviewInputOptions;
+	readonly extensionFolderPath: string;
+	readonly state: any;
+}
+
+export class WebviewEditorInputFactory implements IEditorInputFactory {
+
+	public static readonly ID = WebviewEditorInput.typeId;
+
+	public constructor(
+		@IWebviewEditorService private readonly _webviewService: IWebviewEditorService
+	) { }
+
+	public serialize(
+		input: WebviewEditorInput
+	): string {
+		// Has no state, don't revive
+		if (!input.state) {
+			return null;
+		}
+
+		// Only attempt revival if we may have a reviver
+		if (!this._webviewService.canRevive(input) && !input.reviver) {
+			return null;
+		}
+
+		const data: SerializedWebview = {
+			viewType: input.viewType,
+			title: input.getName(),
+			options: input.options,
+			extensionFolderPath: input.extensionFolderPath.fsPath,
+			state: input.state
+		};
+		return JSON.stringify(data);
+	}
+
+	public deserialize(
+		instantiationService: IInstantiationService,
+		serializedEditorInput: string
+	): WebviewEditorInput {
+		const data: SerializedWebview = JSON.parse(serializedEditorInput);
+		return this._webviewService.reviveWebview(data.viewType, data.title, data.state, data.options, data.extensionFolderPath);
+	}
+}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
new file mode 100644
index 00000000000..1d0f11200ca
--- /dev/null
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { Position } from 'vs/platform/editor/common/editor';
+import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import * as vscode from 'vscode';
+import { WebviewEditorInput } from './webviewEditorInput';
+
+export const IWebviewEditorService = createDecorator<IWebviewEditorService>('webviewEditorService');
+
+export interface IWebviewEditorService {
+	_serviceBrand: any;
+
+	createWebview(
+		viewType: string,
+		title: string,
+		column: Position,
+		options: WebviewInputOptions,
+		extensionFolderPath: string,
+		events: WebviewEvents
+	): WebviewEditorInput;
+
+	reviveWebview(
+		viewType: string,
+		title: string,
+		state: any,
+		options: WebviewInputOptions,
+		extensionFolderPath: string
+	): WebviewEditorInput;
+
+	revealWebview(
+		webview: WebviewEditorInput,
+		column: Position | undefined
+	): void;
+
+	registerReviver(
+		viewType: string,
+		reviver: WebviewReviver
+	): IDisposable;
+
+	canRevive(
+		input: WebviewEditorInput
+	): boolean;
+}
+
+export interface WebviewReviver {
+	canRevive(
+		webview: WebviewEditorInput
+	): boolean;
+
+	reviveWebview(
+		webview: WebviewEditorInput
+	): TPromise<void>;
+}
+
+export interface WebviewEvents {
+	onMessage?(message: any): void;
+	onDidChangePosition?(newPosition: Position): void;
+	onDispose?(): void;
+	onDidClickLink?(link: URI, options: vscode.WebviewOptions): void;
+}
+
+export interface WebviewInputOptions extends vscode.WebviewOptions, vscode.WebviewPanelOptions {
+	tryRestoreScrollPosition?: boolean;
+}
+
+export class WebviewEditorService implements IWebviewEditorService {
+	_serviceBrand: any;
+
+	private readonly _revivers = new Map<string, WebviewReviver>();
+	private _awaitingRevival: { input: WebviewEditorInput, resolve: (x: any) => void }[] = [];
+
+	constructor(
+		@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IEditorGroupService private readonly _editorGroupService: IEditorGroupService,
+	) { }
+
+	createWebview(
+		viewType: string,
+		title: string,
+		column: Position,
+		options: vscode.WebviewOptions,
+		extensionFolderPath: string,
+		events: WebviewEvents
+	): WebviewEditorInput {
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, {}, events, extensionFolderPath, undefined);
+		this._editorService.openEditor(webviewInput, { pinned: true }, column);
+		return webviewInput;
+	}
+
+	revealWebview(
+		webview: WebviewEditorInput,
+		column: Position | undefined
+	): void {
+		if (typeof column === 'undefined' || webview.position === column) {
+			this._editorService.openEditor(webview, { preserveFocus: false }, column);
+		} else {
+			this._editorGroupService.moveEditor(webview, webview.position, column, { preserveFocus: false });
+		}
+	}
+
+	reviveWebview(
+		viewType: string,
+		title: string,
+		state: any,
+		options: WebviewInputOptions,
+		extensionFolderPath: string
+	): WebviewEditorInput {
+		const webviewInput = this._instantiationService.createInstance(WebviewEditorInput, viewType, title, options, state, {}, extensionFolderPath, {
+			canRevive: (webview) => {
+				return true;
+			},
+			reviveWebview: async (webview: WebviewEditorInput): TPromise<void> => {
+				const didRevive = await this.tryRevive(webview);
+				if (didRevive) {
+					return;
+				}
+				// A reviver may not be registered yet. Put into queue and resolve promise when we can revive
+				let resolve: (value: void) => void;
+				const promise = new TPromise<void>(r => { resolve = r; });
+				this._awaitingRevival.push({ input: webview, resolve });
+				return promise;
+			}
+		});
+
+		return webviewInput;
+	}
+
+	registerReviver(
+		viewType: string,
+		reviver: WebviewReviver
+	): IDisposable {
+		if (this._revivers.has(viewType)) {
+			throw new Error(`Reviver for '${viewType}' already registered`);
+		}
+
+		this._revivers.set(viewType, reviver);
+
+		// Resolve any pending views
+		const toRevive = this._awaitingRevival.filter(x => x.input.viewType === viewType);
+		this._awaitingRevival = this._awaitingRevival.filter(x => x.input.viewType !== viewType);
+
+		for (const input of toRevive) {
+			reviver.reviveWebview(input.input).then(() => input.resolve(void 0));
+		}
+
+		return toDisposable(() => {
+			this._revivers.delete(viewType);
+		});
+	}
+
+	canRevive(
+		webview: WebviewEditorInput
+	): boolean {
+		const viewType = webview.viewType;
+		return this._revivers.has(viewType) && this._revivers.get(viewType).canRevive(webview);
+	}
+
+	private async tryRevive(
+		webview: WebviewEditorInput
+	): TPromise<boolean> {
+		const reviver = this._revivers.get(webview.viewType);
+		if (!reviver) {
+			return false;
+		}
+
+		await reviver.reviveWebview(webview);
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/html/electron-browser/webview.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
similarity index 96%
rename from src/vs/workbench/parts/html/electron-browser/webview.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
index d33a1c750f8..7a7836459dd 100644
--- a/src/vs/workbench/parts/html/electron-browser/webview.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
@@ -3,18 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import URI from 'vs/base/common/uri';
+import { addClass, addDisposableListener } from 'vs/base/browser/dom';
+import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Event, Emitter } from 'vs/base/common/event';
-import { addDisposableListener, addClass } from 'vs/base/browser/dom';
-import { editorBackground, editorForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
-import { ITheme, LIGHT, DARK, IThemeService } from 'vs/platform/theme/common/themeService';
-import { WebviewFindWidget } from './webviewFindWidget';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { nativeSep } from 'vs/base/common/paths';
 import { startsWith } from 'vs/base/common/strings';
+import URI from 'vs/base/common/uri';
+import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { editorBackground, editorForeground, textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
+import { DARK, ITheme, IThemeService, LIGHT } from 'vs/platform/theme/common/themeService';
+import { WebviewFindWidget } from './webviewFindWidget';
 
 export interface WebviewOptions {
 	readonly allowScripts?: boolean;
@@ -22,10 +22,10 @@ export interface WebviewOptions {
 	readonly svgWhiteList?: string[];
 	readonly enableWrappedPostMessage?: boolean;
 	readonly useSameOriginForRoot?: boolean;
-	readonly localResourceRoots?: URI[];
+	readonly localResourceRoots?: ReadonlyArray<URI>;
 }
 
-export class Webview {
+export class WebviewElement {
 	private readonly _webview: Electron.WebviewTag;
 	private _ready: Promise<this>;
 	private _disposables: IDisposable[] = [];
@@ -421,7 +421,7 @@ namespace ApiThemeClassName {
 function registerFileProtocol(
 	contents: Electron.WebContents,
 	protocol: string,
-	getRoots: () => URI[]
+	getRoots: () => ReadonlyArray<URI>
 ) {
 	contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => {
 		const requestPath = URI.parse(request.url).path;
@@ -432,7 +432,8 @@ function registerFileProtocol(
 				return;
 			}
 		}
-		callback({ error: 'Cannot load resource outside of protocol root' });
+		console.error('Webview: Cannot load resource outside of protocol root');
+		callback({ error: -10 /* ACCESS_DENIED: https://cs.chromium.org/chromium/src/net/base/net_error_list.h */ });
 	}, (error) => {
 		if (error) {
 			console.error('Failed to register protocol ' + protocol);
diff --git a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
similarity index 94%
rename from src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
rename to src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
index f304d2f56eb..13ca4b99ce4 100644
--- a/src/vs/workbench/parts/html/electron-browser/webviewFindWidget.ts
+++ b/src/vs/workbench/parts/webview/electron-browser/webviewFindWidget.ts
@@ -5,13 +5,13 @@
 
 import { SimpleFindWidget } from 'vs/editor/contrib/find/simpleFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { Webview } from './webview';
+import { WebviewElement } from './webviewElement';
 
 export class WebviewFindWidget extends SimpleFindWidget {
 
 	constructor(
 		@IContextViewService contextViewService: IContextViewService,
-		private readonly webview: Webview
+		private readonly webview: WebviewElement
 	) {
 		super(contextViewService);
 	}
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
index a2948effde7..c86b0a64c73 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts
@@ -25,11 +25,20 @@ export class GettingStarted implements IWorkbenchContribution {
 	) {
 		this.appName = product.nameLong;
 
-		/* do not open a browser when we run an extension or --skip-getting-started is provided */
-		if (product.welcomePage && !environmentService.isExtensionDevelopment && !environmentService.skipGettingStarted) {
-			this.welcomePageURL = product.welcomePage;
-			this.handleWelcome();
+		if (!product.welcomePage) {
+			return;
 		}
+
+		if (environmentService.skipGettingStarted) {
+			return;
+		}
+
+		if (environmentService.isExtensionDevelopment) {
+			return;
+		}
+
+		this.welcomePageURL = product.welcomePage;
+		this.handleWelcome();
 	}
 
 	private getUrl(telemetryInfo: ITelemetryInfo): string {
diff --git a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
index 072ca1fbb84..49a9d309bbf 100644
--- a/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
+++ b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/telemetryOptOut.ts
@@ -13,7 +13,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/
 import URI from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IWindowService } from 'vs/platform/windows/common/windows';
+import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
 
 export class TelemetryOptOut implements IWorkbenchContribution {
 
@@ -24,13 +24,17 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 		@IOpenerService openerService: IOpenerService,
 		@INotificationService notificationService: INotificationService,
 		@IWindowService windowService: IWindowService,
+		@IWindowsService windowsService: IWindowsService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
 		if (!product.telemetryOptOutUrl || storageService.get(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN)) {
 			return;
 		}
-		windowService.isFocused().then(focused => {
-			if (!focused) {
+		Promise.all([
+			windowService.isFocused(),
+			windowsService.getWindowCount()
+		]).then(([focused, count]) => {
+			if (!focused && count > 1) {
 				return null;
 			}
 			storageService.store(TelemetryOptOut.TELEMETRY_OPT_OUT_SHOWN, true);
@@ -39,8 +43,15 @@ export class TelemetryOptOut implements IWorkbenchContribution {
 			const privacyUrl = product.privacyStatementUrl || product.telemetryOptOutUrl;
 			const optOutNotice = localize('telemetryOptOut.optOutNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt out]({1}).", privacyUrl, optOutUrl);
 			const optInNotice = localize('telemetryOptOut.optInNotice', "Help improve VS Code by allowing Microsoft to collect usage data. Read our [privacy statement]({0}) and learn how to [opt in]({1}).", privacyUrl, optOutUrl);
-			return notificationService.prompt(Severity.Info, telemetryService.isOptedIn ? optOutNotice : optInNotice, [localize('telemetryOptOut.readMore', "Read More")])
-				.then(() => openerService.open(URI.parse(optOutUrl)));
+
+			notificationService.prompt(
+				Severity.Info,
+				telemetryService.isOptedIn ? optOutNotice : optInNotice,
+				[{
+					label: localize('telemetryOptOut.readMore', "Read More"),
+					run: () => openerService.open(URI.parse(optOutUrl))
+				}]
+			);
 		})
 			.then(null, onUnexpectedError);
 	}
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
index 50cf77eafad..bc843e58ab3 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css
@@ -97,8 +97,16 @@
 	left: 45px;
 }
 
+.monaco-workbench > .welcomeOverlay > .key.notifications {
+	position: absolute;
+	bottom: 25px;
+	right: 16px;
+}
+
 .monaco-workbench > .welcomeOverlay > .key.problems > .label,
-.monaco-workbench > .welcomeOverlay > .key.problems > .shortcut {
+.monaco-workbench > .welcomeOverlay > .key.problems > .shortcut,
+.monaco-workbench > .welcomeOverlay > .key.notifications > .label,
+.monaco-workbench > .welcomeOverlay > .key.notifications > .shortcut {
 	vertical-align: super;
 }
 
diff --git a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
index 75313c3e266..9e0118794aa 100644
--- a/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
+++ b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts
@@ -91,6 +91,13 @@ const keys: Key[] = [
 		label: localize('welcomeOverlay.commandPalette', "Find and run all commands"),
 		command: ShowAllCommandsAction.ID
 	},
+	{
+		id: 'notifications',
+		arrow: '&cudarrr;',
+		arrowLast: true,
+		label: localize('welcomeOverlay.notifications', "Show notifications"),
+		command: 'notifications.showList'
+	}
 ];
 
 const OVERLAY_VISIBLE = new RawContextKey<boolean>('interfaceOverviewVisible', false);
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
index c026520816d..27e73025e43 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.ts
@@ -57,7 +57,7 @@ export default () => `
 		.replace('{0}', `<span class="extensionPackList"></span>`)
 		.replace('{1}', `<a href="command:workbench.extensions.action.showLanguageExtensions">${escape(localize('welcomePage.moreExtensions', "more"))}</a>`)}
 						</span></button></li>
-						<li class="showRecommendedKeymapExtensions"><button role="group" data-href="command:workbench.extensions.action.showRecommendedKeymapExtensions"><h3 class="caption">${escape(localize('welcomePage.installKeymapDescription', "Install keyboard shortcuts"))}</h3> <span class="detail">${escape(localize('welcomePage.installKeymapExtension', "Install the keyboard shortcuts of {0} and {1}"))
+						<li class="showRecommendedKeymapExtensions"><button role="group" data-href="command:workbench.extensions.action.showRecommendedKeymapExtensions"><h3 class="caption">${escape(localize('welcomePage.installKeymapDescription', "Settings and keybindings"))}</h3> <span class="detail">${escape(localize('welcomePage.installKeymapExtension', "Install the settings and keyboard shortcuts of {0} and {1}"))
 		.replace('{0}', `<span class="keymapList"></span>`)
 		.replace('{1}', `<a href="command:workbench.extensions.action.showRecommendedKeymapExtensions">${escape(localize('welcomePage.others', "others"))}</a>`)}
 						</span></button></li>
diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
index 290a2b95ac3..21f183d2458 100644
--- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
+++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
@@ -427,9 +427,12 @@ class WelcomePage {
 						});
 				});
 
-			this.notificationService.prompt(Severity.Info, strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name), [localize('ok', "OK"), localize('details', "Details")]).then(choice => {
-				switch (choice) {
-					case 0 /* OK */:
+			this.notificationService.prompt(
+				Severity.Info,
+				strings.reloadAfterInstall.replace('{0}', extensionSuggestion.name),
+				[{
+					label: localize('ok', "OK"),
+					run: () => {
 						const messageDelay = TPromise.timeout(300);
 						messageDelay.then(() => {
 							this.notificationService.info(strings.installing.replace('{0}', extensionSuggestion.name));
@@ -491,8 +494,10 @@ class WelcomePage {
 								});
 								this.notificationService.error(err);
 							});
-						break;
-					case 1 /* Details */:
+					}
+				}, {
+					label: localize('details', "Details"),
+					run: () => {
 						/* __GDPR__FRAGMENT__
 							"WelcomePageDetails-1" : {
 								"from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -506,9 +511,9 @@ class WelcomePage {
 						this.extensionsWorkbenchService.queryGallery({ names: [extensionSuggestion.id] })
 							.then(result => this.extensionsWorkbenchService.open(result.firstPage[0]))
 							.then(null, onUnexpectedError);
-						break;
-				}
-			});
+					}
+				}]
+			);
 		}).then(null, err => {
 			/* __GDPR__FRAGMENT__
 				"WelcomePageInstalled-6" : {
diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
index cf45387bede..8198c3ea31c 100644
--- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
+++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
@@ -11,9 +11,8 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import * as strings from 'vs/base/common/strings';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { $, Dimension, Builder } from 'vs/base/browser/builder';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { EditorOptions } from 'vs/workbench/common/editor';
+import { EditorOptions, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
@@ -40,6 +39,7 @@ import { UILabelProvider } from 'vs/base/common/keybindingLabels';
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { deepClone } from 'vs/base/common/objects';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { Dimension, size } from 'vs/base/browser/dom';
 
 export const WALK_THROUGH_FOCUS = new RawContextKey<boolean>('interactivePlaygroundFocus', false);
 
@@ -55,12 +55,6 @@ interface IWalkThroughEditorViewState {
 	viewState: IViewState;
 }
 
-interface IWalkThroughEditorViewStates {
-	0?: IWalkThroughEditorViewState;
-	1?: IWalkThroughEditorViewState;
-	2?: IWalkThroughEditorViewState;
-}
-
 class WalkThroughCodeEditor extends CodeEditor {
 
 	constructor(
@@ -71,9 +65,10 @@ class WalkThroughCodeEditor extends CodeEditor {
 		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@ICommandService commandService: ICommandService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@INotificationService notificationService: INotificationService,
 	) {
-		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, themeService);
+		super(domElement, options, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService);
 	}
 
 	getTelemetryData() {
@@ -91,6 +86,7 @@ export class WalkThroughPart extends BaseEditor {
 	private scrollbar: DomScrollableElement;
 	private editorFocus: IContextKey<boolean>;
 	private size: Dimension;
+	private editorViewStateMemento: EditorViewStateMemento<IWalkThroughEditorViewState>;
 
 	constructor(
 		@ITelemetryService telemetryService: ITelemetryService,
@@ -99,18 +95,17 @@ export class WalkThroughPart extends BaseEditor {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IOpenerService private openerService: IOpenerService,
 		@IKeybindingService private keybindingService: IKeybindingService,
-		@IStorageService private storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@INotificationService private notificationService: INotificationService
 	) {
 		super(WalkThroughPart.ID, telemetryService, themeService);
 		this.editorFocus = WALK_THROUGH_FOCUS.bindTo(this.contextKeyService);
+		this.editorViewStateMemento = new EditorViewStateMemento<IWalkThroughEditorViewState>(this.getMemento(storageService, Scope.WORKSPACE), WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY);
 	}
 
-	createEditor(parent: Builder): void {
-		const container = parent.getHTMLElement();
-
+	createEditor(container: HTMLElement): void {
 		this.content = document.createElement('div');
 		this.content.tabIndex = 0;
 		this.content.style.outlineStyle = 'none';
@@ -214,9 +209,9 @@ export class WalkThroughPart extends BaseEditor {
 		return uri.with({ query: JSON.stringify(query) });
 	}
 
-	layout(size: Dimension): void {
-		this.size = size;
-		$(this.content).style({ height: `${size.height}px`, width: `${size.width}px` });
+	layout(dimension: Dimension): void {
+		this.size = dimension;
+		size(this.content, dimension.width, dimension.height);
 		this.updateSizeClasses();
 		this.contentDisposables.forEach(disposable => {
 			if (disposable instanceof CodeEditor) {
@@ -281,7 +276,7 @@ export class WalkThroughPart extends BaseEditor {
 		}
 
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 
 		this.contentDisposables = dispose(this.contentDisposables);
@@ -302,7 +297,7 @@ export class WalkThroughPart extends BaseEditor {
 						input.onReady(this.content.firstElementChild as HTMLElement);
 					}
 					this.scrollbar.scanDomNode();
-					this.loadTextEditorViewState(input.getResource());
+					this.loadTextEditorViewState(input);
 					this.updatedScrollPosition();
 					return;
 				}
@@ -432,7 +427,7 @@ export class WalkThroughPart extends BaseEditor {
 					input.onReady(innerContent);
 				}
 				this.scrollbar.scanDomNode();
-				this.loadTextEditorViewState(input.getResource());
+				this.loadTextEditorViewState(input);
 				this.updatedScrollPosition();
 			});
 	}
@@ -496,61 +491,46 @@ export class WalkThroughPart extends BaseEditor {
 		});
 	}
 
-	private saveTextEditorViewState(resource: URI): void {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		let editorViewStateMemento: { [key: string]: { [position: number]: IWalkThroughEditorViewState } } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (!editorViewStateMemento) {
-			editorViewStateMemento = Object.create(null);
-			memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY] = editorViewStateMemento;
-		}
-
+	private saveTextEditorViewState(input: WalkThroughInput): void {
 		const scrollPosition = this.scrollbar.getScrollPosition();
-		const editorViewState: IWalkThroughEditorViewState = {
+
+		this.editorViewStateMemento.saveState(input, this.position, {
 			viewState: {
 				scrollTop: scrollPosition.scrollTop,
 				scrollLeft: scrollPosition.scrollLeft
 			}
-		};
-
-		let fileViewState = editorViewStateMemento[resource.toString()];
-		if (!fileViewState) {
-			fileViewState = Object.create(null);
-			editorViewStateMemento[resource.toString()] = fileViewState;
-		}
-
-		if (typeof this.position === 'number') {
-			fileViewState[this.position] = editorViewState;
-		}
+		});
 	}
 
-	private loadTextEditorViewState(resource: URI) {
-		const memento = this.getMemento(this.storageService, Scope.WORKSPACE);
-		const editorViewStateMemento: { [key: string]: IWalkThroughEditorViewStates } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY];
-		if (editorViewStateMemento) {
-			const fileViewState = editorViewStateMemento[resource.toString()];
-			if (fileViewState) {
-				const state = fileViewState[this.position];
-				if (state) {
-					this.scrollbar.setScrollPosition(state.viewState);
-				}
-			}
+	private loadTextEditorViewState(input: WalkThroughInput) {
+		const state = this.editorViewStateMemento.loadState(input, this.position);
+		if (state) {
+			this.scrollbar.setScrollPosition(state.viewState);
 		}
 	}
 
 	public clearInput(): void {
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 		super.clearInput();
 	}
 
 	public shutdown(): void {
 		if (this.input instanceof WalkThroughInput) {
-			this.saveTextEditorViewState(this.input.getResource());
+			this.saveTextEditorViewState(this.input);
 		}
 		super.shutdown();
 	}
 
+	protected saveMemento(): void {
+
+		// ensure to first save our view state memento
+		this.editorViewStateMemento.save();
+
+		super.saveMemento();
+	}
+
 	dispose(): void {
 		this.editorFocus.reset();
 		this.contentDisposables = dispose(this.contentDisposables);
diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
similarity index 97%
rename from src/vs/workbench/services/backup/test/node/backupFileService.test.ts
rename to src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
index aa59da270d7..3af98297733 100644
--- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts
@@ -14,9 +14,10 @@ import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
 import Uri from 'vs/base/common/uri';
 import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService';
-import { FileService } from 'vs/workbench/services/files/node/fileService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel';
-import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
+import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
@@ -38,7 +39,7 @@ const untitledBackupPath = path.join(workspaceBackupPath, 'untitled', crypto.cre
 
 class TestBackupFileService extends BackupFileService {
 	constructor(workspace: Uri, backupHome: string, workspacesJsonPath: string) {
-		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
+		const fileService = new FileService(new TestContextService(new Workspace(workspace.fsPath, workspace.fsPath, toWorkspaceFolders([{ path: workspace.fsPath }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
 
 		super(workspaceBackupPath, fileService);
 	}
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index 3bdae770e7a..344bfa78905 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -13,10 +13,6 @@ export const FOLDER_SETTINGS_PATH = `${FOLDER_CONFIG_FOLDER_NAME}/${FOLDER_SETTI
 export const IWorkspaceConfigurationService = createDecorator<IWorkspaceConfigurationService>('configurationService');
 
 export interface IWorkspaceConfigurationService extends IConfigurationService {
-	/**
-	 * Returns untrusted configuration keys for the current workspace.
-	 */
-	getUnsupportedWorkspaceKeys(): string[];
 }
 
 export const defaultSettingsSchemaId = 'vscode://schemas/settings/default';
@@ -29,5 +25,5 @@ export const TASKS_CONFIGURATION_KEY = 'tasks';
 export const LAUNCH_CONFIGURATION_KEY = 'launch';
 
 export const WORKSPACE_STANDALONE_CONFIGURATIONS = Object.create(null);
-WORKSPACE_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/tasks.json`;
-WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/launch.json`;
+WORKSPACE_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/${TASKS_CONFIGURATION_KEY}.json`;
+WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/${LAUNCH_CONFIGURATION_KEY}.json`;
diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index 8ca3d17b3da..ddc4e0db248 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -32,13 +32,15 @@ const configurationEntrySchema: IJSONSchema = {
 						type: 'object',
 						properties: {
 							isExecutable: {
-								type: 'boolean'
+								type: 'boolean',
+								deprecationMessage: 'This property is deprecated. Instead use `scope` property and set it to `application` value.'
 							},
 							scope: {
 								type: 'string',
-								enum: ['window', 'resource'],
+								enum: ['application', 'window', 'resource'],
 								default: 'window',
 								enumDescriptions: [
+									nls.localize('scope.application.description', "Application specific configuration, which can be configured only in User settings."),
 									nls.localize('scope.window.description', "Window specific configuration, which can be configured in the User or Workspace settings."),
 									nls.localize('scope.resource.description', "Resource specific configuration, which can be configured in the User, Workspace or Folder settings.")
 								],
@@ -130,7 +132,17 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
 		for (let key in properties) {
 			const message = validateProperty(key);
 			const propertyConfiguration = configuration.properties[key];
-			propertyConfiguration.scope = propertyConfiguration.scope && propertyConfiguration.scope.toString() === 'resource' ? ConfigurationScope.RESOURCE : ConfigurationScope.WINDOW;
+			if (propertyConfiguration.scope) {
+				if (propertyConfiguration.scope.toString() === 'application') {
+					propertyConfiguration.scope = ConfigurationScope.APPLICATION;
+				} else if (propertyConfiguration.scope.toString() === 'resource') {
+					propertyConfiguration.scope = ConfigurationScope.RESOURCE;
+				} else {
+					propertyConfiguration.scope = ConfigurationScope.WINDOW;
+				}
+			} else {
+				propertyConfiguration.scope = ConfigurationScope.WINDOW;
+			}
 			propertyConfiguration.notMultiRootAdopted = !(extension.description.isBuiltin || (Array.isArray(extension.description.keywords) && extension.description.keywords.indexOf('multi-root ready') !== -1));
 			if (message) {
 				extension.collector.warn(message);
diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 27be593edfe..90def0b9e15 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -5,30 +5,15 @@
 'use strict';
 
 import { equals } from 'vs/base/common/objects';
-import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel, IConfigurationOverrides, IOverrides } from 'vs/platform/configuration/common/configuration';
+import { compare, toValuesTree, IConfigurationChangeEvent, ConfigurationTarget, IConfigurationModel, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 import { Configuration as BaseConfiguration, ConfigurationModelParser, ConfigurationChangeEvent, ConfigurationModel, AbstractConfigurationChangeEvent } from 'vs/platform/configuration/common/configurationModels';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IConfigurationRegistry, IConfigurationPropertySchema, Extensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
-import { StrictResourceMap } from 'vs/base/common/map';
+import { ResourceMap } from 'vs/base/common/map';
 import URI from 'vs/base/common/uri';
 
-export class SettingsModel extends ConfigurationModel {
-
-	private _unsupportedKeys: string[];
-
-	constructor(contents: any, keys: string[], overrides: IOverrides[], unsupportedKeys: string[]) {
-		super(contents, keys, overrides);
-		this._unsupportedKeys = unsupportedKeys;
-	}
-
-	public get unsupportedKeys(): string[] {
-		return this._unsupportedKeys;
-	}
-
-}
-
 export class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
 
 	private _folders: IStoredWorkspaceFolder[] = [];
@@ -37,7 +22,7 @@ export class WorkspaceConfigurationModelParser extends ConfigurationModelParser
 
 	constructor(name: string) {
 		super(name);
-		this._settingsModelParser = new FolderSettingsModelParser(name);
+		this._settingsModelParser = new FolderSettingsModelParser(name, [ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE]);
 		this._launchModel = new ConfigurationModel();
 	}
 
@@ -45,8 +30,8 @@ export class WorkspaceConfigurationModelParser extends ConfigurationModelParser
 		return this._folders;
 	}
 
-	get settingsModel(): SettingsModel {
-		return this._settingsModelParser.settingsModel;
+	get settingsModel(): ConfigurationModel {
+		return this._settingsModelParser.configurationModel;
 	}
 
 	get launchModel(): ConfigurationModel {
@@ -96,9 +81,9 @@ export class StandaloneConfigurationModelParser extends ConfigurationModelParser
 export class FolderSettingsModelParser extends ConfigurationModelParser {
 
 	private _raw: any;
-	private _settingsModel: SettingsModel;
+	private _settingsModel: ConfigurationModel;
 
-	constructor(name: string, private configurationScope?: ConfigurationScope) {
+	constructor(name: string, private scopes: ConfigurationScope[]) {
 		super(name);
 	}
 
@@ -108,11 +93,7 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	}
 
 	get configurationModel(): ConfigurationModel {
-		return this._settingsModel || new SettingsModel({}, [], [], []);
-	}
-
-	get settingsModel(): SettingsModel {
-		return <SettingsModel>this.configurationModel;
+		return this._settingsModel || new ConfigurationModel();
 	}
 
 	reprocess(): void {
@@ -120,34 +101,22 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	}
 
 	private parseWorkspaceSettings(rawSettings: any): void {
-		const unsupportedKeys = [];
 		const rawWorkspaceSettings = {};
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
 		for (let key in rawSettings) {
-			if (this.isNotExecutable(key, configurationProperties)) {
-				if (this.configurationScope === void 0 || this.getScope(key, configurationProperties) === this.configurationScope) {
-					rawWorkspaceSettings[key] = rawSettings[key];
-				}
-			} else {
-				unsupportedKeys.push(key);
+			const scope = this.getScope(key, configurationProperties);
+			if (this.scopes.indexOf(scope) !== -1) {
+				rawWorkspaceSettings[key] = rawSettings[key];
 			}
 		}
 		const configurationModel = this.parseRaw(rawWorkspaceSettings);
-		this._settingsModel = new SettingsModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides, unsupportedKeys);
+		this._settingsModel = new ConfigurationModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides);
 	}
 
 	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {
 		const propertySchema = configurationProperties[key];
 		return propertySchema ? propertySchema.scope : ConfigurationScope.WINDOW;
 	}
-
-	private isNotExecutable(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): boolean {
-		const propertySchema = configurationProperties[key];
-		if (!propertySchema) {
-			return true; // Unknown propertis are ignored from checks
-		}
-		return !propertySchema.isExecutable;
-	}
 }
 
 export class Configuration extends BaseConfiguration {
@@ -156,9 +125,9 @@ export class Configuration extends BaseConfiguration {
 		defaults: ConfigurationModel,
 		user: ConfigurationModel,
 		workspaceConfiguration: ConfigurationModel,
-		folders: StrictResourceMap<ConfigurationModel>,
+		folders: ResourceMap<ConfigurationModel>,
 		memoryConfiguration: ConfigurationModel,
-		memoryConfigurationByResource: StrictResourceMap<ConfigurationModel>,
+		memoryConfigurationByResource: ResourceMap<ConfigurationModel>,
 		private readonly _workspace: Workspace) {
 		super(defaults, user, workspaceConfiguration, folders, memoryConfiguration, memoryConfigurationByResource);
 	}
@@ -266,8 +235,8 @@ export class AllKeysConfigurationChangeEvent extends AbstractConfigurationChange
 		return this._changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
-		return new StrictResourceMap();
+	get changedConfigurationByResource(): ResourceMap<IConfigurationModel> {
+		return new ResourceMap();
 	}
 
 	get affectedKeys(): string[] {
@@ -287,7 +256,7 @@ export class WorkspaceConfigurationChangeEvent implements IConfigurationChangeEv
 		return this.configurationChangeEvent.changedConfiguration;
 	}
 
-	get changedConfigurationByResource(): StrictResourceMap<IConfigurationModel> {
+	get changedConfigurationByResource(): ResourceMap<IConfigurationModel> {
 		return this.configurationChangeEvent.changedConfigurationByResource;
 	}
 
@@ -317,4 +286,4 @@ export class WorkspaceConfigurationChangeEvent implements IConfigurationChangeEv
 
 		return false;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 70082cd28ba..b763c271181 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -4,74 +4,31 @@
  *--------------------------------------------------------------------------------------------*/
 
 import URI from 'vs/base/common/uri';
+import { createHash } from 'crypto';
 import * as paths from 'vs/base/common/paths';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Event, Emitter } from 'vs/base/common/event';
-import { readFile } from 'vs/base/node/pfs';
+import * as pfs from 'vs/base/node/pfs';
 import * as errors from 'vs/base/common/errors';
 import * as collections from 'vs/base/common/collections';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { RunOnceScheduler } from 'vs/base/common/async';
-import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
+import { FileChangeType, FileChangesEvent, IContent, IFileService } from 'vs/platform/files/common/files';
 import { isLinux } from 'vs/base/common/platform';
 import { ConfigWatcher } from 'vs/base/node/config';
-import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
+import { ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { WorkspaceConfigurationModelParser, FolderSettingsModelParser, StandaloneConfigurationModelParser } from 'vs/workbench/services/configuration/common/configurationModels';
-import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY } from 'vs/workbench/services/configuration/common/configuration';
+import { FOLDER_SETTINGS_PATH, TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY } from 'vs/workbench/services/configuration/common/configuration';
 import { IStoredWorkspace, IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import * as extfs from 'vs/base/node/extfs';
 import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService';
-import { WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import { WorkbenchState, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { relative } from 'path';
 import { equals } from 'vs/base/common/objects';
-
-// node.hs helper functions
-
-interface IStat {
-	resource: URI;
-	isDirectory?: boolean;
-	children?: { resource: URI; }[];
-}
-
-interface IContent {
-	resource: URI;
-	value: string;
-}
-
-function resolveContents(resources: URI[]): TPromise<IContent[]> {
-	const contents: IContent[] = [];
-
-	return TPromise.join(resources.map(resource => {
-		return resolveContent(resource).then(content => {
-			contents.push(content);
-		});
-	})).then(() => contents);
-}
-
-function resolveContent(resource: URI): TPromise<IContent> {
-	return readFile(resource.fsPath).then(contents => ({ resource, value: contents.toString() }));
-}
-
-function resolveStat(resource: URI): TPromise<IStat> {
-	return new TPromise<IStat>((c, e) => {
-		extfs.readdir(resource.fsPath, (error, children) => {
-			if (error) {
-				if ((<any>error).code === 'ENOTDIR') {
-					c({ resource });
-				} else {
-					e(error);
-				}
-			} else {
-				c({
-					resource,
-					isDirectory: true,
-					children: children.map(child => { return { resource: URI.file(paths.join(resource.fsPath, child)) }; })
-				});
-			}
-		});
-	});
-}
+import { Schemas } from 'vs/base/common/network';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IConfigurationModel } from 'vs/platform/configuration/common/configuration';
 
 export class WorkspaceConfiguration extends Disposable {
 
@@ -135,10 +92,6 @@ export class WorkspaceConfiguration extends Disposable {
 		return this._cache;
 	}
 
-	getUnsupportedKeys(): string[] {
-		return this._workspaceConfigurationModelParser.settingsModel.unsupportedKeys;
-	}
-
 	reprocessWorkspaceSettings(): ConfigurationModel {
 		this._workspaceConfigurationModelParser.reprocessWorkspaceSettings();
 		this.consolidate();
@@ -170,108 +123,192 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 }
 
-export class FolderConfiguration extends Disposable {
+function isFolderConfigurationFile(resource: URI): boolean {
+	const name = paths.basename(resource.path);
+	return [`${FOLDER_SETTINGS_NAME}.json`, `${TASKS_CONFIGURATION_KEY}.json`, `${LAUNCH_CONFIGURATION_KEY}.json`].some(p => p === name);// only workspace config files
+}
 
-	private static readonly RELOAD_CONFIGURATION_DELAY = 50;
+export interface IFolderConfiguration {
+	readonly onDidChange: Event<void>;
+	readonly loaded: boolean;
+	loadConfiguration(): TPromise<ConfigurationModel>;
+	reprocess(): ConfigurationModel;
+	dispose(): void;
+}
 
-	private bulkFetchFromWorkspacePromise: TPromise;
-	private workspaceFilePathToConfiguration: { [relativeWorkspacePath: string]: TPromise<ConfigurationModelParser> };
+export abstract class AbstractFolderConfiguration extends Disposable implements IFolderConfiguration {
 
 	private _folderSettingsModelParser: FolderSettingsModelParser;
-	private _standAloneConfigurations: ConfigurationModel[] = [];
-	private _cache: ConfigurationModel = new ConfigurationModel();
+	private _standAloneConfigurations: ConfigurationModel[];
+	private _cache: ConfigurationModel;
+	private _loaded: boolean = false;
 
-	private reloadConfigurationScheduler: RunOnceScheduler;
-	private readonly reloadConfigurationEventEmitter: Emitter<ConfigurationModel> = new Emitter<ConfigurationModel>();
+	protected readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
 
-	constructor(private folder: URI, private configFolderRelativePath: string, workbenchState: WorkbenchState) {
+	constructor(protected readonly folder: URI, workbenchState: WorkbenchState, from?: AbstractFolderConfiguration) {
 		super();
 
-		this._folderSettingsModelParser = new FolderSettingsModelParser(FOLDER_SETTINGS_PATH, WorkbenchState.WORKSPACE === workbenchState ? ConfigurationScope.RESOURCE : void 0);
-		this.workspaceFilePathToConfiguration = Object.create(null);
-		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this.loadConfiguration().then(configuration => this.reloadConfigurationEventEmitter.fire(configuration), errors.onUnexpectedError), FolderConfiguration.RELOAD_CONFIGURATION_DELAY));
+		this._folderSettingsModelParser = from ? from._folderSettingsModelParser : new FolderSettingsModelParser(FOLDER_SETTINGS_PATH, WorkbenchState.WORKSPACE === workbenchState ? [ConfigurationScope.RESOURCE] : [ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE]);
+		this._standAloneConfigurations = from ? from._standAloneConfigurations : [];
+		this._cache = from ? from._cache : new ConfigurationModel();
+	}
+
+	get loaded(): boolean {
+		return this._loaded;
 	}
 
 	loadConfiguration(): TPromise<ConfigurationModel> {
-		// Load workspace locals
-		return this.loadWorkspaceConfigFiles().then(workspaceConfigFiles => {
-			this._standAloneConfigurations = Object.keys(workspaceConfigFiles).filter(key => key !== FOLDER_SETTINGS_PATH).map(key => <ConfigurationModel>workspaceConfigFiles[key].configurationModel);
-			// Consolidate (support *.json files in the workspace settings folder)
-			this.consolidate();
-			return this._cache;
-		});
+		return this.loadFolderConfigurationContents()
+			.then((contents) => {
+				this.parseContents(contents);
+				// Consolidate (support *.json files in the workspace settings folder)
+				this.consolidate();
+				this._loaded = true;
+				return this._cache;
+			});
 	}
 
 	reprocess(): ConfigurationModel {
-		const oldContents = this._folderSettingsModelParser.settingsModel.contents;
+		const oldContents = this._folderSettingsModelParser.configurationModel.contents;
 		this._folderSettingsModelParser.reprocess();
-		if (!equals(oldContents, this._folderSettingsModelParser.settingsModel.contents)) {
+		if (!equals(oldContents, this._folderSettingsModelParser.configurationModel.contents)) {
 			this.consolidate();
 		}
 		return this._cache;
 	}
 
-	getUnsupportedKeys(): string[] {
-		return this._folderSettingsModelParser.settingsModel.unsupportedKeys;
-	}
-
 	private consolidate(): void {
-		this._cache = this._folderSettingsModelParser.settingsModel.merge(...this._standAloneConfigurations);
+		this._cache = this._folderSettingsModelParser.configurationModel.merge(...this._standAloneConfigurations);
 	}
 
-	private loadWorkspaceConfigFiles(): TPromise<{ [relativeWorkspacePath: string]: ConfigurationModelParser }> {
-		// once: when invoked for the first time we fetch json files that contribute settings
-		if (!this.bulkFetchFromWorkspacePromise) {
-			this.bulkFetchFromWorkspacePromise = resolveStat(this.toResource(this.configFolderRelativePath)).then(stat => {
-				if (!stat.isDirectory) {
-					return TPromise.as([]);
+	private parseContents(contents: { resource: URI, value: string }[]): void {
+		this._standAloneConfigurations = [];
+		for (const content of contents) {
+			const name = paths.basename(content.resource.path);
+			if (name === `${FOLDER_SETTINGS_NAME}.json`) {
+				this._folderSettingsModelParser.parse(content.value);
+			} else {
+				const matches = /([^\.]*)*\.json/.exec(name);
+				if (matches && matches[1]) {
+					const standAloneConfigurationModelParser = new StandaloneConfigurationModelParser(content.resource.toString(), matches[1]);
+					standAloneConfigurationModelParser.parse(content.value);
+					this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel);
 				}
+			}
+		}
+	}
 
-				return resolveContents(stat.children.filter(stat => {
-					const isJson = paths.extname(stat.resource.fsPath) === '.json';
-					if (!isJson) {
-						return false; // only JSON files
+	protected abstract loadFolderConfigurationContents(): TPromise<{ resource: URI, value: string }[]>;
+}
+
+export class NodeBasedFolderConfiguration extends AbstractFolderConfiguration {
+
+	private readonly folderConfigurationPath: URI;
+
+	constructor(folder: URI, configFolderRelativePath: string, workbenchState: WorkbenchState) {
+		super(folder, workbenchState);
+		this.folderConfigurationPath = URI.file(paths.join(this.folder.fsPath, configFolderRelativePath));
+	}
+
+	protected loadFolderConfigurationContents(): TPromise<{ resource: URI, value: string }[]> {
+		return this.resolveStat(this.folderConfigurationPath).then(stat => {
+			if (!stat.isDirectory) {
+				return TPromise.as([]);
+			}
+			return this.resolveContents(stat.children.filter(stat => isFolderConfigurationFile(stat.resource))
+				.map(stat => stat.resource));
+		}, err => [] /* never fail this call */)
+			.then(null, errors.onUnexpectedError);
+	}
+
+	private resolveContents(resources: URI[]): TPromise<{ resource: URI, value: string }[]> {
+		return TPromise.join(resources.map(resource =>
+			pfs.readFile(resource.fsPath)
+				.then(contents => ({ resource, value: contents.toString() }))));
+	}
+
+	private resolveStat(resource: URI): TPromise<{ resource: URI, isDirectory?: boolean, children?: { resource: URI; }[] }> {
+		return new TPromise<{ resource: URI, isDirectory?: boolean, children?: { resource: URI; }[] }>((c, e) => {
+			extfs.readdir(resource.fsPath, (error, children) => {
+				if (error) {
+					if ((<any>error).code === 'ENOTDIR') {
+						c({ resource });
+					} else {
+						e(error);
 					}
+				} else {
+					c({
+						resource,
+						isDirectory: true,
+						children: children.map(child => { return { resource: URI.file(paths.join(resource.fsPath, child)) }; })
+					});
+				}
+			});
+		});
+	}
+}
 
-					return this.isWorkspaceConfigurationFile(this.toFolderRelativePath(stat.resource)); // only workspace config files
-				}).map(stat => stat.resource));
-			}, err => [] /* never fail this call */)
-				.then((contents: IContent[]) => {
-					contents.forEach(content => this.workspaceFilePathToConfiguration[this.toFolderRelativePath(content.resource)] = TPromise.as(this.createConfigurationModelParser(content)));
-				}, errors.onUnexpectedError);
+export class FileServiceBasedFolderConfiguration extends AbstractFolderConfiguration {
+
+	private bulkContentFetchromise: TPromise<any>;
+	private workspaceFilePathToConfiguration: { [relativeWorkspacePath: string]: TPromise<IContent> };
+	private reloadConfigurationScheduler: RunOnceScheduler;
+	private readonly folderConfigurationPath: URI;
+
+	constructor(folder: URI, private configFolderRelativePath: string, workbenchState: WorkbenchState, private fileService: IFileService, from?: AbstractFolderConfiguration) {
+		super(folder, workbenchState, from);
+		this.folderConfigurationPath = folder.with({ path: paths.join(this.folder.path, configFolderRelativePath) });
+		this.workspaceFilePathToConfiguration = Object.create(null);
+		this.reloadConfigurationScheduler = this._register(new RunOnceScheduler(() => this._onDidChange.fire(), 50));
+		this._register(fileService.onFileChanges(e => this.handleWorkspaceFileEvents(e)));
+	}
+
+	protected loadFolderConfigurationContents(): TPromise<{ resource: URI, value: string }[]> {
+		// once: when invoked for the first time we fetch json files that contribute settings
+		if (!this.bulkContentFetchromise) {
+			this.bulkContentFetchromise = this.fileService.resolveFile(this.folderConfigurationPath)
+				.then(stat => {
+					if (stat.isDirectory && stat.children) {
+						stat.children
+							.filter(child => isFolderConfigurationFile(child.resource))
+							.forEach(child => this.workspaceFilePathToConfiguration[this.toFolderRelativePath(child.resource)] = this.fileService.resolveContent(child.resource).then(null, errors.onUnexpectedError));
+					}
+				}).then(null, err => [] /* never fail this call */);
 		}
 
 		// on change: join on *all* configuration file promises so that we can merge them into a single configuration object. this
 		// happens whenever a config file changes, is deleted, or added
-		return this.bulkFetchFromWorkspacePromise.then(() => TPromise.join(this.workspaceFilePathToConfiguration));
+		return this.bulkContentFetchromise.then(() => TPromise.join(this.workspaceFilePathToConfiguration).then(result => collections.values(result)));
 	}
 
-	public handleWorkspaceFileEvents(event: FileChangesEvent): TPromise<ConfigurationModel> {
+	private handleWorkspaceFileEvents(event: FileChangesEvent): void {
 		const events = event.changes;
 		let affectedByChanges = false;
 
 		// Find changes that affect workspace configuration files
 		for (let i = 0, len = events.length; i < len; i++) {
 			const resource = events[i].resource;
-			const isJson = paths.extname(resource.fsPath) === '.json';
-			const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.basename(resource.fsPath) === this.configFolderRelativePath);
+			const folderRelativePath = this.toFolderRelativePath(resource);
+			if (!folderRelativePath) {
+				continue; // event is not inside folder
+			}
+
+			const basename = paths.basename(resource.path);
+			const isJson = paths.extname(basename) === '.json';
+			const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && basename === this.configFolderRelativePath);
 			if (!isJson && !isDeletedSettingsFolder) {
 				continue; // only JSON files or the actual settings folder
 			}
 
-			const workspacePath = this.toFolderRelativePath(resource);
-			if (!workspacePath) {
-				continue; // event is not inside workspace
-			}
-
 			// Handle case where ".vscode" got deleted
-			if (workspacePath === this.configFolderRelativePath && events[i].type === FileChangeType.DELETED) {
+			if (isDeletedSettingsFolder) {
 				this.workspaceFilePathToConfiguration = Object.create(null);
 				affectedByChanges = true;
 			}
 
 			// only valid workspace config files
-			if (!this.isWorkspaceConfigurationFile(workspacePath)) {
+			if (!isFolderConfigurationFile(resource)) {
 				continue;
 			}
 
@@ -279,72 +316,176 @@ export class FolderConfiguration extends Disposable {
 			// remove promises for delete events
 			switch (events[i].type) {
 				case FileChangeType.DELETED:
-					affectedByChanges = collections.remove(this.workspaceFilePathToConfiguration, workspacePath);
+					affectedByChanges = collections.remove(this.workspaceFilePathToConfiguration, folderRelativePath);
 					break;
 				case FileChangeType.UPDATED:
 				case FileChangeType.ADDED:
-					this.workspaceFilePathToConfiguration[workspacePath] = resolveContent(resource).then(content => this.createConfigurationModelParser(content), errors.onUnexpectedError);
+					this.workspaceFilePathToConfiguration[folderRelativePath] = this.fileService.resolveContent(resource).then(null, errors.onUnexpectedError);
 					affectedByChanges = true;
 			}
 		}
 
-		if (!affectedByChanges) {
-			return TPromise.as(null);
+		if (affectedByChanges) {
+			this.reloadConfigurationScheduler.schedule();
 		}
+	}
 
-		return new TPromise((c, e) => {
-			let disposable = this.reloadConfigurationEventEmitter.event(configuration => {
-				disposable.dispose();
-				c(configuration);
-			});
-			// trigger reload of the configuration if we are affected by changes
-			if (!this.reloadConfigurationScheduler.isScheduled()) {
-				this.reloadConfigurationScheduler.schedule();
+	private toFolderRelativePath(resource: URI): string {
+		if (resource.scheme === Schemas.file) {
+			if (paths.isEqualOrParent(resource.fsPath, this.folder.fsPath, !isLinux /* ignorecase */)) {
+				return paths.normalize(relative(this.folder.fsPath, resource.fsPath));
 			}
+		} else {
+			if (paths.isEqualOrParent(resource.path, this.folder.path, true /* ignorecase */)) {
+				return paths.normalize(relative(this.folder.path, resource.path));
+			}
+		}
+		return null;
+	}
+}
+
+export class CachedFolderConfiguration extends Disposable implements IFolderConfiguration {
+
+	private readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+
+	private readonly cachedFolderPath: string;
+	private readonly cachedConfigurationPath: string;
+	private configurationModel: ConfigurationModel;
+
+	loaded: boolean = false;
+
+	constructor(
+		folder: URI,
+		configFolderRelativePath: string,
+		environmentService: IEnvironmentService) {
+		super();
+		this.cachedFolderPath = paths.join(environmentService.appSettingsHome, createHash('md5').update(paths.join(folder.path, configFolderRelativePath)).digest('hex'));
+		this.cachedConfigurationPath = paths.join(this.cachedFolderPath, 'configuration.json');
+		this.configurationModel = new ConfigurationModel();
+	}
+
+	loadConfiguration(): TPromise<ConfigurationModel> {
+		return pfs.readFile(this.cachedConfigurationPath)
+			.then(contents => {
+				const parsed: IConfigurationModel = JSON.parse(contents.toString());
+				this.configurationModel = new ConfigurationModel(parsed.contents, parsed.keys, parsed.overrides);
+				this.loaded = true;
+				return this.configurationModel;
+			}, () => this.configurationModel);
+	}
+
+	updateConfiguration(configurationModel: ConfigurationModel): TPromise<void> {
+		const raw = JSON.stringify(configurationModel.toJSON());
+		return this.createCachedFolder().then(created => {
+			if (created) {
+				return configurationModel.keys.length ? pfs.writeFile(this.cachedConfigurationPath, raw) : pfs.rimraf(this.cachedFolderPath);
+			}
+			return null;
 		});
 	}
 
-	private createConfigurationModelParser(content: IContent): ConfigurationModelParser {
-		const path = this.toFolderRelativePath(content.resource);
-		if (path === FOLDER_SETTINGS_PATH) {
-			this._folderSettingsModelParser.parse(content.value);
-			return this._folderSettingsModelParser;
-		} else {
-			const matches = /\/([^\.]*)*\.json/.exec(path);
-			if (matches && matches[1]) {
-				const standAloneConfigurationModelParser = new StandaloneConfigurationModelParser(content.resource.toString(), matches[1]);
-				standAloneConfigurationModelParser.parse(content.value);
-				return standAloneConfigurationModelParser;
+	reprocess(): ConfigurationModel {
+		return this.configurationModel;
+	}
+
+	getUnsupportedKeys(): string[] {
+		return [];
+	}
+
+	private createCachedFolder(): TPromise<boolean> {
+		return pfs.exists(this.cachedFolderPath)
+			.then(null, () => false)
+			.then(exists => exists ? exists : pfs.mkdirp(this.cachedFolderPath).then(() => true, () => false));
+	}
+}
+
+export class FolderConfiguration extends Disposable implements IFolderConfiguration {
+
+	protected readonly _onDidChange: Emitter<void> = this._register(new Emitter<void>());
+	readonly onDidChange: Event<void> = this._onDidChange.event;
+
+	private folderConfiguration: IFolderConfiguration;
+	private cachedFolderConfiguration: CachedFolderConfiguration;
+	private _loaded: boolean = false;
+
+	constructor(
+		readonly workspaceFolder: IWorkspaceFolder,
+		private readonly configFolderRelativePath: string,
+		private readonly workbenchState: WorkbenchState,
+		private environmentService: IEnvironmentService,
+		fileService?: IFileService
+	) {
+		super();
+
+		this.cachedFolderConfiguration = new CachedFolderConfiguration(this.workspaceFolder.uri, this.configFolderRelativePath, this.environmentService);
+		this.folderConfiguration = this.cachedFolderConfiguration;
+		if (fileService) {
+			this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.workspaceFolder.uri, this.configFolderRelativePath, this.workbenchState, fileService);
+		} else if (this.workspaceFolder.uri.scheme === Schemas.file) {
+			this.folderConfiguration = new NodeBasedFolderConfiguration(this.workspaceFolder.uri, this.configFolderRelativePath, this.workbenchState);
+		}
+		this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
+	}
+
+	loadConfiguration(): TPromise<ConfigurationModel> {
+		return this.folderConfiguration.loadConfiguration()
+			.then(model => {
+				this._loaded = this.folderConfiguration.loaded;
+				return model;
+			});
+	}
+
+	reprocess(): ConfigurationModel {
+		return this.folderConfiguration.reprocess();
+	}
+
+	get loaded(): boolean {
+		return this._loaded;
+	}
+
+	adopt(fileService: IFileService): TPromise<boolean> {
+		if (fileService) {
+			if (this.folderConfiguration instanceof CachedFolderConfiguration) {
+				return this.adoptFromCachedConfiguration(fileService);
+			}
+
+			if (this.folderConfiguration instanceof NodeBasedFolderConfiguration) {
+				return this.adoptFromNodeBasedConfiguration(fileService);
 			}
 		}
-		return new ConfigurationModelParser(null);
+		return TPromise.as(false);
 	}
 
-	private isWorkspaceConfigurationFile(folderRelativePath: string): boolean {
-		return [FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY], WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY]].some(p => p === folderRelativePath);
+	private adoptFromCachedConfiguration(fileService: IFileService): TPromise<boolean> {
+		const folderConfiguration = new FileServiceBasedFolderConfiguration(this.workspaceFolder.uri, this.configFolderRelativePath, this.workbenchState, fileService);
+		return folderConfiguration.loadConfiguration()
+			.then(() => {
+				this.folderConfiguration = folderConfiguration;
+				this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
+				this.updateCache();
+				return true;
+			});
 	}
 
-	private toResource(folderRelativePath: string): URI {
-		if (typeof folderRelativePath === 'string') {
-			return URI.file(paths.join(this.folder.fsPath, folderRelativePath));
+	private adoptFromNodeBasedConfiguration(fileService: IFileService): TPromise<boolean> {
+		const oldFolderConfiguration = this.folderConfiguration;
+		this.folderConfiguration = new FileServiceBasedFolderConfiguration(this.workspaceFolder.uri, this.configFolderRelativePath, this.workbenchState, fileService, <AbstractFolderConfiguration>oldFolderConfiguration);
+		oldFolderConfiguration.dispose();
+		this._register(this.folderConfiguration.onDidChange(e => this.onDidFolderConfigurationChange()));
+		return TPromise.as(false);
+	}
+
+	private onDidFolderConfigurationChange(): void {
+		this.updateCache();
+		this._onDidChange.fire();
+	}
+
+	private updateCache(): TPromise<void> {
+		if (this.workspaceFolder.uri.scheme !== Schemas.file && this.folderConfiguration instanceof FileServiceBasedFolderConfiguration) {
+			return this.folderConfiguration.loadConfiguration()
+				.then(configurationModel => this.cachedFolderConfiguration.updateConfiguration(configurationModel));
 		}
-
-		return null;
-	}
-
-	private toFolderRelativePath(resource: URI, toOSPath?: boolean): string {
-		if (this.contains(resource)) {
-			return paths.normalize(relative(this.folder.fsPath, resource.fsPath), toOSPath);
-		}
-
-		return null;
-	}
-
-	private contains(resource: URI): boolean {
-		if (resource) {
-			return paths.isEqualOrParent(resource.fsPath, this.folder.fsPath, !isLinux /* ignorecase */);
-		}
-
-		return false;
+		return TPromise.as(null);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index b242c7188c6..2e4521f6e26 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -39,6 +39,11 @@ export enum ConfigurationEditingErrorCode {
 	 */
 	ERROR_UNKNOWN_KEY,
 
+	/**
+	 * Error when trying to write an application setting into workspace settings.
+	 */
+	ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION,
+
 	/**
 	 * Error when trying to write an invalid folder configuration key to folder settings.
 	 */
@@ -192,19 +197,19 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.notificationService.prompt(Severity.Error, error.message, [openStandAloneConfigurationActionLabel])
-				.then(option => {
-					if (option === 0) {
-						this.openFile(operation.resource);
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: openStandAloneConfigurationActionLabel,
+					run: () => this.openFile(operation.resource)
+				}]
+			);
 		} else {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('open', "Open Settings")])
-				.then(option => {
-					if (option === 0) {
-						this.openSettings(operation);
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('open', "Open Settings"),
+					run: () => this.openSettings(operation)
+				}]
+			);
 		}
 	}
 
@@ -213,30 +218,30 @@ export class ConfigurationEditingService {
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
 				: null;
 		if (openStandAloneConfigurationActionLabel) {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), openStandAloneConfigurationActionLabel])
-				.then(option => {
-					switch (option) {
-						case 0 /* Save & Retry */:
-							const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
-							this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
-							break;
-						case 1 /* Open Config */:
-							this.openFile(operation.resource);
-							break;
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('saveAndRetry', "Save and Retry"),
+					run: () => {
+						const key = operation.key ? `${operation.workspaceStandAloneConfigurationKey}.${operation.key}` : operation.workspaceStandAloneConfigurationKey;
+						this.writeConfiguration(operation.target, { key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
 					}
-				});
+				},
+				{
+					label: openStandAloneConfigurationActionLabel,
+					run: () => this.openFile(operation.resource)
+				}]
+			);
 		} else {
-			this.notificationService.prompt(Severity.Error, error.message, [nls.localize('saveAndRetry', "Save and Retry"), nls.localize('open', "Open Settings")])
-				.then(option => {
-					switch (option) {
-						case 0 /* Save and Retry */:
-							this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes });
-							break;
-						case 1 /* Open Settings */:
-							this.openSettings(operation);
-							break;
-					}
-				});
+			this.notificationService.prompt(Severity.Error, error.message,
+				[{
+					label: nls.localize('saveAndRetry', "Save and Retry"),
+					run: () => this.writeConfiguration(operation.target, { key: operation.key, value: operation.value }, <ConfigurationEditingOptions>{ force: true, scopes })
+				},
+				{
+					label: nls.localize('open', "Open Settings"),
+					run: () => this.openSettings(operation)
+				}]
+			);
 		}
 	}
 
@@ -274,6 +279,7 @@ export class ConfigurationEditingService {
 
 			// API constraints
 			case ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY: return nls.localize('errorUnknownKey', "Unable to write to {0} because {1} is not a registered configuration.", this.stringifyTarget(target), operation.key);
+			case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION: return nls.localize('errorInvalidWorkspaceConfigurationApplication', "Unable to write {0} to Workspace Settings. This setting can be written only into User settings.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_CONFIGURATION: return nls.localize('errorInvalidFolderConfiguration', "Unable to write to Folder Settings because {0} does not support the folder resource scope.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET: return nls.localize('errorInvalidUserTarget', "Unable to write to User Settings because {0} does not support for global scope.", operation.key);
 			case ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET: return nls.localize('errorInvalidWorkspaceTarget', "Unable to write to Workspace Settings because {0} does not support for workspace scope in a multi folder workspace.", operation.key);
@@ -396,6 +402,15 @@ export class ConfigurationEditingService {
 			return this.wrapError(ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED, target, operation);
 		}
 
+		if (target === ConfigurationTarget.WORKSPACE) {
+			if (!operation.workspaceStandAloneConfigurationKey) {
+				const configurationProperties = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).getConfigurationProperties();
+				if (configurationProperties[operation.key].scope === ConfigurationScope.APPLICATION) {
+					return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION, target, operation);
+				}
+			}
+		}
+
 		if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
 			if (!operation.resource) {
 				return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_FOLDER_TARGET, target, operation);
diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts
index 72329335ed4..f304dc4c546 100644
--- a/src/vs/workbench/services/configuration/node/configurationService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationService.ts
@@ -9,14 +9,14 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { dirname, basename } from 'path';
 import * as assert from 'vs/base/common/assert';
 import { Event, Emitter } from 'vs/base/common/event';
-import { StrictResourceMap } from 'vs/base/common/map';
-import { equals } from 'vs/base/common/objects';
+import { ResourceMap } from 'vs/base/common/map';
+import { equals, deepClone } from 'vs/base/common/objects';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { Queue } from 'vs/base/common/async';
 import { stat, writeFile } from 'vs/base/node/pfs';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IWorkspaceContextService, Workspace, WorkbenchState, IWorkspaceFolder, toWorkspaceFolders, IWorkspaceFoldersChangeEvent, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
-import { FileChangesEvent } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { isLinux } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ConfigurationChangeEvent, ConfigurationModel, DefaultConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
@@ -24,7 +24,7 @@ import { IConfigurationChangeEvent, ConfigurationTarget, IConfigurationOverrides
 import { Configuration, WorkspaceConfigurationChangeEvent, AllKeysConfigurationChangeEvent } from 'vs/workbench/services/configuration/common/configurationModels';
 import { IWorkspaceConfigurationService, FOLDER_CONFIG_FOLDER_NAME, defaultSettingsSchemaId, userSettingsSchemaId, workspaceSettingsSchemaId, folderSettingsSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { IConfigurationNode, IConfigurationRegistry, Extensions, settingsSchema, resourceSettingsSchema, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema, allSettings, windowSettings, resourceSettings, applicationSettings } from 'vs/platform/configuration/common/configurationRegistry';
 import { createHash } from 'crypto';
 import { getWorkspaceLabel, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IStoredWorkspaceFolder, isStoredWorkspaceFolder, IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces';
 import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
@@ -37,9 +37,10 @@ import { WorkspaceConfiguration, FolderConfiguration } from 'vs/workbench/servic
 import { JSONEditingService } from 'vs/workbench/services/configuration/node/jsonEditingService';
 import { Schemas } from 'vs/base/common/network';
 import { massageFolderPathForWorkspace } from 'vs/platform/workspaces/node/workspaces';
-import { distinct } from 'vs/base/common/arrays';
 import { UserConfiguration } from 'vs/platform/configuration/node/configuration';
 import { getBaseLabel } from 'vs/base/common/labels';
+import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
+import { localize } from 'vs/nls';
 
 export class WorkspaceService extends Disposable implements IWorkspaceConfigurationService, IWorkspaceContextService {
 
@@ -50,7 +51,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	private defaultConfiguration: DefaultConfigurationModel;
 	private userConfiguration: UserConfiguration;
 	private workspaceConfiguration: WorkspaceConfiguration;
-	private cachedFolderConfigs: StrictResourceMap<FolderConfiguration>;
+	private cachedFolderConfigs: ResourceMap<FolderConfiguration>;
 
 	private workspaceEditingQueue: Queue<void>;
 
@@ -66,6 +67,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	protected readonly _onDidChangeWorkbenchState: Emitter<WorkbenchState> = this._register(new Emitter<WorkbenchState>());
 	public readonly onDidChangeWorkbenchState: Event<WorkbenchState> = this._onDidChangeWorkbenchState.event;
 
+	private fileService: IFileService;
 	private configurationEditingService: ConfigurationEditingService;
 	private jsonEditingService: JSONEditingService;
 
@@ -236,7 +238,9 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	// Workspace Configuration Service Impl
 
 	getConfigurationData(): IConfigurationData {
-		return this._configuration.toData();
+		const configurationData = this._configuration.toData();
+		configurationData.isComplete = this.cachedFolderConfigs.values().every(c => c.loaded);
+		return configurationData;
 	}
 
 	getValue<T>(): T;
@@ -291,32 +295,31 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return this._configuration.keys();
 	}
 
-	getUnsupportedWorkspaceKeys(): string[] {
-		const unsupportedWorkspaceKeys = [...this.workspaceConfiguration.getUnsupportedKeys()];
-		for (const folder of this.workspace.folders) {
-			unsupportedWorkspaceKeys.push(...this.cachedFolderConfigs.get(folder.uri).getUnsupportedKeys());
-		}
-		return distinct(unsupportedWorkspaceKeys);
-	}
-
 	initialize(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration): TPromise<any> {
 		return this.createWorkspace(arg)
 			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace));
 	}
 
-	setInstantiationService(instantiationService: IInstantiationService): void {
-		this.configurationEditingService = instantiationService.createInstance(ConfigurationEditingService);
-		this.jsonEditingService = instantiationService.createInstance(JSONEditingService);
+	acquireFileService(fileService: IFileService): void {
+		this.fileService = fileService;
+		const changedWorkspaceFolders: IWorkspaceFolder[] = [];
+		TPromise.join(this.cachedFolderConfigs.values()
+			.map(folderConfiguration => folderConfiguration.adopt(fileService)
+				.then(result => {
+					if (result) {
+						changedWorkspaceFolders.push(folderConfiguration.workspaceFolder);
+					}
+				})))
+			.then(() => {
+				for (const workspaceFolder of changedWorkspaceFolders) {
+					this.onWorkspaceFolderConfigurationChanged(workspaceFolder);
+				}
+			});
 	}
 
-	handleWorkspaceFileEvents(event: FileChangesEvent): TPromise<void> {
-		switch (this.getWorkbenchState()) {
-			case WorkbenchState.FOLDER:
-				return this.onSingleFolderFileChanges(event);
-			case WorkbenchState.WORKSPACE:
-				return this.onWorkspaceFileChanges(event);
-		}
-		return TPromise.as(void 0);
+	acquireInstantiationService(instantiationService: IInstantiationService): void {
+		this.configurationEditingService = instantiationService.createInstance(ConfigurationEditingService);
+		this.jsonEditingService = instantiationService.createInstance(JSONEditingService);
 	}
 
 	private createWorkspace(arg: IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | IWindowConfiguration): TPromise<Workspace> {
@@ -438,18 +441,18 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 
 	private loadConfiguration(): TPromise<void> {
 		// reset caches
-		this.cachedFolderConfigs = new StrictResourceMap<FolderConfiguration>();
+		this.cachedFolderConfigs = new ResourceMap<FolderConfiguration>();
 
 		const folders = this.workspace.folders;
 		return this.loadFolderConfigurations(folders)
 			.then((folderConfigurations) => {
 
 				let workspaceConfiguration = this.getWorkspaceConfigurationModel(folderConfigurations);
-				const folderConfigurationModels = new StrictResourceMap<ConfigurationModel>();
+				const folderConfigurationModels = new ResourceMap<ConfigurationModel>();
 				folderConfigurations.forEach((folderConfiguration, index) => folderConfigurationModels.set(folders[index].uri, folderConfiguration));
 
 				const currentConfiguration = this._configuration;
-				this._configuration = new Configuration(this.defaultConfiguration, this.userConfiguration.configurationModel, workspaceConfiguration, folderConfigurationModels, new ConfigurationModel(), new StrictResourceMap<ConfigurationModel>(), this.getWorkbenchState() !== WorkbenchState.EMPTY ? this.workspace : null); //TODO: Sandy Avoid passing null
+				this._configuration = new Configuration(this.defaultConfiguration, this.userConfiguration.configurationModel, workspaceConfiguration, folderConfigurationModels, new ConfigurationModel(), new ResourceMap<ConfigurationModel>(), this.getWorkbenchState() !== WorkbenchState.EMPTY ? this.workspace : null); //TODO: Sandy Avoid passing null
 
 				if (currentConfiguration) {
 					const changedKeys = this._configuration.compare(currentConfiguration);
@@ -489,15 +492,29 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	private registerConfigurationSchemas(): void {
 		if (this.workspace) {
 			const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
-			jsonRegistry.registerSchema(defaultSettingsSchemaId, settingsSchema);
-			jsonRegistry.registerSchema(userSettingsSchemaId, settingsSchema);
+			const convertToNotSuggestedProperties = (properties: IJSONSchemaMap, errorMessage: string): IJSONSchemaMap => {
+				return Object.keys(properties).reduce((result: IJSONSchemaMap, property) => {
+					result[property] = deepClone(properties[property]);
+					result[property].deprecationMessage = errorMessage;
+					return result;
+				}, {});
+			};
+
+			const allSettingsSchema: IJSONSchema = { properties: allSettings.properties, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+			const unsupportedApplicationSettings = convertToNotSuggestedProperties(applicationSettings.properties, localize('unsupportedApplicationSetting', "This setting can be applied only in User Settings"));
+			const workspaceSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...windowSettings.properties, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+
+			jsonRegistry.registerSchema(defaultSettingsSchemaId, allSettingsSchema);
+			jsonRegistry.registerSchema(userSettingsSchemaId, allSettingsSchema);
 
 			if (WorkbenchState.WORKSPACE === this.getWorkbenchState()) {
-				jsonRegistry.registerSchema(workspaceSettingsSchemaId, settingsSchema);
-				jsonRegistry.registerSchema(folderSettingsSchemaId, resourceSettingsSchema);
+				const unsupportedWindowSettings = convertToNotSuggestedProperties(windowSettings.properties, localize('unsupportedWindowSetting', "This setting cannot be applied now. It will be applied when you open this folder directly."));
+				const folderSettingsSchema: IJSONSchema = { properties: { ...unsupportedApplicationSettings, ...unsupportedWindowSettings, ...resourceSettings.properties }, patternProperties: allSettings.patternProperties, additionalProperties: false, errorMessage: 'Unknown configuration setting' };
+				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
+				jsonRegistry.registerSchema(folderSettingsSchemaId, folderSettingsSchema);
 			} else {
-				jsonRegistry.registerSchema(workspaceSettingsSchemaId, settingsSchema);
-				jsonRegistry.registerSchema(folderSettingsSchemaId, settingsSchema);
+				jsonRegistry.registerSchema(workspaceSettingsSchemaId, workspaceSettingsSchema);
+				jsonRegistry.registerSchema(folderSettingsSchemaId, workspaceSettingsSchema);
 			}
 		}
 	}
@@ -526,33 +543,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return TPromise.as(null);
 	}
 
-	private onWorkspaceFileChanges(event: FileChangesEvent): TPromise<void> {
-		return TPromise.join(this.workspace.folders.map(folder =>
-			// handle file event for each folder
-			this.cachedFolderConfigs.get(folder.uri).handleWorkspaceFileEvents(event)
-				// Update folder configuration if handled
-				.then(folderConfiguration => folderConfiguration ? this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration) : new ConfigurationChangeEvent()))
-		).then(changeEvents => {
-			const consolidateChangeEvent = changeEvents.reduce((consolidated, e) => consolidated.change(e), new ConfigurationChangeEvent());
-			this.triggerConfigurationChange(consolidateChangeEvent, ConfigurationTarget.WORKSPACE_FOLDER);
-		});
-	}
-
-	private onSingleFolderFileChanges(event: FileChangesEvent): TPromise<void> {
-		const folder = this.workspace.folders[0];
-		return this.cachedFolderConfigs.get(folder.uri).handleWorkspaceFileEvents(event)
-			.then(folderConfiguration => {
-				if (folderConfiguration) {
-					// File change handled
-					this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration);
-					const workspaceChangedKeys = this._configuration.compareAndUpdateWorkspaceConfiguration(folderConfiguration);
-					this.triggerConfigurationChange(workspaceChangedKeys, ConfigurationTarget.WORKSPACE);
-				}
-			});
-	}
-
 	private onWorkspaceFolderConfigurationChanged(folder: IWorkspaceFolder, key?: string): TPromise<void> {
-		this.disposeFolderConfiguration(folder);
 		return this.loadFolderConfigurations([folder])
 			.then(([folderConfiguration]) => {
 				const folderChangedKeys = this._configuration.compareAndUpdateFolderConfiguration(folder.uri, folderConfiguration);
@@ -571,6 +562,8 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		// Remove the configurations of deleted folders
 		for (const key of this.cachedFolderConfigs.keys()) {
 			if (!this.workspace.folders.filter(folder => folder.uri.toString() === key.toString())[0]) {
+				const folderConfiguration = this.cachedFolderConfigs.get(key);
+				folderConfiguration.dispose();
 				this.cachedFolderConfigs.delete(key);
 				changeEvent = changeEvent.change(this._configuration.compareAndDeleteFolderConfiguration(key));
 			}
@@ -591,8 +584,12 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 
 	private loadFolderConfigurations(folders: IWorkspaceFolder[]): TPromise<ConfigurationModel[]> {
 		return TPromise.join([...folders.map(folder => {
-			const folderConfiguration = new FolderConfiguration(folder.uri, this.workspaceSettingsRootFolder, this.getWorkbenchState());
-			this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
+			let folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
+			if (!folderConfiguration) {
+				folderConfiguration = new FolderConfiguration(folder, this.workspaceSettingsRootFolder, this.getWorkbenchState(), this.environmentService, this.fileService);
+				this._register(folderConfiguration.onDidChange(() => this.onWorkspaceFolderConfigurationChanged(folder)));
+				this.cachedFolderConfigs.set(folder.uri, this._register(folderConfiguration));
+			}
 			return folderConfiguration.loadConfiguration();
 		})]);
 	}
@@ -679,13 +676,6 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 
 		return path1 === path2;
 	}
-
-	private disposeFolderConfiguration(folder: IWorkspaceFolder): void {
-		const folderConfiguration = this.cachedFolderConfigs.get(folder.uri);
-		if (folderConfiguration) {
-			folderConfiguration.dispose();
-		}
-	}
 }
 
 interface IExportedConfigurationNode {
diff --git a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
index 2b675b8cab6..2a397b9df49 100644
--- a/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
+++ b/src/vs/workbench/services/configuration/test/common/configurationModels.test.ts
@@ -13,7 +13,7 @@ import URI from 'vs/base/common/uri';
 import { ConfigurationChangeEvent, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { StrictResourceMap } from 'vs/base/common/map';
+import { ResourceMap } from 'vs/base/common/map';
 
 suite('FolderSettingsModelParser', () => {
 
@@ -32,47 +32,47 @@ suite('FolderSettingsModelParser', () => {
 					'default': 'isSet',
 					scope: ConfigurationScope.RESOURCE
 				},
-				'FolderSettingsModelParser.executable': {
+				'FolderSettingsModelParser.application': {
 					'type': 'string',
 					'default': 'isSet',
-					isExecutable: true
+					scope: ConfigurationScope.APPLICATION
 				}
 			}
 		});
 	});
 
 	test('parse all folder settings', () => {
-		const testObject = new FolderSettingsModelParser('settings');
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
-		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.executable': 'executable' }));
+		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.application': 'executable' }));
 
 		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'window': 'window', 'resource': 'resource' } });
 	});
 
 	test('parse resource folder settings', () => {
-		const testObject = new FolderSettingsModelParser('settings', ConfigurationScope.RESOURCE);
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE]);
 
-		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.executable': 'executable' }));
+		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.window': 'window', 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.application': 'executable' }));
 
 		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'resource': 'resource' } });
 	});
 
-	test('reprocess folder settings excludes executable', () => {
-		const testObject = new FolderSettingsModelParser('settings');
+	test('reprocess folder settings excludes application setting', () => {
+		const testObject = new FolderSettingsModelParser('settings', [ConfigurationScope.RESOURCE, ConfigurationScope.WINDOW]);
 
-		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.anotherExecutable': 'executable' }));
+		testObject.parse(JSON.stringify({ 'FolderSettingsModelParser.resource': 'resource', 'FolderSettingsModelParser.anotherApplicationSetting': 'executable' }));
 
-		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'resource': 'resource', 'anotherExecutable': 'executable' } });
+		assert.deepEqual(testObject.configurationModel.contents, { 'FolderSettingsModelParser': { 'resource': 'resource', 'anotherApplicationSetting': 'executable' } });
 
 		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 		configurationRegistry.registerConfiguration({
 			'id': 'FolderSettingsModelParser_2',
 			'type': 'object',
 			'properties': {
-				'FolderSettingsModelParser.anotherExecutable': {
+				'FolderSettingsModelParser.anotherApplicationSetting': {
 					'type': 'string',
 					'default': 'isSet',
-					isExecutable: true
+					scope: ConfigurationScope.APPLICATION
 				}
 			}
 		});
@@ -194,7 +194,7 @@ suite('AllKeysConfigurationChangeEvent', () => {
 
 	test('changeEvent affects keys for any resource', () => {
 		const configuraiton = new Configuration(new ConfigurationModel({}, ['window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows']),
-			new ConfigurationModel(), new ConfigurationModel(), new StrictResourceMap(), new ConfigurationModel(), new StrictResourceMap(), null);
+			new ConfigurationModel(), new ConfigurationModel(), new ResourceMap(), new ConfigurationModel(), new ResourceMap(), null);
 		let testObject = new AllKeysConfigurationChangeEvent(configuraiton, ConfigurationTarget.USER, null);
 
 		assert.deepEqual(testObject.affectedKeys, ['window.title', 'window.zoomLevel', 'window.restoreFullscreen', 'workbench.editor.enablePreview', 'window.restoreWindows']);
@@ -234,4 +234,4 @@ suite('AllKeysConfigurationChangeEvent', () => {
 		assert.ok(!testObject.affectsConfiguration('files'));
 		assert.ok(!testObject.affectsConfiguration('files', URI.file('file1')));
 	});
-});
\ No newline at end of file
+});
diff --git a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
similarity index 97%
rename from src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
rename to src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
index 0712f46945d..0e42aaccf0c 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
@@ -18,11 +18,12 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import * as extfs from 'vs/base/node/extfs';
-import { TestTextFileService, TestTextResourceConfigurationService, workbenchInstantiationService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestTextResourceConfigurationService, workbenchInstantiationService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import * as uuid from 'vs/base/common/uuid';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
-import { FileService } from 'vs/workbench/services/files/node/fileService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { ConfigurationEditingService, ConfigurationEditingError, ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/node/configurationEditingService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration';
@@ -104,7 +105,7 @@ suite('ConfigurationEditingService', () => {
 		instantiationService.stub(IWorkspaceContextService, workspaceService);
 		return workspaceService.initialize(noWorkspace ? {} as IWindowConfiguration : workspaceDir).then(() => {
 			instantiationService.stub(IConfigurationService, workspaceService);
-			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 			instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
 			instantiationService.stub(ICommandService, CommandService);
diff --git a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
similarity index 90%
rename from src/vs/workbench/services/configuration/test/node/configurationService.test.ts
rename to src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
index b099e02c1b3..a04189f3079 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -21,11 +21,12 @@ import * as uuid from 'vs/base/common/uuid';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
 import { ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/node/configurationEditingService';
-import { FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { workbenchInstantiationService, TestTextResourceConfigurationService, TestTextFileService, TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
-import { FileService } from 'vs/workbench/services/files/node/fileService';
+import { workbenchInstantiationService, TestTextResourceConfigurationService, TestTextFileService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -151,10 +152,10 @@ suite('WorkspaceContextService - Workspace', () => {
 
 				return workspaceService.initialize({ id: configPath, configPath }).then(() => {
 
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.setInstantiationService(instantiationService);
+					workspaceService.acquireInstantiationService(instantiationService);
 
 					testObject = workspaceService;
 				});
@@ -409,10 +410,10 @@ suite('WorkspaceService - Initialization', () => {
 				instantiationService.stub(IEnvironmentService, environmentService);
 
 				return workspaceService.initialize(<IWindowConfiguration>{}).then(() => {
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.setInstantiationService(instantiationService);
+					workspaceService.acquireInstantiationService(instantiationService);
 					testObject = workspaceService;
 				});
 			});
@@ -632,15 +633,15 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			'id': '_test',
 			'type': 'object',
 			'properties': {
+				'configurationService.folder.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
 				'configurationService.folder.testSetting': {
 					'type': 'string',
 					'default': 'isSet',
 					scope: ConfigurationScope.RESOURCE
-				},
-				'configurationService.folder.executableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					isExecutable: true
 				}
 			}
 		});
@@ -662,10 +663,10 @@ suite('WorkspaceConfigurationService - Folder', () => {
 				instantiationService.stub(IEnvironmentService, environmentService);
 
 				return workspaceService.initialize(folderDir).then(() => {
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.setInstantiationService(instantiationService);
+					workspaceService.acquireInstantiationService(instantiationService);
 					testObject = workspaceService;
 				});
 			});
@@ -682,7 +683,7 @@ suite('WorkspaceConfigurationService - Folder', () => {
 	});
 
 	test('defaults', () => {
-		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'testSetting': 'isSet', 'executableSetting': 'isSet' } });
+		assert.deepEqual(testObject.getValue('configurationService'), { 'folder': { 'applicationSetting': 'isSet', 'testSetting': 'isSet' } });
 	});
 
 	test('globals override defaults', () => {
@@ -731,48 +732,29 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			});
 	});
 
-	test('executable settings are not read from workspace', () => {
-		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.executableSetting": "userValue" }');
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.executableSetting": "workspaceValue" }');
+	test('application settings are not read from workspace', () => {
+		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.applicationSetting": "userValue" }');
+		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.applicationSetting": "workspaceValue" }');
 		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('configurationService.folder.executableSetting'), 'userValue'));
+			.then(() => assert.equal(testObject.getValue('configurationService.folder.applicationSetting'), 'userValue'));
 	});
 
-	test('get unsupported workspace settings', () => {
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.executableSetting": "workspaceValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.deepEqual(testObject.getUnsupportedWorkspaceKeys(), ['configurationService.folder.executableSetting']));
-	});
-
-	test('get unsupported workspace settings after defaults are registered', () => {
-		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.anotherExecutableSetting": "workspaceValue" }');
+	test('get application scope settings are not loaded after defaults are registered', () => {
+		fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.anotherApplicationSetting": "workspaceValue" }');
 		return testObject.reloadConfiguration()
 			.then(() => {
 				configurationRegistry.registerConfiguration({
 					'id': '_test',
 					'type': 'object',
 					'properties': {
-						'configurationService.folder.anotherExecutableSetting': {
+						'configurationService.folder.anotherApplicationSetting': {
 							'type': 'string',
 							'default': 'isSet',
-							isExecutable: true
+							scope: ConfigurationScope.APPLICATION
 						}
 					}
 				});
-				assert.deepEqual(testObject.getUnsupportedWorkspaceKeys(), ['configurationService.folder.anotherExecutableSetting']);
-			});
-	});
-
-	test('workspace change triggers event', () => {
-		const settingsFile = path.join(workspaceDir, '.vscode', 'settings.json');
-		fs.writeFileSync(settingsFile, '{ "configurationService.folder.testSetting": "workspaceValue" }');
-		const event = new FileChangesEvent([{ resource: URI.file(settingsFile), type: FileChangeType.ADDED }]);
-		const target = sinon.spy();
-		testObject.onDidChangeConfiguration(target);
-		return (<WorkspaceService>testObject).handleWorkspaceFileEvents(event)
-			.then(() => {
-				assert.equal(testObject.getValue('configurationService.folder.testSetting'), 'workspaceValue');
-				assert.ok(target.called);
+				assert.deepEqual(testObject.keys().workspace, []);
 			});
 	});
 
@@ -880,6 +862,11 @@ suite('WorkspaceConfigurationService - Folder', () => {
 			.then(() => assert.equal(testObject.getValue('tasks.service.testSetting'), 'value'));
 	});
 
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.folder.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
 	test('update tasks configuration', () => {
 		return testObject.updateValue('tasks', { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }, ConfigurationTarget.WORKSPACE)
 			.then(() => assert.deepEqual(testObject.getValue('tasks'), { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] }));
@@ -922,21 +909,15 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 					'type': 'string',
 					'default': 'isSet'
 				},
+				'configurationService.workspace.applicationSetting': {
+					'type': 'string',
+					'default': 'isSet',
+					scope: ConfigurationScope.APPLICATION
+				},
 				'configurationService.workspace.testResourceSetting': {
 					'type': 'string',
 					'default': 'isSet',
 					scope: ConfigurationScope.RESOURCE
-				},
-				'configurationService.workspace.testExecutableSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					isExecutable: true
-				},
-				'configurationService.workspace.testExecutableResourceSetting': {
-					'type': 'string',
-					'default': 'isSet',
-					isExecutable: true,
-					scope: ConfigurationScope.RESOURCE
 				}
 			}
 		});
@@ -958,10 +939,10 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 
 				return workspaceService.initialize({ id: configPath, configPath }).then(() => {
 
-					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), { disableWatcher: true }));
+					instantiationService.stub(IFileService, new FileService(<IWorkspaceContextService>workspaceService, TestEnvironmentService, new TestTextResourceConfigurationService(), workspaceService, new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true }));
 					instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 					instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
-					workspaceService.setInstantiationService(instantiationService);
+					workspaceService.acquireInstantiationService(instantiationService);
 
 					workspaceContextService = workspaceService;
 					jsonEditingServce = instantiationService.createInstance(JSONEditingService);
@@ -980,25 +961,11 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 		return void 0;
 	});
 
-	test('executable settings are not read from workspace', () => {
-		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.testExecutableSetting": "userValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.testExecutableSetting': 'workspaceValue' } }, true)
+	test('application settings are not read from workspace', () => {
+		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.applicationSetting": "userValue" }');
+		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.applicationSetting': 'workspaceValue' } }, true)
 			.then(() => testObject.reloadConfiguration())
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testExecutableSetting'), 'userValue'));
-	});
-
-	test('executable settings are not read from workspace folder', () => {
-		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.testExecutableResourceSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testExecutableResourceSetting": "workspaceFolderValue" }');
-		return testObject.reloadConfiguration()
-			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testExecutableResourceSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue'));
-	});
-
-	test('get unsupported workspace settings', () => {
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testExecutableResourceSetting": "workspaceFolderValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.testExecutableSetting': 'workspaceValue' } }, true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => assert.deepEqual(testObject.getUnsupportedWorkspaceKeys(), ['configurationService.workspace.testExecutableSetting', 'configurationService.workspace.testExecutableResourceSetting']));
+			.then(() => assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue'));
 	});
 
 	test('workspace settings override user settings after defaults are registered ', () => {
@@ -1020,45 +987,30 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			});
 	});
 
-	test('executable settings are not read from workspace folder after defaults are registered', () => {
-		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.testNewExecutableResourceSetting": "userValue" }');
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewExecutableResourceSetting": "workspaceFolderValue" }');
+	test('application settings are not read from workspace folder', () => {
+		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.applicationSetting": "userValue" }');
+		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.applicationSetting": "workspaceFolderValue" }');
+		return testObject.reloadConfiguration()
+			.then(() => assert.equal(testObject.getValue('configurationService.workspace.applicationSetting'), 'userValue'));
+	});
+
+	test('application settings are not read from workspace folder after defaults are registered', () => {
+		fs.writeFileSync(environmentService.appSettingsPath, '{ "configurationService.workspace.testNewApplicationSetting": "userValue" }');
+		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewApplicationSetting": "workspaceFolderValue" }');
 		return testObject.reloadConfiguration()
 			.then(() => {
 				configurationRegistry.registerConfiguration({
 					'id': '_test',
 					'type': 'object',
 					'properties': {
-						'configurationService.workspace.testNewExecutableResourceSetting': {
+						'configurationService.workspace.testNewApplicationSetting': {
 							'type': 'string',
 							'default': 'isSet',
-							isExecutable: true,
-							scope: ConfigurationScope.RESOURCE
+							scope: ConfigurationScope.APPLICATION
 						}
 					}
 				});
-				assert.equal(testObject.getValue('configurationService.workspace.testNewExecutableResourceSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
-			});
-	});
-
-	test('get unsupported workspace settings after defaults are registered', () => {
-		fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testNewExecutableResourceSetting2": "workspaceFolderValue" }');
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'settings', value: { 'configurationService.workspace.testExecutableSetting': 'workspaceValue' } }, true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				configurationRegistry.registerConfiguration({
-					'id': '_test',
-					'type': 'object',
-					'properties': {
-						'configurationService.workspace.testNewExecutableResourceSetting2': {
-							'type': 'string',
-							'default': 'isSet',
-							isExecutable: true,
-							scope: ConfigurationScope.RESOURCE
-						}
-					}
-				});
-				assert.deepEqual(testObject.getUnsupportedWorkspaceKeys(), ['configurationService.workspace.testExecutableSetting', 'configurationService.workspace.testNewExecutableResourceSetting2']);
+				assert.equal(testObject.getValue('configurationService.workspace.testNewApplicationSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri }), 'userValue');
 			});
 	});
 
@@ -1206,6 +1158,11 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			.then(() => assert.ok(target.called));
 	});
 
+	test('update application setting into workspace configuration in a workspace is not supported', () => {
+		return testObject.updateValue('configurationService.workspace.applicationSetting', 'workspaceValue', {}, ConfigurationTarget.WORKSPACE, true)
+			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_CONFIGURATION_APPLICATION));
+	});
+
 	test('update workspace folder configuration', () => {
 		const workspace = workspaceContextService.getWorkspace();
 		return testObject.updateValue('configurationService.workspace.testResourceSetting', 'workspaceFolderValue', { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE_FOLDER)
diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
index e8d49f21309..080f600ce81 100644
--- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
@@ -3,10 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import uri from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
-import * as types from 'vs/base/common/types';
+import { Schemas } from 'vs/base/common/network';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { sequence } from 'vs/base/common/async';
+import { toResource } from 'vs/workbench/common/editor';
 import { IStringDictionary } from 'vs/base/common/collections';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@@ -14,210 +16,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { toResource } from 'vs/workbench/common/editor';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
+import { IProcessEnvironment } from 'vs/base/common/platform';
+import { VariableResolver } from 'vs/workbench/services/configurationResolver/node/variableResolver';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { relative } from 'path';
-import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
-import { normalizeDriveLetter } from 'vs/base/common/labels';
-import { Schemas } from 'vs/base/common/network';
-import { localize } from 'vs/nls';
+import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 
-class VariableResolver {
-	static VARIABLE_REGEXP = /\$\{(.*?)\}/g;
-	private envVariables: IProcessEnvironment;
-
-	constructor(
-		envVariables: IProcessEnvironment,
-		private configurationService: IConfigurationService,
-		private editorService: IWorkbenchEditorService,
-		private environmentService: IEnvironmentService,
-		private workspaceContextService: IWorkspaceContextService
-	) {
-		if (isWindows) {
-			this.envVariables = Object.create(null);
-			Object.keys(envVariables).forEach(key => {
-				this.envVariables[key.toLowerCase()] = envVariables[key];
-			});
-		} else {
-			this.envVariables = envVariables;
-		}
-	}
-
-	resolve(context: IWorkspaceFolder, value: string): string {
-		const filePath = this.getFilePath();
-		return value.replace(VariableResolver.VARIABLE_REGEXP, (match: string, variable: string) => {
-			const parts = variable.split(':');
-			let sufix: string;
-			if (parts && parts.length > 1) {
-				variable = parts[0];
-				sufix = parts[1];
-			}
-
-			switch (variable) {
-				case 'env': {
-					if (sufix) {
-						if (isWindows) {
-							sufix = sufix.toLowerCase();
-						}
-
-						const env = this.envVariables[sufix];
-						if (types.isString(env)) {
-							return env;
-						}
-
-						// For `env` we should do the same as a normal shell does - evaluates missing envs to an empty string #46436
-						return '';
-					}
-				}
-				case 'config': {
-					if (sufix) {
-						const config = this.configurationService.getValue<string>(sufix, context ? { resource: context.uri } : undefined);
-						if (!types.isUndefinedOrNull(config) && !types.isObject(config)) {
-							return config;
-						}
-					}
-				}
-				default: {
-					if (sufix) {
-						const folder = this.workspaceContextService.getWorkspace().folders.filter(f => f.name === sufix).pop();
-						if (folder) {
-							context = folder;
-						}
-					}
-
-					switch (variable) {
-						case 'workspaceRoot':
-						case 'workspaceFolder': {
-							if (context) {
-								return normalizeDriveLetter(context.uri.fsPath);
-							}
-							if (this.workspaceContextService.getWorkspace().folders.length > 1) {
-								throw new Error(localize('canNotResolveWorkspaceFolderMultiRoot', "${workspaceFolder} can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
-							}
-
-							throw new Error(localize('canNotResolveWorkspaceFolder', "${workspaceFolder} can not be resolved. Please open a folder."));
-						} case 'cwd':
-							return context ? normalizeDriveLetter(context.uri.fsPath) : process.cwd();
-						case 'workspaceRootFolderName':
-						case 'workspaceFolderBasename': {
-							if (context) {
-								return paths.basename(context.uri.fsPath);
-							}
-							if (this.workspaceContextService.getWorkspace().folders.length > 1) {
-								throw new Error(localize('canNotResolveFolderBasenameMultiRoot', "${workspaceFolderBasename} can not be resolved in a multi folder workspace. Scope this variables using : and a folder name."));
-							}
-
-							throw new Error(localize('canNotResolveFolderBasename', "${workspaceFolderBasename} can not be resolved. Please open a folder."));
-						} case 'lineNumber': {
-							const lineNumber = this.getLineNumber();
-							if (lineNumber) {
-								return lineNumber;
-							}
-
-							throw new Error(localize('canNotResolveLineNumber', "${lineNumber} can not be resolved, please open an editor."));
-						} case 'selectedText': {
-							const selectedText = this.getSelectedText();
-							if (selectedText) {
-								return selectedText;
-							}
-
-							throw new Error(localize('canNotResolveSelectedText', "${selectedText} can not be resolved, please open an editor."));
-						} case 'file': {
-							if (filePath) {
-								return filePath;
-							}
-
-							throw new Error(localize('canNotResolveFile', "${file} can not be resolved, please open an editor."));
-						} case 'relativeFile': {
-							if (context && filePath) {
-								return paths.normalize(relative(context.uri.fsPath, filePath));
-							}
-							if (filePath) {
-								return filePath;
-							}
-
-							throw new Error(localize('canNotResolveRelativeFile', "${relativeFile} can not be resolved, please open an editor."));
-						} case 'fileDirname': {
-							if (filePath) {
-								return paths.dirname(filePath);
-							}
-
-							throw new Error(localize('canNotResolveFileDirname', "${fileDirname} can not be resolved, please open an editor."));
-						} case 'fileExtname': {
-							if (filePath) {
-								return paths.extname(filePath);
-							}
-
-							throw new Error(localize('canNotResolveFileExtname', "${fileExtname} can not be resolved, please open an editor."));
-						} case 'fileBasename': {
-							if (filePath) {
-								return paths.basename(filePath);
-							}
-
-							throw new Error(localize('canNotResolveFileBasename', "${fileBasename} can not be resolved, please open an editor."));
-						} case 'fileBasenameNoExtension': {
-							if (filePath) {
-								const basename = paths.basename(filePath);
-								return basename.slice(0, basename.length - paths.extname(basename).length);
-							}
-
-							throw new Error(localize('canNotResolveFileBasenameNoExtension', "${fileBasenameNoExtension} can not be resolved, please open an editor."));
-						}
-						case 'execPath':
-							return this.environmentService.execPath;
-
-						default:
-							return match;
-					}
-				}
-			}
-		});
-	}
-
-	private getSelectedText(): string {
-		const activeEditor = this.editorService.getActiveEditor();
-		if (activeEditor) {
-			const editorControl = (<ICodeEditor>activeEditor.getControl());
-			if (editorControl) {
-				const editorModel = editorControl.getModel();
-				const editorSelection = editorControl.getSelection();
-				if (editorModel && editorSelection) {
-					return editorModel.getValueInRange(editorSelection);
-				}
-			}
-		}
-
-		return undefined;
-	}
-
-	private getFilePath(): string {
-		let input = this.editorService.getActiveEditorInput();
-		if (input instanceof DiffEditorInput) {
-			input = input.modifiedInput;
-		}
-
-		const fileResource = toResource(input, { filter: Schemas.file });
-		if (!fileResource) {
-			return undefined;
-		}
-
-		return paths.normalize(fileResource.fsPath, true);
-	}
-
-	private getLineNumber(): string {
-		const activeEditor = this.editorService.getActiveEditor();
-		if (activeEditor) {
-			const editorControl = (<ICodeEditor>activeEditor.getControl());
-			if (editorControl) {
-				const lineNumber = editorControl.getSelection().positionLineNumber;
-				return String(lineNumber);
-			}
-		}
-
-		return undefined;
-	}
-}
 
 export class ConfigurationResolverService implements IConfigurationResolverService {
 	_serviceBrand: any;
@@ -231,42 +34,68 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
 		@ICommandService private commandService: ICommandService,
 		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService
 	) {
-		this.resolver = new VariableResolver(envVariables, configurationService, editorService, environmentService, workspaceContextService);
+		this.resolver = new VariableResolver({
+			getFolderUri: (folderName: string): uri => {
+				const folder = workspaceContextService.getWorkspace().folders.filter(f => f.name === folderName).pop();
+				return folder ? folder.uri : undefined;
+			},
+			getWorkspaceFolderCount: (): number => {
+				return workspaceContextService.getWorkspace().folders.length;
+			},
+			getConfigurationValue: (folderUri: uri, suffix: string) => {
+				return configurationService.getValue<string>(suffix, folderUri ? { resource: folderUri } : undefined);
+			},
+			getExecPath: () => {
+				return environmentService['execPath'];
+			},
+			getFilePath: (): string | undefined => {
+				let input = editorService.getActiveEditorInput();
+				if (input instanceof DiffEditorInput) {
+					input = input.modifiedInput;
+				}
+				const fileResource = toResource(input, { filter: Schemas.file });
+				if (!fileResource) {
+					return undefined;
+				}
+				return paths.normalize(fileResource.fsPath, true);
+			},
+			getSelectedText: (): string | undefined => {
+				const activeEditor = editorService.getActiveEditor();
+				if (activeEditor) {
+					const editorControl = (<ICodeEditor>activeEditor.getControl());
+					if (editorControl) {
+						const editorModel = editorControl.getModel();
+						const editorSelection = editorControl.getSelection();
+						if (editorModel && editorSelection) {
+							return editorModel.getValueInRange(editorSelection);
+						}
+					}
+				}
+				return undefined;
+			},
+			getLineNumber: (): string => {
+				const activeEditor = editorService.getActiveEditor();
+				if (activeEditor) {
+					const editorControl = (<ICodeEditor>activeEditor.getControl());
+					if (editorControl) {
+						const lineNumber = editorControl.getSelection().positionLineNumber;
+						return String(lineNumber);
+					}
+				}
+				return undefined;
+			}
+		}, envVariables);
 	}
 
 	public resolve(root: IWorkspaceFolder, value: string): string;
 	public resolve(root: IWorkspaceFolder, value: string[]): string[];
 	public resolve(root: IWorkspaceFolder, value: IStringDictionary<string>): IStringDictionary<string>;
 	public resolve(root: IWorkspaceFolder, value: any): any {
-		if (types.isString(value)) {
-			return this.resolver.resolve(root, value);
-		} else if (types.isArray(value)) {
-			return value.map(s => this.resolver.resolve(root, s));
-		} else if (types.isObject(value)) {
-			let result: IStringDictionary<string | IStringDictionary<string> | string[]> = Object.create(null);
-			Object.keys(value).forEach(key => {
-				result[key] = this.resolve(root, value[key]);
-			});
-
-			return result;
-		}
-		return value;
+		return this.resolver.resolveAny(root ? root.uri : undefined, value);
 	}
 
 	public resolveAny(root: IWorkspaceFolder, value: any): any {
-		if (types.isString(value)) {
-			return this.resolver.resolve(root, value);
-		} else if (types.isArray(value)) {
-			return value.map(s => this.resolveAny(root, s));
-		} else if (types.isObject(value)) {
-			let result: IStringDictionary<string | IStringDictionary<string> | string[]> = Object.create(null);
-			Object.keys(value).forEach(key => {
-				result[key] = this.resolveAny(root, value[key]);
-			});
-
-			return result;
-		}
-		return value;
+		return this.resolver.resolveAny(root ? root.uri : undefined, value);
 	}
 
 	/**
diff --git a/src/vs/workbench/services/configurationResolver/node/variableResolver.ts b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
new file mode 100644
index 00000000000..a8fc1e8b982
--- /dev/null
+++ b/src/vs/workbench/services/configurationResolver/node/variableResolver.ts
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as paths from 'vs/base/common/paths';
+import * as types from 'vs/base/common/types';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { relative } from 'path';
+import { IProcessEnvironment, isWindows } from 'vs/base/common/platform';
+import { normalizeDriveLetter } from 'vs/base/common/labels';
+import { localize } from 'vs/nls';
+import uri from 'vs/base/common/uri';
+
+
+export interface IVariableAccessor {
+	getFolderUri(folderName: string): uri | undefined;
+	getWorkspaceFolderCount(): number;
+	getConfigurationValue(folderUri: uri, section: string): string | undefined;
+	getExecPath(): string | undefined;
+	getFilePath(): string | undefined;
+	getSelectedText(): string | undefined;
+	getLineNumber(): string;
+}
+
+export class VariableResolver {
+
+	static VARIABLE_REGEXP = /\$\{(.*?)\}/g;
+
+	private envVariables: IProcessEnvironment;
+
+	constructor(
+		private accessor: IVariableAccessor,
+		envVariables: IProcessEnvironment
+	) {
+		if (isWindows) {
+			this.envVariables = Object.create(null);
+			Object.keys(envVariables).forEach(key => {
+				this.envVariables[key.toLowerCase()] = envVariables[key];
+			});
+		} else {
+			this.envVariables = envVariables;
+		}
+	}
+
+	resolveAny(folderUri: uri, value: any): any {
+		if (types.isString(value)) {
+			return this.resolve(folderUri, value);
+		} else if (types.isArray(value)) {
+			return value.map(s => this.resolveAny(folderUri, s));
+		} else if (types.isObject(value)) {
+			let result: IStringDictionary<string | IStringDictionary<string> | string[]> = Object.create(null);
+			Object.keys(value).forEach(key => {
+				result[key] = this.resolveAny(folderUri, value[key]);
+			});
+			return result;
+		}
+		return value;
+	}
+
+	resolve(folderUri: uri, value: string): string {
+
+		const filePath = this.accessor.getFilePath();
+
+		return value.replace(VariableResolver.VARIABLE_REGEXP, (match: string, variable: string) => {
+
+			let argument: string;
+			const parts = variable.split(':');
+			if (parts && parts.length > 1) {
+				variable = parts[0];
+				argument = parts[1];
+			}
+
+			switch (variable) {
+
+				case 'env':
+					if (argument) {
+						if (isWindows) {
+							argument = argument.toLowerCase();
+						}
+						const env = this.envVariables[argument];
+						if (types.isString(env)) {
+							return env;
+						}
+						// For `env` we should do the same as a normal shell does - evaluates missing envs to an empty string #46436
+						return '';
+					}
+					throw new Error(localize('missingEnvVarName', "'{0}' can not be resolved because no environment variable name is given.", match));
+
+				case 'config':
+					if (argument) {
+						const config = this.accessor.getConfigurationValue(folderUri, argument);
+						if (types.isUndefinedOrNull(config)) {
+							throw new Error(localize('configNotFound', "'{0}' can not be resolved because setting '{1}' not found.", match, argument));
+						}
+						if (types.isObject(config)) {
+							throw new Error(localize('configNoString', "'{0}' can not be resolved because '{1}' is a structured value.", match, argument));
+						}
+						return config;
+					}
+					throw new Error(localize('missingConfigName', "'{0}' can not be resolved because no settings name is given.", match));
+
+				default: {
+
+					// common error handling for all variables that require an open folder and accept a folder name argument
+					switch (variable) {
+						case 'workspaceRoot':
+						case 'workspaceFolder':
+						case 'workspaceRootFolderName':
+						case 'workspaceFolderBasename':
+						case 'relativeFile':
+							if (argument) {
+								const folder = this.accessor.getFolderUri(argument);
+								if (folder) {
+									folderUri = folder;
+								} else {
+									throw new Error(localize('canNotFindFolder', "'{0}' can not be resolved. No such folder '{1}'.", match, argument));
+								}
+							}
+							if (!folderUri) {
+								if (this.accessor.getWorkspaceFolderCount() > 1) {
+									throw new Error(localize('canNotResolveWorkspaceFolderMultiRoot', "'{0}' can not be resolved in a multi folder workspace. Scope this variable using ':' and a workspace folder name.", match));
+								}
+								throw new Error(localize('canNotResolveWorkspaceFolder', "'{0}' can not be resolved. Please open a folder.", match));
+							}
+							break;
+						default:
+							break;
+					}
+
+					// common error handling for all variables that require an open file
+					switch (variable) {
+						case 'file':
+						case 'relativeFile':
+						case 'fileDirname':
+						case 'fileExtname':
+						case 'fileBasename':
+						case 'fileBasenameNoExtension':
+							if (!filePath) {
+								throw new Error(localize('canNotResolveFile', "'{0}' can not be resolved. Please open an editor.", match));
+							}
+							break;
+						default:
+							break;
+					}
+
+					switch (variable) {
+						case 'workspaceRoot':
+						case 'workspaceFolder':
+							return normalizeDriveLetter(folderUri.fsPath);
+
+						case 'cwd':
+							return folderUri ? normalizeDriveLetter(folderUri.fsPath) : process.cwd();
+
+						case 'workspaceRootFolderName':
+						case 'workspaceFolderBasename':
+							return paths.basename(folderUri.fsPath);
+
+						case 'lineNumber':
+							const lineNumber = this.accessor.getLineNumber();
+							if (lineNumber) {
+								return lineNumber;
+							}
+							throw new Error(localize('canNotResolveLineNumber', "'{0}' can not be resolved. Make sure to have a line selected in the active editor.", match));
+
+						case 'selectedText':
+							const selectedText = this.accessor.getSelectedText();
+							if (selectedText) {
+								return selectedText;
+							}
+							throw new Error(localize('canNotResolveSelectedText', "'{0}' can not be resolved. Make sure to have some text selected in the active editor.", match));
+
+						case 'file':
+							return filePath;
+
+						case 'relativeFile':
+							if (folderUri) {
+								return paths.normalize(relative(folderUri.fsPath, filePath));
+							}
+							return filePath;
+
+						case 'fileDirname':
+							return paths.dirname(filePath);
+
+						case 'fileExtname':
+							return paths.extname(filePath);
+
+						case 'fileBasename':
+							return paths.basename(filePath);
+
+						case 'fileBasenameNoExtension':
+							const basename = paths.basename(filePath);
+							return basename.slice(0, basename.length - paths.extname(basename).length);
+
+						case 'execPath':
+							const ep = this.accessor.getExecPath();
+							if (ep) {
+								return ep;
+							}
+							throw new Error(localize('canNotResolveExecPath', "'{0}' can not be resolved.", match));
+
+						default:
+							return match;
+					}
+				}
+			}
+		});
+	}
+}
diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
index ddbc43f5c6d..5b514fb535b 100644
--- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
+++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
@@ -86,7 +86,7 @@ suite('Configuration Resolver Service', () => {
 		if (platform.isWindows) {
 			assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - Value for key1');
 		} else {
-			assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - ${env:Key1}');
+			assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - ');
 		}
 	});
 
@@ -196,18 +196,6 @@ suite('Configuration Resolver Service', () => {
 		assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:editor.lineNumbers} ${config:editor.insertSpaces} xyz'), 'abc foo 123 false xyz');
 	});
 
-	test('configuration should not evaluate Javascript', () => {
-		let configurationService: IConfigurationService;
-		configurationService = new MockConfigurationService({
-			editor: {
-				abc: 'foo'
-			}
-		});
-
-		let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService());
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:editor[\'abc\'.substr(0)]} xyz'), 'abc ${config:editor[\'abc\'.substr(0)]} xyz');
-	});
-
 	test('uses original variable as fallback', () => {
 		let configurationService: IConfigurationService;
 		configurationService = new MockConfigurationService({
@@ -215,10 +203,8 @@ suite('Configuration Resolver Service', () => {
 		});
 
 		let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService());
-		assert.strictEqual(service.resolve(workspace, 'abc ${invalidVariable} xyz'), 'abc ${invalidVariable} xyz');
-		assert.strictEqual(service.resolve(workspace, 'abc ${env:invalidVariable} xyz'), 'abc ${env:invalidVariable} xyz');
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.abc.def} xyz'), 'abc ${config:editor.abc.def} xyz');
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:panel.abc} xyz'), 'abc ${config:panel.abc} xyz');
+		assert.strictEqual(service.resolve(workspace, 'abc ${unknownVariable} xyz'), 'abc ${unknownVariable} xyz');
+		assert.strictEqual(service.resolve(workspace, 'abc ${env:unknownVariable} xyz'), 'abc  xyz');
 	});
 
 	test('configuration variables with invalid accessor', () => {
@@ -230,9 +216,14 @@ suite('Configuration Resolver Service', () => {
 		});
 
 		let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService());
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:} xyz'), 'abc ${config:} xyz');
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:editor..fontFamily} xyz'), 'abc ${config:editor..fontFamily} xyz');
-		assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'), 'abc ${config:editor.none.none2} xyz');
+
+		assert.throws(() => service.resolve(workspace, 'abc ${env} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${env:} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${config} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${config:} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${config:editor} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${config:editor..fontFamily} xyz'));
+		assert.throws(() => service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'));
 	});
 
 	test('interactive variable simple', () => {
diff --git a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
index 4778b3aa678..627c221fa6c 100644
--- a/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
+++ b/src/vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts
@@ -119,7 +119,7 @@ export class CrashReporterService implements ICrashReporterService {
 		// Experimental crash reporting support for child processes on Mac only for now
 		if (this.isEnabled && isMacintosh) {
 			const childProcessOptions = deepClone(this.options);
-			childProcessOptions.extra.processName = name;
+			(<any>childProcessOptions.extra).processName = name;
 			childProcessOptions.crashesDirectory = os.tmpdir();
 
 			return childProcessOptions;
diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 4f55f3044ab..dfce99a732f 100644
--- a/src/vs/workbench/services/decorations/browser/decorationsService.ts
+++ b/src/vs/workbench/services/decorations/browser/decorationsService.ts
@@ -245,6 +245,9 @@ class DecorationProviderWrapper {
 
 			} else {
 				// selective changes -> drop for resource, fetch again, send event
+				// perf: the map stores thenables, decorations, or `null`-markers.
+				// we make us of that and ignore all uris in which we have never
+				// been interested.
 				for (const uri of uris) {
 					this._fetchData(uri);
 				}
@@ -363,6 +366,8 @@ export class FileDecorationsService implements IDecorationsService {
 
 	dispose(): void {
 		dispose(this._disposables);
+		dispose(this._onDidChangeDecorations);
+		dispose(this._onDidChangeDecorationsDelayed);
 	}
 
 	registerDecorationsProvider(provider: IDecorationsProvider): IDisposable {
diff --git a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
index b8c9e471fab..631cc2df561 100644
--- a/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
+++ b/src/vs/workbench/services/decorations/test/browser/decorationsService.test.ts
@@ -75,7 +75,7 @@ suite('DecorationsService', function () {
 		assert.equal(callCounter, 1);
 	});
 
-	test('Clear decorations on provider dispose', function () {
+	test('Clear decorations on provider dispose', async function () {
 		let uri = URI.parse('foo:bar');
 		let callCounter = 0;
 
@@ -94,13 +94,14 @@ suite('DecorationsService', function () {
 
 		// un-register -> ensure good event
 		let didSeeEvent = false;
-		service.onDidChangeDecorations(e => {
+		let p = toPromise(service.onDidChangeDecorations).then(e => {
 			assert.equal(e.affectsResource(uri), true);
 			assert.deepEqual(service.getDecoration(uri, false), undefined);
 			assert.equal(callCounter, 1);
 			didSeeEvent = true;
 		});
 		reg.dispose();
+		await p;
 		assert.equal(didSeeEvent, true);
 	});
 
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index 2ec528fcec0..95a5a332c4d 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -125,12 +125,12 @@ const schema: IJSONSchema = {
 	properties: {
 		engines: {
 			type: 'object',
-
+			description: nls.localize('vscode.extension.engines', "Engine compatibility."),
 			properties: {
 				'vscode': {
 					type: 'string',
 					description: nls.localize('vscode.extension.engines.vscode', 'For VS Code extensions, specifies the VS Code version that the extension is compatible with. Cannot be *. For example: ^0.10.5 indicates compatibility with a minimum VS Code version of 0.10.5.'),
-					default: '^0.10.0',
+					default: '^1.22.0',
 				}
 			}
 		},
@@ -147,8 +147,15 @@ const schema: IJSONSchema = {
 			type: 'array',
 			uniqueItems: true,
 			items: {
-				type: 'string',
-				enum: ['Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs']
+				oneOf: [{
+					type: 'string',
+					enum: ['Programming Languages', 'Snippets', 'Linters', 'Themes', 'Debuggers', 'Other', 'Keymaps', 'Formatters', 'Extension Packs', 'SCM Providers', 'Azure', 'Language Packs'],
+				},
+				{
+					type: 'string',
+					const: 'Languages',
+					deprecationMessage: nls.localize('vscode.extension.category.languages.deprecated', 'Use \'Programming  Languages\' instead'),
+				}]
 			}
 		},
 		galleryBanner: {
@@ -249,6 +256,25 @@ const schema: IJSONSchema = {
 				}
 			}
 		},
+		markdown: {
+			type: 'string',
+			description: nls.localize('vscode.extension.markdown', "Controls the Markdown rendering engine used in the Marketplace. Either github (default) or standard."),
+			enum: ['github', 'standard'],
+			default: 'github'
+		},
+		qna: {
+			default: 'marketplace',
+			description: nls.localize('vscode.extension.qna', "Controls the Q&A link in the Marketplace. Set to marketplace to enable the default Marketplace Q & A site. Set to a string to provide the URL of a custom Q & A site. Set to false to disable Q & A altogether."),
+			anyOf: [
+				{
+					type: ['string', 'boolean'],
+					enum: ['marketplace', false]
+				},
+				{
+					type: 'string'
+				}
+			]
+		},
 		extensionDependencies: {
 			description: nls.localize('vscode.extension.extensionDependencies', 'Dependencies to other extensions. The identifier of an extension is always ${publisher}.${name}. For example: vscode.csharp.'),
 			type: 'array',
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index f6caeb161b4..7a1508c2eec 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -235,11 +235,12 @@ export class ExtensionHostProcessWorker {
 							? nls.localize('extensionHostProcess.startupFailDebug', "Extension host did not start in 10 seconds, it might be stopped on the first line and needs a debugger to continue.")
 							: nls.localize('extensionHostProcess.startupFail', "Extension host did not start in 10 seconds, that might be a problem.");
 
-						this._notificationService.prompt(Severity.Warning, msg, [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-							if (choice === 0) {
-								this._windowService.reloadWindow();
-							}
-						});
+						this._notificationService.prompt(Severity.Warning, msg,
+							[{
+								label: nls.localize('reloadWindow', "Reload Window"),
+								run: () => this._windowService.reloadWindow()
+							}]
+						);
 					}, 10000);
 				}
 
@@ -370,10 +371,7 @@ export class ExtensionHostProcessWorker {
 					appSettingsHome: this._environmentService.appSettingsHome,
 					disableExtensions: this._environmentService.disableExtensions,
 					extensionDevelopmentPath: this._environmentService.extensionDevelopmentPath,
-					extensionTestsPath: this._environmentService.extensionTestsPath,
-					// globally disable proposed api when built and not insiders developing extensions
-					enableProposedApiForAll: !this._environmentService.isBuilt || (!!this._environmentService.extensionDevelopmentPath && product.nameLong.indexOf('Insiders') >= 0),
-					enableProposedApiFor: this._environmentService.args['enable-proposed-api'] || []
+					extensionTestsPath: this._environmentService.extensionTestsPath
 				},
 				workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? null : <IWorkspaceData>this._contextService.getWorkspace(),
 				extensions: extensionDescriptions,
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 0423ebbecc4..7fb1c10edd1 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -41,6 +41,7 @@ import product from 'vs/platform/node/product';
 import * as strings from 'vs/base/common/strings';
 import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 
 let _SystemExtensionsRoot: string = null;
 function getSystemExtensionsRoot(): string {
@@ -299,6 +300,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 		this._extensionHostProcessManager = null;
 		this.startDelayed(lifecycleService);
+
+		if (this._environmentService.disableExtensions) {
+			this._notificationService.info(nls.localize('extensionsDisabled', "All extensions are disabled."));
+		}
 	}
 
 	private startDelayed(lifecycleService: ILifecycleService): void {
@@ -382,16 +387,16 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			message = nls.localize('extensionHostProcess.unresponsiveCrash', "Extension host terminated because it was not responsive.");
 		}
 
-		this._notificationService.prompt(Severity.Error, message, [nls.localize('devTools', "Developer Tools"), nls.localize('restart', "Restart Extension Host")]).then(choice => {
-			switch (choice) {
-				case 0 /* Open Dev Tools */:
-					this._windowService.openDevTools();
-					break;
-				case 1 /* Restart Extension Host */:
-					this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents));
-					break;
-			}
-		});
+		this._notificationService.prompt(Severity.Error, message,
+			[{
+				label: nls.localize('devTools', "Open Developer Tools"),
+				run: () => this._windowService.openDevTools()
+			},
+			{
+				label: nls.localize('restart', "Restart Extension Host"),
+				run: () => this._startExtensionHostProcess(Object.keys(this._allRequestedActivateEvents))
+			}]
+		);
 	}
 
 	// ---- begin IExtensionService
@@ -420,7 +425,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 
 	private _activateByEvent(activationEvent: string): TPromise<void> {
-		return this._extensionHostProcessManager.activateByEvent(activationEvent);
+		if (this._extensionHostProcessManager) {
+			return this._extensionHostProcessManager.activateByEvent(activationEvent);
+		}
+		return NO_OP_VOID_PROMISE;
 	}
 
 	public whenInstalledExtensionsRegistered(): TPromise<boolean> {
@@ -451,8 +459,8 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 
 	public getExtensionsStatus(): { [id: string]: IExtensionsStatus; } {
-		const activationTimes = this._extensionHostProcessManager.getActivationTimes();
-		const runtimeErrors = this._extensionHostProcessManager.getRuntimeErrors();
+		const activationTimes = this._extensionHostProcessManager ? this._extensionHostProcessManager.getActivationTimes() : {};
+		const runtimeErrors = this._extensionHostProcessManager ? this._extensionHostProcessManager.getRuntimeErrors() : {};
 
 		let result: { [id: string]: IExtensionsStatus; } = Object.create(null);
 		if (this._registry) {
@@ -471,7 +479,10 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 
 	public canProfileExtensionHost(): boolean {
-		return this._extensionHostProcessManager.canProfileExtensionHost();
+		if (this._extensionHostProcessManager) {
+			return this._extensionHostProcessManager.canProfileExtensionHost();
+		}
+		return false;
 	}
 
 	public startExtensionHostProfile(): TPromise<ProfileSession> {
@@ -487,7 +498,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 
 	private _scanAndHandleExtensions(): void {
 
-		this._getRuntimeExtension()
+		this._getRuntimeExtensions()
 			.then(runtimeExtensons => {
 				this._registry = new ExtensionDescriptionRegistry(runtimeExtensons);
 
@@ -512,7 +523,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			});
 	}
 
-	private _getRuntimeExtension(): TPromise<IExtensionDescription[]> {
+	private _getRuntimeExtensions(): TPromise<IExtensionDescription[]> {
 		const log = new Logger((severity, source, message) => {
 			this._logOrShowMessage(severity, this._isDev ? messageWithSource2(source, message) : message);
 		});
@@ -576,7 +587,36 @@ export class ExtensionService extends Disposable implements IExtensionService {
 							return runtimeExtensions;
 						}
 					});
-			});
+			}).then(extensions => this._updateEnableProposedApi(extensions));
+	}
+
+	private _updateEnableProposedApi(extensions: IExtensionDescription[]): IExtensionDescription[] {
+		const enableProposedApiForAll = !this._environmentService.isBuilt || (!!this._environmentService.extensionDevelopmentPath && product.nameLong.indexOf('Insiders') >= 0);
+		const enableProposedApiFor = this._environmentService.args['enable-proposed-api'] || [];
+		for (const extension of extensions) {
+			if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
+				&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
+			) {
+				// fast lane -> proposed api is available to all extensions
+				// that are listed in product.json-files
+				extension.enableProposedApi = true;
+
+			} else if (extension.enableProposedApi && !extension.isBuiltin) {
+				if (
+					!enableProposedApiForAll &&
+					enableProposedApiFor.indexOf(extension.id) < 0
+				) {
+					extension.enableProposedApi = false;
+					console.error(`Extension '${extension.id} cannot use PROPOSED API (must started out of dev or enabled via --enable-proposed-api)`);
+
+				} else {
+					// proposed api is available when developing or when an extension was explicitly
+					// spelled out via a command line argument
+					console.warn(`Extension '${extension.id}' uses PROPOSED API which is subject to change and removal without notice.`);
+				}
+			}
+		}
+		return extensions;
 	}
 
 	private _handleExtensionPointMessage(msg: IMessage) {
@@ -634,11 +674,14 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			console.error(err);
 		}
 
-		notificationService.prompt(Severity.Error, nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window."), [nls.localize('reloadWindow', "Reload Window")]).then(choice => {
-			if (choice === 0) {
-				windowService.reloadWindow();
-			}
-		});
+		notificationService.prompt(
+			Severity.Error,
+			nls.localize('extensionCache.invalid', "Extensions have been modified on disk. Please reload the window."),
+			[{
+				label: nls.localize('reloadWindow', "Reload Window"),
+				run: () => windowService.reloadWindow()
+			}]
+		);
 	}
 
 	private static async _readExtensionCache(environmentService: IEnvironmentService, cacheKey: string): TPromise<IExtensionCacheData> {
diff --git a/src/vs/workbench/services/extensions/node/extensionDescriptionRegistry.ts b/src/vs/workbench/services/extensions/node/extensionDescriptionRegistry.ts
index 0d97bec7ccb..5fbb9357739 100644
--- a/src/vs/workbench/services/extensions/node/extensionDescriptionRegistry.ts
+++ b/src/vs/workbench/services/extensions/node/extensionDescriptionRegistry.ts
@@ -33,6 +33,12 @@ export class ExtensionDescriptionRegistry {
 			if (Array.isArray(extensionDescription.activationEvents)) {
 				for (let j = 0, lenJ = extensionDescription.activationEvents.length; j < lenJ; j++) {
 					let activationEvent = extensionDescription.activationEvents[j];
+
+					// TODO@joao: there's no easy way to contribute this
+					if (activationEvent === 'onExternalUri') {
+						activationEvent = `onExternalUri:${extensionDescription.id}`;
+					}
+
 					this._activationMap[activationEvent] = this._activationMap[activationEvent] || [];
 					this._activationMap[activationEvent].push(extensionDescription);
 				}
diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts
index cdcc36031bc..2707535072c 100644
--- a/src/vs/workbench/services/extensions/node/extensionPoints.ts
+++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts
@@ -492,7 +492,7 @@ export class ExtensionScanner {
 	/**
 	 * Read the extension defined in `absoluteFolderPath`
 	 */
-	private static scanExtension(version: string, log: ILog, absoluteFolderPath: string, isBuiltin: boolean, nlsConfig: NlsConfiguration): TPromise<IExtensionDescription> {
+	public static scanExtension(version: string, log: ILog, absoluteFolderPath: string, isBuiltin: boolean, nlsConfig: NlsConfiguration): TPromise<IExtensionDescription> {
 		absoluteFolderPath = normalize(absoluteFolderPath);
 
 		let parser = new ExtensionManifestParser(version, log, absoluteFolderPath, isBuiltin);
diff --git a/src/vs/workbench/services/extensions/node/rpcProtocol.ts b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
index 2e1ae6d2ee8..b40e5d2d19b 100644
--- a/src/vs/workbench/services/extensions/node/rpcProtocol.ts
+++ b/src/vs/workbench/services/extensions/node/rpcProtocol.ts
@@ -10,11 +10,88 @@ import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
 import { LazyPromise } from 'vs/workbench/services/extensions/node/lazyPromise';
 import { ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier';
 import { CharCode } from 'vs/base/common/charCode';
+import URI, { UriComponents } from 'vs/base/common/uri';
+import { MarshalledObject } from 'vs/base/common/marshalling';
 
 declare var Proxy: any; // TODO@TypeScript
 
+export interface IURITransformer {
+	transformIncoming(uri: UriComponents): UriComponents;
+	transformOutgoing(uri: URI): URI;
+}
+
+function _transformOutgoingURIs(obj: any, transformer: IURITransformer, depth: number): any {
+
+	if (!obj || depth > 200) {
+		return null;
+	}
+
+	if (typeof obj === 'object') {
+		if (obj instanceof URI) {
+			return transformer.transformOutgoing(obj);
+		}
+
+		// walk object (or array)
+		for (let key in obj) {
+			if (Object.hasOwnProperty.call(obj, key)) {
+				const r = _transformOutgoingURIs(obj[key], transformer, depth + 1);
+				if (r !== null) {
+					obj[key] = r;
+				}
+			}
+		}
+	}
+
+	return null;
+}
+
+function transformOutgoingURIs(obj: any, transformer: IURITransformer): any {
+	const result = _transformOutgoingURIs(obj, transformer, 0);
+	if (result === null) {
+		// no change
+		return obj;
+	}
+	return result;
+}
+
+function _transformIncomingURIs(obj: any, transformer: IURITransformer, depth: number): any {
+
+	if (!obj || depth > 200) {
+		return null;
+	}
+
+	if (typeof obj === 'object') {
+
+		if ((<MarshalledObject>obj).$mid === 1) {
+			return transformer.transformIncoming(obj);
+		}
+
+		// walk object (or array)
+		for (let key in obj) {
+			if (Object.hasOwnProperty.call(obj, key)) {
+				const r = _transformIncomingURIs(obj[key], transformer, depth + 1);
+				if (r !== null) {
+					obj[key] = r;
+				}
+			}
+		}
+	}
+
+	return null;
+}
+
+function transformIncomingURIs(obj: any, transformer: IURITransformer): any {
+	const result = _transformIncomingURIs(obj, transformer, 0);
+	if (result === null) {
+		// no change
+		return obj;
+	}
+	return result;
+}
+
 export class RPCProtocol implements IRPCProtocol {
 
+	private readonly _uriTransformer: IURITransformer;
 	private _isDisposed: boolean;
 	private readonly _locals: { [id: string]: any; };
 	private readonly _proxies: { [id: string]: any; };
@@ -23,7 +100,8 @@ export class RPCProtocol implements IRPCProtocol {
 	private readonly _pendingRPCReplies: { [msgId: string]: LazyPromise; };
 	private readonly _multiplexor: RPCMultiplexer;
 
-	constructor(protocol: IMessagePassingProtocol) {
+	constructor(protocol: IMessagePassingProtocol, transformer: IURITransformer = null) {
+		this._uriTransformer = transformer;
 		this._isDisposed = false;
 		this._locals = Object.create(null);
 		this._proxies = Object.create(null);
@@ -43,6 +121,13 @@ export class RPCProtocol implements IRPCProtocol {
 		});
 	}
 
+	public transformIncomingURIs<T>(obj: T): T {
+		if (!this._uriTransformer) {
+			return obj;
+		}
+		return transformIncomingURIs(obj, this._uriTransformer);
+	}
+
 	public getProxy<T>(identifier: ProxyIdentifier<T>): T {
 		if (!this._proxies[identifier.id]) {
 			this._proxies[identifier.id] = this._createProxy(identifier.id);
@@ -84,6 +169,9 @@ export class RPCProtocol implements IRPCProtocol {
 		}
 
 		let msg = <RPCMessage>JSON.parse(rawmsg);
+		if (this._uriTransformer) {
+			msg = transformIncomingURIs(msg, this._uriTransformer);
+		}
 
 		switch (msg.type) {
 			case MessageType.Request:
@@ -109,6 +197,9 @@ export class RPCProtocol implements IRPCProtocol {
 
 		this._invokedHandlers[callId].then((r) => {
 			delete this._invokedHandlers[callId];
+			if (this._uriTransformer) {
+				r = transformOutgoingURIs(r, this._uriTransformer);
+			}
 			this._multiplexor.send(MessageFactory.replyOK(callId, r));
 		}, (err) => {
 			delete this._invokedHandlers[callId];
@@ -185,6 +276,9 @@ export class RPCProtocol implements IRPCProtocol {
 		});
 
 		this._pendingRPCReplies[callId] = result;
+		if (this._uriTransformer) {
+			args = transformOutgoingURIs(args, this._uriTransformer);
+		}
 		this._multiplexor.send(MessageFactory.request(callId, proxyId, methodName, args));
 		return result;
 	}
diff --git a/src/vs/workbench/services/files/electron-browser/encoding.ts b/src/vs/workbench/services/files/electron-browser/encoding.ts
new file mode 100644
index 00000000000..c1b99f40985
--- /dev/null
+++ b/src/vs/workbench/services/files/electron-browser/encoding.ts
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
+import * as encoding from 'vs/base/node/encoding';
+import uri from 'vs/base/common/uri';
+import { IResolveContentOptions, isParent, IResourceEncodings } from 'vs/platform/files/common/files';
+import { isLinux } from 'vs/base/common/platform';
+import { join, extname } from 'path';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+
+export interface IEncodingOverride {
+	parent?: uri;
+	extension?: string;
+	encoding: string;
+}
+
+// TODO@Ben debt - encodings should move one layer up from the file service into the text file
+// service and then ideally be passed in as option to the file service
+// the file service should talk about string | Buffer for reading and writing and only convert
+// to strings if a encoding is provided
+export class ResourceEncodings implements IResourceEncodings {
+	private encodingOverride: IEncodingOverride[];
+	private toDispose: IDisposable[];
+
+	constructor(
+		private textResourceConfigurationService: ITextResourceConfigurationService,
+		private environmentService: IEnvironmentService,
+		private contextService: IWorkspaceContextService,
+		encodingOverride?: IEncodingOverride[]
+	) {
+		this.encodingOverride = encodingOverride || this.getEncodingOverrides();
+		this.toDispose = [];
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+
+		// Workspace Folder Change
+		this.toDispose.push(this.contextService.onDidChangeWorkspaceFolders(() => {
+			this.encodingOverride = this.getEncodingOverrides();
+		}));
+	}
+
+	public getReadEncoding(resource: uri, options: IResolveContentOptions, detected: encoding.IDetectedEncodingResult): string {
+		let preferredEncoding: string;
+
+		// Encoding passed in as option
+		if (options && options.encoding) {
+			if (detected.encoding === encoding.UTF8 && options.encoding === encoding.UTF8) {
+				preferredEncoding = encoding.UTF8_with_bom; // indicate the file has BOM if we are to resolve with UTF 8
+			} else {
+				preferredEncoding = options.encoding; // give passed in encoding highest priority
+			}
+		}
+
+		// Encoding detected
+		else if (detected.encoding) {
+			if (detected.encoding === encoding.UTF8) {
+				preferredEncoding = encoding.UTF8_with_bom; // if we detected UTF-8, it can only be because of a BOM
+			} else {
+				preferredEncoding = detected.encoding;
+			}
+		}
+
+		// Encoding configured
+		else if (this.textResourceConfigurationService.getValue(resource, 'files.encoding') === encoding.UTF8_with_bom) {
+			preferredEncoding = encoding.UTF8; // if we did not detect UTF 8 BOM before, this can only be UTF 8 then
+		}
+
+		return this.getEncodingForResource(resource, preferredEncoding);
+	}
+
+	public getWriteEncoding(resource: uri, preferredEncoding?: string): string {
+		return this.getEncodingForResource(resource, preferredEncoding);
+	}
+
+	private getEncodingForResource(resource: uri, preferredEncoding?: string): string {
+		let fileEncoding: string;
+
+		const override = this.getEncodingOverride(resource);
+		if (override) {
+			fileEncoding = override; // encoding override always wins
+		} else if (preferredEncoding) {
+			fileEncoding = preferredEncoding; // preferred encoding comes second
+		} else {
+			fileEncoding = this.textResourceConfigurationService.getValue(resource, 'files.encoding'); // and last we check for settings
+		}
+
+		if (!fileEncoding || !encoding.encodingExists(fileEncoding)) {
+			fileEncoding = encoding.UTF8; // the default is UTF 8
+		}
+
+		return fileEncoding;
+	}
+
+	private getEncodingOverrides(): IEncodingOverride[] {
+		const encodingOverride: IEncodingOverride[] = [];
+
+		// Global settings
+		encodingOverride.push({ parent: uri.file(this.environmentService.appSettingsHome), encoding: encoding.UTF8 });
+
+		// Workspace files
+		encodingOverride.push({ extension: WORKSPACE_EXTENSION, encoding: encoding.UTF8 });
+
+		// Folder Settings
+		this.contextService.getWorkspace().folders.forEach(folder => {
+			encodingOverride.push({ parent: uri.file(join(folder.uri.fsPath, '.vscode')), encoding: encoding.UTF8 });
+		});
+
+		return encodingOverride;
+	}
+
+	private getEncodingOverride(resource: uri): string {
+		if (resource && this.encodingOverride && this.encodingOverride.length) {
+			for (let i = 0; i < this.encodingOverride.length; i++) {
+				const override = this.encodingOverride[i];
+
+				// check if the resource is child of encoding override path
+				if (override.parent && isParent(resource.fsPath, override.parent.fsPath, !isLinux /* ignorecase */)) {
+					return override.encoding;
+				}
+
+				// check if the resource extension is equal to encoding override
+				if (override.extension && extname(resource.fsPath) === `.${override.extension}`) {
+					return override.encoding;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	public dispose(): void {
+		this.toDispose = dispose(this.toDispose);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index fc90d82cce0..f1be736dffc 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -2,91 +2,198 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+
 'use strict';
 
-import * as nls from 'vs/nls';
+import * as paths from 'path';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as crypto from 'crypto';
+import * as assert from 'assert';
+import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot, IFilesConfiguration, IFileSystemProviderRegistrationEvent, IFileSystemProvider } from 'vs/platform/files/common/files';
+import { MAX_FILE_SIZE, MAX_HEAP_SIZE } from 'vs/platform/files/node/files';
+import { isEqualOrParent } from 'vs/base/common/paths';
+import { ResourceMap } from 'vs/base/common/map';
+import * as arrays from 'vs/base/common/arrays';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import * as paths from 'vs/base/common/paths';
-import * as encoding from 'vs/base/node/encoding';
-import * as errors from 'vs/base/common/errors';
+import * as objects from 'vs/base/common/objects';
+import * as extfs from 'vs/base/node/extfs';
+import { nfcall, ThrottledDelayer } from 'vs/base/common/async';
 import uri from 'vs/base/common/uri';
-import { FileOperation, FileOperationEvent, IFileService, IFilesConfiguration, IResolveFileOptions, IFileStat, IResolveFileResult, IContent, IStreamContent, IImportResult, IResolveContentOptions, IUpdateContentOptions, FileChangesEvent, ICreateFileOptions, ITextSnapshot } from 'vs/platform/files/common/files';
-import { FileService as NodeFileService, IFileServiceOptions, IEncodingOverride } from 'vs/workbench/services/files/node/fileService';
-import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import * as nls from 'vs/nls';
+import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
+import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
+import * as pfs from 'vs/base/node/pfs';
+import * as encoding from 'vs/base/node/encoding';
+import * as flow from 'vs/base/node/flow';
+import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService';
+import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService';
+import { toFileChangesEvent, normalize, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
 import { Event, Emitter } from 'vs/base/common/event';
-import { shell } from 'electron';
+import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/watcherService';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
-import product from 'vs/platform/node/product';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { getBaseLabel } from 'vs/base/common/labels';
 import { Schemas } from 'vs/base/common/network';
-import { Severity, INotificationService, PromptOption } from 'vs/platform/notification/common/notification';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import product from 'vs/platform/node/product';
+import { shell } from 'electron';
+import { IEncodingOverride, ResourceEncodings } from 'vs/workbench/services/files/electron-browser/encoding';
+import { createReadableOfSnapshot } from 'vs/workbench/services/files/electron-browser/streams';
+
+class BufferPool {
+
+	static _64K = new BufferPool(64 * 1024, 5);
+
+	constructor(
+		readonly bufferSize: number,
+		private readonly _capacity: number,
+		private readonly _free: Buffer[] = [],
+	) { }
+
+	acquire(): Buffer {
+		if (this._free.length === 0) {
+			return Buffer.allocUnsafe(this.bufferSize);
+		} else {
+			return this._free.shift();
+		}
+	}
+
+	release(buf: Buffer): void {
+		if (this._free.length <= this._capacity) {
+			this._free.push(buf);
+		}
+	}
+}
+
+export interface IFileServiceTestOptions {
+	disableWatcher?: boolean;
+	encodingOverride?: IEncodingOverride[];
+}
 
 export class FileService implements IFileService {
 
 	public _serviceBrand: any;
 
-	// If we run with .NET framework < 4.5, we need to detect this error to inform the user
+	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
+	private static readonly FS_REWATCH_DELAY = 300; // delay to rewatch a file that was renamed or deleted (in ms)
+
 	private static readonly NET_VERSION_ERROR = 'System.MissingMethodException';
 	private static readonly NET_VERSION_ERROR_IGNORE_KEY = 'ignoreNetVersionError';
 
 	private static readonly ENOSPC_ERROR = 'ENOSPC';
 	private static readonly ENOSPC_ERROR_IGNORE_KEY = 'ignoreEnospcError';
 
-	private raw: NodeFileService;
+	protected readonly _onFileChanges: Emitter<FileChangesEvent>;
+	protected readonly _onAfterOperation: Emitter<FileOperationEvent>;
+	protected readonly _onDidChangeFileSystemProviderRegistrations = new Emitter<IFileSystemProviderRegistrationEvent>();
 
-	private toUnbind: IDisposable[];
+	protected toDispose: IDisposable[];
 
-	protected _onFileChanges: Emitter<FileChangesEvent>;
-	protected _onAfterOperation: Emitter<FileOperationEvent>;
+	private activeWorkspaceFileChangeWatcher: IDisposable;
+	private activeFileChangesWatchers: ResourceMap<fs.FSWatcher>;
+	private fileChangesWatchDelayer: ThrottledDelayer<void>;
+	private undeliveredRawFileChangesEvents: IRawFileChange[];
+
+	private _encoding: ResourceEncodings;
 
 	constructor(
-		@IConfigurationService private configurationService: IConfigurationService,
-		@IWorkspaceContextService private contextService: IWorkspaceContextService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ILifecycleService private lifecycleService: ILifecycleService,
-		@INotificationService private notificationService: INotificationService,
-		@IStorageService private storageService: IStorageService,
-		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService
+		private contextService: IWorkspaceContextService,
+		private environmentService: IEnvironmentService,
+		private textResourceConfigurationService: ITextResourceConfigurationService,
+		private configurationService: IConfigurationService,
+		private lifecycleService: ILifecycleService,
+		private storageService: IStorageService,
+		private notificationService: INotificationService,
+		private options: IFileServiceTestOptions = Object.create(null)
 	) {
-		this.toUnbind = [];
+		this.toDispose = [];
 
 		this._onFileChanges = new Emitter<FileChangesEvent>();
-		this.toUnbind.push(this._onFileChanges);
+		this.toDispose.push(this._onFileChanges);
 
 		this._onAfterOperation = new Emitter<FileOperationEvent>();
-		this.toUnbind.push(this._onAfterOperation);
+		this.toDispose.push(this._onAfterOperation);
 
-		const configuration = this.configurationService.getValue<IFilesConfiguration>();
+		this.activeFileChangesWatchers = new ResourceMap<fs.FSWatcher>();
+		this.fileChangesWatchDelayer = new ThrottledDelayer<void>(FileService.FS_EVENT_DELAY);
+		this.undeliveredRawFileChangesEvents = [];
 
-		let watcherIgnoredPatterns: string[] = [];
-		if (configuration.files && configuration.files.watcherExclude) {
-			watcherIgnoredPatterns = Object.keys(configuration.files.watcherExclude).filter(k => !!configuration.files.watcherExclude[k]);
+		this._encoding = new ResourceEncodings(textResourceConfigurationService, environmentService, contextService, this.options.encodingOverride);
+
+		this.registerListeners();
+	}
+
+	public get encoding(): ResourceEncodings {
+		return this._encoding;
+	}
+
+	private registerListeners(): void {
+
+		// Wait until we are fully running before starting file watchers
+		this.lifecycleService.when(LifecyclePhase.Running).then(() => {
+			this.setupFileWatching();
+		});
+
+		// Workbench State Change
+		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => {
+			if (this.lifecycleService.phase >= LifecyclePhase.Running) {
+				this.setupFileWatching();
+			}
+		}));
+
+		// Lifecycle
+		this.lifecycleService.onShutdown(this.dispose, this);
+	}
+
+	private handleError(error: string | Error): void {
+		const msg = error ? error.toString() : void 0;
+		if (!msg) {
+			return;
 		}
 
-		// build config
-		const fileServiceConfig: IFileServiceOptions = {
-			errorLogger: (msg: string) => this.onFileServiceError(msg),
-			encodingOverride: this.getEncodingOverrides(),
-			watcherIgnoredPatterns,
-			verboseLogging: environmentService.verbose,
-			useExperimentalFileWatcher: configuration.files.useExperimentalFileWatcher,
-			elevationSupport: {
-				cliPath: this.environmentService.cliPath,
-				promptTitle: this.environmentService.appNameLong,
-				promptIcnsPath: (isMacintosh && this.environmentService.isBuilt) ? paths.join(paths.dirname(this.environmentService.appRoot), `${product.nameShort}.icns`) : void 0
-			}
-		};
+		// Forward to unexpected error handler
+		onUnexpectedError(msg);
 
-		// create service
-		this.raw = new NodeFileService(contextService, environmentService, textResourceConfigurationService, configurationService, lifecycleService, fileServiceConfig);
+		// Detect if we run < .NET Framework 4.5 (TODO@ben remove with new watcher impl)
+		if (msg.indexOf(FileService.NET_VERSION_ERROR) >= 0 && !this.storageService.getBoolean(FileService.NET_VERSION_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
+			this.notificationService.prompt(
+				Severity.Warning,
+				nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."),
+				[{
+					label: nls.localize('installNet', "Download .NET Framework 4.5"),
+					run: () => window.open('https://go.microsoft.com/fwlink/?LinkId=786533')
+				},
+				{
+					label: nls.localize('neverShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this.storageService.store(FileService.NET_VERSION_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE)
+				}]
+			);
+		}
 
-		// Listeners
-		this.registerListeners();
+		// Detect if we run into ENOSPC issues
+		if (msg.indexOf(FileService.ENOSPC_ERROR) >= 0 && !this.storageService.getBoolean(FileService.ENOSPC_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
+			this.notificationService.prompt(
+				Severity.Warning,
+				nls.localize('enospcError', "{0} is unable to watch for file changes in this large workspace. Please follow the instructions link to resolve this issue.", product.nameLong),
+				[{
+					label: nls.localize('learnMore', "Instructions"),
+					run: () => window.open('https://go.microsoft.com/fwlink/?linkid=867693')
+				},
+				{
+					label: nls.localize('neverShowAgain', "Don't Show Again"),
+					isSecondary: true,
+					run: () => this.storageService.store(FileService.ENOSPC_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE)
+				}]
+			);
+		}
 	}
 
 	public get onFileChanges(): Event<FileChangesEvent> {
@@ -97,132 +204,704 @@ export class FileService implements IFileService {
 		return this._onAfterOperation.event;
 	}
 
-	private onFileServiceError(error: string | Error): void {
-		const msg = error ? error.toString() : void 0;
-		if (!msg) {
+	private setupFileWatching(): void {
+
+		// dispose old if any
+		if (this.activeWorkspaceFileChangeWatcher) {
+			this.activeWorkspaceFileChangeWatcher.dispose();
+		}
+
+		// Return if not aplicable
+		const workbenchState = this.contextService.getWorkbenchState();
+		if (workbenchState === WorkbenchState.EMPTY || this.options.disableWatcher) {
 			return;
 		}
 
-		// Forward to unexpected error handler
-		errors.onUnexpectedError(msg);
-
-		// Detect if we run < .NET Framework 4.5 (TODO@ben remove with new watcher impl)
-		if (msg.indexOf(FileService.NET_VERSION_ERROR) >= 0 && !this.storageService.getBoolean(FileService.NET_VERSION_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			const choices: PromptOption[] = [nls.localize('installNet', "Download .NET Framework 4.5"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
-			this.notificationService.prompt(Severity.Warning, nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."), choices).then(choice => {
-				switch (choice) {
-					case 0 /* Read More */:
-						window.open('https://go.microsoft.com/fwlink/?LinkId=786533');
-						break;
-					case 1 /* Never show again */:
-						this.storageService.store(FileService.NET_VERSION_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+		// new watcher: use it if setting tells us so or we run in multi-root environment
+		const configuration = this.configurationService.getValue<IFilesConfiguration>();
+		if ((configuration.files && configuration.files.useExperimentalFileWatcher) || workbenchState === WorkbenchState.WORKSPACE) {
+			const multiRootWatcher = new NsfwWatcherService(this.contextService, this.configurationService, e => this._onFileChanges.fire(e), err => this.handleError(err), this.environmentService.verbose);
+			this.activeWorkspaceFileChangeWatcher = toDisposable(multiRootWatcher.startWatching());
 		}
 
-		// Detect if we run into ENOSPC issues
-		if (msg.indexOf(FileService.ENOSPC_ERROR) >= 0 && !this.storageService.getBoolean(FileService.ENOSPC_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) {
-			const choices: PromptOption[] = [nls.localize('learnMore', "Instructions"), { label: nls.localize('neverShowAgain', "Don't Show Again") }];
-			this.notificationService.prompt(Severity.Warning, nls.localize('enospcError', "{0} is unable to watch for file changes in this large workspace. Please follow the instructions link to resolve this issue.", product.nameLong), choices).then(choice => {
-				switch (choice) {
-					case 0 /* Read More */:
-						window.open('https://go.microsoft.com/fwlink/?linkid=867693');
-						break;
-					case 1 /* Never show again */:
-						this.storageService.store(FileService.ENOSPC_ERROR_IGNORE_KEY, true, StorageScope.WORKSPACE);
-						break;
-				}
-			});
+		// legacy watcher
+		else {
+			let watcherIgnoredPatterns: string[] = [];
+			if (configuration.files && configuration.files.watcherExclude) {
+				watcherIgnoredPatterns = Object.keys(configuration.files.watcherExclude).filter(k => !!configuration.files.watcherExclude[k]);
+			}
+
+			if (isWindows) {
+				const legacyWindowsWatcher = new WindowsWatcherService(this.contextService, watcherIgnoredPatterns, e => this._onFileChanges.fire(e), err => this.handleError(err), this.environmentService.verbose);
+				this.activeWorkspaceFileChangeWatcher = toDisposable(legacyWindowsWatcher.startWatching());
+			} else {
+				const legacyUnixWatcher = new UnixWatcherService(this.contextService, watcherIgnoredPatterns, e => this._onFileChanges.fire(e), err => this.handleError(err), this.environmentService.verbose);
+				this.activeWorkspaceFileChangeWatcher = toDisposable(legacyUnixWatcher.startWatching());
+			}
 		}
 	}
 
-	private registerListeners(): void {
+	public readonly onDidChangeFileSystemProviderRegistrations: Event<IFileSystemProviderRegistrationEvent> = this._onDidChangeFileSystemProviderRegistrations.event;
 
-		// File events
-		this.toUnbind.push(this.raw.onFileChanges(e => this._onFileChanges.fire(e)));
-		this.toUnbind.push(this.raw.onAfterOperation(e => this._onAfterOperation.fire(e)));
-
-		// Config changes
-		this.toUnbind.push(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationChange(e)));
-
-		// Root changes
-		this.toUnbind.push(this.contextService.onDidChangeWorkspaceFolders(() => this.onDidChangeWorkspaceFolders()));
-
-		// Lifecycle
-		this.lifecycleService.onShutdown(this.dispose, this);
+	public registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
+		throw new Error('not implemented');
 	}
 
-	private onDidChangeWorkspaceFolders(): void {
-		this.updateOptions({ encodingOverride: this.getEncodingOverrides() });
-	}
-
-	private getEncodingOverrides(): IEncodingOverride[] {
-		const encodingOverride: IEncodingOverride[] = [];
-		encodingOverride.push({ resource: uri.file(this.environmentService.appSettingsHome), encoding: encoding.UTF8 });
-		this.contextService.getWorkspace().folders.forEach(folder => {
-			encodingOverride.push({ resource: uri.file(paths.join(folder.uri.fsPath, '.vscode')), encoding: encoding.UTF8 });
-		});
-
-		return encodingOverride;
-	}
-
-	private onConfigurationChange(event: IConfigurationChangeEvent): void {
-		if (event.affectsConfiguration('files.useExperimentalFileWatcher')) {
-			this.updateOptions({ useExperimentalFileWatcher: this.configurationService.getValue<boolean>('files.useExperimentalFileWatcher') });
-		}
-	}
-
-	public updateOptions(options: object): void {
-		this.raw.updateOptions(options);
+	public canHandleResource(resource: uri): boolean {
+		return resource.scheme === Schemas.file;
 	}
 
 	public resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
-		return this.raw.resolveFile(resource, options);
+		return this.resolve(resource, options);
 	}
 
 	public resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
-		return this.raw.resolveFiles(toResolve);
+		return TPromise.join(toResolve.map(resourceAndOptions => this.resolve(resourceAndOptions.resource, resourceAndOptions.options)
+			.then(stat => ({ stat, success: true }), error => ({ stat: void 0, success: false }))));
 	}
 
 	public existsFile(resource: uri): TPromise<boolean> {
-		return this.raw.existsFile(resource);
+		return this.resolveFile(resource).then(() => true, () => false);
 	}
 
 	public resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
-		return this.raw.resolveContent(resource, options);
+		return this.resolveStreamContent(resource, options).then(streamContent => {
+			return new TPromise<IContent>((resolve, reject) => {
+
+				const result: IContent = {
+					resource: streamContent.resource,
+					name: streamContent.name,
+					mtime: streamContent.mtime,
+					etag: streamContent.etag,
+					encoding: streamContent.encoding,
+					value: ''
+				};
+
+				streamContent.value.on('data', chunk => result.value += chunk);
+				streamContent.value.on('error', err => reject(err));
+				streamContent.value.on('end', _ => resolve(result));
+
+				return result;
+			});
+		});
 	}
 
 	public resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
-		return this.raw.resolveStreamContent(resource, options);
+
+		// Guard early against attempts to resolve an invalid file path
+		if (resource.scheme !== Schemas.file || !resource.fsPath) {
+			return TPromise.wrapError<IStreamContent>(new FileOperationError(
+				nls.localize('fileInvalidPath', "Invalid file resource ({0})", resource.toString(true)),
+				FileOperationResult.FILE_INVALID_PATH,
+				options
+			));
+		}
+
+		const result: IStreamContent = {
+			resource: void 0,
+			name: void 0,
+			mtime: void 0,
+			etag: void 0,
+			encoding: void 0,
+			value: void 0
+		};
+
+		const contentResolverTokenSource = new CancellationTokenSource();
+
+		const onStatError = (error: Error) => {
+
+			// error: stop reading the file the stat and content resolve call
+			// usually race, mostly likely the stat call will win and cancel
+			// the content call
+			contentResolverTokenSource.cancel();
+
+			// forward error
+			return TPromise.wrapError(error);
+		};
+
+		const statsPromise = this.resolveFile(resource).then(stat => {
+			result.resource = stat.resource;
+			result.name = stat.name;
+			result.mtime = stat.mtime;
+			result.etag = stat.etag;
+
+			// Return early if resource is a directory
+			if (stat.isDirectory) {
+				return onStatError(new FileOperationError(
+					nls.localize('fileIsDirectoryError', "File is directory"),
+					FileOperationResult.FILE_IS_DIRECTORY,
+					options
+				));
+			}
+
+			// Return early if file not modified since
+			if (options && options.etag && options.etag === stat.etag) {
+				return onStatError(new FileOperationError(
+					nls.localize('fileNotModifiedError', "File not modified since"),
+					FileOperationResult.FILE_NOT_MODIFIED_SINCE,
+					options
+				));
+			}
+
+			// Return early if file is too large to load
+			if (typeof stat.size === 'number') {
+				if (stat.size > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
+					return onStatError(new FileOperationError(
+						nls.localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart VS Code and allow it to use more memory"),
+						FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
+					));
+				}
+
+				if (stat.size > MAX_FILE_SIZE) {
+					return onStatError(new FileOperationError(
+						nls.localize('fileTooLargeError', "File too large to open"),
+						FileOperationResult.FILE_TOO_LARGE
+					));
+				}
+			}
+
+			return void 0;
+		}, err => {
+
+			// Wrap file not found errors
+			if (err.code === 'ENOENT') {
+				return onStatError(new FileOperationError(
+					nls.localize('fileNotFoundError', "File not found ({0})", resource.toString(true)),
+					FileOperationResult.FILE_NOT_FOUND,
+					options
+				));
+			}
+
+			return onStatError(err);
+		});
+
+		let completePromise: Thenable<any>;
+
+		// await the stat iff we already have an etag so that we compare the
+		// etag from the stat before we actually read the file again.
+		if (options && options.etag) {
+			completePromise = statsPromise.then(() => {
+				return this.fillInContents(result, resource, options, contentResolverTokenSource.token); // Waterfall -> only now resolve the contents
+			});
+		}
+
+		// a fresh load without a previous etag which means we can resolve the file stat
+		// and the content at the same time, avoiding the waterfall.
+		else {
+			completePromise = Promise.all([statsPromise, this.fillInContents(result, resource, options, contentResolverTokenSource.token)]);
+		}
+
+		return TPromise.wrap(completePromise).then(() => {
+			contentResolverTokenSource.dispose();
+
+			return result;
+		});
 	}
 
-	public updateContent(resource: uri, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise<IFileStat> {
-		return this.raw.updateContent(resource, value, options);
+	private fillInContents(content: IStreamContent, resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<any> {
+		return this.resolveFileData(resource, options, token).then(data => {
+			content.encoding = data.encoding;
+			content.value = data.stream;
+		});
 	}
 
-	public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
-		return this.raw.moveFile(source, target, overwrite);
+	private resolveFileData(resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<IContentData> {
+
+		const chunkBuffer = BufferPool._64K.acquire();
+
+		const result: IContentData = {
+			encoding: void 0,
+			stream: void 0
+		};
+
+		return new Promise<IContentData>((resolve, reject) => {
+			fs.open(this.toAbsolutePath(resource), 'r', (err, fd) => {
+				if (err) {
+					if (err.code === 'ENOENT') {
+						// Wrap file not found errors
+						err = new FileOperationError(
+							nls.localize('fileNotFoundError', "File not found ({0})", resource.toString(true)),
+							FileOperationResult.FILE_NOT_FOUND,
+							options
+						);
+					}
+
+					return reject(err);
+				}
+
+				let decoder: NodeJS.ReadWriteStream;
+				let totalBytesRead = 0;
+
+				const finish = (err?: any) => {
+
+					if (err) {
+						if (err.code === 'EISDIR') {
+							// Wrap EISDIR errors (fs.open on a directory works, but you cannot read from it)
+							err = new FileOperationError(
+								nls.localize('fileIsDirectoryError', "File is directory"),
+								FileOperationResult.FILE_IS_DIRECTORY,
+								options
+							);
+						}
+						if (decoder) {
+							// If the decoder already started, we have to emit the error through it as
+							// event because the promise is already resolved!
+							decoder.emit('error', err);
+						} else {
+							reject(err);
+						}
+					}
+					if (decoder) {
+						decoder.end();
+					}
+
+					// return the shared buffer
+					BufferPool._64K.release(chunkBuffer);
+
+					if (fd) {
+						fs.close(fd, err => {
+							if (err) {
+								this.handleError(`resolveFileData#close(): ${err.toString()}`);
+							}
+						});
+					}
+				};
+
+				const handleChunk = (bytesRead: number) => {
+					if (token.isCancellationRequested) {
+						// cancellation -> finish
+						finish(new Error('cancelled'));
+					} else if (bytesRead === 0) {
+						// no more data -> finish
+						finish();
+					} else if (bytesRead < chunkBuffer.length) {
+						// write the sub-part of data we received -> repeat
+						decoder.write(chunkBuffer.slice(0, bytesRead), readChunk);
+					} else {
+						// write all data we received -> repeat
+						decoder.write(chunkBuffer, readChunk);
+					}
+				};
+
+				let currentPosition: number = (options && options.position) || null;
+
+				const readChunk = () => {
+					fs.read(fd, chunkBuffer, 0, chunkBuffer.length, currentPosition, (err, bytesRead) => {
+						totalBytesRead += bytesRead;
+
+						if (typeof currentPosition === 'number') {
+							// if we received a position argument as option we need to ensure that
+							// we advance the position by the number of bytesread
+							currentPosition += bytesRead;
+						}
+
+						if (totalBytesRead > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
+							finish(new FileOperationError(
+								nls.localize('fileTooLargeForHeapError', "To open a file of this size, you need to restart VS Code and allow it to use more memory"),
+								FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
+							));
+						}
+
+						if (totalBytesRead > MAX_FILE_SIZE) {
+							// stop when reading too much
+							finish(new FileOperationError(
+								nls.localize('fileTooLargeError', "File too large to open"),
+								FileOperationResult.FILE_TOO_LARGE,
+								options
+							));
+						} else if (err) {
+							// some error happened
+							finish(err);
+
+						} else if (decoder) {
+							// pass on to decoder
+							handleChunk(bytesRead);
+
+						} else {
+							// when receiving the first chunk of data we need to create the
+							// decoding stream which is then used to drive the string stream.
+							const autoGuessEncoding = (options && options.autoGuessEncoding) || this.textResourceConfigurationService.getValue(resource, 'files.autoGuessEncoding');
+							TPromise.as(encoding.detectEncodingFromBuffer(
+								{ buffer: chunkBuffer, bytesRead },
+								autoGuessEncoding
+							)).then(detected => {
+
+								if (options && options.acceptTextOnly && detected.seemsBinary) {
+									// Return error early if client only accepts text and this is not text
+									finish(new FileOperationError(
+										nls.localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
+										FileOperationResult.FILE_IS_BINARY,
+										options
+									));
+
+								} else {
+									result.encoding = this._encoding.getReadEncoding(resource, options, detected);
+									result.stream = decoder = encoding.decodeStream(result.encoding);
+									resolve(result);
+									handleChunk(bytesRead);
+								}
+
+							}).then(void 0, err => {
+								// failed to get encoding
+								finish(err);
+							});
+						}
+					});
+				};
+
+				// start reading
+				readChunk();
+			});
+		});
 	}
 
-	public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
-		return this.raw.copyFile(source, target, overwrite);
+	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
+		if (options.writeElevated) {
+			return this.doUpdateContentElevated(resource, value, options);
+		}
+
+		return this.doUpdateContent(resource, value, options);
 	}
 
-	public createFile(resource: uri, content?: string, options?: ICreateFileOptions): TPromise<IFileStat> {
-		return this.raw.createFile(resource, content, options);
+	private doUpdateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
+		const absolutePath = this.toAbsolutePath(resource);
+
+		// 1.) check file for writing
+		return this.checkFileBeforeWriting(absolutePath, options).then(exists => {
+			let createParentsPromise: TPromise<boolean>;
+			if (exists) {
+				createParentsPromise = TPromise.as(null);
+			} else {
+				createParentsPromise = pfs.mkdirp(paths.dirname(absolutePath));
+			}
+
+			// 2.) create parents as needed
+			return createParentsPromise.then(() => {
+				const encodingToWrite = this._encoding.getWriteEncoding(resource, options.encoding);
+				let addBomPromise: TPromise<boolean> = TPromise.as(false);
+
+				// UTF_16 BE and LE as well as UTF_8 with BOM always have a BOM
+				if (encodingToWrite === encoding.UTF16be || encodingToWrite === encoding.UTF16le || encodingToWrite === encoding.UTF8_with_bom) {
+					addBomPromise = TPromise.as(true);
+				}
+
+				// Existing UTF-8 file: check for options regarding BOM
+				else if (exists && encodingToWrite === encoding.UTF8) {
+					if (options.overwriteEncoding) {
+						addBomPromise = TPromise.as(false); // if we are to overwrite the encoding, we do not preserve it if found
+					} else {
+						addBomPromise = encoding.detectEncodingByBOM(absolutePath).then(enc => enc === encoding.UTF8); // otherwise preserve it if found
+					}
+				}
+
+				// 3.) check to add UTF BOM
+				return addBomPromise.then(addBom => {
+
+					// 4.) set contents and resolve
+					return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite).then(void 0, error => {
+						if (!exists || error.code !== 'EPERM' || !isWindows) {
+							return TPromise.wrapError(error);
+						}
+
+						// On Windows and if the file exists with an EPERM error, we try a different strategy of saving the file
+						// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
+						// (see https://github.com/Microsoft/vscode/issues/931)
+
+						// 5.) truncate
+						return pfs.truncate(absolutePath, 0).then(() => {
+
+							// 6.) set contents (this time with r+ mode) and resolve again
+							return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite, { flag: 'r+' });
+						});
+					});
+				});
+			});
+		}).then(null, error => {
+			if (error.code === 'EACCES' || error.code === 'EPERM') {
+				return TPromise.wrapError(new FileOperationError(
+					nls.localize('filePermission', "Permission denied writing to file ({0})", resource.toString(true)),
+					FileOperationResult.FILE_PERMISSION_DENIED,
+					options
+				));
+			}
+
+			return TPromise.wrapError(error);
+		});
+	}
+
+	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string | ITextSnapshot, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): TPromise<IFileStat> {
+		let writeFilePromise: TPromise<void>;
+
+		// Configure encoding related options as needed
+		const writeFileOptions: extfs.IWriteFileOptions = options ? options : Object.create(null);
+		if (addBOM || encodingToWrite !== encoding.UTF8) {
+			writeFileOptions.encoding = {
+				charset: encodingToWrite,
+				addBOM
+			};
+		}
+
+		if (typeof value === 'string') {
+			writeFilePromise = pfs.writeFile(absolutePath, value, writeFileOptions);
+		} else {
+			writeFilePromise = pfs.writeFile(absolutePath, createReadableOfSnapshot(value), writeFileOptions);
+		}
+
+		// set contents
+		return writeFilePromise.then(() => {
+
+			// resolve
+			return this.resolve(resource);
+		});
+	}
+
+	private doUpdateContentElevated(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
+		const absolutePath = this.toAbsolutePath(resource);
+
+		// 1.) check file for writing
+		return this.checkFileBeforeWriting(absolutePath, options, options.overwriteReadonly /* ignore readonly if we overwrite readonly, this is handled via sudo later */).then(exists => {
+			const writeOptions: IUpdateContentOptions = objects.assign(Object.create(null), options);
+			writeOptions.writeElevated = false;
+			writeOptions.encoding = this._encoding.getWriteEncoding(resource, options.encoding);
+
+			// 2.) write to a temporary file to be able to copy over later
+			const tmpPath = paths.join(os.tmpdir(), `code-elevated-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 6)}`);
+			return this.updateContent(uri.file(tmpPath), value, writeOptions).then(() => {
+
+				// 3.) invoke our CLI as super user
+				return (import('sudo-prompt')).then(sudoPrompt => {
+					return new TPromise<void>((c, e) => {
+						const promptOptions = {
+							name: this.environmentService.appNameLong.replace('-', ''),
+							icns: (isMacintosh && this.environmentService.isBuilt) ? paths.join(paths.dirname(this.environmentService.appRoot), `${product.nameShort}.icns`) : void 0
+						};
+
+						const sudoCommand: string[] = [`"${this.environmentService.cliPath}"`];
+						if (options.overwriteReadonly) {
+							sudoCommand.push('--file-chmod');
+						}
+						sudoCommand.push('--file-write', `"${tmpPath}"`, `"${absolutePath}"`);
+
+						sudoPrompt.exec(sudoCommand.join(' '), promptOptions, (error: string, stdout: string, stderr: string) => {
+							if (error || stderr) {
+								e(error || stderr);
+							} else {
+								c(void 0);
+							}
+						});
+					});
+				}).then(() => {
+
+					// 3.) delete temp file
+					return pfs.del(tmpPath, os.tmpdir()).then(() => {
+
+						// 4.) resolve again
+						return this.resolve(resource);
+					});
+				});
+			});
+		}).then(null, error => {
+			if (this.environmentService.verbose) {
+				this.handleError(`Unable to write to file '${resource.toString(true)}' as elevated user (${error})`);
+			}
+
+			if (!FileOperationError.isFileOperationError(error)) {
+				error = new FileOperationError(
+					nls.localize('filePermission', "Permission denied writing to file ({0})", resource.toString(true)),
+					FileOperationResult.FILE_PERMISSION_DENIED,
+					options
+				);
+			}
+
+			return TPromise.wrapError(error);
+		});
+	}
+
+	public createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
+		const absolutePath = this.toAbsolutePath(resource);
+
+		let checkFilePromise: TPromise<boolean>;
+		if (options.overwrite) {
+			checkFilePromise = TPromise.as(false);
+		} else {
+			checkFilePromise = pfs.exists(absolutePath);
+		}
+
+		// Check file exists
+		return checkFilePromise.then(exists => {
+			if (exists && !options.overwrite) {
+				return TPromise.wrapError<IFileStat>(new FileOperationError(
+					nls.localize('fileExists', "File to create already exists ({0})", resource.toString(true)),
+					FileOperationResult.FILE_MODIFIED_SINCE,
+					options
+				));
+			}
+
+			// Create file
+			return this.updateContent(resource, content).then(result => {
+
+				// Events
+				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, result));
+
+				return result;
+			});
+		});
 	}
 
 	public createFolder(resource: uri): TPromise<IFileStat> {
-		return this.raw.createFolder(resource);
+
+		// 1.) Create folder
+		const absolutePath = this.toAbsolutePath(resource);
+		return pfs.mkdirp(absolutePath).then(() => {
+
+			// 2.) Resolve
+			return this.resolve(resource).then(result => {
+
+				// Events
+				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, result));
+
+				return result;
+			});
+		});
 	}
 
-	public touchFile(resource: uri): TPromise<IFileStat> {
-		return this.raw.touchFile(resource);
+	private checkFileBeforeWriting(absolutePath: string, options: IUpdateContentOptions = Object.create(null), ignoreReadonly?: boolean): TPromise<boolean /* exists */> {
+		return pfs.exists(absolutePath).then(exists => {
+			if (exists) {
+				return pfs.stat(absolutePath).then(stat => {
+					if (stat.isDirectory()) {
+						return TPromise.wrapError<boolean>(new Error('Expected file is actually a directory'));
+					}
+
+					// Dirty write prevention: if the file on disk has been changed and does not match our expected
+					// mtime and etag, we bail out to prevent dirty writing.
+					//
+					// First, we check for a mtime that is in the future before we do more checks. The assumption is
+					// that only the mtime is an indicator for a file that has changd on disk.
+					//
+					// Second, if the mtime has advanced, we compare the size of the file on disk with our previous
+					// one using the etag() function. Relying only on the mtime check has prooven to produce false
+					// positives due to file system weirdness (especially around remote file systems). As such, the
+					// check for size is a weaker check because it can return a false negative if the file has changed
+					// but to the same length. This is a compromise we take to avoid having to produce checksums of
+					// the file content for comparison which would be much slower to compute.
+					if (typeof options.mtime === 'number' && typeof options.etag === 'string' && options.mtime < stat.mtime.getTime() && options.etag !== etag(stat.size, options.mtime)) {
+						return TPromise.wrapError<boolean>(new FileOperationError(nls.localize('fileModifiedError', "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options));
+					}
+
+					// Throw if file is readonly and we are not instructed to overwrite
+					if (!ignoreReadonly && !(stat.mode & 128) /* readonly */) {
+						if (!options.overwriteReadonly) {
+							return this.readOnlyError<boolean>(options);
+						}
+
+						// Try to change mode to writeable
+						let mode = stat.mode;
+						mode = mode | 128;
+						return pfs.chmod(absolutePath, mode).then(() => {
+
+							// Make sure to check the mode again, it could have failed
+							return pfs.stat(absolutePath).then(stat => {
+								if (!(stat.mode & 128) /* readonly */) {
+									return this.readOnlyError<boolean>(options);
+								}
+
+								return exists;
+							});
+						});
+					}
+
+					return TPromise.as<boolean>(exists);
+				});
+			}
+
+			return TPromise.as<boolean>(exists);
+		});
+	}
+
+	private readOnlyError<T>(options: IUpdateContentOptions): TPromise<T> {
+		return TPromise.wrapError<T>(new FileOperationError(
+			nls.localize('fileReadOnlyError', "File is Read Only"),
+			FileOperationResult.FILE_READ_ONLY,
+			options
+		));
 	}
 
 	public rename(resource: uri, newName: string): TPromise<IFileStat> {
-		return this.raw.rename(resource, newName);
+		const newPath = paths.join(paths.dirname(resource.fsPath), newName);
+
+		return this.moveFile(resource, uri.file(newPath));
+	}
+
+	public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+		return this.moveOrCopyFile(source, target, false, overwrite);
+	}
+
+	public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
+		return this.moveOrCopyFile(source, target, true, overwrite);
+	}
+
+	private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): TPromise<IFileStat> {
+		const sourcePath = this.toAbsolutePath(source);
+		const targetPath = this.toAbsolutePath(target);
+
+		// 1.) move / copy
+		return this.doMoveOrCopyFile(sourcePath, targetPath, keepCopy, overwrite).then(() => {
+
+			// 2.) resolve
+			return this.resolve(target).then(result => {
+
+				// Events
+				this._onAfterOperation.fire(new FileOperationEvent(source, keepCopy ? FileOperation.COPY : FileOperation.MOVE, result));
+
+				return result;
+			});
+		});
+	}
+
+	private doMoveOrCopyFile(sourcePath: string, targetPath: string, keepCopy: boolean, overwrite: boolean): TPromise<boolean /* exists */> {
+
+		// 1.) validate operation
+		if (isParent(targetPath, sourcePath, !isLinux)) {
+			return TPromise.wrapError<boolean>(new Error('Unable to move/copy when source path is parent of target path'));
+		}
+
+		// 2.) check if target exists
+		return pfs.exists(targetPath).then(exists => {
+			const isCaseRename = sourcePath.toLowerCase() === targetPath.toLowerCase();
+			const isSameFile = sourcePath === targetPath;
+
+			// Return early with conflict if target exists and we are not told to overwrite
+			if (exists && !isCaseRename && !overwrite) {
+				return TPromise.wrapError<boolean>(new FileOperationError(nls.localize('fileMoveConflict', "Unable to move/copy. File already exists at destination."), FileOperationResult.FILE_MOVE_CONFLICT));
+			}
+
+			// 3.) make sure target is deleted before we move/copy unless this is a case rename of the same file
+			let deleteTargetPromise = TPromise.wrap<void>(void 0);
+			if (exists && !isCaseRename) {
+				if (isEqualOrParent(sourcePath, targetPath, !isLinux /* ignorecase */)) {
+					return TPromise.wrapError<boolean>(new Error(nls.localize('unableToMoveCopyError', "Unable to move/copy. File would replace folder it is contained in."))); // catch this corner case!
+				}
+
+				deleteTargetPromise = this.del(uri.file(targetPath));
+			}
+
+			return deleteTargetPromise.then(() => {
+
+				// 4.) make sure parents exists
+				return pfs.mkdirp(paths.dirname(targetPath)).then(() => {
+
+					// 4.) copy/move
+					if (isSameFile) {
+						return TPromise.wrap(null);
+					} else if (keepCopy) {
+						return nfcall(extfs.copy, sourcePath, targetPath);
+					} else {
+						return nfcall(extfs.mv, sourcePath, targetPath);
+					}
+				}).then(() => exists);
+			});
+		});
 	}
 
 	public del(resource: uri, useTrash?: boolean): TPromise<void> {
@@ -230,7 +909,7 @@ export class FileService implements IFileService {
 			return this.doMoveItemToTrash(resource);
 		}
 
-		return this.raw.del(resource);
+		return this.doDelete(resource);
 	}
 
 	private doMoveItemToTrash(resource: uri): TPromise<void> {
@@ -245,44 +924,315 @@ export class FileService implements IFileService {
 		return TPromise.as(null);
 	}
 
-	public importFile(source: uri, targetFolder: uri): TPromise<IImportResult> {
-		return this.raw.importFile(source, targetFolder).then((result) => {
-			return <IImportResult>{
-				isNew: result && result.isNew,
-				stat: result && result.stat
-			};
+	private doDelete(resource: uri): TPromise<void> {
+		const absolutePath = this.toAbsolutePath(resource);
+
+		return pfs.del(absolutePath, os.tmpdir()).then(() => {
+
+			// Events
+			this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
+		});
+	}
+
+	// Helpers
+
+	private toAbsolutePath(arg1: uri | IFileStat): string {
+		let resource: uri;
+		if (arg1 instanceof uri) {
+			resource = <uri>arg1;
+		} else {
+			resource = (<IFileStat>arg1).resource;
+		}
+
+		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource: ${resource}`);
+
+		return paths.normalize(resource.fsPath);
+	}
+
+	private resolve(resource: uri, options: IResolveFileOptions = Object.create(null)): TPromise<IFileStat> {
+		return this.toStatResolver(resource).then(model => model.resolve(options));
+	}
+
+	private toStatResolver(resource: uri): TPromise<StatResolver> {
+		const absolutePath = this.toAbsolutePath(resource);
+
+		return pfs.statLink(absolutePath).then(({ isSymbolicLink, stat }) => {
+			return new StatResolver(resource, isSymbolicLink, stat.isDirectory(), stat.mtime.getTime(), stat.size, this.environmentService.verbose ? err => this.handleError(err) : void 0);
 		});
 	}
 
 	public watchFileChanges(resource: uri): void {
-		if (!resource) {
-			return;
+		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource for watching: ${resource}`);
+
+		// Create or get watcher for provided path
+		let watcher = this.activeFileChangesWatchers.get(resource);
+		if (!watcher) {
+			const fsPath = resource.fsPath;
+			const fsName = paths.basename(resource.fsPath);
+
+			watcher = extfs.watch(fsPath, (eventType: string, filename: string) => {
+				const renamedOrDeleted = ((filename && filename !== fsName) || eventType === 'rename');
+
+				// The file was either deleted or renamed. Many tools apply changes to files in an
+				// atomic way ("Atomic Save") by first renaming the file to a temporary name and then
+				// renaming it back to the original name. Our watcher will detect this as a rename
+				// and then stops to work on Mac and Linux because the watcher is applied to the
+				// inode and not the name. The fix is to detect this case and trying to watch the file
+				// again after a certain delay.
+				// In addition, we send out a delete event if after a timeout we detect that the file
+				// does indeed not exist anymore.
+				if (renamedOrDeleted) {
+
+					// Very important to dispose the watcher which now points to a stale inode
+					this.unwatchFileChanges(resource);
+
+					// Wait a bit and try to install watcher again, assuming that the file was renamed quickly ("Atomic Save")
+					setTimeout(() => {
+						this.existsFile(resource).done(exists => {
+
+							// File still exists, so reapply the watcher
+							if (exists) {
+								this.watchFileChanges(resource);
+							}
+
+							// File seems to be really gone, so emit a deleted event
+							else {
+								this.onRawFileChange({
+									type: FileChangeType.DELETED,
+									path: fsPath
+								});
+							}
+						});
+					}, FileService.FS_REWATCH_DELAY);
+				}
+
+				// Handle raw file change
+				this.onRawFileChange({
+					type: FileChangeType.UPDATED,
+					path: fsPath
+				});
+			}, (error: string) => this.handleError(error));
+
+			if (watcher) {
+				this.activeFileChangesWatchers.set(resource, watcher);
+			}
+		}
+	}
+
+	private onRawFileChange(event: IRawFileChange): void {
+
+		// add to bucket of undelivered events
+		this.undeliveredRawFileChangesEvents.push(event);
+
+		if (this.environmentService.verbose) {
+			console.log('%c[node.js Watcher]%c', 'color: green', 'color: black', event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', event.path);
 		}
 
-		if (resource.scheme !== Schemas.file) {
-			return; // only support files
-		}
+		// handle emit through delayer to accommodate for bulk changes
+		this.fileChangesWatchDelayer.trigger(() => {
+			const buffer = this.undeliveredRawFileChangesEvents;
+			this.undeliveredRawFileChangesEvents = [];
 
-		// return early if the resource is inside the workspace for which we have another watcher in place
-		if (this.contextService.isInsideWorkspace(resource)) {
-			return;
-		}
+			// Normalize
+			const normalizedEvents = normalize(buffer);
 
-		this.raw.watchFileChanges(resource);
+			// Logging
+			if (this.environmentService.verbose) {
+				normalizedEvents.forEach(r => {
+					console.log('%c[node.js Watcher]%c >> normalized', 'color: green', 'color: black', r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', r.path);
+				});
+			}
+
+			// Emit
+			this._onFileChanges.fire(toFileChangesEvent(normalizedEvents));
+
+			return TPromise.as(null);
+		});
 	}
 
 	public unwatchFileChanges(resource: uri): void {
-		this.raw.unwatchFileChanges(resource);
-	}
-
-	public getEncoding(resource: uri, preferredEncoding?: string): string {
-		return this.raw.getEncoding(resource, preferredEncoding);
+		const watcher = this.activeFileChangesWatchers.get(resource);
+		if (watcher) {
+			watcher.close();
+			this.activeFileChangesWatchers.delete(resource);
+		}
 	}
 
 	public dispose(): void {
-		this.toUnbind = dispose(this.toUnbind);
+		this.toDispose = dispose(this.toDispose);
 
-		// Dispose service
-		this.raw.dispose();
+		if (this.activeWorkspaceFileChangeWatcher) {
+			this.activeWorkspaceFileChangeWatcher.dispose();
+			this.activeWorkspaceFileChangeWatcher = null;
+		}
+
+		this.activeFileChangesWatchers.forEach(watcher => watcher.close());
+		this.activeFileChangesWatchers.clear();
+	}
+}
+
+function etag(stat: fs.Stats): string;
+function etag(size: number, mtime: number): string;
+function etag(arg1: any, arg2?: any): string {
+	let size: number;
+	let mtime: number;
+	if (typeof arg2 === 'number') {
+		size = arg1;
+		mtime = arg2;
+	} else {
+		size = (<fs.Stats>arg1).size;
+		mtime = (<fs.Stats>arg1).mtime.getTime();
+	}
+
+	return `"${crypto.createHash('sha1').update(String(size) + String(mtime)).digest('hex')}"`;
+}
+
+export class StatResolver {
+	private name: string;
+	private etag: string;
+
+	constructor(
+		private resource: uri,
+		private isSymbolicLink: boolean,
+		private isDirectory: boolean,
+		private mtime: number,
+		private size: number,
+		private errorLogger?: (error: Error | string) => void
+	) {
+		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource: ${resource}`);
+
+		this.name = getBaseLabel(resource);
+		this.etag = etag(size, mtime);
+	}
+
+	public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
+
+		// General Data
+		const fileStat: IFileStat = {
+			resource: this.resource,
+			isDirectory: this.isDirectory,
+			isSymbolicLink: this.isSymbolicLink,
+			name: this.name,
+			etag: this.etag,
+			size: this.size,
+			mtime: this.mtime
+		};
+
+		// File Specific Data
+		if (!this.isDirectory) {
+			return TPromise.as(fileStat);
+		}
+
+		// Directory Specific Data
+		else {
+
+			// Convert the paths from options.resolveTo to absolute paths
+			let absoluteTargetPaths: string[] = null;
+			if (options && options.resolveTo) {
+				absoluteTargetPaths = [];
+				options.resolveTo.forEach(resource => {
+					absoluteTargetPaths.push(resource.fsPath);
+				});
+			}
+
+			return new TPromise<IFileStat>((c, e) => {
+
+				// Load children
+				this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, children => {
+					children = arrays.coalesce(children); // we don't want those null children (could be permission denied when reading a child)
+					fileStat.children = children || [];
+
+					c(fileStat);
+				});
+			});
+		}
+	}
+
+	private resolveChildren(absolutePath: string, absoluteTargetPaths: string[], resolveSingleChildDescendants: boolean, callback: (children: IFileStat[]) => void): void {
+		extfs.readdir(absolutePath, (error: Error, files: string[]) => {
+			if (error) {
+				if (this.errorLogger) {
+					this.errorLogger(error);
+				}
+
+				return callback(null); // return - we might not have permissions to read the folder
+			}
+
+			// for each file in the folder
+			flow.parallel(files, (file: string, clb: (error: Error, children: IFileStat) => void) => {
+				const fileResource = uri.file(paths.resolve(absolutePath, file));
+				let fileStat: fs.Stats;
+				let isSymbolicLink = false;
+				const $this = this;
+
+				flow.sequence(
+					function onError(error: Error): void {
+						if ($this.errorLogger) {
+							$this.errorLogger(error);
+						}
+
+						clb(null, null); // return - we might not have permissions to read the folder or stat the file
+					},
+
+					function stat(this: any): void {
+						extfs.statLink(fileResource.fsPath, this);
+					},
+
+					function countChildren(this: any, statAndLink: extfs.IStatAndLink): void {
+						fileStat = statAndLink.stat;
+						isSymbolicLink = statAndLink.isSymbolicLink;
+
+						if (fileStat.isDirectory()) {
+							extfs.readdir(fileResource.fsPath, (error, result) => {
+								this(null, result ? result.length : 0);
+							});
+						} else {
+							this(null, 0);
+						}
+					},
+
+					function resolve(childCount: number): void {
+						const childStat: IFileStat = {
+							resource: fileResource,
+							isDirectory: fileStat.isDirectory(),
+							isSymbolicLink,
+							name: file,
+							mtime: fileStat.mtime.getTime(),
+							etag: etag(fileStat),
+							size: fileStat.size
+						};
+
+						// Return early for files
+						if (!fileStat.isDirectory()) {
+							return clb(null, childStat);
+						}
+
+						// Handle Folder
+						let resolveFolderChildren = false;
+						if (files.length === 1 && resolveSingleChildDescendants) {
+							resolveFolderChildren = true;
+						} else if (childCount > 0 && absoluteTargetPaths && absoluteTargetPaths.some(targetPath => isEqualOrParent(targetPath, fileResource.fsPath, !isLinux /* ignorecase */))) {
+							resolveFolderChildren = true;
+						}
+
+						// Continue resolving children based on condition
+						if (resolveFolderChildren) {
+							$this.resolveChildren(fileResource.fsPath, absoluteTargetPaths, resolveSingleChildDescendants, children => {
+								children = arrays.coalesce(children);  // we don't want those null children
+								childStat.children = children || [];
+
+								clb(null, childStat);
+							});
+						}
+
+						// Otherwise return result
+						else {
+							clb(null, childStat);
+						}
+					});
+			}, (errors, result) => {
+				callback(result);
+			});
+		});
 	}
 }
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 3f7fbe5d3f8..4cb7cde1d24 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -4,51 +4,49 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
-import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
-import { IContent, IStreamContent, IFileStat, IResolveContentOptions, IUpdateContentOptions, IResolveFileOptions, IResolveFileResult, FileOperationEvent, FileOperation, IFileSystemProvider, IStat, FileType, IImportResult, FileChangesEvent, ICreateFileOptions, FileOperationError, FileOperationResult, ITextSnapshot, snapshotToString } from 'vs/platform/files/common/files';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { posix } from 'path';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { isFalsyOrEmpty, distinct } from 'vs/base/common/arrays';
+import { flatten, isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { TernarySearchTree, keys } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
-import { Progress } from 'vs/platform/progress/common/progress';
-import { decodeStream, encode, UTF8, UTF8_with_bom } from 'vs/base/node/encoding';
-import { TernarySearchTree } from 'vs/base/common/map';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IDecodeStreamOptions, decodeStream, toDecodeStream } from 'vs/base/node/encoding';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
-import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
-import { maxBufferLen, detectMimeAndEncodingFromBuffer } from 'vs/base/node/mime';
-import { MIME_BINARY } from 'vs/base/common/mime';
 import { localize } from 'vs/nls';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { FileChangesEvent, FileOperation, FileOperationError, FileOperationEvent, FileOperationResult, FileOptions, FileSystemProviderCapabilities, IContent, ICreateFileOptions, IFileStat, IFileSystemProvider, IFilesConfiguration, IResolveContentOptions, IResolveFileOptions, IResolveFileResult, IStat, IStreamContent, ITextSnapshot, IUpdateContentOptions, StringSnapshot } from 'vs/platform/files/common/files';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
+import { createReadableOfProvider, createReadableOfSnapshot, createWritableOfProvider } from 'vs/workbench/services/files/electron-browser/streams';
 
 function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): TPromise<IFileStat> {
 	const [resource, stat] = tuple;
 	const fileStat: IFileStat = {
-		isDirectory: false,
-		isSymbolicLink: stat.type === FileType.Symlink,
-		resource: resource,
+		resource,
 		name: posix.basename(resource.path),
+		isDirectory: stat.isDirectory,
+		isSymbolicLink: stat.isSymbolicLink,
 		mtime: stat.mtime,
 		size: stat.size,
 		etag: stat.mtime.toString(29) + stat.size.toString(31),
 	};
 
-	if (stat.type === FileType.Dir) {
-		fileStat.isDirectory = true;
-
+	if (fileStat.isDirectory) {
 		if (recurse && recurse([resource, stat])) {
 			// dir -> resolve
 			return provider.readdir(resource).then(entries => {
-				fileStat.isDirectory = true;
-
 				// resolve children if requested
-				return TPromise.join(entries.map(stat => toIFileStat(provider, stat, recurse))).then(children => {
+				return TPromise.join(entries.map(tuple => {
+					const [name, stat] = tuple;
+					const childResource = resource.with({ path: posix.join(resource.path, name) });
+					return toIFileStat(provider, [childResource, stat], recurse);
+				})).then(children => {
 					fileStat.children = children;
 					return fileStat;
 				});
@@ -74,60 +72,169 @@ export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, ISta
 	});
 }
 
+class WorkspaceWatchLogic {
+
+	private _disposables: IDisposable[] = [];
+	private _watches = new Map<string, URI>();
+
+	constructor(
+		private _fileService: RemoteFileService,
+		@IConfigurationService private _configurationService: IConfigurationService,
+		@IWorkspaceContextService private _contextService: IWorkspaceContextService,
+	) {
+		this._refresh();
+
+		this._disposables.push(this._contextService.onDidChangeWorkspaceFolders(e => {
+			for (const removed of e.removed) {
+				this._unwatchWorkspace(removed.uri);
+			}
+			for (const added of e.added) {
+				this._watchWorkspace(added.uri);
+			}
+		}));
+		this._disposables.push(this._contextService.onDidChangeWorkbenchState(e => {
+			this._refresh();
+		}));
+		this._disposables.push(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('files.watcherExclude')) {
+				this._refresh();
+			}
+		}));
+	}
+
+	dispose(): void {
+		this._unwatchWorkspaces();
+		this._disposables = dispose(this._disposables);
+	}
+
+	private _refresh(): void {
+		this._unwatchWorkspaces();
+		for (const folder of this._contextService.getWorkspace().folders) {
+			if (folder.uri.scheme !== Schemas.file) {
+				this._watchWorkspace(folder.uri);
+			}
+		}
+	}
+
+	private _watchWorkspace(resource: URI) {
+		let exclude: string[] = [];
+		let config = this._configurationService.getValue<IFilesConfiguration>({ resource });
+		if (config.files && config.files.watcherExclude) {
+			for (const key in config.files.watcherExclude) {
+				if (config.files.watcherExclude[key] === true) {
+					exclude.push(key);
+				}
+			}
+		}
+		this._watches.set(resource.toString(), resource);
+		this._fileService.watchFileChanges(resource, { recursive: true, exclude });
+	}
+
+	private _unwatchWorkspace(resource: URI) {
+		if (this._watches.has(resource.toString())) {
+			this._fileService.unwatchFileChanges(resource);
+			this._watches.delete(resource.toString());
+		}
+	}
+
+	private _unwatchWorkspaces() {
+		this._watches.forEach(uri => this._fileService.unwatchFileChanges(uri));
+		this._watches.clear();
+	}
+}
+
 export class RemoteFileService extends FileService {
 
-	private readonly _provider = new Map<string, IFileSystemProvider>();
-	private _supportedSchemes: string[];
+	private readonly _provider: Map<string, IFileSystemProvider>;
+	private readonly _lastKnownSchemes: string[];
 
 	constructor(
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@INotificationService notificationService: INotificationService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
 	) {
 		super(
-			configurationService,
 			contextService,
-			environmentService,
-			lifecycleService,
-			notificationService,
-			_storageService,
+			_environmentService,
 			textResourceConfigurationService,
+			configurationService,
+			lifecycleService,
+			_storageService,
+			notificationService
 		);
 
-		this._supportedSchemes = JSON.parse(this._storageService.get('remote_schemes', undefined, '[]'));
+		this._provider = new Map<string, IFileSystemProvider>();
+		this._lastKnownSchemes = JSON.parse(this._storageService.get('remote_schemes', undefined, '[]'));
+		this.toDispose.push(new WorkspaceWatchLogic(this, configurationService, contextService));
 	}
 
-	registerProvider(authority: string, provider: IFileSystemProvider): IDisposable {
-		if (this._provider.has(authority)) {
-			throw new Error();
+	registerProvider(scheme: string, provider: IFileSystemProvider): IDisposable {
+		if (this._provider.has(scheme)) {
+			throw new Error('a provider for that scheme is already registered');
 		}
 
-		this._supportedSchemes.push(authority);
-		this._storageService.store('remote_schemes', JSON.stringify(distinct(this._supportedSchemes)));
+		this._provider.set(scheme, provider);
+		this._onDidChangeFileSystemProviderRegistrations.fire({ added: true, scheme, provider });
+		this._storageService.store('remote_schemes', JSON.stringify(keys(this._provider)));
 
-		this._provider.set(authority, provider);
-		const reg = provider.onDidChange(changes => {
+		const reg = provider.onDidChangeFile(changes => {
 			// forward change events
 			this._onFileChanges.fire(new FileChangesEvent(changes));
 		});
 		return {
 			dispose: () => {
-				this._provider.delete(authority);
+				this._onDidChangeFileSystemProviderRegistrations.fire({ added: false, scheme, provider });
+				this._provider.delete(scheme);
 				reg.dispose();
 			}
 		};
 	}
 
 	canHandleResource(resource: URI): boolean {
-		return resource.scheme === Schemas.file
-			|| this._provider.has(resource.scheme)
-			// TODO@remote
-			|| this._supportedSchemes.indexOf(resource.scheme) >= 0;
+		if (resource.scheme === Schemas.file || this._provider.has(resource.scheme)) {
+			return true;
+		}
+		// TODO@remote
+		// this needs to go, but this already went viral
+		// https://github.com/Microsoft/vscode/issues/48275
+		if (this._lastKnownSchemes.indexOf(resource.scheme) < 0) {
+			return false;
+		}
+		if (!this._environmentService.isBuilt) {
+			console.warn('[remote] cache information required for ' + resource.toString());
+		}
+		return true;
+	}
+
+	private _tryParseFileOperationResult(err: any): FileOperationResult {
+		if (!(err instanceof Error)) {
+			return undefined;
+		}
+		let match = /^(.+) \(FileSystemError\)$/.exec(err.name);
+		if (!match) {
+			return undefined;
+		}
+		let res: FileOperationResult;
+		switch (match[1]) {
+			case 'EntryNotFound':
+				res = FileOperationResult.FILE_NOT_FOUND;
+				break;
+			case 'EntryIsADirectory':
+				res = FileOperationResult.FILE_IS_DIRECTORY;
+				break;
+			case 'EntryExists':
+			case 'EntryNotADirectory':
+			default:
+				// todo
+				res = undefined;
+				break;
+		}
+		return res;
 	}
 
 	// --- stat
@@ -159,7 +266,10 @@ export class RemoteFileService extends FileService {
 		} else {
 			return this._doResolveFiles([{ resource, options }]).then(data => {
 				if (data.length !== 1 || !data[0].success) {
-					throw new Error(`ENOENT, ${resource}`);
+					throw new FileOperationError(
+						localize('fileNotFoundError', "File not found ({0})", resource.toString(true)),
+						FileOperationResult.FILE_NOT_FOUND
+					);
 				} else {
 					return data[0].stat;
 				}
@@ -188,9 +298,7 @@ export class RemoteFileService extends FileService {
 				promises.push(this._doResolveFiles(group));
 			}
 		}
-		return TPromise.join(promises).then(data => {
-			return [].concat(...data);
-		});
+		return TPromise.join(promises).then(data => flatten(data));
 	}
 
 	private _doResolveFiles(toResolve: { resource: URI; options?: IResolveFileOptions; }[]): TPromise<IResolveFileResult[], any> {
@@ -215,7 +323,7 @@ export class RemoteFileService extends FileService {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveContent(resource, options);
 		} else {
-			return this._doResolveContent(resource, options).then(RemoteFileService._asContent);
+			return this._readFile(resource, options).then(RemoteFileService._asContent);
 		}
 	}
 
@@ -223,11 +331,11 @@ export class RemoteFileService extends FileService {
 		if (resource.scheme === Schemas.file) {
 			return super.resolveStreamContent(resource, options);
 		} else {
-			return this._doResolveContent(resource, options);
+			return this._readFile(resource, options);
 		}
 	}
 
-	private _doResolveContent(resource: URI, options: IResolveContentOptions = Object.create(null)): TPromise<IStreamContent> {
+	private _readFile(resource: URI, options: IResolveContentOptions = Object.create(null)): TPromise<IStreamContent> {
 		return this._withProvider(resource).then(provider => {
 
 			return this.resolveFile(resource).then(fileStat => {
@@ -249,20 +357,18 @@ export class RemoteFileService extends FileService {
 					);
 				}
 
-				const guessEncoding = options.autoGuessEncoding;
-				const count = maxBufferLen(options);
-				const chunks: Buffer[] = [];
+				const decodeStreamOpts: IDecodeStreamOptions = {
+					guessEncoding: options.autoGuessEncoding,
+					overwriteEncoding: detected => {
+						return this.encoding.getReadEncoding(resource, options, { encoding: detected, seemsBinary: false });
+					}
+				};
 
-				return provider.read(
-					resource,
-					0, count,
-					new Progress<Buffer>(chunk => chunks.push(chunk))
-				).then(bytesRead => {
-					// send to bla
-					return detectMimeAndEncodingFromBuffer({ bytesRead, buffer: Buffer.concat(chunks) }, guessEncoding);
+				const readable = createReadableOfProvider(provider, resource, options.position || 0, { read: true });
 
-				}).then(detected => {
-					if (options.acceptTextOnly && detected.mimes.indexOf(MIME_BINARY) >= 0) {
+				return toDecodeStream(readable, decodeStreamOpts).then(data => {
+
+					if (options.acceptTextOnly && data.detected.seemsBinary) {
 						return TPromise.wrapError<IStreamContent>(new FileOperationError(
 							localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
 							FileOperationResult.FILE_IS_BINARY,
@@ -270,53 +376,9 @@ export class RemoteFileService extends FileService {
 						));
 					}
 
-					let preferredEncoding: string;
-					if (options && options.encoding) {
-						if (detected.encoding === UTF8 && options.encoding === UTF8) {
-							preferredEncoding = UTF8_with_bom; // indicate the file has BOM if we are to resolve with UTF 8
-						} else {
-							preferredEncoding = options.encoding; // give passed in encoding highest priority
-						}
-					} else if (detected.encoding) {
-						if (detected.encoding === UTF8) {
-							preferredEncoding = UTF8_with_bom; // if we detected UTF-8, it can only be because of a BOM
-						} else {
-							preferredEncoding = detected.encoding;
-						}
-						// todo@remote - encoding logic should not be kept
-						// hostage inside the node file service
-						// } else if (super.configuredEncoding(resource) === UTF8_with_bom) {
-					} else {
-						preferredEncoding = UTF8; // if we did not detect UTF 8 BOM before, this can only be UTF 8 then
-					}
-
-					// const encoding = this.getEncoding(resource);
-					const stream = decodeStream(preferredEncoding);
-
-					// start with what we have already read
-					// and have a new stream to read the rest
-					let offset = 0;
-					for (const chunk of chunks) {
-						stream.write(chunk);
-						offset += chunk.length;
-					}
-					if (offset < count) {
-						// we didn't read enough the first time which means
-						// that we are done
-						stream.end();
-					} else {
-						// there is more to read
-						provider.read(resource, offset, -1, new Progress<Buffer>(chunk => stream.write(chunk))).then(() => {
-							stream.end();
-						}, err => {
-							stream.emit('error', err);
-							stream.end();
-						});
-					}
-
-					return {
-						encoding: preferredEncoding,
-						value: stream,
+					return <IStreamContent>{
+						encoding: data.detected.encoding,
+						value: data.stream,
 						resource: fileStat.resource,
 						name: fileStat.name,
 						etag: fileStat.etag,
@@ -334,38 +396,45 @@ export class RemoteFileService extends FileService {
 			return super.createFile(resource, content, options);
 		} else {
 			return this._withProvider(resource).then(provider => {
-				let prepare = options && !options.overwrite
-					? this.existsFile(resource)
-					: TPromise.as(false);
 
+				const encoding = this.encoding.getWriteEncoding(resource);
+				return this._writeFile(provider, resource, new StringSnapshot(content), encoding, { write: true, create: true, exclusive: !(options && options.overwrite) });
 
-				return prepare.then(exists => {
-					if (exists && options && !options.overwrite) {
-						return TPromise.wrapError(new FileOperationError('EEXIST', FileOperationResult.FILE_MODIFIED_SINCE, options));
-					}
-					return this._doUpdateContent(provider, resource, content || '', {});
-				}).then(fileStat => {
-					this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, fileStat));
-					return fileStat;
-				});
+			}).then(fileStat => {
+				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, fileStat));
+				return fileStat;
+			}, err => {
+				const message = localize('err.create', "Failed to create file {0}", resource.toString(false));
+				const result = this._tryParseFileOperationResult(err);
+				throw new FileOperationError(message, result, options);
 			});
 		}
 	}
 
-	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise<IFileStat> {
+	async updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise<IFileStat> {
 		if (resource.scheme === Schemas.file) {
 			return super.updateContent(resource, value, options);
 		} else {
+			if (options && options.mkdirp) {
+				await this._mkdirp(resource.with({ path: posix.dirname(resource.path) }));
+			}
 			return this._withProvider(resource).then(provider => {
-				return this._doUpdateContent(provider, resource, value, options || {});
+				const snapshot = typeof value === 'string' ? new StringSnapshot(value) : value;
+				return this._writeFile(provider, resource, snapshot, options && options.encoding, { write: true });
 			});
 		}
 	}
 
-	private _doUpdateContent(provider: IFileSystemProvider, resource: URI, content: string | ITextSnapshot, options: IUpdateContentOptions): TPromise<IFileStat> {
-		const encoding = this.getEncoding(resource, options.encoding);
-		// TODO@Joh support streaming API for remote file system writes
-		return provider.write(resource, encode(typeof content === 'string' ? content : snapshotToString(content), encoding)).then(() => {
+	private _writeFile(provider: IFileSystemProvider, resource: URI, snapshot: ITextSnapshot, preferredEncoding: string, options: FileOptions): TPromise<IFileStat> {
+		const readable = createReadableOfSnapshot(snapshot);
+		const encoding = this.encoding.getWriteEncoding(resource, preferredEncoding);
+		const decoder = decodeStream(encoding);
+		const target = createWritableOfProvider(provider, resource, options);
+		return new TPromise<IFileStat>((resolve, reject) => {
+			readable.pipe(decoder).pipe(target);
+			target.once('error', err => reject(err));
+			target.once('finish', _ => resolve(void 0));
+		}).then(_ => {
 			return this.resolveFile(resource);
 		});
 	}
@@ -386,6 +455,27 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
+	private async _mkdirp(directory: URI): Promise<void> {
+		let basenames: string[] = [];
+		while (directory.path !== '/') {
+			try {
+				let stat = await this.resolveFile(directory);
+				if (!stat.isDirectory) {
+					throw new Error(`${directory.toString()} is not a directory`);
+				}
+			} catch (e) {
+				// ENOENT
+				basenames.push(posix.basename(directory.path));
+				directory = directory.with({ path: posix.dirname(directory.path) });
+			}
+			break;
+		}
+		for (let i = basenames.length - 1; i >= 0; i--) {
+			directory = directory.with({ path: posix.join(directory.path, basenames[i]) });
+			await this.createFolder(directory);
+		}
+	}
+
 	// --- delete
 
 	del(resource: URI, useTrash?: boolean): TPromise<void> {
@@ -393,9 +483,7 @@ export class RemoteFileService extends FileService {
 			return super.del(resource, useTrash);
 		} else {
 			return this._withProvider(resource).then(provider => {
-				return provider.stat(resource).then(stat => {
-					return stat.type === FileType.Dir ? provider.rmdir(resource) : provider.unlink(resource);
-				}).then(() => {
+				return provider.delete(resource).then(() => {
 					this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
 				});
 			});
@@ -443,7 +531,7 @@ export class RemoteFileService extends FileService {
 			: TPromise.as(null);
 
 		return prepare.then(() => this._withProvider(source)).then(provider => {
-			return provider.move(source, target).then(stat => {
+			return provider.rename(source, target, { create: true, exclusive: !overwrite }).then(stat => {
 				return toIFileStat(provider, [target, stat]);
 			}).then(fileStat => {
 				this._onAfterOperation.fire(new FileOperationEvent(source, FileOperation.MOVE, fileStat));
@@ -463,75 +551,81 @@ export class RemoteFileService extends FileService {
 		});
 	}
 
-	importFile(source: URI, targetFolder: URI): TPromise<IImportResult> {
-		if (source.scheme === targetFolder.scheme && source.scheme === Schemas.file) {
-			return super.importFile(source, targetFolder);
-		} else {
-			const target = targetFolder.with({ path: posix.join(targetFolder.path, posix.basename(source.path)) });
-			return this.copyFile(source, target, false).then(stat => ({ stat, isNew: false }));
-		}
-	}
-
 	copyFile(source: URI, target: URI, overwrite?: boolean): TPromise<IFileStat> {
 		if (source.scheme === target.scheme && source.scheme === Schemas.file) {
 			return super.copyFile(source, target, overwrite);
 		}
 
-		const prepare = overwrite
-			? this.del(target).then(undefined, err => { /*ignore*/ })
-			: TPromise.as(null);
+		return this._withProvider(target).then(provider => {
 
-		return prepare.then(() => {
-			// todo@ben, can only copy text files
-			// https://github.com/Microsoft/vscode/issues/41543
-			return this.resolveContent(source, { acceptTextOnly: true }).then(content => {
-				return this._withProvider(target).then(provider => {
-					return this._doUpdateContent(provider, target, content.value, { encoding: content.encoding }).then(fileStat => {
-						this._onAfterOperation.fire(new FileOperationEvent(source, FileOperation.COPY, fileStat));
-						return fileStat;
+			if (source.scheme === target.scheme && (provider.capabilities & FileSystemProviderCapabilities.FileFolderCopy)) {
+				// good: provider supports copy withing scheme
+				return provider.copy(source, target, { create: true, exclusive: !overwrite }).then(stat => toIFileStat(provider, [target, stat]));
+			}
+
+			const prepare = overwrite
+				? this.del(target).then(undefined, err => { /*ignore*/ })
+				: TPromise.as(null);
+
+			return prepare.then(() => {
+				// todo@ben, can only copy text files
+				// https://github.com/Microsoft/vscode/issues/41543
+				return this.resolveContent(source, { acceptTextOnly: true }).then(content => {
+					return this._withProvider(target).then(provider => {
+						return this._writeFile(
+							provider, target,
+							new StringSnapshot(content.value),
+							content.encoding,
+							{ write: true, create: true, exclusive: !overwrite }
+						).then(fileStat => {
+							this._onAfterOperation.fire(new FileOperationEvent(source, FileOperation.COPY, fileStat));
+							return fileStat;
+						});
+					}, err => {
+						if (err instanceof Error && err.name === 'ENOPRO') {
+							// file scheme
+							return super.updateContent(target, content.value, { encoding: content.encoding });
+						} else {
+							return TPromise.wrapError(err);
+						}
 					});
-				}, err => {
-					if (err instanceof Error && err.name === 'ENOPRO') {
-						// file scheme
-						return super.updateContent(target, content.value, { encoding: content.encoding });
-					} else {
-						return TPromise.wrapError(err);
-					}
 				});
 			});
 		});
-
 	}
 
-	touchFile(resource: URI): TPromise<IFileStat, any> {
+	private _activeWatches = new Map<string, { unwatch: Thenable<IDisposable>, count: number }>();
+
+	public watchFileChanges(resource: URI, opts: { recursive?: boolean, exclude?: string[] } = {}): void {
 		if (resource.scheme === Schemas.file) {
-			return super.touchFile(resource);
-		} else {
-			return this._doTouchFile(resource);
+			return super.watchFileChanges(resource);
 		}
-	}
 
-	private _doTouchFile(resource: URI): TPromise<IFileStat> {
-		return this._withProvider(resource).then(provider => {
-			return provider.stat(resource).then(() => {
-				return provider.utimes(resource, Date.now(), Date.now());
+		const key = resource.toString();
+		const entry = this._activeWatches.get(key);
+		if (entry) {
+			entry.count += 1;
+			return;
+		}
+
+		this._activeWatches.set(key, {
+			count: 1,
+			unwatch: this._withProvider(resource).then(provider => {
+				return provider.watch(resource, opts);
 			}, err => {
-				return provider.write(resource, new Uint8Array(0));
-			}).then(() => {
-				return this.resolveFile(resource);
-			});
+				return { dispose() { } };
+			})
 		});
 	}
 
-	// TODO@Joh - file watching on demand!
-	public watchFileChanges(resource: URI): void {
-		if (resource.scheme === Schemas.file) {
-			super.watchFileChanges(resource);
-		}
-	}
 	public unwatchFileChanges(resource: URI): void {
 		if (resource.scheme === Schemas.file) {
-			super.unwatchFileChanges(resource);
+			return super.unwatchFileChanges(resource);
+		}
+		let entry = this._activeWatches.get(resource.toString());
+		if (entry && --entry.count === 0) {
+			entry.unwatch.then(dispose);
+			this._activeWatches.delete(resource.toString());
 		}
 	}
 }
diff --git a/src/vs/workbench/services/files/electron-browser/streams.ts b/src/vs/workbench/services/files/electron-browser/streams.ts
new file mode 100644
index 00000000000..583166be2cc
--- /dev/null
+++ b/src/vs/workbench/services/files/electron-browser/streams.ts
@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { Readable, Writable } from 'stream';
+import { UTF8 } from 'vs/base/node/encoding';
+import URI from 'vs/base/common/uri';
+import { IFileSystemProvider, ITextSnapshot, FileSystemProviderCapabilities, FileOptions } from 'vs/platform/files/common/files';
+import { illegalArgument } from 'vs/base/common/errors';
+
+export function createWritableOfProvider(provider: IFileSystemProvider, resource: URI, opts: FileOptions): Writable {
+	if (provider.capabilities & FileSystemProviderCapabilities.FileOpenReadWriteClose) {
+		return createWritable(provider, resource, opts);
+	} else if (provider.capabilities & FileSystemProviderCapabilities.FileReadWrite) {
+		return createSimpleWritable(provider, resource, opts);
+	} else {
+		throw illegalArgument();
+	}
+}
+
+function createSimpleWritable(provider: IFileSystemProvider, resource: URI, opts: FileOptions): Writable {
+	return new class extends Writable {
+		_chunks: Buffer[] = [];
+		constructor(opts?) {
+			super(opts);
+		}
+		_write(chunk: Buffer, encoding: string, callback: Function) {
+			this._chunks.push(chunk);
+			callback(null);
+		}
+		end() {
+			// todo@joh - end might have another chunk...
+			provider.writeFile(resource, Buffer.concat(this._chunks), opts).then(_ => {
+				super.end();
+			}, err => {
+				this.emit('error', err);
+			});
+		}
+	};
+}
+
+function createWritable(provider: IFileSystemProvider, resource: URI, opts: FileOptions): Writable {
+	return new class extends Writable {
+		_fd: number;
+		_pos: number;
+		constructor(opts?) {
+			super(opts);
+		}
+		async _write(chunk: Buffer, encoding, callback: Function) {
+			try {
+				if (typeof this._fd !== 'number') {
+					this._fd = await provider.open(resource, opts);
+				}
+				let bytesWritten = await provider.write(this._fd, this._pos, chunk, 0, chunk.length);
+				this._pos += bytesWritten;
+				callback();
+			} catch (err) {
+				callback(err);
+			}
+		}
+		end() {
+			provider.close(this._fd).then(_ => {
+				super.end();
+			}, err => {
+				this.emit('error', err);
+			});
+		}
+	};
+}
+
+export function createReadableOfProvider(provider: IFileSystemProvider, resource: URI, position: number, opts: FileOptions): Readable {
+	if (provider.capabilities & FileSystemProviderCapabilities.FileOpenReadWriteClose) {
+		return createReadable(provider, resource, position, opts);
+	} else if (provider.capabilities & FileSystemProviderCapabilities.FileReadWrite) {
+		return createSimpleReadable(provider, resource, position, opts);
+	} else {
+		throw illegalArgument();
+	}
+}
+
+function createReadable(provider: IFileSystemProvider, resource: URI, position: number, opts: FileOptions): Readable {
+	return new class extends Readable {
+		_fd: number;
+		_pos: number = position;
+		_reading: boolean = false;
+		constructor(opts?) {
+			super(opts);
+			this.once('close', _ => this._final());
+		}
+		async _read(size?: number) {
+			if (this._reading) {
+				return;
+			}
+			this._reading = true;
+			try {
+				if (typeof this._fd !== 'number') {
+					this._fd = await provider.open(resource, opts);
+				}
+				let buffer = Buffer.allocUnsafe(64 * 1024);
+				while (this._reading) {
+					let bytesRead = await provider.read(this._fd, this._pos, buffer, 0, buffer.length);
+					if (bytesRead === 0) {
+						this._reading = false;
+						this.push(null);
+					}
+					else {
+						this._reading = this.push(buffer.slice(0, bytesRead));
+						this._pos += bytesRead;
+					}
+				}
+			}
+			catch (err) {
+				//
+				this.emit('error', err);
+			}
+		}
+		async _final() {
+			if (typeof this._fd === 'number') {
+				await provider.close(this._fd);
+			}
+		}
+	};
+}
+
+function createSimpleReadable(provider: IFileSystemProvider, resource: URI, position: number, opts: FileOptions): Readable {
+	return new class extends Readable {
+		_readOperation: Thenable<any>;
+		_read(size?: number): void {
+			if (this._readOperation) {
+				return;
+			}
+			this._readOperation = provider.readFile(resource, opts).then(data => {
+				this.push(data.slice(position));
+				this.push(null);
+			}, err => {
+				this.emit('error', err);
+				this.push(null);
+			});
+		}
+	};
+}
+
+export function createReadableOfSnapshot(snapshot: ITextSnapshot): Readable {
+	return new Readable({
+		read: function () {
+			try {
+				let chunk: string;
+				let canPush = true;
+
+				// Push all chunks as long as we can push and as long as
+				// the underlying snapshot returns strings to us
+				while (canPush && typeof (chunk = snapshot.read()) === 'string') {
+					canPush = this.push(chunk);
+				}
+
+				// Signal EOS by pushing NULL
+				if (typeof chunk !== 'string') {
+					this.push(null);
+				}
+			} catch (error) {
+				this.emit('error', error);
+			}
+		},
+		encoding: UTF8 // very important, so that strings are passed around and not buffers!
+	});
+}
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
deleted file mode 100644
index 873c0914b1e..00000000000
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as paths from 'path';
-import * as fs from 'fs';
-import * as os from 'os';
-import * as crypto from 'crypto';
-import * as assert from 'assert';
-import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot } from 'vs/platform/files/common/files';
-import { MAX_FILE_SIZE, MAX_HEAP_SIZE } from 'vs/platform/files/node/files';
-import { isEqualOrParent } from 'vs/base/common/paths';
-import { ResourceMap } from 'vs/base/common/map';
-import * as arrays from 'vs/base/common/arrays';
-import * as baseMime from 'vs/base/common/mime';
-import { TPromise } from 'vs/base/common/winjs.base';
-import * as objects from 'vs/base/common/objects';
-import * as extfs from 'vs/base/node/extfs';
-import { nfcall, ThrottledDelayer } from 'vs/base/common/async';
-import uri from 'vs/base/common/uri';
-import * as nls from 'vs/nls';
-import { isWindows, isLinux } from 'vs/base/common/platform';
-import { dispose, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
-import * as pfs from 'vs/base/node/pfs';
-import * as encoding from 'vs/base/node/encoding';
-import { detectMimeAndEncodingFromBuffer, IMimeAndEncoding } from 'vs/base/node/mime';
-import * as flow from 'vs/base/node/flow';
-import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService';
-import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService';
-import { toFileChangesEvent, normalize, IRawFileChange } from 'vs/workbench/services/files/node/watcher/common';
-import { Event, Emitter } from 'vs/base/common/event';
-import { FileWatcher as NsfwWatcherService } from 'vs/workbench/services/files/node/watcher/nsfw/watcherService';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
-import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
-import { getBaseLabel } from 'vs/base/common/labels';
-import { Readable } from 'stream';
-import { Schemas } from 'vs/base/common/network';
-
-export interface IEncodingOverride {
-	resource: uri;
-	encoding: string;
-}
-
-export interface IFileServiceOptions {
-	tmpDir?: string;
-	errorLogger?: (msg: string) => void;
-	encodingOverride?: IEncodingOverride[];
-	watcherIgnoredPatterns?: string[];
-	disableWatcher?: boolean;
-	verboseLogging?: boolean;
-	useExperimentalFileWatcher?: boolean;
-	writeElevated?: (source: string, target: string) => TPromise<void>;
-	elevationSupport?: {
-		cliPath: string;
-		promptTitle: string;
-		promptIcnsPath?: string;
-	};
-}
-
-function etag(stat: fs.Stats): string;
-function etag(size: number, mtime: number): string;
-function etag(arg1: any, arg2?: any): string {
-	let size: number;
-	let mtime: number;
-	if (typeof arg2 === 'number') {
-		size = arg1;
-		mtime = arg2;
-	} else {
-		size = (<fs.Stats>arg1).size;
-		mtime = (<fs.Stats>arg1).mtime.getTime();
-	}
-
-	return `"${crypto.createHash('sha1').update(String(size) + String(mtime)).digest('hex')}"`;
-}
-
-class BufferPool {
-
-	static _64K = new BufferPool(64 * 1024, 5);
-
-	constructor(
-		readonly bufferSize: number,
-		private readonly _capacity: number,
-		private readonly _free: Buffer[] = [],
-	) {
-		//
-	}
-
-	acquire(): Buffer {
-		if (this._free.length === 0) {
-			return Buffer.allocUnsafe(this.bufferSize);
-		} else {
-			return this._free.shift();
-		}
-	}
-
-	release(buf: Buffer): void {
-		if (this._free.length <= this._capacity) {
-			this._free.push(buf);
-		}
-	}
-}
-
-export class FileService implements IFileService {
-
-	public _serviceBrand: any;
-
-	private static readonly FS_EVENT_DELAY = 50; // aggregate and only emit events when changes have stopped for this duration (in ms)
-	private static readonly FS_REWATCH_DELAY = 300; // delay to rewatch a file that was renamed or deleted (in ms)
-
-	private tmpPath: string;
-	private options: IFileServiceOptions;
-
-	private readonly _onFileChanges: Emitter<FileChangesEvent>;
-	private readonly _onAfterOperation: Emitter<FileOperationEvent>;
-
-	private toDispose: IDisposable[];
-
-	private activeFileChangesWatchers: ResourceMap<fs.FSWatcher>;
-	private fileChangesWatchDelayer: ThrottledDelayer<void>;
-	private undeliveredRawFileChangesEvents: IRawFileChange[];
-
-	private activeWorkspaceFileChangeWatcher: IDisposable;
-
-	constructor(
-		private contextService: IWorkspaceContextService,
-		private environmentService: IEnvironmentService,
-		private textResourceConfigurationService: ITextResourceConfigurationService,
-		private configurationService: IConfigurationService,
-		private lifecycleService: ILifecycleService,
-		options: IFileServiceOptions
-	) {
-		this.toDispose = [];
-		this.options = options || Object.create(null);
-		this.tmpPath = this.options.tmpDir || os.tmpdir();
-
-		this._onFileChanges = new Emitter<FileChangesEvent>();
-		this.toDispose.push(this._onFileChanges);
-
-		this._onAfterOperation = new Emitter<FileOperationEvent>();
-		this.toDispose.push(this._onAfterOperation);
-
-		if (!this.options.errorLogger) {
-			this.options.errorLogger = console.error;
-		}
-
-		this.activeFileChangesWatchers = new ResourceMap<fs.FSWatcher>();
-		this.fileChangesWatchDelayer = new ThrottledDelayer<void>(FileService.FS_EVENT_DELAY);
-		this.undeliveredRawFileChangesEvents = [];
-
-		lifecycleService.when(LifecyclePhase.Running).then(() => {
-			this.setupFileWatching(); // wait until we are fully running before starting file watchers
-		});
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		this.toDispose.push(this.contextService.onDidChangeWorkbenchState(() => {
-			if (this.lifecycleService.phase >= LifecyclePhase.Running) {
-				this.setupFileWatching();
-			}
-		}));
-	}
-
-	public get onFileChanges(): Event<FileChangesEvent> {
-		return this._onFileChanges.event;
-	}
-
-	public get onAfterOperation(): Event<FileOperationEvent> {
-		return this._onAfterOperation.event;
-	}
-
-	public updateOptions(options: IFileServiceOptions): void {
-		if (options) {
-			objects.mixin(this.options, options); // overwrite current options
-		}
-	}
-
-	private setupFileWatching(): void {
-
-		// dispose old if any
-		if (this.activeWorkspaceFileChangeWatcher) {
-			this.activeWorkspaceFileChangeWatcher.dispose();
-		}
-
-		// Return if not aplicable
-		const workbenchState = this.contextService.getWorkbenchState();
-		if (workbenchState === WorkbenchState.EMPTY || this.options.disableWatcher) {
-			return;
-		}
-
-		// new watcher: use it if setting tells us so or we run in multi-root environment
-		if (this.options.useExperimentalFileWatcher || workbenchState === WorkbenchState.WORKSPACE) {
-			this.activeWorkspaceFileChangeWatcher = toDisposable(this.setupNsfwWorkspaceWatching().startWatching());
-		}
-
-		// old watcher
-		else {
-			if (isWindows) {
-				this.activeWorkspaceFileChangeWatcher = toDisposable(this.setupWin32WorkspaceWatching().startWatching());
-			} else {
-				this.activeWorkspaceFileChangeWatcher = toDisposable(this.setupUnixWorkspaceWatching().startWatching());
-			}
-		}
-	}
-
-	private setupWin32WorkspaceWatching(): WindowsWatcherService {
-		return new WindowsWatcherService(this.contextService, this.options.watcherIgnoredPatterns, e => this._onFileChanges.fire(e), this.options.errorLogger, this.options.verboseLogging);
-	}
-
-	private setupUnixWorkspaceWatching(): UnixWatcherService {
-		return new UnixWatcherService(this.contextService, this.options.watcherIgnoredPatterns, e => this._onFileChanges.fire(e), this.options.errorLogger, this.options.verboseLogging);
-	}
-
-	private setupNsfwWorkspaceWatching(): NsfwWatcherService {
-		return new NsfwWatcherService(this.contextService, this.configurationService, e => this._onFileChanges.fire(e), this.options.errorLogger, this.options.verboseLogging);
-	}
-
-	public resolveFile(resource: uri, options?: IResolveFileOptions): TPromise<IFileStat> {
-		return this.resolve(resource, options);
-	}
-
-	public resolveFiles(toResolve: { resource: uri, options?: IResolveFileOptions }[]): TPromise<IResolveFileResult[]> {
-		return TPromise.join(toResolve.map(resourceAndOptions => this.resolve(resourceAndOptions.resource, resourceAndOptions.options)
-			.then(stat => ({ stat, success: true }), error => ({ stat: void 0, success: false }))));
-	}
-
-	public existsFile(resource: uri): TPromise<boolean> {
-		return this.resolveFile(resource).then(() => true, () => false);
-	}
-
-	public resolveContent(resource: uri, options?: IResolveContentOptions): TPromise<IContent> {
-		return this.resolveStreamContent(resource, options).then(streamContent => {
-			return new TPromise<IContent>((resolve, reject) => {
-
-				const result: IContent = {
-					resource: streamContent.resource,
-					name: streamContent.name,
-					mtime: streamContent.mtime,
-					etag: streamContent.etag,
-					encoding: streamContent.encoding,
-					value: ''
-				};
-
-				streamContent.value.on('data', chunk => result.value += chunk);
-				streamContent.value.on('error', err => reject(err));
-				streamContent.value.on('end', _ => resolve(result));
-
-				return result;
-			});
-		});
-	}
-
-	public resolveStreamContent(resource: uri, options?: IResolveContentOptions): TPromise<IStreamContent> {
-
-		// Guard early against attempts to resolve an invalid file path
-		if (resource.scheme !== Schemas.file || !resource.fsPath) {
-			return TPromise.wrapError<IStreamContent>(new FileOperationError(
-				nls.localize('fileInvalidPath', "Invalid file resource ({0})", resource.toString(true)),
-				FileOperationResult.FILE_INVALID_PATH,
-				options
-			));
-		}
-
-		const result: IStreamContent = {
-			resource: void 0,
-			name: void 0,
-			mtime: void 0,
-			etag: void 0,
-			encoding: void 0,
-			value: void 0
-		};
-
-		const contentResolverTokenSource = new CancellationTokenSource();
-
-		const onStatError = (error: Error) => {
-
-			// error: stop reading the file the stat and content resolve call
-			// usually race, mostly likely the stat call will win and cancel
-			// the content call
-			contentResolverTokenSource.cancel();
-
-			// forward error
-			return TPromise.wrapError(error);
-		};
-
-		const statsPromise = this.resolveFile(resource).then(stat => {
-			result.resource = stat.resource;
-			result.name = stat.name;
-			result.mtime = stat.mtime;
-			result.etag = stat.etag;
-
-			// Return early if resource is a directory
-			if (stat.isDirectory) {
-				return onStatError(new FileOperationError(
-					nls.localize('fileIsDirectoryError', "File is directory"),
-					FileOperationResult.FILE_IS_DIRECTORY,
-					options
-				));
-			}
-
-			// Return early if file not modified since
-			if (options && options.etag && options.etag === stat.etag) {
-				return onStatError(new FileOperationError(
-					nls.localize('fileNotModifiedError', "File not modified since"),
-					FileOperationResult.FILE_NOT_MODIFIED_SINCE,
-					options
-				));
-			}
-
-			// Return early if file is too large to load
-			if (typeof stat.size === 'number') {
-				if (stat.size > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
-					let memoryLimit = this.textResourceConfigurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
-					return onStatError(new FileOperationError(
-						nls.localize('fileTooLargeForHeapError', "File size exceeds the default memory limit. Relaunch with a higher limit. The current setting is configured to relaunch with {0}MB", memoryLimit),
-						FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
-					));
-				}
-
-				if (stat.size > MAX_FILE_SIZE) {
-					return onStatError(new FileOperationError(
-						nls.localize('fileTooLargeError', "File too large to open"),
-						FileOperationResult.FILE_TOO_LARGE
-					));
-				}
-			}
-
-			return void 0;
-		}, err => {
-
-			// Wrap file not found errors
-			if (err.code === 'ENOENT') {
-				return onStatError(new FileOperationError(
-					nls.localize('fileNotFoundError', "File not found ({0})", resource.toString(true)),
-					FileOperationResult.FILE_NOT_FOUND,
-					options
-				));
-			}
-
-			return onStatError(err);
-		});
-
-		let completePromise: Thenable<any>;
-
-		// await the stat iff we already have an etag so that we compare the
-		// etag from the stat before we actually read the file again.
-		if (options && options.etag) {
-			completePromise = statsPromise.then(() => {
-				return this.fillInContents(result, resource, options, contentResolverTokenSource.token); // Waterfall -> only now resolve the contents
-			});
-		}
-
-		// a fresh load without a previous etag which means we can resolve the file stat
-		// and the content at the same time, avoiding the waterfall.
-		else {
-			completePromise = Promise.all([statsPromise, this.fillInContents(result, resource, options, contentResolverTokenSource.token)]);
-		}
-
-		return TPromise.wrap(completePromise).then(() => {
-			contentResolverTokenSource.dispose();
-
-			return result;
-		});
-	}
-
-	private fillInContents(content: IStreamContent, resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<any> {
-		return this.resolveFileData(resource, options, token).then(data => {
-			content.encoding = data.encoding;
-			content.value = data.stream;
-		});
-	}
-
-	private resolveFileData(resource: uri, options: IResolveContentOptions, token: CancellationToken): Thenable<IContentData> {
-
-		const chunkBuffer = BufferPool._64K.acquire();
-
-		const result: IContentData = {
-			encoding: void 0,
-			stream: void 0
-		};
-
-		return new Promise<IContentData>((resolve, reject) => {
-			fs.open(this.toAbsolutePath(resource), 'r', (err, fd) => {
-				if (err) {
-					if (err.code === 'ENOENT') {
-						// Wrap file not found errors
-						err = new FileOperationError(
-							nls.localize('fileNotFoundError', "File not found ({0})", resource.toString(true)),
-							FileOperationResult.FILE_NOT_FOUND,
-							options
-						);
-					}
-
-					return reject(err);
-				}
-
-				let decoder: NodeJS.ReadWriteStream;
-				let totalBytesRead = 0;
-
-				const finish = (err?: any) => {
-
-					if (err) {
-						if (err.code === 'EISDIR') {
-							// Wrap EISDIR errors (fs.open on a directory works, but you cannot read from it)
-							err = new FileOperationError(
-								nls.localize('fileIsDirectoryError', "File is directory"),
-								FileOperationResult.FILE_IS_DIRECTORY,
-								options
-							);
-						}
-						if (decoder) {
-							// If the decoder already started, we have to emit the error through it as
-							// event because the promise is already resolved!
-							decoder.emit('error', err);
-						} else {
-							reject(err);
-						}
-					}
-					if (decoder) {
-						decoder.end();
-					}
-
-					// return the shared buffer
-					BufferPool._64K.release(chunkBuffer);
-
-					if (fd) {
-						fs.close(fd, err => {
-							if (err) {
-								this.options.errorLogger(`resolveFileData#close(): ${err.toString()}`);
-							}
-						});
-					}
-				};
-
-				const handleChunk = (bytesRead: number) => {
-					if (token.isCancellationRequested) {
-						// cancellation -> finish
-						finish(new Error('cancelled'));
-					} else if (bytesRead === 0) {
-						// no more data -> finish
-						finish();
-					} else if (bytesRead < chunkBuffer.length) {
-						// write the sub-part of data we received -> repeat
-						decoder.write(chunkBuffer.slice(0, bytesRead), readChunk);
-					} else {
-						// write all data we received -> repeat
-						decoder.write(chunkBuffer, readChunk);
-					}
-				};
-
-				let currentPosition: number = (options && options.position) || null;
-
-				const readChunk = () => {
-					fs.read(fd, chunkBuffer, 0, chunkBuffer.length, currentPosition, (err, bytesRead) => {
-						totalBytesRead += bytesRead;
-
-						if (typeof currentPosition === 'number') {
-							// if we received a position argument as option we need to ensure that
-							// we advance the position by the number of bytesread
-							currentPosition += bytesRead;
-						}
-
-						if (totalBytesRead > Math.max(this.environmentService.args['max-memory'] * 1024 * 1024 || 0, MAX_HEAP_SIZE)) {
-							let memoryLimit = this.textResourceConfigurationService.getValue<number>(null, 'files.maxMemoryForLargeFilesMB') | 4096;
-							finish(new FileOperationError(
-								nls.localize('fileTooLargeForHeapError', "File size exceeds the default memory limit. Relaunch with a higher limit. The current setting is configured to relaunch with {0}MB", memoryLimit),
-								FileOperationResult.FILE_EXCEED_MEMORY_LIMIT
-							));
-						}
-
-						if (totalBytesRead > MAX_FILE_SIZE) {
-							// stop when reading too much
-							finish(new FileOperationError(
-								nls.localize('fileTooLargeError', "File too large to open"),
-								FileOperationResult.FILE_TOO_LARGE,
-								options
-							));
-						} else if (err) {
-							// some error happened
-							finish(err);
-
-						} else if (decoder) {
-							// pass on to decoder
-							handleChunk(bytesRead);
-
-						} else {
-							// when receiving the first chunk of data we need to create the
-							// decoding stream which is then used to drive the string stream.
-							TPromise.as(detectMimeAndEncodingFromBuffer(
-								{ buffer: chunkBuffer, bytesRead },
-								options && options.autoGuessEncoding || this.configuredAutoGuessEncoding(resource)
-							)).then(value => {
-
-								if (options && options.acceptTextOnly && value.mimes.indexOf(baseMime.MIME_BINARY) >= 0) {
-									// Return error early if client only accepts text and this is not text
-									finish(new FileOperationError(
-										nls.localize('fileBinaryError', "File seems to be binary and cannot be opened as text"),
-										FileOperationResult.FILE_IS_BINARY,
-										options
-									));
-
-								} else {
-									result.encoding = this.getEncoding(resource, this.getPeferredEncoding(resource, options, value));
-									result.stream = decoder = encoding.decodeStream(result.encoding);
-									resolve(result);
-									handleChunk(bytesRead);
-								}
-
-							}).then(void 0, err => {
-								// failed to get encoding
-								finish(err);
-							});
-						}
-					});
-				};
-
-				// start reading
-				readChunk();
-			});
-		});
-	}
-
-	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
-		if (this.options.elevationSupport && options.writeElevated) {
-			return this.doUpdateContentElevated(resource, value, options);
-		}
-
-		return this.doUpdateContent(resource, value, options);
-	}
-
-	private doUpdateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		// 1.) check file
-		return this.checkFile(absolutePath, options).then(exists => {
-			let createParentsPromise: TPromise<boolean>;
-			if (exists) {
-				createParentsPromise = TPromise.as(null);
-			} else {
-				createParentsPromise = pfs.mkdirp(paths.dirname(absolutePath));
-			}
-
-			// 2.) create parents as needed
-			return createParentsPromise.then(() => {
-				const encodingToWrite = this.getEncoding(resource, options.encoding);
-				let addBomPromise: TPromise<boolean> = TPromise.as(false);
-
-				// UTF_16 BE and LE as well as UTF_8 with BOM always have a BOM
-				if (encodingToWrite === encoding.UTF16be || encodingToWrite === encoding.UTF16le || encodingToWrite === encoding.UTF8_with_bom) {
-					addBomPromise = TPromise.as(true);
-				}
-
-				// Existing UTF-8 file: check for options regarding BOM
-				else if (exists && encodingToWrite === encoding.UTF8) {
-					if (options.overwriteEncoding) {
-						addBomPromise = TPromise.as(false); // if we are to overwrite the encoding, we do not preserve it if found
-					} else {
-						addBomPromise = encoding.detectEncodingByBOM(absolutePath).then(enc => enc === encoding.UTF8); // otherwise preserve it if found
-					}
-				}
-
-				// 3.) check to add UTF BOM
-				return addBomPromise.then(addBom => {
-
-					// 4.) set contents and resolve
-					return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite).then(void 0, error => {
-						if (!exists || error.code !== 'EPERM' || !isWindows) {
-							return TPromise.wrapError(error);
-						}
-
-						// On Windows and if the file exists with an EPERM error, we try a different strategy of saving the file
-						// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
-						// (see https://github.com/Microsoft/vscode/issues/931)
-
-						// 5.) truncate
-						return pfs.truncate(absolutePath, 0).then(() => {
-
-							// 6.) set contents (this time with r+ mode) and resolve again
-							return this.doSetContentsAndResolve(resource, absolutePath, value, addBom, encodingToWrite, { flag: 'r+' });
-						});
-					});
-				});
-			});
-		}).then(null, error => {
-			if (error.code === 'EACCES' || error.code === 'EPERM') {
-				return TPromise.wrapError(new FileOperationError(
-					nls.localize('filePermission', "Permission denied writing to file ({0})", resource.toString(true)),
-					FileOperationResult.FILE_PERMISSION_DENIED,
-					options
-				));
-			}
-
-			return TPromise.wrapError(error);
-		});
-	}
-
-	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string | ITextSnapshot, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): TPromise<IFileStat> {
-		let writeFilePromise: TPromise<void>;
-
-		// Configure encoding related options as needed
-		const writeFileOptions: extfs.IWriteFileOptions = options ? options : Object.create(null);
-		if (addBOM || encodingToWrite !== encoding.UTF8) {
-			writeFileOptions.encoding = {
-				charset: encodingToWrite,
-				addBOM
-			};
-		}
-
-		if (typeof value === 'string') {
-			writeFilePromise = pfs.writeFile(absolutePath, value, writeFileOptions);
-		} else {
-			writeFilePromise = pfs.writeFile(absolutePath, this.snapshotToReadableStream(value), writeFileOptions);
-		}
-
-		// set contents
-		return writeFilePromise.then(() => {
-
-			// resolve
-			return this.resolve(resource);
-		});
-	}
-
-	private snapshotToReadableStream(snapshot: ITextSnapshot): NodeJS.ReadableStream {
-		return new Readable({
-			read: function () {
-				try {
-					let chunk: string;
-					let canPush = true;
-
-					// Push all chunks as long as we can push and as long as
-					// the underlying snapshot returns strings to us
-					while (canPush && typeof (chunk = snapshot.read()) === 'string') {
-						canPush = this.push(chunk);
-					}
-
-					// Signal EOS by pushing NULL
-					if (typeof chunk !== 'string') {
-						this.push(null);
-					}
-				} catch (error) {
-					this.emit('error', error);
-				}
-			},
-			encoding: encoding.UTF8 // very important, so that strings are passed around and not buffers!
-		});
-	}
-
-	private doUpdateContentElevated(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise<IFileStat> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		// 1.) check file
-		return this.checkFile(absolutePath, options, options.overwriteReadonly /* ignore readonly if we overwrite readonly, this is handled via sudo later */).then(exists => {
-			const writeOptions: IUpdateContentOptions = objects.assign(Object.create(null), options);
-			writeOptions.writeElevated = false;
-			writeOptions.encoding = this.getEncoding(resource, options.encoding);
-
-			// 2.) write to a temporary file to be able to copy over later
-			const tmpPath = paths.join(this.tmpPath, `code-elevated-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 6)}`);
-			return this.updateContent(uri.file(tmpPath), value, writeOptions).then(() => {
-
-				// 3.) invoke our CLI as super user
-				return (import('sudo-prompt')).then(sudoPrompt => {
-					return new TPromise<void>((c, e) => {
-						const promptOptions = { name: this.options.elevationSupport.promptTitle.replace('-', ''), icns: this.options.elevationSupport.promptIcnsPath };
-
-						const sudoCommand: string[] = [`"${this.options.elevationSupport.cliPath}"`];
-						if (options.overwriteReadonly) {
-							sudoCommand.push('--file-chmod');
-						}
-						sudoCommand.push('--file-write', `"${tmpPath}"`, `"${absolutePath}"`);
-
-						sudoPrompt.exec(sudoCommand.join(' '), promptOptions, (error: string, stdout: string, stderr: string) => {
-							if (error || stderr) {
-								e(error || stderr);
-							} else {
-								c(void 0);
-							}
-						});
-					});
-				}).then(() => {
-
-					// 3.) delete temp file
-					return pfs.del(tmpPath, this.tmpPath).then(() => {
-
-						// 4.) resolve again
-						return this.resolve(resource);
-					});
-				});
-			});
-		}).then(null, error => {
-			if (this.options.verboseLogging) {
-				this.options.errorLogger(`Unable to write to file '${resource.toString(true)}' as elevated user (${error})`);
-			}
-
-			if (!FileOperationError.isFileOperationError(error)) {
-				error = new FileOperationError(
-					nls.localize('filePermission', "Permission denied writing to file ({0})", resource.toString(true)),
-					FileOperationResult.FILE_PERMISSION_DENIED,
-					options
-				);
-			}
-
-			return TPromise.wrapError(error);
-		});
-	}
-
-	public createFile(resource: uri, content: string = '', options: ICreateFileOptions = Object.create(null)): TPromise<IFileStat> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		let checkFilePromise: TPromise<boolean>;
-		if (options.overwrite) {
-			checkFilePromise = TPromise.as(false);
-		} else {
-			checkFilePromise = pfs.exists(absolutePath);
-		}
-
-		// Check file exists
-		return checkFilePromise.then(exists => {
-			if (exists && !options.overwrite) {
-				return TPromise.wrapError<IFileStat>(new FileOperationError(
-					nls.localize('fileExists', "File to create already exists ({0})", resource.toString(true)),
-					FileOperationResult.FILE_MODIFIED_SINCE,
-					options
-				));
-			}
-
-			// Create file
-			return this.updateContent(resource, content).then(result => {
-
-				// Events
-				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, result));
-
-				return result;
-			});
-		});
-	}
-
-	public createFolder(resource: uri): TPromise<IFileStat> {
-
-		// 1.) Create folder
-		const absolutePath = this.toAbsolutePath(resource);
-		return pfs.mkdirp(absolutePath).then(() => {
-
-			// 2.) Resolve
-			return this.resolve(resource).then(result => {
-
-				// Events
-				this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.CREATE, result));
-
-				return result;
-			});
-		});
-	}
-
-	public touchFile(resource: uri): TPromise<IFileStat> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		// 1.) check file
-		return this.checkFile(absolutePath).then(exists => {
-			let createPromise: TPromise<IFileStat>;
-			if (exists) {
-				createPromise = TPromise.as(null);
-			} else {
-				createPromise = this.createFile(resource);
-			}
-
-			// 2.) create file as needed
-			return createPromise.then(() => {
-
-				// 3.) update atime and mtime
-				return pfs.touch(absolutePath).then(() => {
-
-					// 4.) resolve
-					return this.resolve(resource);
-				});
-			});
-		});
-	}
-
-	public rename(resource: uri, newName: string): TPromise<IFileStat> {
-		const newPath = paths.join(paths.dirname(resource.fsPath), newName);
-
-		return this.moveFile(resource, uri.file(newPath));
-	}
-
-	public moveFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
-		return this.moveOrCopyFile(source, target, false, overwrite);
-	}
-
-	public copyFile(source: uri, target: uri, overwrite?: boolean): TPromise<IFileStat> {
-		return this.moveOrCopyFile(source, target, true, overwrite);
-	}
-
-	private moveOrCopyFile(source: uri, target: uri, keepCopy: boolean, overwrite: boolean): TPromise<IFileStat> {
-		const sourcePath = this.toAbsolutePath(source);
-		const targetPath = this.toAbsolutePath(target);
-
-		// 1.) move / copy
-		return this.doMoveOrCopyFile(sourcePath, targetPath, keepCopy, overwrite).then(() => {
-
-			// 2.) resolve
-			return this.resolve(target).then(result => {
-
-				// Events
-				this._onAfterOperation.fire(new FileOperationEvent(source, keepCopy ? FileOperation.COPY : FileOperation.MOVE, result));
-
-				return result;
-			});
-		});
-	}
-
-	private doMoveOrCopyFile(sourcePath: string, targetPath: string, keepCopy: boolean, overwrite: boolean): TPromise<boolean /* exists */> {
-
-		// 1.) validate operation
-		if (isParent(targetPath, sourcePath, !isLinux)) {
-			return TPromise.wrapError<boolean>(new Error('Unable to move/copy when source path is parent of target path'));
-		}
-
-		// 2.) check if target exists
-		return pfs.exists(targetPath).then(exists => {
-			const isCaseRename = sourcePath.toLowerCase() === targetPath.toLowerCase();
-			const isSameFile = sourcePath === targetPath;
-
-			// Return early with conflict if target exists and we are not told to overwrite
-			if (exists && !isCaseRename && !overwrite) {
-				return TPromise.wrapError<boolean>(new FileOperationError(nls.localize('fileMoveConflict', "Unable to move/copy. File already exists at destination."), FileOperationResult.FILE_MOVE_CONFLICT));
-			}
-
-			// 3.) make sure target is deleted before we move/copy unless this is a case rename of the same file
-			let deleteTargetPromise = TPromise.wrap<void>(void 0);
-			if (exists && !isCaseRename) {
-				if (isEqualOrParent(sourcePath, targetPath, !isLinux /* ignorecase */)) {
-					return TPromise.wrapError<boolean>(new Error(nls.localize('unableToMoveCopyError', "Unable to move/copy. File would replace folder it is contained in."))); // catch this corner case!
-				}
-
-				deleteTargetPromise = this.del(uri.file(targetPath));
-			}
-
-			return deleteTargetPromise.then(() => {
-
-				// 4.) make sure parents exists
-				return pfs.mkdirp(paths.dirname(targetPath)).then(() => {
-
-					// 4.) copy/move
-					if (isSameFile) {
-						return TPromise.wrap(null);
-					} else if (keepCopy) {
-						return nfcall(extfs.copy, sourcePath, targetPath);
-					} else {
-						return nfcall(extfs.mv, sourcePath, targetPath);
-					}
-				}).then(() => exists);
-			});
-		});
-	}
-
-	public importFile(source: uri, targetFolder: uri): TPromise<IImportResult> {
-		const sourcePath = this.toAbsolutePath(source);
-		const targetResource = uri.file(paths.join(targetFolder.fsPath, paths.basename(source.fsPath)));
-		const targetPath = this.toAbsolutePath(targetResource);
-
-		// 1.) resolve
-		return pfs.stat(sourcePath).then(stat => {
-			if (stat.isDirectory()) {
-				return TPromise.wrapError<IImportResult>(new Error(nls.localize('foldersCopyError', "Folders cannot be copied into the workspace. Please select individual files to copy them."))); // for now we do not allow to import a folder into a workspace
-			}
-
-			// 2.) copy
-			return this.doMoveOrCopyFile(sourcePath, targetPath, true, true).then(exists => {
-
-				// 3.) resolve
-				return this.resolve(targetResource).then(stat => {
-
-					// Events
-					this._onAfterOperation.fire(new FileOperationEvent(source, FileOperation.IMPORT, stat));
-
-					return <IImportResult>{ isNew: !exists, stat: stat };
-				});
-			});
-		});
-	}
-
-	public del(resource: uri): TPromise<void> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		return pfs.del(absolutePath, this.tmpPath).then(() => {
-
-			// Events
-			this._onAfterOperation.fire(new FileOperationEvent(resource, FileOperation.DELETE));
-		});
-	}
-
-	// Helpers
-
-	private toAbsolutePath(arg1: uri | IFileStat): string {
-		let resource: uri;
-		if (arg1 instanceof uri) {
-			resource = <uri>arg1;
-		} else {
-			resource = (<IFileStat>arg1).resource;
-		}
-
-		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource: ${resource}`);
-
-		return paths.normalize(resource.fsPath);
-	}
-
-	private resolve(resource: uri, options: IResolveFileOptions = Object.create(null)): TPromise<IFileStat> {
-		return this.toStatResolver(resource)
-			.then(model => model.resolve(options));
-	}
-
-	private toStatResolver(resource: uri): TPromise<StatResolver> {
-		const absolutePath = this.toAbsolutePath(resource);
-
-		return pfs.statLink(absolutePath).then(({ isSymbolicLink, stat }) => {
-			return new StatResolver(resource, isSymbolicLink, stat.isDirectory(), stat.mtime.getTime(), stat.size, this.options.verboseLogging ? this.options.errorLogger : void 0);
-		});
-	}
-
-	private getPeferredEncoding(resource: uri, options: IResolveContentOptions, detected: IMimeAndEncoding): string {
-		let preferredEncoding: string;
-		if (options && options.encoding) {
-			if (detected.encoding === encoding.UTF8 && options.encoding === encoding.UTF8) {
-				preferredEncoding = encoding.UTF8_with_bom; // indicate the file has BOM if we are to resolve with UTF 8
-			} else {
-				preferredEncoding = options.encoding; // give passed in encoding highest priority
-			}
-		} else if (detected.encoding) {
-			if (detected.encoding === encoding.UTF8) {
-				preferredEncoding = encoding.UTF8_with_bom; // if we detected UTF-8, it can only be because of a BOM
-			} else {
-				preferredEncoding = detected.encoding;
-			}
-		} else if (this.configuredEncoding(resource) === encoding.UTF8_with_bom) {
-			preferredEncoding = encoding.UTF8; // if we did not detect UTF 8 BOM before, this can only be UTF 8 then
-		}
-		return preferredEncoding;
-	}
-
-	public getEncoding(resource: uri, preferredEncoding?: string): string {
-		let fileEncoding: string;
-
-		const override = this.getEncodingOverride(resource);
-		if (override) {
-			fileEncoding = override;
-		} else if (preferredEncoding) {
-			fileEncoding = preferredEncoding;
-		} else {
-			fileEncoding = this.configuredEncoding(resource);
-		}
-
-		if (!fileEncoding || !encoding.encodingExists(fileEncoding)) {
-			fileEncoding = encoding.UTF8; // the default is UTF 8
-		}
-
-		return fileEncoding;
-	}
-
-	private configuredAutoGuessEncoding(resource: uri): boolean {
-		return this.textResourceConfigurationService.getValue(resource, 'files.autoGuessEncoding');
-	}
-
-	private configuredEncoding(resource: uri): string {
-		return this.textResourceConfigurationService.getValue(resource, 'files.encoding');
-	}
-
-	private getEncodingOverride(resource: uri): string {
-		if (resource && this.options.encodingOverride && this.options.encodingOverride.length) {
-			for (let i = 0; i < this.options.encodingOverride.length; i++) {
-				const override = this.options.encodingOverride[i];
-
-				// check if the resource is a child of the resource with override and use
-				// the provided encoding in that case
-				if (isParent(resource.fsPath, override.resource.fsPath, !isLinux /* ignorecase */)) {
-					return override.encoding;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private checkFile(absolutePath: string, options: IUpdateContentOptions = Object.create(null), ignoreReadonly?: boolean): TPromise<boolean /* exists */> {
-		return pfs.exists(absolutePath).then(exists => {
-			if (exists) {
-				return pfs.stat(absolutePath).then(stat => {
-					if (stat.isDirectory()) {
-						return TPromise.wrapError<boolean>(new Error('Expected file is actually a directory'));
-					}
-
-					// Dirty write prevention
-					if (typeof options.mtime === 'number' && typeof options.etag === 'string' && options.mtime < stat.mtime.getTime()) {
-
-						// Find out if content length has changed
-						if (options.etag !== etag(stat.size, options.mtime)) {
-							return TPromise.wrapError<boolean>(new FileOperationError(nls.localize('fileModifiedError', "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options));
-						}
-					}
-
-					// Throw if file is readonly and we are not instructed to overwrite
-					if (!ignoreReadonly && !(stat.mode & 128) /* readonly */) {
-						if (!options.overwriteReadonly) {
-							return this.readOnlyError<boolean>(options);
-						}
-
-						// Try to change mode to writeable
-						let mode = stat.mode;
-						mode = mode | 128;
-						return pfs.chmod(absolutePath, mode).then(() => {
-
-							// Make sure to check the mode again, it could have failed
-							return pfs.stat(absolutePath).then(stat => {
-								if (!(stat.mode & 128) /* readonly */) {
-									return this.readOnlyError<boolean>(options);
-								}
-
-								return exists;
-							});
-						});
-					}
-
-					return TPromise.as<boolean>(exists);
-				});
-			}
-
-			return TPromise.as<boolean>(exists);
-		});
-	}
-
-	private readOnlyError<T>(options: IUpdateContentOptions): TPromise<T> {
-		return TPromise.wrapError<T>(new FileOperationError(
-			nls.localize('fileReadOnlyError', "File is Read Only"),
-			FileOperationResult.FILE_READ_ONLY,
-			options
-		));
-	}
-
-	public watchFileChanges(resource: uri): void {
-		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource for watching: ${resource}`);
-
-		// Create or get watcher for provided path
-		let watcher = this.activeFileChangesWatchers.get(resource);
-		if (!watcher) {
-			const fsPath = resource.fsPath;
-			const fsName = paths.basename(resource.fsPath);
-
-			watcher = extfs.watch(fsPath, (eventType: string, filename: string) => {
-				const renamedOrDeleted = ((filename && filename !== fsName) || eventType === 'rename');
-
-				// The file was either deleted or renamed. Many tools apply changes to files in an
-				// atomic way ("Atomic Save") by first renaming the file to a temporary name and then
-				// renaming it back to the original name. Our watcher will detect this as a rename
-				// and then stops to work on Mac and Linux because the watcher is applied to the
-				// inode and not the name. The fix is to detect this case and trying to watch the file
-				// again after a certain delay.
-				// In addition, we send out a delete event if after a timeout we detect that the file
-				// does indeed not exist anymore.
-				if (renamedOrDeleted) {
-
-					// Very important to dispose the watcher which now points to a stale inode
-					this.unwatchFileChanges(resource);
-
-					// Wait a bit and try to install watcher again, assuming that the file was renamed quickly ("Atomic Save")
-					setTimeout(() => {
-						this.existsFile(resource).done(exists => {
-
-							// File still exists, so reapply the watcher
-							if (exists) {
-								this.watchFileChanges(resource);
-							}
-
-							// File seems to be really gone, so emit a deleted event
-							else {
-								this.onRawFileChange({
-									type: FileChangeType.DELETED,
-									path: fsPath
-								});
-							}
-						});
-					}, FileService.FS_REWATCH_DELAY);
-				}
-
-				// Handle raw file change
-				this.onRawFileChange({
-					type: FileChangeType.UPDATED,
-					path: fsPath
-				});
-			}, (error: string) => this.options.errorLogger(error));
-
-			if (watcher) {
-				this.activeFileChangesWatchers.set(resource, watcher);
-			}
-		}
-	}
-
-	private onRawFileChange(event: IRawFileChange): void {
-
-		// add to bucket of undelivered events
-		this.undeliveredRawFileChangesEvents.push(event);
-
-		if (this.options.verboseLogging) {
-			console.log('%c[node.js Watcher]%c', 'color: green', 'color: black', event.type === FileChangeType.ADDED ? '[ADDED]' : event.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', event.path);
-		}
-
-		// handle emit through delayer to accommodate for bulk changes
-		this.fileChangesWatchDelayer.trigger(() => {
-			const buffer = this.undeliveredRawFileChangesEvents;
-			this.undeliveredRawFileChangesEvents = [];
-
-			// Normalize
-			const normalizedEvents = normalize(buffer);
-
-			// Logging
-			if (this.options.verboseLogging) {
-				normalizedEvents.forEach(r => {
-					console.log('%c[node.js Watcher]%c >> normalized', 'color: green', 'color: black', r.type === FileChangeType.ADDED ? '[ADDED]' : r.type === FileChangeType.DELETED ? '[DELETED]' : '[CHANGED]', r.path);
-				});
-			}
-
-			// Emit
-			this._onFileChanges.fire(toFileChangesEvent(normalizedEvents));
-
-			return TPromise.as(null);
-		});
-	}
-
-	public unwatchFileChanges(resource: uri): void {
-		const watcher = this.activeFileChangesWatchers.get(resource);
-		if (watcher) {
-			watcher.close();
-			this.activeFileChangesWatchers.delete(resource);
-		}
-	}
-
-	public dispose(): void {
-		this.toDispose = dispose(this.toDispose);
-
-		if (this.activeWorkspaceFileChangeWatcher) {
-			this.activeWorkspaceFileChangeWatcher.dispose();
-			this.activeWorkspaceFileChangeWatcher = null;
-		}
-
-		this.activeFileChangesWatchers.forEach(watcher => watcher.close());
-		this.activeFileChangesWatchers.clear();
-	}
-}
-
-export class StatResolver {
-	private name: string;
-	private etag: string;
-
-	constructor(
-		private resource: uri,
-		private isSymbolicLink: boolean,
-		private isDirectory: boolean,
-		private mtime: number,
-		private size: number,
-		private errorLogger?: (error: Error | string) => void
-	) {
-		assert.ok(resource && resource.scheme === Schemas.file, `Invalid resource: ${resource}`);
-
-		this.name = getBaseLabel(resource);
-		this.etag = etag(size, mtime);
-	}
-
-	public resolve(options: IResolveFileOptions): TPromise<IFileStat> {
-
-		// General Data
-		const fileStat: IFileStat = {
-			resource: this.resource,
-			isDirectory: this.isDirectory,
-			isSymbolicLink: this.isSymbolicLink,
-			name: this.name,
-			etag: this.etag,
-			size: this.size,
-			mtime: this.mtime
-		};
-
-		// File Specific Data
-		if (!this.isDirectory) {
-			return TPromise.as(fileStat);
-		}
-
-		// Directory Specific Data
-		else {
-
-			// Convert the paths from options.resolveTo to absolute paths
-			let absoluteTargetPaths: string[] = null;
-			if (options && options.resolveTo) {
-				absoluteTargetPaths = [];
-				options.resolveTo.forEach(resource => {
-					absoluteTargetPaths.push(resource.fsPath);
-				});
-			}
-
-			return new TPromise<IFileStat>((c, e) => {
-
-				// Load children
-				this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, children => {
-					children = arrays.coalesce(children); // we don't want those null children (could be permission denied when reading a child)
-					fileStat.children = children || [];
-
-					c(fileStat);
-				});
-			});
-		}
-	}
-
-	private resolveChildren(absolutePath: string, absoluteTargetPaths: string[], resolveSingleChildDescendants: boolean, callback: (children: IFileStat[]) => void): void {
-		extfs.readdir(absolutePath, (error: Error, files: string[]) => {
-			if (error) {
-				if (this.errorLogger) {
-					this.errorLogger(error);
-				}
-
-				return callback(null); // return - we might not have permissions to read the folder
-			}
-
-			// for each file in the folder
-			flow.parallel(files, (file: string, clb: (error: Error, children: IFileStat) => void) => {
-				const fileResource = uri.file(paths.resolve(absolutePath, file));
-				let fileStat: fs.Stats;
-				let isSymbolicLink = false;
-				const $this = this;
-
-				flow.sequence(
-					function onError(error: Error): void {
-						if ($this.errorLogger) {
-							$this.errorLogger(error);
-						}
-
-						clb(null, null); // return - we might not have permissions to read the folder or stat the file
-					},
-
-					function stat(this: any): void {
-						extfs.statLink(fileResource.fsPath, this);
-					},
-
-					function countChildren(this: any, statAndLink: extfs.IStatAndLink): void {
-						fileStat = statAndLink.stat;
-						isSymbolicLink = statAndLink.isSymbolicLink;
-
-						if (fileStat.isDirectory()) {
-							extfs.readdir(fileResource.fsPath, (error, result) => {
-								this(null, result ? result.length : 0);
-							});
-						} else {
-							this(null, 0);
-						}
-					},
-
-					function resolve(childCount: number): void {
-						const childStat: IFileStat = {
-							resource: fileResource,
-							isDirectory: fileStat.isDirectory(),
-							isSymbolicLink,
-							name: file,
-							mtime: fileStat.mtime.getTime(),
-							etag: etag(fileStat),
-							size: fileStat.size
-						};
-
-						// Return early for files
-						if (!fileStat.isDirectory()) {
-							return clb(null, childStat);
-						}
-
-						// Handle Folder
-						let resolveFolderChildren = false;
-						if (files.length === 1 && resolveSingleChildDescendants) {
-							resolveFolderChildren = true;
-						} else if (childCount > 0 && absoluteTargetPaths && absoluteTargetPaths.some(targetPath => isEqualOrParent(targetPath, fileResource.fsPath, !isLinux /* ignorecase */))) {
-							resolveFolderChildren = true;
-						}
-
-						// Continue resolving children based on condition
-						if (resolveFolderChildren) {
-							$this.resolveChildren(fileResource.fsPath, absoluteTargetPaths, resolveSingleChildDescendants, children => {
-								children = arrays.coalesce(children);  // we don't want those null children
-								childStat.children = children || [];
-
-								clb(null, childStat);
-							});
-						}
-
-						// Otherwise return result
-						else {
-							clb(null, childStat);
-						}
-					});
-			}, (errors, result) => {
-				callback(result);
-			});
-		});
-	}
-}
diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
index 6b85c158939..5e73b6cbaeb 100644
--- a/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/nsfw/nsfwWatcherService.ts
@@ -61,7 +61,7 @@ export class NsfwWatcherService implements IWatcherService {
 			ignored: request.ignored
 		};
 
-		process.on('uncaughtException', e => {
+		process.on('uncaughtException', (e: Error | string) => {
 
 			// Specially handle ENOSPC errors that can happen when
 			// the watcher consumes so many file descriptors that
diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
index 191689d3615..175ef1a62ec 100644
--- a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
+++ b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
@@ -19,6 +19,7 @@ import { realcaseSync } from 'vs/base/node/extfs';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as watcher from 'vs/workbench/services/files/node/watcher/common';
 import { IWatcherRequest, IWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcher';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 
 export class ChokidarWatcherService implements IWatcherService {
 
@@ -28,6 +29,7 @@ export class ChokidarWatcherService implements IWatcherService {
 	private spamCheckStartTime: number;
 	private spamWarningLogged: boolean;
 	private enospcErrorLogged: boolean;
+	private toDispose: IDisposable[] = [];
 
 	public watch(request: IWatcherRequest): TPromise<void> {
 		const watcherOpts: chokidar.IOptions = {
@@ -62,6 +64,11 @@ export class ChokidarWatcherService implements IWatcherService {
 		let undeliveredFileEvents: watcher.IRawFileChange[] = [];
 		const fileEventDelayer = new ThrottledDelayer(ChokidarWatcherService.FS_EVENT_DELAY);
 
+		this.toDispose.push(toDisposable(() => {
+			chokidarWatcher.close();
+			fileEventDelayer.cancel();
+		}));
+
 		return new TPromise<void>((c, e, p) => {
 			chokidarWatcher.on('all', (type: string, path: string) => {
 				if (isMacintosh) {
@@ -156,8 +163,12 @@ export class ChokidarWatcherService implements IWatcherService {
 				}
 			});
 		}, () => {
-			chokidarWatcher.close();
-			fileEventDelayer.cancel();
+			this.toDispose = dispose(this.toDispose);
 		});
 	}
+
+	public stop(): TPromise<void> {
+		this.toDispose = dispose(this.toDispose);
+		return TPromise.as(void 0);
+	}
 }
diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
similarity index 86%
rename from src/vs/workbench/services/files/test/node/fileService.test.ts
rename to src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
index e526018a866..822b9dc356d 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts
@@ -11,18 +11,19 @@ import * as os from 'os';
 import * as assert from 'assert';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { FileService, IEncodingOverride } from 'vs/workbench/services/files/node/fileService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { FileOperation, FileOperationEvent, FileChangesEvent, FileOperationResult, FileOperationError } from 'vs/platform/files/common/files';
 import uri from 'vs/base/common/uri';
 import * as uuid from 'vs/base/common/uuid';
 import * as pfs from 'vs/base/node/pfs';
 import * as encodingLib from 'vs/base/node/encoding';
-import * as utils from 'vs/workbench/services/files/test/node/utils';
-import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
+import * as utils from 'vs/workbench/services/files/test/electron-browser/utils';
+import { TestEnvironmentService, TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { timeout } from 'vs/base/common/async';
+import { IEncodingOverride } from 'vs/workbench/services/files/electron-browser/encoding';
 
 suite('FileService', () => {
 	let service: FileService;
@@ -35,7 +36,7 @@ suite('FileService', () => {
 		const sourceDir = require.toUrl('./fixtures/service');
 
 		return pfs.copy(sourceDir, testDir).then(() => {
-			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), { disableWatcher: true });
+			service = new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), new TestStorageService(), new TestNotificationService(), { disableWatcher: true });
 		});
 	});
 
@@ -148,44 +149,6 @@ suite('FileService', () => {
 		});
 	});
 
-	test('touchFile', function () {
-		return service.touchFile(uri.file(path.join(testDir, 'test.txt'))).then(s => {
-			assert.equal(s.name, 'test.txt');
-			assert.equal(fs.existsSync(s.resource.fsPath), true);
-			assert.equal(fs.readFileSync(s.resource.fsPath).length, 0);
-
-			const stat = fs.statSync(s.resource.fsPath);
-
-			return timeout(10).then(() => {
-				return service.touchFile(s.resource).then(s => {
-					const statNow = fs.statSync(s.resource.fsPath);
-					assert.ok(statNow.mtime.getTime() >= stat.mtime.getTime()); // one some OS the resolution seems to be 1s, so we use >= here
-					assert.equal(statNow.size, stat.size);
-				});
-			});
-		});
-	});
-
-	test('touchFile - multi folder', function () {
-		const multiFolderPaths = ['a', 'couple', 'of', 'folders'];
-
-		return service.touchFile(uri.file(path.join(testDir, ...multiFolderPaths, 'test.txt'))).then(s => {
-			assert.equal(s.name, 'test.txt');
-			assert.equal(fs.existsSync(s.resource.fsPath), true);
-			assert.equal(fs.readFileSync(s.resource.fsPath).length, 0);
-
-			const stat = fs.statSync(s.resource.fsPath);
-
-			return timeout(10).then(() => {
-				return service.touchFile(s.resource).then(s => {
-					const statNow = fs.statSync(s.resource.fsPath);
-					assert.ok(statNow.mtime.getTime() >= stat.mtime.getTime()); // one some OS the resolution seems to be 1s, so we use >= here
-					assert.equal(statNow.size, stat.size);
-				});
-			});
-		});
-	});
-
 	test('renameFile', function () {
 		let event: FileOperationEvent;
 		const toDispose = service.onAfterOperation(e => {
@@ -465,36 +428,18 @@ suite('FileService', () => {
 		});
 	});
 
-	test('importFile', function () {
-		let event: FileOperationEvent;
-		const toDispose = service.onAfterOperation(e => {
-			event = e;
-		});
-
-		return service.resolveFile(uri.file(path.join(testDir, 'deep'))).then(target => {
-			const resource = uri.file(require.toUrl('./fixtures/service/index.html'));
-			return service.importFile(resource, target.resource).then(res => {
-				assert.equal(res.isNew, true);
-				assert.equal(fs.existsSync(res.stat.resource.fsPath), true);
-
-				assert.ok(event);
-				assert.equal(event.resource.fsPath, resource.fsPath);
-				assert.equal(event.operation, FileOperation.IMPORT);
-				assert.equal(event.target.resource.fsPath, res.stat.resource.fsPath);
-				toDispose.dispose();
-			});
-		});
-	});
-
-	test('importFile - MIX CASE', function () {
+	test('copyFile - MIX CASE', function () {
 		return service.resolveFile(uri.file(path.join(testDir, 'index.html'))).then(source => {
 			return service.rename(source.resource, 'CONWAY.js').then(renamed => { // index.html => CONWAY.js
 				assert.equal(fs.existsSync(renamed.resource.fsPath), true);
 				assert.ok(fs.readdirSync(testDir).some(f => f === 'CONWAY.js'));
 
 				return service.resolveFile(uri.file(path.join(testDir, 'deep', 'conway.js'))).then(source => {
-					return service.importFile(source.resource, uri.file(testDir)).then(res => { // CONWAY.js => conway.js
-						assert.equal(fs.existsSync(res.stat.resource.fsPath), true);
+					const targetParent = uri.file(testDir);
+					const target = targetParent.with({ path: path.posix.join(targetParent.path, path.posix.basename(source.resource.path)) });
+
+					return service.copyFile(source.resource, target, true).then(res => { // CONWAY.js => conway.js
+						assert.equal(fs.existsSync(res.resource.fsPath), true);
 						assert.ok(fs.readdirSync(testDir).some(f => f === 'conway.js'));
 					});
 				});
@@ -502,48 +447,12 @@ suite('FileService', () => {
 		});
 	});
 
-	test('importFile - overwrite folder with file', function () {
-		let createEvent: FileOperationEvent;
-		let importEvent: FileOperationEvent;
-		let deleteEvent: FileOperationEvent;
-		const toDispose = service.onAfterOperation(e => {
-			if (e.operation === FileOperation.CREATE) {
-				createEvent = e;
-			} else if (e.operation === FileOperation.DELETE) {
-				deleteEvent = e;
-			} else if (e.operation === FileOperation.IMPORT) {
-				importEvent = e;
-			}
-		});
-
-		return service.resolveFile(uri.file(testDir)).then(parent => {
-			const folderResource = uri.file(path.join(parent.resource.fsPath, 'conway.js'));
-			return service.createFolder(folderResource).then(f => {
-				const resource = uri.file(path.join(testDir, 'deep', 'conway.js'));
-				return service.importFile(resource, uri.file(testDir)).then(res => {
-					assert.equal(fs.existsSync(res.stat.resource.fsPath), true);
-					assert.ok(fs.readdirSync(testDir).some(f => f === 'conway.js'));
-					assert.ok(fs.statSync(res.stat.resource.fsPath).isFile);
-
-					assert.ok(createEvent);
-					assert.ok(deleteEvent);
-					assert.ok(importEvent);
-
-					assert.equal(importEvent.resource.fsPath, resource.fsPath);
-					assert.equal(importEvent.target.resource.fsPath, res.stat.resource.fsPath);
-
-					assert.equal(deleteEvent.resource.fsPath, folderResource.fsPath);
-
-					toDispose.dispose();
-				});
-			});
-		});
-	});
-
-	test('importFile - same file', function () {
+	test('copyFile - same file', function () {
 		return service.resolveFile(uri.file(path.join(testDir, 'index.html'))).then(source => {
-			return service.importFile(source.resource, uri.file(path.dirname(source.resource.fsPath))).then(imported => {
-				assert.equal(imported.stat.size, source.size);
+			const targetParent = uri.file(path.dirname(source.resource.fsPath));
+			const target = targetParent.with({ path: path.posix.join(targetParent.path, path.posix.basename(source.resource.path)) });
+			return service.copyFile(source.resource, target, true).then(copied => {
+				assert.equal(copied.size, source.size);
 			});
 		});
 	});
@@ -912,7 +821,7 @@ suite('FileService', () => {
 		}, 100);
 	});
 
-	test('options - encoding', function () {
+	test('options - encoding override (parent)', function () {
 
 		// setup
 		const _id = uuid.generateUuid();
@@ -922,7 +831,7 @@ suite('FileService', () => {
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			const encodingOverride: IEncodingOverride[] = [];
 			encodingOverride.push({
-				resource: uri.file(path.join(testDir, 'deep')),
+				parent: uri.file(path.join(testDir, 'deep')),
 				encoding: 'utf16le'
 			});
 
@@ -931,10 +840,63 @@ suite('FileService', () => {
 
 			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
 
-			const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), TestEnvironmentService, textResourceConfigurationService, configurationService, new TestLifecycleService(), {
-				encodingOverride,
-				disableWatcher: true
+			const _service = new FileService(
+				new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+				TestEnvironmentService,
+				textResourceConfigurationService,
+				configurationService,
+				new TestLifecycleService(),
+				new TestStorageService(),
+				new TestNotificationService(),
+				{
+					encodingOverride,
+					disableWatcher: true
+				});
+
+			return _service.resolveContent(uri.file(path.join(testDir, 'index.html'))).then(c => {
+				assert.equal(c.encoding, 'windows1252');
+
+				return _service.resolveContent(uri.file(path.join(testDir, 'deep', 'conway.js'))).then(c => {
+					assert.equal(c.encoding, 'utf16le');
+
+					// teardown
+					_service.dispose();
+				});
 			});
+		});
+	});
+
+	test('options - encoding override (extension)', function () {
+
+		// setup
+		const _id = uuid.generateUuid();
+		const _testDir = path.join(parentDir, _id);
+		const _sourceDir = require.toUrl('./fixtures/service');
+
+		return pfs.copy(_sourceDir, _testDir).then(() => {
+			const encodingOverride: IEncodingOverride[] = [];
+			encodingOverride.push({
+				extension: 'js',
+				encoding: 'utf16le'
+			});
+
+			const configurationService = new TestConfigurationService();
+			configurationService.setUserConfiguration('files', { encoding: 'windows1252' });
+
+			const textResourceConfigurationService = new TestTextResourceConfigurationService(configurationService);
+
+			const _service = new FileService(
+				new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+				TestEnvironmentService,
+				textResourceConfigurationService,
+				configurationService,
+				new TestLifecycleService(),
+				new TestStorageService(),
+				new TestNotificationService(),
+				{
+					encodingOverride,
+					disableWatcher: true
+				});
 
 			return _service.resolveContent(uri.file(path.join(testDir, 'index.html'))).then(c => {
 				assert.equal(c.encoding, 'windows1252');
@@ -957,9 +919,17 @@ suite('FileService', () => {
 		const _sourceDir = require.toUrl('./fixtures/service');
 		const resource = uri.file(path.join(testDir, 'index.html'));
 
-		const _service = new FileService(new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), new TestLifecycleService(), {
-			disableWatcher: true
-		});
+		const _service = new FileService(
+			new TestContextService(new Workspace(_testDir, _testDir, toWorkspaceFolders([{ path: _testDir }]))),
+			TestEnvironmentService,
+			new TestTextResourceConfigurationService(),
+			new TestConfigurationService(),
+			new TestLifecycleService(),
+			new TestStorageService(),
+			new TestNotificationService(),
+			{
+				disableWatcher: true
+			});
 
 		return pfs.copy(_sourceDir, _testDir).then(() => {
 			return pfs.readFile(resource.fsPath).then(data => {
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/examples/company.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/company.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/examples/company.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/company.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/examples/conway.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/conway.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/examples/conway.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/conway.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/examples/employee.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/employee.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/examples/employee.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/employee.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/examples/small.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/small.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/examples/small.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/examples/small.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/index.html b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/index.html
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/index.html
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/index.html
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/company.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/company.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/company.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/company.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/conway.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/conway.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/conway.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/conway.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/employee.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/employee.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/employee.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/employee.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/small.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/small.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/other/deep/small.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/other/deep/small.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/resolver/site.css b/src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/site.css
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/resolver/site.css
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/resolver/site.css
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/binary.txt b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/binary.txt
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/binary.txt
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/binary.txt
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/deep/company.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/company.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/deep/company.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/company.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/deep/conway.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/conway.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/deep/conway.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/conway.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/deep/employee.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/employee.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/deep/employee.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/employee.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/deep/small.js b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/small.js
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/deep/small.js
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/deep/small.js
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/index.html b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/index.html
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/index.html
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/index.html
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/lorem.txt b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/lorem.txt
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/lorem.txt
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/lorem.txt
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/small.txt b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/small.txt
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/small.txt
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/small.txt
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/small_umlaut.txt b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/small_umlaut.txt
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/small_umlaut.txt
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/small_umlaut.txt
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/some_utf16le.css b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/some_utf16le.css
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/some_utf16le.css
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/some_utf16le.css
diff --git a/src/vs/workbench/services/files/test/node/fixtures/service/some_utf8_bom.txt b/src/vs/workbench/services/files/test/electron-browser/fixtures/service/some_utf8_bom.txt
similarity index 100%
rename from src/vs/workbench/services/files/test/node/fixtures/service/some_utf8_bom.txt
rename to src/vs/workbench/services/files/test/electron-browser/fixtures/service/some_utf8_bom.txt
diff --git a/src/vs/workbench/services/files/test/node/resolver.test.ts b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
similarity index 97%
rename from src/vs/workbench/services/files/test/node/resolver.test.ts
rename to src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
index 230d31d4e0f..3a9c19ad869 100644
--- a/src/vs/workbench/services/files/test/node/resolver.test.ts
+++ b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts
@@ -9,10 +9,10 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as assert from 'assert';
 
-import { StatResolver } from 'vs/workbench/services/files/node/fileService';
+import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileService';
 import uri from 'vs/base/common/uri';
 import { isLinux } from 'vs/base/common/platform';
-import * as utils from 'vs/workbench/services/files/test/node/utils';
+import * as utils from 'vs/workbench/services/files/test/electron-browser/utils';
 
 function create(relativePath: string): StatResolver {
 	let basePath = require.toUrl('./fixtures/resolver');
diff --git a/src/vs/workbench/services/files/test/node/utils.ts b/src/vs/workbench/services/files/test/electron-browser/utils.ts
similarity index 100%
rename from src/vs/workbench/services/files/test/node/utils.ts
rename to src/vs/workbench/services/files/test/electron-browser/utils.ts
diff --git a/src/vs/workbench/services/files/test/node/watcher.test.ts b/src/vs/workbench/services/files/test/electron-browser/watcher.test.ts
similarity index 100%
rename from src/vs/workbench/services/files/test/node/watcher.test.ts
rename to src/vs/workbench/services/files/test/electron-browser/watcher.test.ts
diff --git a/src/vs/workbench/services/issue/common/issue.ts b/src/vs/workbench/services/issue/common/issue.ts
index b998241ce1c..e97d68ea091 100644
--- a/src/vs/workbench/services/issue/common/issue.ts
+++ b/src/vs/workbench/services/issue/common/issue.ts
@@ -14,4 +14,5 @@ export const IWorkbenchIssueService = createDecorator<IWorkbenchIssueService>('w
 export interface IWorkbenchIssueService {
 	_serviceBrand: any;
 	openReporter(dataOverrides?: Partial<IssueReporterData>): TPromise<void>;
+	openProcessExplorer(): TPromise<void>;
 }
diff --git a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
index 7e78f2904a5..80d5a39cad2 100644
--- a/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
+++ b/src/vs/workbench/services/issue/electron-browser/workbenchIssueService.ts
@@ -8,7 +8,7 @@
 import { IssueReporterStyles, IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
-import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground } from 'vs/platform/theme/common/colorRegistry';
+import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { IExtensionManagementService, IExtensionEnablementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { webFrame } from 'electron';
@@ -41,6 +41,21 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 			return this.issueService.openReporter(issueReporterData);
 		});
 	}
+
+	openProcessExplorer(): TPromise<void> {
+		const theme = this.themeService.getTheme();
+		const data = {
+			zoomLevel: webFrame.getZoomLevel(),
+			styles: {
+				backgroundColor: theme.getColor(editorBackground) && theme.getColor(editorBackground).toString(),
+				color: theme.getColor(editorForeground).toString(),
+				hoverBackground: theme.getColor(listHoverBackground) && theme.getColor(listHoverBackground).toString(),
+				hoverForeground: theme.getColor(listHoverForeground) && theme.getColor(listHoverForeground).toString(),
+				highlightForeground: theme.getColor(listHighlightForeground) && theme.getColor(listHighlightForeground).toString()
+			}
+		};
+		return this.issueService.openProcessExplorer(data);
+	}
 }
 
 export function getIssueReporterStyles(theme: ITheme): IssueReporterStyles {
diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
index 2bb8da1d890..1c56f4f0dde 100644
--- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
@@ -74,6 +74,9 @@ export class NativeResolvedKeybinding extends ResolvedKeybinding {
 
 	constructor(mapper: MacLinuxKeyboardMapper, OS: OperatingSystem, firstPart: ScanCodeBinding, chordPart: ScanCodeBinding) {
 		super();
+		if (!firstPart) {
+			throw new Error(`Invalid USLayoutResolvedKeybinding`);
+		}
 		this._mapper = mapper;
 		this._OS = OS;
 		this._firstPart = firstPart;
diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
index 02c1dac816c..869932b1b18 100644
--- a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
+++ b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -86,6 +86,9 @@ export class WindowsNativeResolvedKeybinding extends ResolvedKeybinding {
 
 	constructor(mapper: WindowsKeyboardMapper, firstPart: SimpleKeybinding, chordPart: SimpleKeybinding) {
 		super();
+		if (!firstPart) {
+			throw new Error(`Invalid WindowsNativeResolvedKeybinding firstPart`);
+		}
 		this._mapper = mapper;
 		this._firstPart = firstPart;
 		this._chordPart = chordPart;
diff --git a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
similarity index 95%
rename from src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
rename to src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
index 9e7e5d447f1..80766a0ed14 100644
--- a/src/vs/workbench/services/keybinding/test/node/keybindingEditing.test.ts
+++ b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts
@@ -16,11 +16,12 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { KeyCode, SimpleKeybinding, ChordKeybinding } from 'vs/base/common/keyCodes';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import * as extfs from 'vs/base/node/extfs';
-import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService, TestContextService, TestTextResourceConfigurationService, TestHashService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { IWorkspaceContextService, Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import * as uuid from 'vs/base/common/uuid';
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
-import { FileService } from 'vs/workbench/services/files/node/fileService';
+import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
@@ -80,7 +81,16 @@ suite('Keybindings Editing', () => {
 			instantiationService.stub(ITelemetryService, NullTelemetryService);
 			instantiationService.stub(IModeService, ModeServiceImpl);
 			instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
-			instantiationService.stub(IFileService, new FileService(new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))), TestEnvironmentService, new TestTextResourceConfigurationService(), new TestConfigurationService(), lifecycleService, { disableWatcher: true }));
+			instantiationService.stub(IFileService, new FileService(
+				new TestContextService(new Workspace(testDir, testDir, toWorkspaceFolders([{ path: testDir }]))),
+				TestEnvironmentService,
+				new TestTextResourceConfigurationService(),
+				new TestConfigurationService(),
+				lifecycleService,
+				new TestStorageService(),
+				new TestNotificationService(),
+				{ disableWatcher: true })
+			);
 			instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
 			instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
 			instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 815873ed0ff..52fbfe0638c 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, PromptOption, INotificationActions } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, INotificationHandle, Severity, NotificationMessage, INotificationActions, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { INotificationsModel, NotificationsModel } from 'vs/workbench/common/notifications';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -65,61 +65,49 @@ export class NotificationService implements INotificationService {
 		return this.model.notify(notification);
 	}
 
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
+	public prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		let handle: INotificationHandle;
+		let choiceClicked = false;
 
-		const promise = new TPromise<number>(c => {
+		// Convert choices into primary/secondary actions
+		const actions: INotificationActions = { primary: [], secondary: [] };
+		choices.forEach((choice, index) => {
+			const action = new Action(`workbench.dialog.choice.${index}`, choice.label, null, true, () => {
+				choiceClicked = true;
 
-			// Complete promise with index of action that was picked
-			const callback = (index: number, closeNotification: boolean) => () => {
-				c(index);
+				// Pass to runner
+				choice.run();
 
-				if (closeNotification) {
-					handle.dispose();
+				// Close notification unless we are told to keep open
+				if (!choice.keepOpen) {
+					handle.close();
 				}
 
 				return TPromise.as(void 0);
-			};
-
-			// Convert choices into primary/secondary actions
-			const actions: INotificationActions = {
-				primary: [],
-				secondary: []
-			};
-
-			choices.forEach((choice, index) => {
-				let isPrimary = true;
-				let label: string;
-				let closeNotification = false;
-
-				if (typeof choice === 'string') {
-					label = choice;
-				} else {
-					isPrimary = false;
-					label = choice.label;
-					closeNotification = !choice.keepOpen;
-				}
-
-				const action = new Action(`workbench.dialog.choice.${index}`, label, null, true, callback(index, closeNotification));
-				if (isPrimary) {
-					actions.primary.push(action);
-				} else {
-					actions.secondary.push(action);
-				}
 			});
 
-			// Show notification with actions
-			handle = this.notify({ severity, message, actions });
+			if (!choice.isSecondary) {
+				actions.primary.push(action);
+			} else {
+				actions.secondary.push(action);
+			}
+		});
 
-			// Cancel promise and cleanup when notification gets disposed
-			once(handle.onDidDispose)(() => {
-				dispose(...actions.primary, ...actions.secondary);
-				promise.cancel();
-			});
+		// Show notification with actions
+		handle = this.notify({ severity, message, actions });
 
-		}, () => handle.dispose());
+		once(handle.onDidClose)(() => {
 
-		return promise;
+			// Cleanup when notification gets disposed
+			dispose(...actions.primary, ...actions.secondary);
+
+			// Indicate cancellation to the outside if no action was executed
+			if (!choiceClicked && typeof onCancel === 'function') {
+				onCancel();
+			}
+		});
+
+		return handle;
 	}
 
 	public dispose(): void {
diff --git a/src/vs/workbench/services/part/common/partService.ts b/src/vs/workbench/services/part/common/partService.ts
index c9a780fb3b4..c96d2e0ed70 100644
--- a/src/vs/workbench/services/part/common/partService.ts
+++ b/src/vs/workbench/services/part/common/partService.ts
@@ -28,7 +28,7 @@ export interface ILayoutOptions {
 	source?: Parts;
 }
 
-export interface Dimension {
+export interface IDimension {
 	readonly width: number;
 	readonly height: number;
 }
@@ -46,7 +46,7 @@ export interface IPartService {
 	/**
 	 * Emits when the editor part's layout changes.
 	 */
-	onEditorLayout: Event<Dimension>;
+	onEditorLayout: Event<IDimension>;
 
 	/**
 	 * Asks the part service to layout all parts.
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
similarity index 73%
rename from src/vs/workbench/parts/preferences/browser/preferencesService.ts
rename to src/vs/workbench/services/preferences/browser/preferencesService.ts
index c569308d4e8..c9e793a29d6 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/css!./media/preferences';
 import * as network from 'vs/base/common/network';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
@@ -22,11 +21,10 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { IFileService, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/parts/preferences/common/preferences';
-import { SettingsEditorModel, DefaultSettingsEditorModel, DefaultKeybindingsEditorModel, defaultKeybindingsContents, DefaultSettings, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
+import { IPreferencesService, IPreferencesEditorModel, ISetting, getSettingsTargetName, FOLDER_SETTINGS_PATH, DEFAULT_SETTINGS_EDITOR_SETTING } from 'vs/workbench/services/preferences/common/preferences';
+import { SettingsEditorModel, DefaultSettingsEditorModel, DefaultKeybindingsEditorModel, defaultKeybindingsContents, DefaultSettings, WorkspaceConfigurationEditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { DefaultPreferencesEditorInput, PreferencesEditorInput } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
-import { KeybindingsEditorInput } from 'vs/workbench/parts/preferences/browser/keybindingsEditor';
+import { DefaultPreferencesEditorInput, PreferencesEditorInput, KeybindingsEditorInput } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
@@ -34,7 +32,6 @@ import { Position, IPosition } from 'vs/editor/common/core/position';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
-import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { parse } from 'vs/base/common/json';
@@ -51,10 +48,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	private readonly _onDispose: Emitter<void> = new Emitter<void>();
 
-	private _defaultSettingsUriCounter = 0;
-	private _defaultSettingsContentModel: DefaultSettings;
-	private _defaultResourceSettingsUriCounter = 0;
-	private _defaultResourceSettingsContentModel: DefaultSettings;
+	private _defaultUserSettingsUriCounter = 0;
+	private _defaultUserSettingsContentModel: DefaultSettings;
+	private _defaultWorkspaceSettingsUriCounter = 0;
+	private _defaultWorkspaceSettingsContentModel: DefaultSettings;
+	private _defaultFolderSettingsUriCounter = 0;
+	private _defaultFolderSettingsContentModel: DefaultSettings;
 
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
@@ -73,13 +72,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		@IModeService private modeService: IModeService
 	) {
 		super();
-		this.editorGroupService.onEditorsChanged(() => {
-			const activeEditorInput = this.editorService.getActiveEditorInput();
-			if (activeEditorInput instanceof PreferencesEditorInput) {
-				this.lastOpenedSettingsInput = activeEditorInput;
-			}
-		});
-
 		// The default keybindings.json updates based on keyboard layouts, so here we make sure
 		// if a model has been given out we update it accordingly.
 		keybindingService.onDidUpdateKeybindings(() => {
@@ -108,9 +100,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	resolveModel(uri: URI): TPromise<ITextModel> {
-		if (this.isDefaultSettingsResource(uri) || this.isDefaultResourceSettingsResource(uri)) {
+		if (this.isDefaultSettingsResource(uri)) {
 
-			const scope = this.isDefaultSettingsResource(uri) ? ConfigurationScope.WINDOW : ConfigurationScope.RESOURCE;
+			const target = this.getConfigurationTargetFromDefaultSettingsResource(uri);
 			const mode = this.modeService.getOrCreateMode('jsonc');
 			const model = this._register(this.modelService.createModel('', mode, uri));
 
@@ -122,7 +114,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 						// model has not been given out => nothing to do
 						return;
 					}
-					defaultSettings = this.getDefaultSettings(scope);
+					defaultSettings = this.getDefaultSettings(target);
 					this.modelService.updateModel(model, defaultSettings.parse());
 					defaultSettings._onDidChange.fire();
 				}
@@ -130,7 +122,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 			// Check if Default settings is already created and updated in above promise
 			if (!defaultSettings) {
-				defaultSettings = this.getDefaultSettings(scope);
+				defaultSettings = this.getDefaultSettings(target);
 				this.modelService.updateModel(model, defaultSettings.parse());
 			}
 
@@ -138,7 +130,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		}
 
 		if (this.defaultSettingsRawResource.toString() === uri.toString()) {
-			let defaultSettings: DefaultSettings = this.getDefaultSettings(ConfigurationScope.WINDOW);
+			let defaultSettings: DefaultSettings = this.getDefaultSettings(ConfigurationTarget.USER);
 			const mode = this.modeService.getOrCreateMode('jsonc');
 			const model = this._register(this.modelService.createModel(defaultSettings.raw, mode, uri));
 			return TPromise.as(model);
@@ -155,7 +147,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	createPreferencesEditorModel(uri: URI): TPromise<IPreferencesEditorModel<any>> {
-		if (this.isDefaultSettingsResource(uri) || this.isDefaultResourceSettingsResource(uri)) {
+		if (this.isDefaultSettingsResource(uri)) {
 			return this.createDefaultSettingsEditorModel(uri);
 		}
 
@@ -179,8 +171,15 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor({ resource: this.defaultSettingsRawResource }, EditorPosition.ONE) as TPromise<any>;
 	}
 
+	openSettings(): TPromise<IEditor> {
+		const editorInput = this.getActiveSettingsEditorInput() || this.lastOpenedSettingsInput;
+		const resource = editorInput ? editorInput.master.getResource() : this.userSettingsResource;
+		const target = this.getConfigurationTargetFromSettingsResource(resource);
+		return this.openOrSwitchSettings(target, resource);
+	}
+
 	openGlobalSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
-		return this.doOpenSettings(ConfigurationTarget.USER, this.userSettingsResource, options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.USER, this.userSettingsResource, options, position);
 	}
 
 	openWorkspaceSettings(options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
@@ -188,29 +187,19 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
 			return TPromise.as(null);
 		}
-		return this.doOpenSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE, this.workspaceSettingsResource, options, position);
 	}
 
 	openFolderSettings(folder: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
-		return this.doOpenSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, position);
+		return this.openOrSwitchSettings(ConfigurationTarget.WORKSPACE_FOLDER, this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, folder), options, position);
 	}
 
 	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void> {
 		const activeEditor = this.editorService.getActiveEditor();
 		if (activeEditor && activeEditor.input instanceof PreferencesEditorInput) {
-			return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
-				.then(toInput => {
-					const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
-					return this.editorService.replaceEditors([{
-						toReplace: this.lastOpenedSettingsInput,
-						replaceWith
-					}], activeEditor.position).then(() => {
-						this.lastOpenedSettingsInput = replaceWith;
-					});
-				});
+			return this.doSwitchSettings(target, resource, activeEditor.input, activeEditor.position).then(() => null);
 		} else {
-			this.doOpenSettings(target, resource);
-			return undefined;
+			return this.doOpenSettings(target, resource).then(() => null);
 		}
 	}
 
@@ -251,6 +240,16 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
+		const activeGroup = this.editorGroupService.getStacksModel().activeGroup;
+		const positionToReplace = position !== void 0 ? position : activeGroup ? this.editorGroupService.getStacksModel().positionOfGroup(activeGroup) : EditorPosition.ONE;
+		const editorInput = this.getActiveSettingsEditorInput(positionToReplace);
+		if (editorInput && editorInput.master.getResource().fsPath !== resource.fsPath) {
+			return this.doSwitchSettings(configurationTarget, resource, editorInput, positionToReplace);
+		}
+		return this.doOpenSettings(configurationTarget, resource, options, position);
+	}
+
 	private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, position?: EditorPosition): TPromise<IEditor> {
 		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 		return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
@@ -271,20 +270,72 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			});
 	}
 
+	private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, position?: EditorPosition): TPromise<IEditor> {
+		return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
+			.then(toInput => {
+				const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);
+				return this.editorService.replaceEditors([{
+					toReplace: input,
+					replaceWith
+				}], position).then(editors => {
+					this.lastOpenedSettingsInput = replaceWith;
+					return editors[0];
+				});
+			});
+	}
+
+	private getActiveSettingsEditorInput(position?: EditorPosition): PreferencesEditorInput {
+		const stacksModel = this.editorGroupService.getStacksModel();
+		const group = position !== void 0 ? stacksModel.groupAt(position) : stacksModel.activeGroup;
+		return group && <PreferencesEditorInput>group.getEditors().filter(e => e instanceof PreferencesEditorInput)[0];
+	}
+
+	private getConfigurationTargetFromSettingsResource(resource: URI): ConfigurationTarget {
+		if (this.userSettingsResource.toString() === resource.toString()) {
+			return ConfigurationTarget.USER;
+		}
+
+		const workspaceSettingsResource = this.workspaceSettingsResource;
+		if (workspaceSettingsResource && workspaceSettingsResource.toString() === resource.toString()) {
+			return ConfigurationTarget.WORKSPACE;
+		}
+
+		const folder = this.contextService.getWorkspaceFolder(resource);
+		if (folder) {
+			return ConfigurationTarget.WORKSPACE_FOLDER;
+		}
+
+		return ConfigurationTarget.USER;
+	}
+
+	private getConfigurationTargetFromDefaultSettingsResource(uri: URI) {
+		return this.isDefaultWorkspaceSettingsResource(uri) ? ConfigurationTarget.WORKSPACE : this.isDefaultFolderSettingsResource(uri) ? ConfigurationTarget.WORKSPACE_FOLDER : ConfigurationTarget.USER;
+	}
+
 	private isDefaultSettingsResource(uri: URI): boolean {
+		return this.isDefaultUserSettingsResource(uri) || this.isDefaultWorkspaceSettingsResource(uri) || this.isDefaultFolderSettingsResource(uri);
+	}
+
+	private isDefaultUserSettingsResource(uri: URI): boolean {
 		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?settings\.json$/);
 	}
 
-	private isDefaultResourceSettingsResource(uri: URI): boolean {
+	private isDefaultWorkspaceSettingsResource(uri: URI): boolean {
+		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?workspaceSettings\.json$/);
+	}
+
+	private isDefaultFolderSettingsResource(uri: URI): boolean {
 		return uri.authority === 'defaultsettings' && uri.scheme === network.Schemas.vscode && !!uri.path.match(/\/(\d+\/)?resourceSettings\.json$/);
 	}
 
 	private getDefaultSettingsResource(configurationTarget: ConfigurationTarget): URI {
-		if (configurationTarget === ConfigurationTarget.WORKSPACE_FOLDER) {
-			return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultResourceSettingsUriCounter++}/resourceSettings.json` });
-		} else {
-			return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultSettingsUriCounter++}/settings.json` });
+		switch (configurationTarget) {
+			case ConfigurationTarget.WORKSPACE:
+				return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultWorkspaceSettingsUriCounter++}/workspaceSettings.json` });
+			case ConfigurationTarget.WORKSPACE_FOLDER:
+				return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultFolderSettingsUriCounter++}/resourceSettings.json` });
 		}
+		return URI.from({ scheme: network.Schemas.vscode, authority: 'defaultsettings', path: `/${this._defaultUserSettingsUriCounter++}/settings.json` });
 	}
 
 	private getPreferencesEditorInputName(target: ConfigurationTarget, resource: URI): string {
@@ -314,24 +365,28 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	private createDefaultSettingsEditorModel(defaultSettingsUri: URI): TPromise<DefaultSettingsEditorModel> {
 		return this.textModelResolverService.createModelReference(defaultSettingsUri)
 			.then(reference => {
-				const scope = this.isDefaultSettingsResource(defaultSettingsUri) ? ConfigurationScope.WINDOW : ConfigurationScope.RESOURCE;
-				return this.instantiationService.createInstance(DefaultSettingsEditorModel, defaultSettingsUri, reference, scope, this.getDefaultSettings(scope));
+				const target = this.getConfigurationTargetFromDefaultSettingsResource(defaultSettingsUri);
+				return this.instantiationService.createInstance(DefaultSettingsEditorModel, defaultSettingsUri, reference, this.getDefaultSettings(target));
 			});
 	}
 
-	private getDefaultSettings(scope: ConfigurationScope): DefaultSettings {
-		switch (scope) {
-			case ConfigurationScope.WINDOW:
-				if (!this._defaultSettingsContentModel) {
-					this._defaultSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), scope);
-				}
-				return this._defaultSettingsContentModel;
-			case ConfigurationScope.RESOURCE:
-				if (!this._defaultResourceSettingsContentModel) {
-					this._defaultResourceSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), scope);
-				}
-				return this._defaultResourceSettingsContentModel;
+	private getDefaultSettings(target: ConfigurationTarget): DefaultSettings {
+		if (target === ConfigurationTarget.WORKSPACE) {
+			if (!this._defaultWorkspaceSettingsContentModel) {
+				this._defaultWorkspaceSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+			}
+			return this._defaultWorkspaceSettingsContentModel;
 		}
+		if (target === ConfigurationTarget.WORKSPACE_FOLDER) {
+			if (!this._defaultFolderSettingsContentModel) {
+				this._defaultFolderSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+			}
+			return this._defaultFolderSettingsContentModel;
+		}
+		if (!this._defaultUserSettingsContentModel) {
+			this._defaultUserSettingsContentModel = new DefaultSettings(this.getMostCommonlyUsedSettings(), target);
+		}
+		return this._defaultUserSettingsContentModel;
 	}
 
 	private getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): URI {
diff --git a/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts b/src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
similarity index 100%
rename from src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
rename to src/vs/workbench/services/preferences/common/keybindingsEditorModel.ts
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
new file mode 100644
index 00000000000..0a4d82056b0
--- /dev/null
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import URI from 'vs/base/common/uri';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IEditor, Position, IEditorOptions } from 'vs/platform/editor/common/editor';
+import { ITextModel } from 'vs/editor/common/model';
+import { IRange } from 'vs/editor/common/core/range';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { join } from 'vs/base/common/paths';
+import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { Event } from 'vs/base/common/event';
+import { IStringDictionary } from 'vs/base/common/collections';
+import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { localize } from 'vs/nls';
+
+export interface ISettingsGroup {
+	id: string;
+	range: IRange;
+	title: string;
+	titleRange: IRange;
+	sections: ISettingsSection[];
+}
+
+export interface ISettingsSection {
+	titleRange?: IRange;
+	title?: string;
+	settings: ISetting[];
+}
+
+export interface ISetting {
+	range: IRange;
+	key: string;
+	keyRange: IRange;
+	value: any;
+	valueRange: IRange;
+	description: string[];
+	descriptionRanges: IRange[];
+	overrides?: ISetting[];
+	overrideOf?: ISetting;
+}
+
+export interface IExtensionSetting extends ISetting {
+	extensionName: string;
+	extensionPublisher: string;
+}
+
+export interface ISearchResult {
+	filterMatches: ISettingMatch[];
+	metadata?: IFilterMetadata;
+}
+
+export interface ISearchResultGroup {
+	id: string;
+	label: string;
+	result: ISearchResult;
+	order: number;
+}
+
+export interface IFilterResult {
+	query?: string;
+	filteredGroups: ISettingsGroup[];
+	allGroups: ISettingsGroup[];
+	matches: IRange[];
+	metadata?: IStringDictionary<IFilterMetadata>;
+}
+
+export interface ISettingMatch {
+	setting: ISetting;
+	matches: IRange[];
+	score: number;
+}
+
+export interface IScoredResults {
+	[key: string]: IRemoteSetting;
+}
+
+export interface IRemoteSetting {
+	score: number;
+	key: string;
+	id: string;
+	defaultValue: string;
+	description: string;
+	packageId: string;
+	extensionName?: string;
+	extensionPublisher?: string;
+}
+
+export interface IFilterMetadata {
+	requestUrl: string;
+	requestBody: string;
+	timestamp: number;
+	duration: number;
+	scoredResults: IScoredResults;
+	extensions?: ILocalExtension[];
+
+	/** The number of requests made, since requests are split by number of filters */
+	requestCount?: number;
+
+	/** The name of the server that actually served the request */
+	context: string;
+}
+
+export interface IPreferencesEditorModel<T> {
+	uri: URI;
+	getPreference(key: string): T;
+	dispose(): void;
+}
+
+export type IGroupFilter = (group: ISettingsGroup) => boolean;
+export type ISettingMatcher = (setting: ISetting, group: ISettingsGroup) => { matches: IRange[], score: number };
+
+export interface ISettingsEditorModel extends IPreferencesEditorModel<ISetting> {
+	readonly onDidChangeGroups: Event<void>;
+	settingsGroups: ISettingsGroup[];
+	filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[];
+	findValueMatches(filter: string, setting: ISetting): IRange[];
+	updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult;
+}
+
+export interface IKeybindingsEditorModel<T> extends IPreferencesEditorModel<T> {
+}
+
+export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
+
+export interface IPreferencesService {
+	_serviceBrand: any;
+
+	userSettingsResource: URI;
+	workspaceSettingsResource: URI;
+	getFolderSettingsResource(resource: URI): URI;
+
+	resolveModel(uri: URI): TPromise<ITextModel>;
+	createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
+
+	openRawDefaultSettings(): TPromise<void>;
+	openSettings(): TPromise<IEditor>;
+	openGlobalSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	openWorkspaceSettings(options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	openFolderSettings(folder: URI, options?: IEditorOptions, position?: Position): TPromise<IEditor>;
+	switchSettings(target: ConfigurationTarget, resource: URI): TPromise<void>;
+	openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
+
+	configureSettingsForLanguage(language: string): void;
+}
+
+export function getSettingsTargetName(target: ConfigurationTarget, resource: URI, workspaceContextService: IWorkspaceContextService): string {
+	switch (target) {
+		case ConfigurationTarget.USER:
+			return localize('userSettingsTarget', "User Settings");
+		case ConfigurationTarget.WORKSPACE:
+			return localize('workspaceSettingsTarget', "Workspace Settings");
+		case ConfigurationTarget.WORKSPACE_FOLDER:
+			const folder = workspaceContextService.getWorkspaceFolder(resource);
+			return folder ? folder.name : '';
+	}
+	return '';
+}
+
+export const FOLDER_SETTINGS_PATH = join('.vscode', 'settings.json');
+export const DEFAULT_SETTINGS_EDITOR_SETTING = 'workbench.settings.openDefaultSettings';
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
new file mode 100644
index 00000000000..f8fb62cb73a
--- /dev/null
+++ b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { SideBySideEditorInput, EditorInput } from 'vs/workbench/common/editor';
+import { Verbosity } from 'vs/platform/editor/common/editor';
+import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
+import URI from 'vs/base/common/uri';
+import { ITextModelService } from 'vs/editor/common/services/resolverService';
+import { IHashService } from 'vs/workbench/services/hash/common/hashService';
+import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { OS } from 'vs/base/common/platform';
+import { TPromise } from 'vs/base/common/winjs.base';
+
+export class PreferencesEditorInput extends SideBySideEditorInput {
+	public static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
+
+	getTypeId(): string {
+		return PreferencesEditorInput.ID;
+	}
+
+	public supportsSplitEditor(): boolean {
+		return true;
+	}
+
+	public getTitle(verbosity: Verbosity): string {
+		return this.master.getTitle(verbosity);
+	}
+}
+
+export class DefaultPreferencesEditorInput extends ResourceEditorInput {
+	public static readonly ID = 'workbench.editorinputs.defaultpreferences';
+	constructor(defaultSettingsResource: URI,
+		@ITextModelService textModelResolverService: ITextModelService,
+		@IHashService hashService: IHashService
+	) {
+		super(nls.localize('settingsEditorName', "Default Settings"), '', defaultSettingsResource, textModelResolverService, hashService);
+	}
+
+	getTypeId(): string {
+		return DefaultPreferencesEditorInput.ID;
+	}
+
+	matches(other: any): boolean {
+		if (other instanceof DefaultPreferencesEditorInput) {
+			return true;
+		}
+		if (!super.matches(other)) {
+			return false;
+		}
+		return true;
+	}
+}
+
+export class KeybindingsEditorInput extends EditorInput {
+
+	public static readonly ID: string = 'workbench.input.keybindings';
+	public readonly keybindingsModel: KeybindingsEditorModel;
+
+	constructor(@IInstantiationService instantiationService: IInstantiationService) {
+		super();
+		this.keybindingsModel = instantiationService.createInstance(KeybindingsEditorModel, OS);
+	}
+
+	getTypeId(): string {
+		return KeybindingsEditorInput.ID;
+	}
+
+	getName(): string {
+		return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
+	}
+
+	resolve(refresh?: boolean): TPromise<KeybindingsEditorModel> {
+		return TPromise.as(this.keybindingsModel);
+	}
+
+	matches(otherInput: any): boolean {
+		return otherInput instanceof KeybindingsEditorInput;
+	}
+}
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts
similarity index 98%
rename from src/vs/workbench/parts/preferences/common/preferencesModels.ts
rename to src/vs/workbench/services/preferences/common/preferencesModels.ts
index 3119e7a4b16..a3ea720f8b6 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts
@@ -15,7 +15,7 @@ import { visit, JSONVisitor } from 'vs/base/common/json';
 import { ITextModel, IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
 import { EditorModel } from 'vs/workbench/common/editor';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN, IConfigurationPropertySchema, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup, IFilterMetadata } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup, IFilterMetadata } from 'vs/workbench/services/preferences/common/preferences';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IRange, Range } from 'vs/editor/common/core/range';
@@ -403,7 +403,7 @@ export class DefaultSettings extends Disposable {
 
 	constructor(
 		private _mostCommonlyUsedSettingsKeys: string[],
-		readonly configurationScope: ConfigurationScope,
+		readonly target: ConfigurationTarget,
 	) {
 		super();
 	}
@@ -555,10 +555,13 @@ export class DefaultSettings extends Disposable {
 	}
 
 	private matchesScope(property: IConfigurationNode): boolean {
-		if (this.configurationScope === ConfigurationScope.WINDOW) {
-			return true;
+		if (this.target === ConfigurationTarget.WORKSPACE_FOLDER) {
+			return property.scope === ConfigurationScope.RESOURCE;
 		}
-		return property.scope === this.configurationScope;
+		if (this.target === ConfigurationTarget.WORKSPACE) {
+			return property.scope === ConfigurationScope.WINDOW || property.scope === ConfigurationScope.RESOURCE;
+		}
+		return true;
 	}
 
 	private compareConfigurationNodes(c1: IConfigurationNode, c2: IConfigurationNode): number {
@@ -603,7 +606,6 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	constructor(
 		private _uri: URI,
 		reference: IReference<ITextEditorModel>,
-		readonly configurationScope: ConfigurationScope,
 		private readonly defaultSettings: DefaultSettings
 	) {
 		super();
@@ -617,6 +619,10 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		return this._uri;
 	}
 
+	public get target(): ConfigurationTarget {
+		return this.defaultSettings.target;
+	}
+
 	public get settingsGroups(): ISettingsGroup[] {
 		return this.defaultSettings.settingsGroups;
 	}
diff --git a/src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts b/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
similarity index 99%
rename from src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
rename to src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
index 195bae94fae..e607fdd1b5f 100644
--- a/src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
+++ b/src/vs/workbench/services/preferences/test/common/keybindingsEditorModel.test.ts
@@ -16,7 +16,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { KeybindingsEditorModel, IKeybindingItemEntry } from 'vs/workbench/parts/preferences/common/keybindingsEditorModel';
+import { KeybindingsEditorModel, IKeybindingItemEntry } from 'vs/workbench/services/preferences/common/keybindingsEditorModel';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
 
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index f34a176cfe3..dac37102f25 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -102,17 +102,17 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 		// Replay Infinite Progress
 		else if (this.progressState.infinite) {
-			this.progressbar.infinite().getContainer().show();
+			this.progressbar.infinite().show();
 		}
 
 		// Replay Finite Progress (Total & Worked)
 		else {
 			if (this.progressState.total) {
-				this.progressbar.total(this.progressState.total).getContainer().show();
+				this.progressbar.total(this.progressState.total).show();
 			}
 
 			if (this.progressState.worked) {
-				this.progressbar.worked(this.progressState.worked).getContainer().show();
+				this.progressbar.worked(this.progressState.worked).show();
 			}
 		}
 	}
@@ -152,20 +152,12 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 			// Infinite: Start Progressbar and Show after Delay
 			if (!types.isUndefinedOrNull(infinite)) {
-				if (types.isUndefinedOrNull(delay)) {
-					this.progressbar.infinite().getContainer().show();
-				} else {
-					this.progressbar.infinite().getContainer().showDelayed(delay);
-				}
+				this.progressbar.infinite().show(delay);
 			}
 
 			// Finite: Start Progressbar and Show after Delay
 			else if (!types.isUndefinedOrNull(total)) {
-				if (types.isUndefinedOrNull(delay)) {
-					this.progressbar.total(total).getContainer().show();
-				} else {
-					this.progressbar.total(total).getContainer().showDelayed(delay);
-				}
+				this.progressbar.total(total).show(delay);
 			}
 		}
 
@@ -200,7 +192,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 					this.progressState.infinite = true;
 					this.progressState.worked = void 0;
 					this.progressState.total = void 0;
-					this.progressbar.infinite().getContainer().show();
+					this.progressbar.infinite().show();
 				}
 			},
 
@@ -209,7 +201,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 				this.progressState.done = true;
 
 				if (this.isActive) {
-					this.progressbar.stop().getContainer().hide();
+					this.progressbar.stop().hide();
 				}
 			}
 		};
@@ -244,7 +236,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 			this.clearProgressState();
 
 			if (this.isActive) {
-				this.progressbar.stop().getContainer().hide();
+				this.progressbar.stop().hide();
 			}
 		};
 
@@ -257,11 +249,7 @@ export class WorkbenchProgressService extends ScopedService implements IProgress
 
 		// Show Progress when active
 		if (this.isActive) {
-			if (types.isUndefinedOrNull(delay)) {
-				this.progressbar.infinite().getContainer().show();
-			} else {
-				this.progressbar.infinite().getContainer().showDelayed(delay);
-			}
+			this.progressbar.infinite().show(delay);
 		}
 	}
 
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 9359d3e0623..876dd549910 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -166,10 +166,10 @@ export class ProgressService2 implements IProgressService2 {
 		}
 	}
 
-	private _withNotificationProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, percentage?: number }>) => P, onDidCancel?: () => void): P {
+	private _withNotificationProgress<P extends Thenable<R>, R=any>(options: IProgressOptions, callback: (progress: IProgress<{ message?: string, increment?: number }>) => P, onDidCancel?: () => void): P {
 		const toDispose: IDisposable[] = [];
 
-		const createNotification = (message: string, percentage?: number): INotificationHandle => {
+		const createNotification = (message: string, increment?: number): INotificationHandle => {
 			if (!message) {
 				return undefined; // we need a message at least
 			}
@@ -201,35 +201,35 @@ export class ProgressService2 implements IProgressService2 {
 				actions
 			});
 
-			updateProgress(handle, percentage);
+			updateProgress(handle, increment);
 
-			once(handle.onDidDispose)(() => {
+			once(handle.onDidClose)(() => {
 				dispose(toDispose);
 			});
 
 			return handle;
 		};
 
-		const updateProgress = (notification: INotificationHandle, percentage?: number): void => {
-			if (typeof percentage === 'number' && percentage > 0) {
+		const updateProgress = (notification: INotificationHandle, increment?: number): void => {
+			if (typeof increment === 'number' && increment >= 0) {
 				notification.progress.total(100); // always percentage based
-				notification.progress.worked(percentage);
+				notification.progress.worked(increment);
 			} else {
 				notification.progress.infinite();
 			}
 		};
 
 		let handle: INotificationHandle;
-		const updateNotification = (message?: string, percentage?: number): void => {
+		const updateNotification = (message?: string, increment?: number): void => {
 			if (!handle) {
-				handle = createNotification(message, percentage);
+				handle = createNotification(message, increment);
 			} else {
 				if (typeof message === 'string') {
 					handle.updateMessage(message);
 				}
 
-				if (typeof percentage === 'number') {
-					updateProgress(handle, percentage);
+				if (typeof increment === 'number') {
+					updateProgress(handle, increment);
 				}
 			}
 		};
@@ -240,14 +240,14 @@ export class ProgressService2 implements IProgressService2 {
 		// Update based on progress
 		const p = callback({
 			report: progress => {
-				updateNotification(progress.message, progress.percentage);
+				updateNotification(progress.message, progress.increment);
 			}
 		});
 
 		// Show progress for at least 800ms and then hide once done or canceled
 		always(TPromise.join([TPromise.timeout(800), p]), () => {
 			if (handle) {
-				handle.dispose();
+				handle.close();
 			}
 		});
 
diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts
index 0f8a924c3fd..577d37ad5b3 100644
--- a/src/vs/workbench/services/progress/test/progressService.test.ts
+++ b/src/vs/workbench/services/progress/test/progressService.test.ts
@@ -22,10 +22,12 @@ let activeViewlet: Viewlet = {} as any;
 class TestViewletService implements IViewletService {
 	public _serviceBrand: any;
 
+	onDidViewletRegisterEmitter = new Emitter<ViewletDescriptor>();
 	onDidViewletOpenEmitter = new Emitter<IViewlet>();
 	onDidViewletCloseEmitter = new Emitter<IViewlet>();
 	onDidViewletEnableEmitter = new Emitter<{ id: string, enabled: boolean }>();
 
+	onDidViewletRegister = this.onDidViewletRegisterEmitter.event;
 	onDidViewletOpen = this.onDidViewletOpenEmitter.event;
 	onDidViewletClose = this.onDidViewletCloseEmitter.event;
 	onDidViewletEnablementChange = this.onDidViewletEnableEmitter.event;
@@ -212,11 +214,12 @@ class TestProgressBar {
 		return this.done();
 	}
 
-	public getContainer() {
-		return {
-			show: function () { },
-			hide: function () { }
-		};
+	public show(): void {
+
+	}
+
+	public hide(): void {
+
 	}
 }
 
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
index 57cb8d2bc06..8f2f0e3c850 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -29,7 +29,7 @@ const rgDiskPath = rgPath.replace(/\bnode_modules\.asar\b/, 'node_modules.asar.u
 export class RipgrepEngine {
 	private isDone = false;
 	private rgProc: cp.ChildProcess;
-	private killRgProcFn: Function;
+	private killRgProcFn: (code?: number) => void;
 	private postProcessExclusions: glob.ParsedExpression;
 
 	private ripgrepParser: RipgrepParser;
diff --git a/src/vs/workbench/services/search/node/worker/searchWorker.ts b/src/vs/workbench/services/search/node/worker/searchWorker.ts
index a9490a8e459..cdda1b2b257 100644
--- a/src/vs/workbench/services/search/node/worker/searchWorker.ts
+++ b/src/vs/workbench/services/search/node/worker/searchWorker.ts
@@ -13,9 +13,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
 import * as strings from 'vs/base/common/strings';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { LineMatch, FileMatch } from '../search';
-import * as baseMime from 'vs/base/common/mime';
-import { UTF16le, UTF16be, UTF8, UTF8_with_bom, encodingExists, decode, bomLength } from 'vs/base/node/encoding';
-import { detectMimeAndEncodingFromBuffer } from 'vs/base/node/mime';
+import { UTF16le, UTF16be, UTF8, UTF8_with_bom, encodingExists, decode, bomLength, detectEncodingFromBuffer } from 'vs/base/node/encoding';
 
 import { ISearchWorker, ISearchWorkerSearchArgs, ISearchWorkerSearchResult } from './searchWorkerIpc';
 
@@ -208,13 +206,13 @@ export class SearchWorkerEngine {
 
 						// Detect encoding and mime when this is the beginning of the file
 						if (isFirstRead) {
-							const mimeAndEncoding = detectMimeAndEncodingFromBuffer({ buffer, bytesRead }, false);
-							if (mimeAndEncoding.mimes[mimeAndEncoding.mimes.length - 1] !== baseMime.MIME_TEXT) {
+							const detected = detectEncodingFromBuffer({ buffer, bytesRead }, false);
+							if (detected.seemsBinary) {
 								return clb(null); // skip files that seem binary
 							}
 
 							// Check for BOM offset
-							switch (mimeAndEncoding.encoding) {
+							switch (detected.encoding) {
 								case UTF8:
 									pos = i = bomLength(UTF8);
 									options.encoding = UTF8;
diff --git a/src/vs/workbench/services/search/test/node/searchService.test.ts b/src/vs/workbench/services/search/test/node/searchService.test.ts
index c687527d3b3..5d33088e881 100644
--- a/src/vs/workbench/services/search/test/node/searchService.test.ts
+++ b/src/vs/workbench/services/search/test/node/searchService.test.ts
@@ -109,7 +109,7 @@ suite('SearchService', () => {
 					assert.deepStrictEqual(value, match);
 					results++;
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -131,7 +131,7 @@ suite('SearchService', () => {
 					});
 					results.push(value.length);
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -218,7 +218,7 @@ suite('SearchService', () => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
-				assert.fail(value);
+				assert.fail(JSON.stringify(value));
 			}
 		});
 	});
@@ -245,7 +245,7 @@ suite('SearchService', () => {
 					});
 					results.push(value.length);
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 	});
@@ -275,7 +275,7 @@ suite('SearchService', () => {
 			if (Array.isArray(value)) {
 				results.push(...value.map(v => v.path));
 			} else {
-				assert.fail(value);
+				assert.fail(JSON.stringify(value));
 			}
 		}).then(() => {
 			const results = [];
@@ -291,7 +291,7 @@ suite('SearchService', () => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 		}).then(() => {
@@ -316,7 +316,7 @@ suite('SearchService', () => {
 				if (Array.isArray(value)) {
 					results.push(...value.map(v => v.path));
 				} else {
-					assert.fail(value);
+					assert.fail(JSON.stringify(value));
 				}
 			});
 		});
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 2dc9ec326c5..6b86202d1a1 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -18,7 +18,7 @@ import * as types from 'vs/base/common/types';
 import { IMode } from 'vs/editor/common/modes';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorModel, ISaveOptions, ISaveErrorHandler, ISaveParticipant, StateChange, SaveReason, IRawTextContent, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { EncodingMode } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
@@ -128,38 +128,51 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	}
 
 	private onFileChanges(e: FileChangesEvent): void {
+		let fileEventImpactsModel = false;
+		let newInOrphanModeGuess: boolean;
 
-		// Track ADD and DELETES for updates of this model to orphan-mode
-		const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
-		const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
-
-		if (modelFileDeleted || modelFileAdded) {
-			const newInOrphanModeGuess = modelFileDeleted && !modelFileAdded;
-			if (this.inOrphanMode !== newInOrphanModeGuess) {
-				let checkOrphanedPromise: TPromise<boolean>;
-				if (newInOrphanModeGuess) {
-					// We have received reports of users seeing delete events even though the file still
-					// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
-					// Since we do not want to mark the model as orphaned, we have to check if the
-					// file is really gone and not just a faulty file event.
-					checkOrphanedPromise = TPromise.timeout(100).then(() => {
-						if (this.disposed) {
-							return true;
-						}
-
-						return this.fileService.existsFile(this.resource).then(exists => !exists);
-					});
-				} else {
-					checkOrphanedPromise = TPromise.as(false);
-				}
-
-				checkOrphanedPromise.done(newInOrphanModeValidated => {
-					if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
-						this.setOrphaned(newInOrphanModeValidated);
-					}
-				});
+		// If we are currently orphaned, we check if the model file was added back
+		if (this.inOrphanMode) {
+			const modelFileAdded = e.contains(this.resource, FileChangeType.ADDED);
+			if (modelFileAdded) {
+				newInOrphanModeGuess = false;
+				fileEventImpactsModel = true;
 			}
 		}
+
+		// Otherwise we check if the model file was deleted
+		else {
+			const modelFileDeleted = e.contains(this.resource, FileChangeType.DELETED);
+			if (modelFileDeleted) {
+				newInOrphanModeGuess = true;
+				fileEventImpactsModel = true;
+			}
+		}
+
+		if (fileEventImpactsModel && this.inOrphanMode !== newInOrphanModeGuess) {
+			let checkOrphanedPromise: TPromise<boolean>;
+			if (newInOrphanModeGuess) {
+				// We have received reports of users seeing delete events even though the file still
+				// exists (network shares issue: https://github.com/Microsoft/vscode/issues/13665).
+				// Since we do not want to mark the model as orphaned, we have to check if the
+				// file is really gone and not just a faulty file event.
+				checkOrphanedPromise = TPromise.timeout(100).then(() => {
+					if (this.disposed) {
+						return true;
+					}
+
+					return this.fileService.existsFile(this.resource).then(exists => !exists);
+				});
+			} else {
+				checkOrphanedPromise = TPromise.as(false);
+			}
+
+			checkOrphanedPromise.done(newInOrphanModeValidated => {
+				if (this.inOrphanMode !== newInOrphanModeValidated && !this.disposed) {
+					this.setOrphaned(newInOrphanModeValidated);
+				}
+			});
+		}
 	}
 
 	private setOrphaned(orphaned: boolean): void {
@@ -243,7 +256,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		if (soft) {
 			loadPromise = TPromise.as(this);
 		} else {
-			loadPromise = this.load(true /* force */);
+			loadPromise = this.load({ forceReadFromDisk: true });
 		}
 
 		return loadPromise.then(() => {
@@ -259,28 +272,28 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	public load(force?: boolean /* bypass any caches and really go to disk */): TPromise<TextFileEditorModel> {
+	public load(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		diag('load() - enter', this.resource, new Date());
 
 		// It is very important to not reload the model when the model is dirty. We only want to reload the model from the disk
 		// if no save is pending to avoid data loss. This might cause a save conflict in case the file has been modified on the disk
 		// meanwhile, but this is a very low risk.
-		if (this.dirty) {
-			diag('load() - exit - without loading because model is dirty', this.resource, new Date());
+		if (this.dirty || this.saveSequentializer.hasPendingSave()) {
+			diag('load() - exit - without loading because model is dirty or being saved', this.resource, new Date());
 
 			return TPromise.as(this);
 		}
 
 		// Only for new models we support to load from backup
 		if (!this.textEditorModel && !this.createTextEditorModelPromise) {
-			return this.loadWithBackup(force);
+			return this.loadWithBackup(options);
 		}
 
 		// Otherwise load from file resource
-		return this.loadFromFile(force);
+		return this.loadFromFile(options);
 	}
 
-	private loadWithBackup(force: boolean): TPromise<TextFileEditorModel> {
+	private loadWithBackup(options?: ILoadOptions): TPromise<TextFileEditorModel> {
 		return this.backupFileService.loadBackupResource(this.resource).then(backup => {
 
 			// Make sure meanwhile someone else did not suceed or start loading
@@ -296,30 +309,32 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 					mtime: Date.now(),
 					etag: void 0,
 					value: createTextBufferFactory(''), /* will be filled later from backup */
-					encoding: this.fileService.getEncoding(this.resource, this.preferredEncoding)
+					encoding: this.fileService.encoding.getWriteEncoding(this.resource, this.preferredEncoding)
 				};
 
 				return this.loadWithContent(content, backup);
 			}
 
 			// Otherwise load from file
-			return this.loadFromFile(force);
+			return this.loadFromFile(options);
 		});
 	}
 
-	private loadFromFile(force: boolean): TPromise<TextFileEditorModel> {
+	private loadFromFile(options?: ILoadOptions): TPromise<TextFileEditorModel> {
+		const forceReadFromDisk = options && options.forceReadFromDisk;
+		const allowBinary = this.isResolved() /* always allow if we resolved previously */ || (options && options.allowBinary);
 
 		// Decide on etag
 		let etag: string;
-		if (force) {
-			etag = void 0; // bypass cache if force loading is true
+		if (forceReadFromDisk) {
+			etag = void 0; // reset ETag if we enforce to read from disk
 		} else if (this.lastResolvedDiskStat) {
 			etag = this.lastResolvedDiskStat.etag; // otherwise respect etag to support caching
 		}
 
 		// Resolve Content
 		return this.textFileService
-			.resolveTextContent(this.resource, { acceptTextOnly: true, etag, encoding: this.preferredEncoding })
+			.resolveTextContent(this.resource, { acceptTextOnly: !allowBinary, etag, encoding: this.preferredEncoding })
 			.then(content => this.handleLoadSuccess(content), error => this.handleLoadError(error));
 	}
 
@@ -677,16 +692,15 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// mark the save participant as current pending save operation
 		return this.saveSequentializer.setPending(versionId, saveParticipantPromise.then(newVersionId => {
 
-			// Under certain conditions a save to the model will not cause the contents to the flushed on
-			// disk because we can assume that the contents are already on disk. Instead, we just touch the
-			// file to still trigger external file watchers for example.
+			// Under certain conditions we do a short-cut of flushing contents to disk when we can assume that
+			// the file has not changed and as such was not dirty before.
 			// The conditions are all of:
 			// - a forced, explicit save (Ctrl+S)
 			// - the model is not dirty (otherwise we know there are changed which needs to go to the file)
 			// - the model is not in orphan mode (because in that case we know the file does not exist on disk)
 			// - the model version did not change due to save participants running
 			if (options.force && !this.dirty && !this.inOrphanMode && options.reason === SaveReason.EXPLICIT && versionId === newVersionId) {
-				return this.doTouch();
+				return this.doTouch(newVersionId);
 			}
 
 			// update versionId with its new value (if pre-save changes happened)
@@ -776,12 +790,16 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		});
 	}
 
-	private doTouch(): TPromise<void> {
-		return this.fileService.touchFile(this.resource).then(stat => {
+	private doTouch(versionId: number): TPromise<void> {
+		return this.saveSequentializer.setPending(versionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
+			mtime: this.lastResolvedDiskStat.mtime,
+			encoding: this.getEncoding(),
+			etag: this.lastResolvedDiskStat.etag
+		}).then(stat => {
 
 			// Updated resolved stat with updated stat since touching it might have changed mtime
 			this.updateLastResolvedDiskStat(stat);
-		}, () => void 0 /* gracefully ignore errors if just touching */);
+		}, () => void 0 /* gracefully ignore errors if just touching */));
 	}
 
 	private setDirty(dirty: boolean): () => void {
@@ -827,8 +845,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		}
 
 		// Subsequent resolve - make sure that we only assign it if the mtime is equal or has advanced.
-		// This is essential a If-Modified-Since check on the client ot prevent race conditions from loading
-		// and saving. If a save comes in late after a revert was called, the mtime could be out of sync.
+		// This prevents race conditions from loading and saving. If a save comes in late after a revert
+		// was called, the mtime could be out of sync.
 		else if (this.lastResolvedDiskStat.mtime <= newVersionOnDiskStat.mtime) {
 			this.lastResolvedDiskStat = newVersionOnDiskStat;
 		}
@@ -921,7 +939,9 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			this.updatePreferredEncoding(encoding);
 
 			// Load
-			this.load(true /* force because encoding has changed */).done(null, onUnexpectedError);
+			this.load({
+				forceReadFromDisk: true	// because encoding has changed
+			}).done(null, onUnexpectedError);
 		}
 	}
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index c617d2113f8..7b19b9d0a36 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange, IModelLoadOrCreateOptions, ILoadOptions } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ResourceMap } from 'vs/base/common/map';
@@ -167,22 +167,27 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 			return pendingLoad;
 		}
 
+		let modelLoadOptions: ILoadOptions;
+		if (options && options.allowBinary) {
+			modelLoadOptions = { allowBinary: true };
+		}
+
 		let modelPromise: TPromise<ITextFileEditorModel>;
 
 		// Model exists
 		let model = this.get(resource);
 		if (model) {
-			if (!options || !options.reload) {
-				modelPromise = TPromise.as(model);
+			if (options && options.reload) {
+				modelPromise = model.load(modelLoadOptions);
 			} else {
-				modelPromise = model.load();
+				modelPromise = TPromise.as(model);
 			}
 		}
 
 		// Model does not exist
 		else {
 			model = this.instantiationService.createInstance(TextFileEditorModel, resource, options ? options.encoding : void 0);
-			modelPromise = model.load();
+			modelPromise = model.load(modelLoadOptions);
 
 			// Install state change listener
 			this.mapResourceToStateChangeListener.set(resource, model.onDidStateChange(state => {
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index cacab86e342..94d8b44b598 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -140,8 +140,22 @@ export interface IRawTextContent extends IBaseStat {
 }
 
 export interface IModelLoadOrCreateOptions {
+
+
+	/**
+	 * The encoding to use when resolving the model text content.
+	 */
 	encoding?: string;
+
+	/**
+	 * Wether to reload the model if it already exists.
+	 */
 	reload?: boolean;
+
+	/**
+	 * Allow to load a model even if we think it is a binary file.
+	 */
+	allowBinary?: boolean;
 }
 
 export interface ITextFileEditorModelManager {
@@ -179,6 +193,19 @@ export interface ISaveOptions {
 	writeElevated?: boolean;
 }
 
+export interface ILoadOptions {
+
+	/**
+	 * Go to disk bypassing any cache of the model if any.
+	 */
+	forceReadFromDisk?: boolean;
+
+	/**
+	 * Allow to load a model even if we think it is a binary file.
+	 */
+	allowBinary?: boolean;
+}
+
 export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport {
 
 	onDidContentChange: Event<StateChange>;
@@ -196,7 +223,7 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	save(options?: ISaveOptions): TPromise<void>;
 
-	load(): TPromise<ITextFileEditorModel>;
+	load(options?: ILoadOptions): TPromise<ITextFileEditorModel>;
 
 	revert(soft?: boolean): TPromise<void>;
 
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index dcb3faa86c3..c7617a56e68 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -17,6 +17,7 @@ import * as network from 'vs/base/common/network';
 import { ITextModelService, ITextModelContentProvider, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
+import { IFileService } from 'vs/platform/files/common/files';
 
 class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorModel>> {
 
@@ -24,19 +25,15 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 
 	constructor(
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@ITextFileService private textFileService: ITextFileService
+		@ITextFileService private textFileService: ITextFileService,
+		@IFileService private fileService: IFileService
 	) {
 		super();
 	}
 
 	public createReferencedObject(key: string): TPromise<ITextEditorModel> {
 		const resource = URI.parse(key);
-
-		if (resource.scheme === network.Schemas.file) {
-			return this.textFileService.models.loadOrCreate(resource);
-		}
-		if (!this.providers[resource.scheme]) {
-			// TODO@remote
+		if (this.fileService.canHandleResource(resource)) {
 			return this.textFileService.models.loadOrCreate(resource);
 		}
 		return this.resolveTextModelContent(key).then(() => this.instantiationService.createInstance(ResourceEditorModel, resource));
diff --git a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
index a05bfc5cf4f..7ce9567369d 100644
--- a/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
+++ b/src/vs/workbench/services/themes/electron-browser/themeCompatibility.ts
@@ -66,6 +66,7 @@ addSettingMapping('rangeHighlight', editorColorRegistry.editorRangeHighlight);
 addSettingMapping('caret', editorColorRegistry.editorCursorForeground);
 addSettingMapping('invisibles', editorColorRegistry.editorWhitespaces);
 addSettingMapping('guide', editorColorRegistry.editorIndentGuides);
+addSettingMapping('activeGuide', editorColorRegistry.editorActiveIndentGuides);
 
 const ansiColorMap = ['ansiBlack', 'ansiRed', 'ansiGreen', 'ansiYellow', 'ansiBlue', 'ansiMagenta', 'ansiCyan', 'ansiWhite',
 	'ansiBrightBlack', 'ansiBrightRed', 'ansiBrightGreen', 'ansiBrightYellow', 'ansiBrightBlue', 'ansiBrightMagenta', 'ansiBrightCyan', 'ansiBrightWhite'
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 238a245d3ce..abe12f5b9e7 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -20,10 +20,7 @@ import { ColorThemeData } from './colorThemeData';
 import { ITheme, Extensions as ThemingExtensions, IThemingRegistry } from 'vs/platform/theme/common/themeService';
 import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { Color } from 'vs/base/common/color';
-
-import { $ } from 'vs/base/browser/builder';
 import { Event, Emitter } from 'vs/base/common/event';
-
 import * as colorThemeSchema from 'vs/workbench/services/themes/common/colorThemeSchema';
 import * as fileIconThemeSchema from 'vs/workbench/services/themes/common/fileIconThemeSchema';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -32,6 +29,7 @@ import { ColorThemeStore } from 'vs/workbench/services/themes/electron-browser/c
 import { FileIconThemeStore } from 'vs/workbench/services/themes/electron-browser/fileIconThemeStore';
 import { FileIconThemeData } from 'vs/workbench/services/themes/electron-browser/fileIconThemeData';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { removeClasses, addClasses } from 'vs/base/browser/dom';
 
 // implementation
 
@@ -315,11 +313,11 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 	private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): TPromise<IColorTheme> {
 		if (this.container) {
 			if (this.currentColorTheme) {
-				$(this.container).removeClass(this.currentColorTheme.id);
+				removeClasses(this.container, this.currentColorTheme.id);
 			} else {
-				$(this.container).removeClass(VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME);
+				removeClasses(this.container, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME);
 			}
-			$(this.container).addClass(newTheme.id);
+			addClasses(this.container, newTheme.id);
 		}
 		this.currentColorTheme = newTheme;
 		if (!this.themingParticipantChangeListener) {
@@ -362,7 +360,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 						"id" : { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"name": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
 						"isBuiltin": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
-						"publisherDisplayName": { "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+						"publisherDisplayName": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 						"themeId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 					}
 				*/
@@ -415,9 +413,9 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 		if (this.container) {
 			if (iconThemeData.id) {
-				$(this.container).addClass(fileIconsEnabledClass);
+				addClasses(this.container, fileIconsEnabledClass);
 			} else {
-				$(this.container).removeClass(fileIconsEnabledClass);
+				removeClasses(this.container, fileIconsEnabledClass);
 			}
 		}
 		if (iconThemeData.id) {
diff --git a/src/vs/workbench/services/viewlet/browser/viewlet.ts b/src/vs/workbench/services/viewlet/browser/viewlet.ts
index ba1f9f17a5f..02006a2397a 100644
--- a/src/vs/workbench/services/viewlet/browser/viewlet.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewlet.ts
@@ -16,6 +16,7 @@ export const IViewletService = createDecorator<IViewletService>('viewletService'
 export interface IViewletService {
 	_serviceBrand: ServiceIdentifier<any>;
 
+	onDidViewletRegister: Event<ViewletDescriptor>;
 	onDidViewletOpen: Event<IViewlet>;
 	onDidViewletClose: Event<IViewlet>;
 	onDidViewletEnablementChange: Event<{ id: string, enabled: boolean }>;
diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts
index a54cd61ec89..0a5271c8081 100644
--- a/src/vs/workbench/services/viewlet/browser/viewletService.ts
+++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts
@@ -33,6 +33,7 @@ export class ViewletService implements IViewletService {
 	private _onDidViewletEnable = new Emitter<{ id: string, enabled: boolean }>();
 	private disposables: IDisposable[] = [];
 
+	public get onDidViewletRegister(): Event<ViewletDescriptor> { return <Event<ViewletDescriptor>>this.viewletRegistry.onDidRegister; }
 	public get onDidViewletOpen(): Event<IViewlet> { return this.sidebarPart.onDidViewletOpen; }
 	public get onDidViewletClose(): Event<IViewlet> { return this.sidebarPart.onDidViewletClose; }
 	public get onDidViewletEnablementChange(): Event<{ id: string, enabled: boolean }> { return this._onDidViewletEnable.event; }
diff --git a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
index f5acaa9c5ba..5e8f0fb6ca9 100644
--- a/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspace/node/workspaceEditingService.ts
@@ -155,31 +155,33 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 	private handleWorkspaceConfigurationEditingError(error: JSONEditingError): TPromise<void> {
 		switch (error.code) {
 			case JSONEditingErrorCode.ERROR_INVALID_FILE:
-				return this.onInvalidWorkspaceConfigurationFileError();
+				this.onInvalidWorkspaceConfigurationFileError();
+				return TPromise.as(void 0);
 			case JSONEditingErrorCode.ERROR_FILE_DIRTY:
-				return this.onWorkspaceConfigurationFileDirtyError();
+				this.onWorkspaceConfigurationFileDirtyError();
+				return TPromise.as(void 0);
 		}
 		this.notificationService.error(error.message);
 		return TPromise.as(void 0);
 	}
 
-	private onInvalidWorkspaceConfigurationFileError(): TPromise<void> {
+	private onInvalidWorkspaceConfigurationFileError(): void {
 		const message = nls.localize('errorInvalidTaskConfiguration', "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again.");
-		return this.askToOpenWorkspaceConfigurationFile(message);
+		this.askToOpenWorkspaceConfigurationFile(message);
 	}
 
-	private onWorkspaceConfigurationFileDirtyError(): TPromise<void> {
+	private onWorkspaceConfigurationFileDirtyError(): void {
 		const message = nls.localize('errorWorkspaceConfigurationFileDirty', "Unable to write into workspace configuration file because the file is dirty. Please save it and try again.");
-		return this.askToOpenWorkspaceConfigurationFile(message);
+		this.askToOpenWorkspaceConfigurationFile(message);
 	}
 
-	private askToOpenWorkspaceConfigurationFile(message: string): TPromise<void> {
-		return this.notificationService.prompt(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration")])
-			.then(option => {
-				if (option === 0) {
-					this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
-				}
-			});
+	private askToOpenWorkspaceConfigurationFile(message: string): void {
+		this.notificationService.prompt(Severity.Error, message,
+			[{
+				label: nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration"),
+				run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
+			}]
+		);
 	}
 
 	private doEnterWorkspace(mainSidePromise: () => TPromise<IEnterWorkspaceResult>): TPromise<void> {
diff --git a/src/vs/workbench/test/browser/part.test.ts b/src/vs/workbench/test/browser/part.test.ts
index 6eaae451336..4ba14edc657 100644
--- a/src/vs/workbench/test/browser/part.test.ts
+++ b/src/vs/workbench/test/browser/part.test.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { Build, Builder } from 'vs/base/browser/builder';
+import { Builder, $ } from 'vs/base/browser/builder';
 import { Part } from 'vs/workbench/browser/part';
 import * as Types from 'vs/base/common/types';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -16,16 +16,16 @@ import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 
 class MyPart extends Part {
 
-	constructor(private expectedParent: Builder) {
+	constructor(private expectedParent: HTMLElement) {
 		super('myPart', { hasTitle: true }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 		assert.strictEqual(parent, this.expectedParent);
 		return super.createTitleArea(parent);
 	}
 
-	public createContentArea(parent: Builder): Builder {
+	public createContentArea(parent: HTMLElement): HTMLElement {
 		assert.strictEqual(parent, this.expectedParent);
 		return super.createContentArea(parent);
 	}
@@ -41,22 +41,22 @@ class MyPart2 extends Part {
 		super('myPart2', { hasTitle: true }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.title',
 				innerHtml: 'Title'
 			});
-		});
+		}).getHTMLElement();
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.content',
 				innerHtml: 'Content'
 			});
-		});
+		}).getHTMLElement();
 	}
 }
 
@@ -66,17 +66,17 @@ class MyPart3 extends Part {
 		super('myPart2', { hasTitle: false }, new TestThemeService());
 	}
 
-	public createTitleArea(parent: Builder): Builder {
+	public createTitleArea(parent: HTMLElement): HTMLElement {
 		return null;
 	}
 
-	public createContentArea(parent: Builder): Builder {
-		return parent.div(function (div) {
+	public createContentArea(parent: HTMLElement): HTMLElement {
+		return $(parent).div(function (div) {
 			div.span({
 				id: 'myPart.content',
 				innerHtml: 'Content'
 			});
-		});
+		}).getHTMLElement();
 	}
 }
 
@@ -97,14 +97,13 @@ suite('Workbench Part', () => {
 	});
 
 	test('Creation', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
-		let part = new MyPart(b);
-		part.create(b);
+		let part = new MyPart(b.getHTMLElement());
+		part.create(b.getHTMLElement());
 
 		assert.strictEqual(part.getId(), 'myPart');
-		assert.strictEqual(part.getContainer(), b);
 
 		// Memento
 		let memento = part.getMemento(storage);
@@ -115,7 +114,7 @@ suite('Workbench Part', () => {
 		part.shutdown();
 
 		// Re-Create to assert memento contents
-		part = new MyPart(b);
+		part = new MyPart(b.getHTMLElement());
 
 		memento = part.getMemento(storage);
 		assert(memento);
@@ -127,31 +126,31 @@ suite('Workbench Part', () => {
 		delete memento.bar;
 
 		part.shutdown();
-		part = new MyPart(b);
+		part = new MyPart(b.getHTMLElement());
 		memento = part.getMemento(storage);
 		assert(memento);
 		assert.strictEqual(Types.isEmptyObject(memento), true);
 	});
 
 	test('Part Layout with Title and Content', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
 		let part = new MyPart2();
-		part.create(b);
+		part.create(b.getHTMLElement());
 
-		assert(Build.withElementById('myPart.title'));
-		assert(Build.withElementById('myPart.content'));
+		assert(document.getElementById('myPart.title'));
+		assert(document.getElementById('myPart.content'));
 	});
 
 	test('Part Layout with Content only', function () {
-		let b = Build.withElementById(fixtureId);
+		let b = new Builder(document.getElementById(fixtureId));
 		b.div().hide();
 
 		let part = new MyPart3();
-		part.create(b);
+		part.create(b.getHTMLElement());
 
-		assert(!Build.withElementById('myPart.title'));
-		assert(Build.withElementById('myPart.content'));
+		assert(!document.getElementById('myPart.title'));
+		assert(document.getElementById('myPart.content'));
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/browser/parts/views/contributableViews.test.ts b/src/vs/workbench/test/browser/parts/views/contributableViews.test.ts
new file mode 100644
index 00000000000..4153fce6fc1
--- /dev/null
+++ b/src/vs/workbench/test/browser/parts/views/contributableViews.test.ts
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ContributableViewsModel } from 'vs/workbench/browser/parts/views/contributableViews';
+import { ViewLocation, ViewsRegistry, IViewDescriptor } from 'vs/workbench/common/views';
+import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
+import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+import { SimpleConfigurationService } from 'vs/editor/standalone/browser/simpleServices';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { move } from 'vs/base/common/arrays';
+
+const location = ViewLocation.register('test');
+
+class ViewDescriptorSequence {
+
+	readonly elements: IViewDescriptor[];
+	private disposables: IDisposable[] = [];
+
+	constructor(model: ContributableViewsModel) {
+		this.elements = [...model.visibleViewDescriptors];
+		model.onDidAdd(({ viewDescriptor, index }) => this.elements.splice(index, 0, viewDescriptor), null, this.disposables);
+		model.onDidRemove(({ viewDescriptor, index }) => this.elements.splice(index, 1), null, this.disposables);
+		model.onDidMove(({ from, to }) => move(this.elements, from.index, to.index), null, this.disposables);
+	}
+
+	dispose() {
+		this.disposables = dispose(this.disposables);
+	}
+}
+
+suite('ContributableViewsModel', () => {
+	let contextKeyService: IContextKeyService;
+
+	setup(() => {
+		const configurationService = new SimpleConfigurationService();
+		contextKeyService = new ContextKeyService(configurationService);
+	});
+
+	teardown(() => {
+		contextKeyService.dispose();
+	});
+
+	test('empty model', function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		assert.equal(model.visibleViewDescriptors.length, 0);
+	});
+
+	test('register/unregister', function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		assert.equal(model.visibleViewDescriptors.length, 0);
+		assert.equal(seq.elements.length, 0);
+
+		const viewDescriptor: IViewDescriptor = {
+			id: 'view1',
+			ctor: null,
+			location,
+			name: 'Test View 1'
+		};
+
+		ViewsRegistry.registerViews([viewDescriptor]);
+
+		assert.equal(model.visibleViewDescriptors.length, 1);
+		assert.equal(seq.elements.length, 1);
+		assert.deepEqual(model.visibleViewDescriptors[0], viewDescriptor);
+		assert.deepEqual(seq.elements[0], viewDescriptor);
+
+		ViewsRegistry.deregisterViews(['view1'], location);
+
+		assert.equal(model.visibleViewDescriptors.length, 0);
+		assert.equal(seq.elements.length, 0);
+	});
+
+	test('when contexts', async function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		assert.equal(model.visibleViewDescriptors.length, 0);
+		assert.equal(seq.elements.length, 0);
+
+		const viewDescriptor: IViewDescriptor = {
+			id: 'view1',
+			ctor: null,
+			location,
+			name: 'Test View 1',
+			when: ContextKeyExpr.equals('showview1', true)
+		};
+
+		ViewsRegistry.registerViews([viewDescriptor]);
+		assert.equal(model.visibleViewDescriptors.length, 0, 'view should not appear since context isnt in');
+		assert.equal(seq.elements.length, 0);
+
+		const key = contextKeyService.createKey('showview1', false);
+		assert.equal(model.visibleViewDescriptors.length, 0, 'view should still not appear since showview1 isnt true');
+		assert.equal(seq.elements.length, 0);
+
+		key.set(true);
+		await new Promise(c => setTimeout(c, 30));
+		assert.equal(model.visibleViewDescriptors.length, 1, 'view should appear');
+		assert.equal(seq.elements.length, 1);
+		assert.deepEqual(model.visibleViewDescriptors[0], viewDescriptor);
+		assert.equal(seq.elements[0], viewDescriptor);
+
+		key.set(false);
+		await new Promise(c => setTimeout(c, 30));
+		assert.equal(model.visibleViewDescriptors.length, 0, 'view should disappear');
+		assert.equal(seq.elements.length, 0);
+
+		ViewsRegistry.deregisterViews(['view1'], location);
+		assert.equal(model.visibleViewDescriptors.length, 0, 'view should not be there anymore');
+		assert.equal(seq.elements.length, 0);
+
+		key.set(true);
+		await new Promise(c => setTimeout(c, 30));
+		assert.equal(model.visibleViewDescriptors.length, 0, 'view should not be there anymore');
+		assert.equal(seq.elements.length, 0);
+	});
+
+	test('when contexts - multiple', async function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		const view1: IViewDescriptor = { id: 'view1', ctor: null, location, name: 'Test View 1' };
+		const view2: IViewDescriptor = { id: 'view2', ctor: null, location, name: 'Test View 2', when: ContextKeyExpr.equals('showview2', true) };
+
+		ViewsRegistry.registerViews([view1, view2]);
+		assert.deepEqual(model.visibleViewDescriptors, [view1], 'only view1 should be visible');
+		assert.deepEqual(seq.elements, [view1], 'only view1 should be visible');
+
+		const key = contextKeyService.createKey('showview2', false);
+		assert.deepEqual(model.visibleViewDescriptors, [view1], 'still only view1 should be visible');
+		assert.deepEqual(seq.elements, [view1], 'still only view1 should be visible');
+
+		key.set(true);
+		await new Promise(c => setTimeout(c, 30));
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2], 'both views should be visible');
+		assert.deepEqual(seq.elements, [view1, view2], 'both views should be visible');
+
+		ViewsRegistry.deregisterViews([view1.id, view2.id], location);
+	});
+
+	test('when contexts - multiple 2', async function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		const view1: IViewDescriptor = { id: 'view1', ctor: null, location, name: 'Test View 1', when: ContextKeyExpr.equals('showview1', true) };
+		const view2: IViewDescriptor = { id: 'view2', ctor: null, location, name: 'Test View 2' };
+
+		ViewsRegistry.registerViews([view1, view2]);
+		assert.deepEqual(model.visibleViewDescriptors, [view2], 'only view2 should be visible');
+		assert.deepEqual(seq.elements, [view2], 'only view2 should be visible');
+
+		const key = contextKeyService.createKey('showview1', false);
+		assert.deepEqual(model.visibleViewDescriptors, [view2], 'still only view2 should be visible');
+		assert.deepEqual(seq.elements, [view2], 'still only view2 should be visible');
+
+		key.set(true);
+		await new Promise(c => setTimeout(c, 30));
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2], 'both views should be visible');
+		assert.deepEqual(seq.elements, [view1, view2], 'both views should be visible');
+
+		ViewsRegistry.deregisterViews([view1.id, view2.id], location);
+	});
+
+	test('setVisible', function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		const view1: IViewDescriptor = { id: 'view1', ctor: null, location, name: 'Test View 1', canToggleVisibility: true };
+		const view2: IViewDescriptor = { id: 'view2', ctor: null, location, name: 'Test View 2', canToggleVisibility: true };
+		const view3: IViewDescriptor = { id: 'view3', ctor: null, location, name: 'Test View 3', canToggleVisibility: true };
+
+		ViewsRegistry.registerViews([view1, view2, view3]);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3]);
+		assert.deepEqual(seq.elements, [view1, view2, view3]);
+
+		model.setVisible('view2', true);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'nothing should happen');
+		assert.deepEqual(seq.elements, [view1, view2, view3]);
+
+		model.setVisible('view2', false);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view3], 'view2 should hide');
+		assert.deepEqual(seq.elements, [view1, view3]);
+
+		model.setVisible('view1', false);
+		assert.deepEqual(model.visibleViewDescriptors, [view3], 'view1 should hide');
+		assert.deepEqual(seq.elements, [view3]);
+
+		model.setVisible('view3', false);
+		assert.deepEqual(model.visibleViewDescriptors, [], 'view3 shoud hide');
+		assert.deepEqual(seq.elements, []);
+
+		model.setVisible('view1', true);
+		assert.deepEqual(model.visibleViewDescriptors, [view1], 'view1 should show');
+		assert.deepEqual(seq.elements, [view1]);
+
+		model.setVisible('view3', true);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view3], 'view3 should show');
+		assert.deepEqual(seq.elements, [view1, view3]);
+
+		model.setVisible('view2', true);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'view2 should show');
+		assert.deepEqual(seq.elements, [view1, view2, view3]);
+
+		ViewsRegistry.deregisterViews([view1.id, view2.id, view3.id], location);
+		assert.deepEqual(model.visibleViewDescriptors, []);
+		assert.deepEqual(seq.elements, []);
+	});
+
+	test('move', function () {
+		const model = new ContributableViewsModel(location, contextKeyService);
+		const seq = new ViewDescriptorSequence(model);
+
+		const view1: IViewDescriptor = { id: 'view1', ctor: null, location, name: 'Test View 1' };
+		const view2: IViewDescriptor = { id: 'view2', ctor: null, location, name: 'Test View 2' };
+		const view3: IViewDescriptor = { id: 'view3', ctor: null, location, name: 'Test View 3' };
+
+		ViewsRegistry.registerViews([view1, view2, view3]);
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'model views should be OK');
+		assert.deepEqual(seq.elements, [view1, view2, view3], 'sql views should be OK');
+
+		model.move('view3', 'view1');
+		assert.deepEqual(model.visibleViewDescriptors, [view3, view1, view2], 'view3 should go to the front');
+		assert.deepEqual(seq.elements, [view3, view1, view2]);
+
+		model.move('view1', 'view2');
+		assert.deepEqual(model.visibleViewDescriptors, [view3, view2, view1], 'view1 should go to the end');
+		assert.deepEqual(seq.elements, [view3, view2, view1]);
+
+		model.move('view1', 'view3');
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view3, view2], 'view1 should go to the front');
+		assert.deepEqual(seq.elements, [view1, view3, view2]);
+
+		model.move('view2', 'view3');
+		assert.deepEqual(model.visibleViewDescriptors, [view1, view2, view3], 'view2 should go to the middle');
+		assert.deepEqual(seq.elements, [view1, view2, view3]);
+	});
+});
diff --git a/src/vs/workbench/test/common/editor/editor.test.ts b/src/vs/workbench/test/common/editor/editor.test.ts
index 218ff420427..fcfba8f9799 100644
--- a/src/vs/workbench/test/common/editor/editor.test.ts
+++ b/src/vs/workbench/test/common/editor/editor.test.ts
@@ -7,9 +7,9 @@
 
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { EditorInput, toResource } from 'vs/workbench/common/editor';
+import { EditorInput, toResource, EditorViewStateMemento } from 'vs/workbench/common/editor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { IEditorModel } from 'vs/platform/editor/common/editor';
+import { IEditorModel, Position } from 'vs/platform/editor/common/editor';
 import URI from 'vs/base/common/uri';
 import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -86,4 +86,129 @@ suite('Workbench - Editor', () => {
 		assert.equal(toResource(file, { supportSideBySide: true, filter: Schemas.file }).toString(), file.getResource().toString());
 		assert.equal(toResource(file, { supportSideBySide: true, filter: [Schemas.file, Schemas.untitled] }).toString(), file.getResource().toString());
 	});
+
+	test('EditorViewStateMemento - basics', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		let res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(!res);
+
+		memento.saveState(URI.file('/A'), Position.ONE, { line: 3 });
+		res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		memento.saveState(URI.file('/A'), Position.TWO, { line: 5 });
+		res = memento.loadState(URI.file('/A'), Position.TWO);
+		assert.ok(res);
+		assert.equal(res.line, 5);
+
+		// Ensure capped at 3 elements
+		memento.saveState(URI.file('/B'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/C'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/D'), Position.ONE, { line: 1 });
+		memento.saveState(URI.file('/E'), Position.ONE, { line: 1 });
+
+		assert.ok(!memento.loadState(URI.file('/A'), Position.ONE));
+		assert.ok(!memento.loadState(URI.file('/B'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/E'), Position.ONE));
+
+		memento.save();
+
+		memento = new EditorViewStateMemento(rawMemento, 'key', 3);
+		assert.ok(memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/E'), Position.ONE));
+
+		memento.clearState(URI.file('/C'));
+		memento.clearState(URI.file('/E'));
+
+		assert.ok(!memento.loadState(URI.file('/C'), Position.ONE));
+		assert.ok(memento.loadState(URI.file('/D'), Position.ONE));
+		assert.ok(!memento.loadState(URI.file('/E'), Position.ONE));
+	});
+
+	test('EditorViewStateMemento - use with editor input', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		class TestEditorInput extends EditorInput {
+			constructor(private resource: URI, private id = 'testEditorInput') {
+				super();
+			}
+			public getTypeId() { return 'testEditorInput'; }
+			public resolve(): TPromise<IEditorModel> { return null; }
+
+			public matches(other: TestEditorInput): boolean {
+				return other && this.id === other.id && other instanceof TestEditorInput;
+			}
+
+			public getResource(): URI {
+				return this.resource;
+			}
+		}
+
+		const rawMemento = Object.create(null);
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		const testInputA = new TestEditorInput(URI.file('/A'));
+
+		let res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(!res);
+
+		memento.saveState(testInputA, Position.ONE, { line: 3 });
+		res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 3);
+
+		// State removed when input gets disposed
+		testInputA.dispose();
+		res = memento.loadState(testInputA, Position.ONE);
+		assert.ok(!res);
+	});
+
+	test('EditorViewStateMemento - migration', function () {
+		interface TestViewState {
+			line: number;
+		}
+
+		const rawMemento = {
+			'key': {
+				[URI.file('/A').toString()]: {
+					0: {
+						line: 5
+					}
+				},
+				[URI.file('/B').toString()]: {
+					0: {
+						line: 1
+					},
+					1: {
+						line: 2
+					}
+				}
+			}
+		};
+		let memento = new EditorViewStateMemento<TestViewState>(rawMemento, 'key', 3);
+
+		let res = memento.loadState(URI.file('/A'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 5);
+
+		res = memento.loadState(URI.file('/B'), Position.ONE);
+		assert.ok(res);
+		assert.equal(res.line, 1);
+
+		res = memento.loadState(URI.file('/B'), Position.TWO);
+		assert.ok(res);
+		assert.equal(res.line, 2);
+	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/common/notifications.test.ts b/src/vs/workbench/test/common/notifications.test.ts
index 533cc9ae266..fc7699a81f1 100644
--- a/src/vs/workbench/test/common/notifications.test.ts
+++ b/src/vs/workbench/test/common/notifications.test.ts
@@ -96,11 +96,11 @@ suite('Notifications', () => {
 		assert.equal(called, 1);
 
 		called = 0;
-		item1.onDidDispose(() => {
+		item1.onDidClose(() => {
 			called++;
 		});
 
-		item1.dispose();
+		item1.close();
 		assert.equal(called, 1);
 
 		// Error with Action
@@ -157,11 +157,11 @@ suite('Notifications', () => {
 		assert.equal(model.notifications.length, 3);
 
 		let called = 0;
-		item1Handle.onDidDispose(() => {
+		item1Handle.onDidClose(() => {
 			called++;
 		});
 
-		item1Handle.dispose();
+		item1Handle.close();
 		assert.equal(called, 1);
 		assert.equal(model.notifications.length, 2);
 		assert.equal(lastEvent.item.severity, item1.severity);
@@ -176,7 +176,7 @@ suite('Notifications', () => {
 		assert.equal(lastEvent.index, 0);
 		assert.equal(lastEvent.kind, NotificationChangeType.ADD);
 
-		item2Handle.dispose();
+		item2Handle.close();
 		assert.equal(model.notifications.length, 1);
 		assert.equal(lastEvent.item.severity, item2Duplicate.severity);
 		assert.equal(lastEvent.item.message.value, item2Duplicate.message);
diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
index 5e6b7013ec1..4801ffcda53 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
@@ -129,7 +129,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		const diagnostics = new ExtHostDiagnostics(rpcProtocol);
 		rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, diagnostics);
 
-		extHost = new ExtHostLanguageFeatures(rpcProtocol, extHostDocuments, commands, heapService, diagnostics);
+		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics);
 		rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, extHost);
 
 		mainThread = rpcProtocol.set(MainContext.MainThreadLanguageFeatures, inst.createInstance(MainThreadLanguageFeatures, rpcProtocol));
@@ -422,6 +422,39 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		});
 	});
 
+	test('Suggest, resolve completion items', async function () {
+
+		let resolveCount = 0;
+
+		disposables.push(extHost.registerCompletionItemProvider(defaultSelector, <vscode.CompletionItemProvider>{
+			provideCompletionItems(): any {
+				let a = new types.CompletionItem('item1');
+				let b = new types.CompletionItem('item2');
+				let c = new types.CompletionItem('item3');
+				let d = new types.CompletionItem('item4');
+				return new types.CompletionList([a, b, c, d], false);
+			},
+			resolveCompletionItem(item) {
+				resolveCount += 1;
+				return item;
+			}
+		}, []));
+
+		await rpcProtocol.sync();
+
+		let list = await commands.executeCommand<vscode.CompletionList>(
+			'vscode.executeCompletionItemProvider',
+			model.uri,
+			new types.Position(0, 4),
+			undefined,
+			2 // maxItemsToResolve
+		);
+
+		assert.ok(list instanceof types.CompletionList);
+		assert.equal(resolveCount, 2);
+
+	});
+
 	// --- quickfix
 
 	test('QuickFix, back and forth', function () {
@@ -501,6 +534,40 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		});
 	});
 
+	test('CodeLens, resolve', async function () {
+
+		let resolveCount = 0;
+
+		disposables.push(extHost.registerCodeLensProvider(defaultSelector, <vscode.CodeLensProvider>{
+			provideCodeLenses(): any {
+				return [
+					new types.CodeLens(new types.Range(0, 0, 1, 1)),
+					new types.CodeLens(new types.Range(0, 0, 1, 1)),
+					new types.CodeLens(new types.Range(0, 0, 1, 1)),
+					new types.CodeLens(new types.Range(0, 0, 1, 1), { title: 'Already resolved', command: 'fff' })
+				];
+			},
+			resolveCodeLens(codeLens: types.CodeLens) {
+				codeLens.command = { title: resolveCount.toString(), command: 'resolved' };
+				resolveCount += 1;
+				return codeLens;
+			}
+		}));
+
+		await rpcProtocol.sync();
+
+		let value = await commands.executeCommand<vscode.CodeLens[]>('vscode.executeCodeLensProvider', model.uri, 2);
+
+		assert.equal(value.length, 3); // the resolve argument defines the number of results being returned
+		assert.equal(resolveCount, 2);
+
+		resolveCount = 0;
+		value = await commands.executeCommand<vscode.CodeLens[]>('vscode.executeCodeLensProvider', model.uri);
+
+		assert.equal(value.length, 4);
+		assert.equal(resolveCount, 0);
+	});
+
 	test('Links, back and forth', function () {
 
 		disposables.push(extHost.registerDocumentLinkProvider(defaultSelector, <vscode.DocumentLinkProvider>{
@@ -522,4 +589,55 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			});
 		});
 	});
+
+
+	test('Color provider', function () {
+
+		disposables.push(extHost.registerColorProvider(defaultSelector, <vscode.DocumentColorProvider>{
+			provideDocumentColors(): vscode.ColorInformation[] {
+				return [new types.ColorInformation(new types.Range(0, 0, 0, 20), new types.Color(0.1, 0.2, 0.3, 0.4))];
+			},
+			provideColorPresentations(color: vscode.Color, context: { range: vscode.Range, document: vscode.TextDocument }): vscode.ColorPresentation[] {
+				const cp = new types.ColorPresentation('#ABC');
+				cp.textEdit = types.TextEdit.replace(new types.Range(1, 0, 1, 20), '#ABC');
+				cp.additionalTextEdits = [types.TextEdit.insert(new types.Position(2, 20), '*')];
+				return [cp];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return commands.executeCommand<vscode.ColorInformation[]>('vscode.executeDocumentColorProvider', model.uri).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.equal(first.color.red, 0.1);
+				assert.equal(first.color.green, 0.2);
+				assert.equal(first.color.blue, 0.3);
+				assert.equal(first.color.alpha, 0.4);
+				assert.equal(first.range.start.line, 0);
+				assert.equal(first.range.start.character, 0);
+				assert.equal(first.range.end.line, 0);
+				assert.equal(first.range.end.character, 20);
+			});
+		}).then(() => {
+			const color = new types.Color(0.5, 0.6, 0.7, 0.8);
+			const range = new types.Range(0, 0, 0, 20);
+			return commands.executeCommand<vscode.ColorPresentation[]>('vscode.executeColorPresentationProvider', color, { uri: model.uri, range }).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.equal(first.label, '#ABC');
+				assert.equal(first.textEdit.newText, '#ABC');
+				assert.equal(first.textEdit.range.start.line, 1);
+				assert.equal(first.textEdit.range.start.character, 0);
+				assert.equal(first.textEdit.range.end.line, 1);
+				assert.equal(first.textEdit.range.end.character, 20);
+				assert.equal(first.additionalTextEdits.length, 1);
+				assert.equal(first.additionalTextEdits[0].range.start.line, 2);
+				assert.equal(first.additionalTextEdits[0].range.start.character, 20);
+				assert.equal(first.additionalTextEdits[0].range.end.line, 2);
+				assert.equal(first.additionalTextEdits[0].range.end.character, 20);
+			});
+		});
+	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
index 382cbc08b75..6638722bd03 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostConfiguration.test.ts
@@ -17,6 +17,7 @@ import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IWorkspaceFolder, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { NullLogService } from 'vs/platform/log/common/log';
+import { assign } from 'vs/base/common/objects';
 
 suite('ExtHostConfiguration', function () {
 
@@ -41,7 +42,8 @@ suite('ExtHostConfiguration', function () {
 			user: new ConfigurationModel(contents),
 			workspace: new ConfigurationModel(),
 			folders: Object.create(null),
-			configurationScopes: {}
+			configurationScopes: {},
+			isComplete: true
 		};
 	}
 
@@ -146,6 +148,88 @@ suite('ExtHostConfiguration', function () {
 		assert.equal(actual['statusBar.foreground'], 'somevalue');
 	});
 
+	test('Stringify returned configuration', function () {
+
+		const all = createExtHostConfiguration({
+			'farboo': {
+				'config0': true,
+				'nested': {
+					'config1': 42,
+					'config2': 'Das Pferd frisst kein Reis.'
+				},
+				'config4': ''
+			},
+			'workbench': {
+				'colorCustomizations': {
+					'statusBar.foreground': 'somevalue'
+				},
+				'emptyobjectkey': {
+				}
+			}
+		});
+
+		let testObject = all.getConfiguration();
+		let actual = testObject.get('farboo');
+		assert.deepEqual(JSON.stringify({
+			'config0': true,
+			'nested': {
+				'config1': 42,
+				'config2': 'Das Pferd frisst kein Reis.'
+			},
+			'config4': ''
+		}), JSON.stringify(actual));
+
+		assert.deepEqual(undefined, JSON.stringify(testObject.get('unknownkey')));
+
+		actual = testObject.get('farboo');
+		actual['config0'] = false;
+		assert.deepEqual(JSON.stringify({
+			'config0': false,
+			'nested': {
+				'config1': 42,
+				'config2': 'Das Pferd frisst kein Reis.'
+			},
+			'config4': ''
+		}), JSON.stringify(actual));
+
+		actual = testObject.get('workbench')['colorCustomizations'];
+		actual['statusBar.background'] = 'anothervalue';
+		assert.deepEqual(JSON.stringify({
+			'statusBar.foreground': 'somevalue',
+			'statusBar.background': 'anothervalue'
+		}), JSON.stringify(actual));
+
+		actual = testObject.get('workbench');
+		actual['unknownkey'] = 'somevalue';
+		assert.deepEqual(JSON.stringify({
+			'colorCustomizations': {
+				'statusBar.foreground': 'somevalue'
+			},
+			'emptyobjectkey': {},
+			'unknownkey': 'somevalue'
+		}), JSON.stringify(actual));
+
+		actual = all.getConfiguration('workbench').get('emptyobjectkey');
+		actual = assign(actual || {}, {
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		});
+		assert.deepEqual(JSON.stringify({
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		}), JSON.stringify(actual));
+
+		actual = all.getConfiguration('workbench').get('unknownkey');
+		actual = assign(actual || {}, {
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		});
+		assert.deepEqual(JSON.stringify({
+			'statusBar.background': `#0ff`,
+			'statusBar.foreground': `#ff0`,
+		}), JSON.stringify(actual));
+	});
+
 	test('cannot modify returned configuration', function () {
 
 		const all = createExtHostConfiguration({
@@ -197,7 +281,8 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace: new ConfigurationModel({}, []),
 				folders: Object.create(null),
-				configurationScopes: {}
+				configurationScopes: {},
+				isComplete: true
 			}
 		);
 
@@ -243,7 +328,8 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace,
 				folders,
-				configurationScopes: {}
+				configurationScopes: {},
+				isComplete: true
 			}
 		);
 
@@ -317,7 +403,8 @@ suite('ExtHostConfiguration', function () {
 				}, ['editor.wordWrap']),
 				workspace,
 				folders,
-				configurationScopes: {}
+				configurationScopes: {},
+				isComplete: true
 			}
 		);
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
index f808f44c17f..daad9c035e9 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
@@ -101,6 +101,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: '\t '
 			}],
@@ -157,6 +158,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: ''
 			}],
@@ -174,6 +176,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: 'is could be'
 			}],
@@ -191,6 +194,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 1, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: 'is could be\na line with number'
 			}],
@@ -211,6 +215,7 @@ suite('ExtHostDocumentData', () => {
 		data.onEvents({
 			changes: [{
 				range: { startLineNumber: 1, startColumn: 3, endLineNumber: 2, endColumn: 6 },
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: ''
 			}],
@@ -344,6 +349,7 @@ suite('ExtHostDocumentData updates line mapping', () => {
 		return {
 			changes: [{
 				range: range,
+				rangeOffset: undefined,
 				rangeLength: undefined,
 				text: text
 			}],
diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
index b44d25fba63..a8c6bfbfcdf 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
@@ -302,6 +302,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 			documents.$acceptModelChanged(resource, {
 				changes: [{
 					range: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
+					rangeOffset: undefined,
 					rangeLength: undefined,
 					text: 'bar'
 				}],
@@ -337,6 +338,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 							changes: [{
 								range,
 								text,
+								rangeOffset: undefined,
 								rangeLength: undefined,
 							}],
 							eol: undefined,
diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
index ad73ec6a899..f0748586c5d 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -30,7 +30,7 @@ import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefiniti
 import { getHover } from 'vs/editor/contrib/hover/getHover';
 import { getOccurrencesAtPosition } from 'vs/editor/contrib/wordHighlighter/wordHighlighter';
 import { provideReferences } from 'vs/editor/contrib/referenceSearch/referenceSearch';
-import { getCodeActions } from 'vs/editor/contrib/quickFix/quickFix';
+import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
 import { getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search';
 import { rename } from 'vs/editor/contrib/rename/rename';
 import { provideSignatureHelp } from 'vs/editor/contrib/parameterHints/provideSignatureHelp';
@@ -45,6 +45,7 @@ import * as vscode from 'vscode';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
+import { getColors } from 'vs/editor/contrib/colorPicker/color';
 
 const defaultSelector = { scheme: 'far' };
 const model: ITextModel = EditorModel.createFromString(
@@ -110,7 +111,7 @@ suite('ExtHostLanguageFeatures', function () {
 		const diagnostics = new ExtHostDiagnostics(rpcProtocol);
 		rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, diagnostics);
 
-		extHost = new ExtHostLanguageFeatures(rpcProtocol, extHostDocuments, commands, heapService, diagnostics);
+		extHost = new ExtHostLanguageFeatures(rpcProtocol, null, extHostDocuments, commands, heapService, diagnostics);
 		rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, extHost);
 
 		mainThread = rpcProtocol.set(MainContext.MainThreadLanguageFeatures, inst.createInstance(MainThreadLanguageFeatures, rpcProtocol));
@@ -1033,6 +1034,13 @@ suite('ExtHostLanguageFeatures', function () {
 	});
 
 	test('Format Doc, order', function () {
+
+		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
+			provideDocumentFormattingEdits(): any {
+				return undefined;
+			}
+		}));
+
 		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
 			provideDocumentFormattingEdits(): any {
 				return [new types.TextEdit(new types.Range(0, 0, 0, 0), 'testing')];
@@ -1078,6 +1086,11 @@ suite('ExtHostLanguageFeatures', function () {
 				return [new types.TextEdit(new types.Range(0, 0, 0, 0), 'range')];
 			}
 		}));
+		disposables.push(extHost.registerDocumentRangeFormattingEditProvider(defaultSelector, <vscode.DocumentRangeFormattingEditProvider>{
+			provideDocumentRangeFormattingEdits(): any {
+				return [new types.TextEdit(new types.Range(2, 3, 4, 5), 'range2')];
+			}
+		}));
 		disposables.push(extHost.registerDocumentFormattingEditProvider(defaultSelector, <vscode.DocumentFormattingEditProvider>{
 			provideDocumentFormattingEdits(): any {
 				return [new types.TextEdit(new types.Range(0, 0, 1, 1), 'doc')];
@@ -1087,7 +1100,11 @@ suite('ExtHostLanguageFeatures', function () {
 			return getDocumentRangeFormattingEdits(model, new EditorRange(1, 1, 1, 1), { insertSpaces: true, tabSize: 4 }).then(value => {
 				assert.equal(value.length, 1);
 				let [first] = value;
-				assert.equal(first.text, 'range');
+				assert.equal(first.text, 'range2');
+				assert.equal(first.range.startLineNumber, 3);
+				assert.equal(first.range.startColumn, 4);
+				assert.equal(first.range.endLineNumber, 5);
+				assert.equal(first.range.endColumn, 6);
 			});
 		});
 	});
@@ -1166,4 +1183,26 @@ suite('ExtHostLanguageFeatures', function () {
 			});
 		});
 	});
+
+	test('Document colors, data conversion', function () {
+
+		disposables.push(extHost.registerColorProvider(defaultSelector, <vscode.DocumentColorProvider>{
+			provideDocumentColors(): vscode.ColorInformation[] {
+				return [new types.ColorInformation(new types.Range(0, 0, 0, 20), new types.Color(0.1, 0.2, 0.3, 0.4))];
+			},
+			provideColorPresentations(color: vscode.Color, context: { range: vscode.Range, document: vscode.TextDocument }): vscode.ColorPresentation[] {
+				return [];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return getColors(model).then(value => {
+				assert.equal(value.length, 1);
+				let [first] = value;
+
+				assert.deepEqual(first.colorInfo.color, { red: 0.1, green: 0.2, blue: 0.3, alpha: 0.4 });
+				assert.deepEqual(first.colorInfo.range, { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 21 });
+			});
+		});
+	});
 });
diff --git a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
index a7711e888f6..feeab0b2895 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostMessagerService.test.ts
@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import { MainThreadMessageService } from 'vs/workbench/api/electron-browser/mainThreadMessageService';
 import { TPromise as Promise, TPromise } from 'vs/base/common/winjs.base';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotification, NoOpNotification, INotificationHandle, PromptOption, Severity } from 'vs/platform/notification/common/notification';
+import { INotificationService, INotification, NoOpNotification, INotificationHandle, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 
 const emptyDialogService = new class implements IDialogService {
@@ -45,7 +45,7 @@ const emptyNotificationService = new class implements INotificationService {
 	error(...args: any[]): never {
 		throw new Error('not implemented');
 	}
-	prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
 		throw new Error('not implemented');
 	}
 };
@@ -71,8 +71,8 @@ class EmptyNotificationService implements INotificationService {
 	error(message: any): void {
 		throw new Error('Method not implemented.');
 	}
-	prompt(severity: Severity, message: string, choices: PromptOption[]): Promise<number, any> {
-		throw new Error('Method not implemented.');
+	prompt(severity: Severity, message: string, choices: IPromptChoice[], onCancel?: () => void): INotificationHandle {
+		throw new Error('not implemented');
 	}
 }
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
index 9b95fc29698..969cac30359 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts
@@ -423,7 +423,7 @@ suite('ExtHostTreeView', function () {
 			});
 	});
 
-	test('reveal will return parents array for an element', () => {
+	test('reveal will return parents array for an element when hierarchy is not loaded', () => {
 		const revealTarget = sinon.spy(target, '$reveal');
 		const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
 		return treeView.reveal({ key: 'aa' })
@@ -436,6 +436,21 @@ suite('ExtHostTreeView', function () {
 			});
 	});
 
+	test('reveal will return parents array for an element when hierarchy is loaded', () => {
+		const revealTarget = sinon.spy(target, '$reveal');
+		const treeView = testObject.createTreeView('treeDataProvider', { treeDataProvider: aCompleteNodeTreeDataProvider() });
+		return testObject.$getChildren('treeDataProvider')
+			.then(() => testObject.$getChildren('treeDataProvider', '0/0:a'))
+			.then(() => treeView.reveal({ key: 'aa' })
+				.then(() => {
+					assert.ok(revealTarget.calledOnce);
+					assert.deepEqual('treeDataProvider', revealTarget.args[0][0]);
+					assert.deepEqual({ handle: '0/0:a/0:aa', label: 'aa', collapsibleState: TreeItemCollapsibleState.None, parentHandle: '0/0:a' }, removeUnsetKeys(revealTarget.args[0][1]));
+					assert.deepEqual([{ handle: '0/0:a', label: 'a', collapsibleState: TreeItemCollapsibleState.Collapsed }], (<Array<any>>revealTarget.args[0][2]).map(arg => removeUnsetKeys(arg)));
+					assert.equal(void 0, revealTarget.args[0][3]);
+				}));
+	});
+
 	test('reveal will return parents array for deeper element with no selection', () => {
 		tree = {
 			'b': {
diff --git a/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts b/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts
new file mode 100644
index 00000000000..0c600626db4
--- /dev/null
+++ b/src/vs/workbench/test/electron-browser/api/extHostWebview.test.ts
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { MainThreadWebviews } from 'vs/workbench/api/electron-browser/mainThreadWebview';
+import { ExtHostWebviews } from 'vs/workbench/api/node/extHostWebview';
+import { mock } from 'vs/workbench/test/electron-browser/api/mock';
+import * as vscode from 'vscode';
+import { SingleProxyRPCProtocol } from './testRPCProtocol';
+import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
+
+suite('ExtHostWebview', function () {
+
+	test('Cannot register multiple serializer for the same view type', async () => {
+		const viewType = 'view.type';
+
+		const shape = createNoopMainThreadWebviews();
+		const extHostWebviews = new ExtHostWebviews(SingleProxyRPCProtocol(shape));
+
+		let lastInvokedDeserializer: vscode.WebviewPanelSerializer | undefined = undefined;
+
+		class NoopSerializer implements vscode.WebviewPanelSerializer {
+			async serializeWebviewPanel(webview: vscode.WebviewPanel): Promise<any> { /* noop */ }
+
+			async deserializeWebviewPanel(webview: vscode.WebviewPanel, state: any): Promise<void> {
+				lastInvokedDeserializer = this;
+			}
+		}
+
+		const serializerA = new NoopSerializer();
+		const serializerB = new NoopSerializer();
+
+		const serializerARegistration = extHostWebviews.registerWebviewPanelSerializer(viewType, serializerA);
+
+		await extHostWebviews.$deserializeWebviewPanel('x', viewType, 'title', {}, EditorPosition.ONE, {});
+		assert.strictEqual(lastInvokedDeserializer, serializerA);
+
+		assert.throws(
+			() => extHostWebviews.registerWebviewPanelSerializer(viewType, serializerB),
+			'Should throw when registering two serializers for the same view');
+
+		serializerARegistration.dispose();
+
+		extHostWebviews.registerWebviewPanelSerializer(viewType, serializerB);
+
+		await extHostWebviews.$deserializeWebviewPanel('x', viewType, 'title', {}, EditorPosition.ONE, {});
+		assert.strictEqual(lastInvokedDeserializer, serializerB);
+	});
+});
+
+
+function createNoopMainThreadWebviews() {
+	return new class extends mock<MainThreadWebviews>() {
+		$registerSerializer() { /* noop */ }
+		$unregisterSerializer() { /* noop */ }
+	};
+}
+
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
index 995c2d814a8..f0465f76568 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
@@ -139,4 +139,31 @@ suite('MainThreadSaveParticipant', function () {
 		});
 	});
 
+	test('trim final new lines bug#46075', function () {
+		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/trim_final_new_line.txt'), 'utf8');
+
+		return model.load().then(() => {
+			const configService = new TestConfigurationService();
+			configService.setUserConfiguration('files', { 'trimFinalNewlines': true });
+
+			const participant = new TrimFinalNewLinesParticipant(configService, undefined);
+
+			const textContent = 'Test';
+			const eol = `${model.textEditorModel.getEOL()}`;
+
+			let content = `${textContent}${eol}${eol}`;
+			model.textEditorModel.setValue(content);
+			// save many times
+			for (let i = 0; i < 10; i++) {
+				participant.participate(model, { reason: SaveReason.EXPLICIT });
+			}
+			// confirm trimming
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}`);
+			// undo should go back to previous content immediately
+			model.textEditorModel.undo();
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}${eol}`);
+			model.textEditorModel.redo();
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}`);
+		});
+	});
 });
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 545ded7f0a3..5acfb8aab9e 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -20,7 +20,7 @@ import Severity from 'vs/base/common/severity';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IPartService, Parts, Position as PartPosition, Dimension } from 'vs/workbench/services/part/common/partService';
+import { IPartService, Parts, Position as PartPosition, IDimension } from 'vs/workbench/services/part/common/partService';
 import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IEditorInput, IEditorOptions, Position, IEditor, IResourceInput } from 'vs/platform/editor/common/editor';
@@ -32,7 +32,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IEditorGroupService, GroupArrangement, GroupOrientation, IEditorTabOptions, IMoveOptions } from 'vs/workbench/services/group/common/groupService';
 import { TextFileService } from 'vs/workbench/services/textfile/common/textFileService';
-import { FileOperationEvent, IFileService, IResolveContentOptions, FileOperationError, IFileStat, IResolveFileResult, IImportResult, FileChangesEvent, IResolveFileOptions, IContent, IUpdateContentOptions, IStreamContent, ICreateFileOptions, ITextSnapshot } from 'vs/platform/files/common/files';
+import { FileOperationEvent, IFileService, IResolveContentOptions, FileOperationError, IFileStat, IResolveFileResult, FileChangesEvent, IResolveFileOptions, IContent, IUpdateContentOptions, IStreamContent, ICreateFileOptions, ITextSnapshot, IResourceEncodings } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -63,7 +63,8 @@ import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKe
 import { ITextBufferFactory, DefaultEndOfLine, EndOfLinePreference } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import { IConfirmation, IConfirmationResult, IDialogService, IDialogOptions } from 'vs/platform/dialogs/common/dialogs';
-import { INotificationService, INotificationHandle, INotification, NoOpNotification, PromptOption } from 'vs/platform/notification/common/notification';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -257,6 +258,7 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(ITelemetryService, NullTelemetryService);
 	instantiationService.stub(INotificationService, new TestNotificationService());
 	instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
+	instantiationService.stub(IWindowService, new TestWindowService());
 	instantiationService.stub(IWindowsService, new TestWindowsService());
 	instantiationService.stub(ITextFileService, <ITextFileService>instantiationService.createInstance(TestTextFileService));
 	instantiationService.stub(ITextModelService, <ITextModelService>instantiationService.createInstance(TextModelResolverService));
@@ -305,33 +307,6 @@ export class TestHistoryService implements IHistoryService {
 	}
 }
 
-export class TestNotificationService implements INotificationService {
-
-	public _serviceBrand: any;
-
-	private static readonly NO_OP: INotificationHandle = new NoOpNotification();
-
-	public info(message: string): INotificationHandle {
-		return this.notify({ severity: Severity.Info, message });
-	}
-
-	public warn(message: string): INotificationHandle {
-		return this.notify({ severity: Severity.Warning, message });
-	}
-
-	public error(error: string | Error): INotificationHandle {
-		return this.notify({ severity: Severity.Error, message: error });
-	}
-
-	public notify(notification: INotification): INotificationHandle {
-		return TestNotificationService.NO_OP;
-	}
-
-	public prompt(severity: Severity, message: string, choices: PromptOption[]): TPromise<number> {
-		return TPromise.as(0);
-	}
-}
-
 export class TestDialogService implements IDialogService {
 
 	public _serviceBrand: any;
@@ -350,13 +325,13 @@ export class TestPartService implements IPartService {
 	public _serviceBrand: any;
 
 	private _onTitleBarVisibilityChange = new Emitter<void>();
-	private _onEditorLayout = new Emitter<Dimension>();
+	private _onEditorLayout = new Emitter<IDimension>();
 
 	public get onTitleBarVisibilityChange(): Event<void> {
 		return this._onTitleBarVisibilityChange.event;
 	}
 
-	public get onEditorLayout(): Event<Dimension> {
+	public get onEditorLayout(): Event<IDimension> {
 		return this._onEditorLayout.event;
 	}
 
@@ -679,6 +654,8 @@ export class TestFileService implements IFileService {
 
 	public _serviceBrand: any;
 
+	public encoding: IResourceEncodings;
+
 	private readonly _onFileChanges: Emitter<FileChangesEvent>;
 	private readonly _onAfterOperation: Emitter<FileOperationEvent>;
 
@@ -796,8 +773,10 @@ export class TestFileService implements IFileService {
 		return TPromise.as(null);
 	}
 
-	touchFile(resource: URI): TPromise<IFileStat> {
-		return TPromise.as(null);
+	onDidChangeFileSystemProviderRegistrations = Event.None;
+
+	registerProvider(scheme: string, provider) {
+		return { dispose() { } };
 	}
 
 	canHandleResource(resource: URI): boolean {
@@ -808,20 +787,13 @@ export class TestFileService implements IFileService {
 		return TPromise.as(null);
 	}
 
-	importFile(source: URI, targetFolder: URI): TPromise<IImportResult> {
-		return TPromise.as(null);
-	}
-
 	watchFileChanges(resource: URI): void {
 	}
 
 	unwatchFileChanges(resource: URI): void {
 	}
 
-	updateOptions(options: any): void {
-	}
-
-	getEncoding(resource: URI): string {
+	getWriteEncoding(resource: URI): string {
 		return 'utf8';
 	}
 
@@ -896,7 +868,7 @@ export class TestWindowService implements IWindowService {
 
 	public _serviceBrand: any;
 
-	onDidChangeFocus: Event<boolean>;
+	onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
 
 	isFocused(): TPromise<boolean> {
 		return TPromise.as(false);
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index 62d2302178b..f9cf799d7fe 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -19,6 +19,7 @@ import 'vs/editor/editor.all';
 import 'vs/workbench/services/actions/electron-browser/menusExtensionPoint';
 
 // Views
+import 'vs/workbench/api/browser/viewsContainersExtensionPoint';
 import 'vs/workbench/api/browser/viewsExtensionPoint';
 
 // Localizations
@@ -67,6 +68,7 @@ import 'vs/workbench/parts/markers/electron-browser/markers.contribution';
 
 import 'vs/workbench/parts/html/electron-browser/html.contribution';
 
+import 'vs/workbench/parts/url/electron-browser/url.contribution';
 import 'vs/workbench/parts/webview/electron-browser/webview.contribution';
 
 import 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution';
@@ -86,8 +88,6 @@ import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; // can be p
 
 import 'vs/workbench/electron-browser/workbench';
 
-import 'vs/workbench/parts/trust/electron-browser/unsupportedWorkspaceSettings.contribution';
-
 import 'vs/workbench/parts/relauncher/electron-browser/relauncher.contribution';
 
 import 'vs/workbench/parts/tasks/electron-browser/task.contribution';
diff --git a/test/electron/index.js b/test/electron/index.js
index aa054f553ca..ee98b8f8ea3 100644
--- a/test/electron/index.js
+++ b/test/electron/index.js
@@ -8,7 +8,6 @@ const { tmpdir } = require('os');
 const { join } = require('path');
 const path = require('path');
 const mocha = require('mocha');
-const JUnitReporter = require('mocha-junit-reporter');
 const events = require('events');
 
 const defaultReporterName = process.platform === 'win32' ? 'list' : 'spec';
@@ -132,7 +131,7 @@ app.on('ready', () => {
 	win.webContents.on('did-finish-load', () => {
 		if (argv.debug) {
 			win.show();
-			win.webContents.openDevTools('right');
+			win.webContents.openDevTools({ mode: 'right' });
 		}
 		win.webContents.send('run', argv);
 	});
@@ -143,11 +142,6 @@ app.on('ready', () => {
 
 	if (argv.tfs) {
 		new TFSReporter(runner);
-		new JUnitReporter(runner, {
-			reporterOptions: {
-				mochaFile: '.build/tests/unit-test-results.xml'
-			}
-		});
 	} else {
 		const reporterPath = path.join(path.dirname(require.resolve('mocha')), 'lib', 'reporters', argv.reporter);
 		let Reporter;
diff --git a/test/smoke/.gitignore b/test/smoke/.gitignore
index 532798d3ea9..6601bb4c588 100644
--- a/test/smoke/.gitignore
+++ b/test/smoke/.gitignore
@@ -4,4 +4,5 @@ Thumbs.db
 node_modules/
 out/
 keybindings.*.json
-test_data/
\ No newline at end of file
+test_data/
+src/vscode/driver.d.ts
\ No newline at end of file
diff --git a/test/smoke/README.md b/test/smoke/README.md
index 8856e454400..0647f5b9bbd 100644
--- a/test/smoke/README.md
+++ b/test/smoke/README.md
@@ -4,43 +4,26 @@
 
 ```
 # Dev
-npm run smoketest
+yarn smoketest
 
-# Specific build
-npm run smoketest -- --build "path/to/code"
-
-# Data Migration tests
-npm run smoketest -- --build "path/to/code-insiders" --stable-build "path/to/code"
+# Build
+yarn smoketest --build "path/to/code"
 ```
 
-The script calls mocha, so all mocha arguments should work fine. For example, use `-f Git` to only run the `Git` tests.
+The script calls mocha, so all mocha arguments should work fine. For example, use `-f Git` to filter all tests except the `Git` tests.
 
-By default, screenshots are not captured. To run tests with screenshots use the argument `--screenshots`.
+A `--verbose` flag can be used to log to the console all the low level driver calls make to Code.
+
+Screenshots can be captured when tests fail. In order to get them,you need to use the argument `--screenshots SCREENSHOT_DIR`.
 
 ## Pitfalls
 
-- Beware of **state**. The tests within a single suite will share the same state.
+- Beware of workbench **state**. The tests within a single suite will share the same state.
 
 - Beware of **singletons**. This evil can, and will, manifest itself under the form of FS paths, TCP ports, IPC handles. Whenever writing a test, or setting up more smoke test architecture, make sure it can run simultaneously with any other tests and even itself.	All test suites should be able to run many times in parallel.
 
 - Beware of **focus**. **Never** depend on DOM elements having focus using `.focused` classes or `:focus` pseudo-classes, since they will lose that state as soon as another window appears on top of the running VS Code window. A safe approach which avoids this problem is to use the `waitForActiveElement` API. Many tests use this whenever they need to wait for a specific element to _have focus_.
 
-- Beware of **timing**. You need to read from or write to the DOM... yeah I know. But is it the right time to do that? Can you 100% promise that that `input` box will be visible and in the DOM at this point in time? Or are you just hoping that it will be so? Every time you want to interact with the DOM, be absolutely sure that you can. Eg. just because you triggered Quick Open, it doesn't mean that it's open; you must wait for the widget to be in the DOM and for its input field to be the active element.
+- Beware of **timing**. You need to read from or write to the DOM... but is it the right time to do that? Can you 100% guarantee that that `input` box will be visible at that point in time? Or are you just hoping that it will be so? Hope is your worst enemy in UI tests. Example: just because you triggered Quick Open with `F1`, it doesn't mean that it's open and you can just start typing; you must first wait for the input element to be in the DOM as well as be the current active element.
 
-- Beware of **waiting**. **Never** wait longer than a couple of seconds for anything, unless it's justified. Think of it as a human using Code. Would a human take 10 minutes to run through the Search viewlet smoke test? Then, the computer should even be faster. **Don't** use `setTimeout` just because. Think about what you should wait for in the DOM to be ready, then wait for that instead.
-
-## Common Issues
-
-### Certain keys don't appear in input boxes (eg: <kbd>Space</kbd>)
-
-This is a **waiting** issue. Everytime you send keys to Code, you must be aware that the keybinding service can handle them. Even if you're sure that input box is focused.
-
-Here's an example: when opening quick open, focus goes from its list to its input. We used to simply wait for the input to have focus and then send some text to be typed, like `Workbench: Show Editor`; yet, only `Workbench:ShowEditor` would be rendered in the input box. This happened due to the fact that the [`ListService` takes 50ms to unset the context key which indicates a list is focused](https://github.com/Microsoft/vscode/blob/c8dee4c016d3a3d475011106e04d8e394d9f138c/src/vs/platform/list/browser/listService.ts#L59). The fix was to [wait 50ms as well on the smoke test](https://github.com/Microsoft/vscode/blob/b82fa8dcb06bbf9c85c1502d0d43322e2e9d1a59/test/smoke/src/areas/quickopen/quickopen.ts#L65).
-
-### I type in a Monaco editor instance, but the text doesn't appear to be there
-
-This is a **waiting** issue. When you type in a Monaco editor instance, you're really typing in a `textarea`. The `textarea` is then polled for its contents, then the editor model gets updated and finally the editor view gets updated. It's a good idea to always wait for the text to appear rendered in the editor after you type in it.
-
-### I type in a Monaco editor instance, but the text appears scrambled
-
-This is an issue which is **not yet fixed**. Unfortunately this seems to happen whenever the CPU load of the system is high. Rerunning the test will often result in a successful outcome.
\ No newline at end of file
+- Beware of **waiting**. **Never** wait longer than a couple of seconds for anything, unless it's justified. Think of it as a human using Code. Would a human take 10 minutes to run through the Search viewlet smoke test? Then, the computer should even be faster. **Don't** use `setTimeout` just because. Think about what you should wait for in the DOM to be ready and wait for that instead.
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 97d8c0b3c3e..e033db34da0 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -3,8 +3,13 @@
   "version": "0.1.0",
   "main": "./src/main.js",
   "scripts": {
-    "postinstall": "tsc",
-    "watch": "tsc --watch",
+    "postinstall": "npm run compile",
+    "compile": "npm run copy-driver && npm run copy-driver-definition && tsc",
+    "watch": "concurrently \"npm run watch-driver\" \"npm run watch-driver-definition\" \"tsc --watch\"",
+    "copy-driver": "cpx src/vscode/driver.js out/vscode",
+    "watch-driver": "cpx src/vscode/driver.js out/vscode -w",
+    "copy-driver-definition": "node tools/copy-driver-definition.js",
+    "watch-driver-definition": "watch \"node tools/copy-driver-definition.js\" ../../src/vs/platform/driver/common",
     "mocha": "mocha"
   },
   "devDependencies": {
@@ -15,6 +20,8 @@
     "@types/node": "8.0.33",
     "@types/rimraf": "2.0.2",
     "@types/webdriverio": "4.6.1",
+    "concurrently": "^3.5.1",
+    "cpx": "^1.5.0",
     "electron": "1.7.7",
     "htmlparser2": "^3.9.2",
     "mkdirp": "^0.5.1",
@@ -22,9 +29,9 @@
     "ncp": "^2.0.0",
     "portastic": "^1.0.1",
     "rimraf": "^2.6.1",
-    "spectron": "^3.7.2",
     "strip-json-comments": "^2.0.1",
     "tmp": "0.0.33",
-    "typescript": "2.5.2"
+    "typescript": "2.5.2",
+    "watch": "^1.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/test/smoke/src/application.ts b/test/smoke/src/application.ts
new file mode 100644
index 00000000000..cd63330d0ab
--- /dev/null
+++ b/test/smoke/src/application.ts
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Workbench } from './areas/workbench/workbench';
+import * as fs from 'fs';
+import * as cp from 'child_process';
+import { Code, spawn, SpawnOptions } from './vscode/code';
+import { Logger } from './logger';
+
+export enum Quality {
+	Dev,
+	Insiders,
+	Stable
+}
+
+export interface ApplicationOptions extends SpawnOptions {
+	quality: Quality;
+	workspacePath: string;
+	workspaceFilePath: string;
+	waitTime: number;
+}
+
+export class Application {
+
+	private _code: Code | undefined;
+	private _workbench: Workbench;
+	private keybindings: any[];
+
+	constructor(private options: ApplicationOptions) { }
+
+	get quality(): Quality {
+		return this.options.quality;
+	}
+
+	get code(): Code {
+		return this._code!;
+	}
+
+	get workbench(): Workbench {
+		return this._workbench;
+	}
+
+	get logger(): Logger {
+		return this.options.logger;
+	}
+
+	get workspacePath(): string {
+		return this.options.workspacePath;
+	}
+
+	get extensionsPath(): string {
+		return this.options.extensionsPath;
+	}
+
+	get userDataPath(): string {
+		return this.options.userDataDir;
+	}
+
+	get workspaceFilePath(): string {
+		return this.options.workspaceFilePath;
+	}
+
+	async start(): Promise<any> {
+		await this._start();
+		await this.code.waitForElement('.explorer-folders-view');
+		await this.code.waitForActiveElement(`.editor-container[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`);
+	}
+
+	async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise<any> {
+		await this.stop();
+		await new Promise(c => setTimeout(c, 1000));
+		await this._start(options.workspaceOrFolder, options.extraArgs);
+	}
+
+	private async _start(workspaceOrFolder = this.options.workspacePath, extraArgs: string[] = []): Promise<any> {
+		await this.retrieveKeybindings();
+		cp.execSync('git checkout .', { cwd: this.options.workspacePath });
+		await this.startApplication(workspaceOrFolder, extraArgs);
+		await this.checkWindowReady();
+	}
+
+	async reload(): Promise<any> {
+		this.code.reload()
+			.catch(err => null); // ignore the connection drop errors
+
+		// needs to be enough to propagate the 'Reload Window' command
+		await new Promise(c => setTimeout(c, 1500));
+		await this.checkWindowReady();
+	}
+
+	async stop(): Promise<any> {
+		if (this._code) {
+			this._code.dispose();
+			this._code = undefined;
+		}
+	}
+
+	async capturePage(): Promise<string> {
+		return this.code.capturePage();
+	}
+
+	private async startApplication(workspaceOrFolder: string, extraArgs: string[] = []): Promise<any> {
+		this._code = await spawn({
+			codePath: this.options.codePath,
+			workspacePath: workspaceOrFolder,
+			userDataDir: this.options.userDataDir,
+			extensionsPath: this.options.extensionsPath,
+			logger: this.options.logger,
+			extraArgs
+		});
+
+		this._workbench = new Workbench(this._code, this.keybindings, this.userDataPath);
+	}
+
+	private async checkWindowReady(): Promise<any> {
+		if (!this.code) {
+			console.error('No code instance found');
+			return;
+		}
+
+		await this.code.waitForWindowIds(ids => ids.length > 0);
+		await this.code.waitForElement('.monaco-workbench');
+
+		// wait a bit, since focus might be stolen off widgets
+		// as soon as they open (eg quick open)
+		await new Promise(c => setTimeout(c, 500));
+	}
+
+	private retrieveKeybindings(): Promise<void> {
+		return new Promise((c, e) => {
+			fs.readFile(process.env.VSCODE_KEYBINDINGS_PATH as string, 'utf8', (err, data) => {
+				if (err) {
+					throw err;
+				}
+				try {
+					this.keybindings = JSON.parse(data);
+					c();
+				} catch (e) {
+					throw new Error(`Error parsing keybindings JSON: ${e}`);
+				}
+			});
+		});
+	}
+}
diff --git a/test/smoke/src/areas/activitybar/activityBar.ts b/test/smoke/src/areas/activitybar/activityBar.ts
index 894eef36f9f..a2acb1ac44d 100644
--- a/test/smoke/src/areas/activitybar/activityBar.ts
+++ b/test/smoke/src/areas/activitybar/activityBar.ts
@@ -3,8 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Element } from 'webdriverio';
-import { SpectronApplication } from '../../spectron/application';
+import { Code } from '../../vscode/code';
 
 export enum ActivityBarPosition {
 	LEFT = 0,
@@ -13,11 +12,9 @@ export enum ActivityBarPosition {
 
 export class ActivityBar {
 
-	constructor(private spectron: SpectronApplication) {
-		// noop
-	}
+	constructor(private code: Code) { }
 
-	public async getActivityBar(position: ActivityBarPosition): Promise<Element> {
+	async waitForActivityBar(position: ActivityBarPosition): Promise<void> {
 		let positionClass: string;
 
 		if (position === ActivityBarPosition.LEFT) {
@@ -28,6 +25,6 @@ export class ActivityBar {
 			throw new Error('No such position for activity bar defined.');
 		}
 
-		return this.spectron.client.waitForElement(`.part.activitybar.${positionClass}`);
+		await this.code.waitForElement(`.part.activitybar.${positionClass}`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/css/css.test.ts b/test/smoke/src/areas/css/css.test.ts
index b7ee545445a..785de831bd6 100644
--- a/test/smoke/src/areas/css/css.test.ts
+++ b/test/smoke/src/areas/css/css.test.ts
@@ -3,55 +3,44 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 import { ProblemSeverity, Problems } from '../problems/problems';
 
 export function setup() {
 	describe('CSS', () => {
-		before(function () {
-			this.app.suiteName = 'CSS';
-		});
-
 		it('verifies quick outline', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('style.css');
 
-			await app.workbench.editor.openOutline();
+			await app.workbench.quickopen.openQuickOutline();
 			await app.workbench.quickopen.waitForQuickOpenElements(names => names.length === 2);
 		});
 
 		it('verifies warnings for the empty rule', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('style.css');
 			await app.workbench.editor.waitForTypeInEditor('style.css', '.foo{}');
 
-			let warning = await app.client.waitForElement(Problems.getSelectorInEditor(ProblemSeverity.WARNING));
-			await app.screenCapturer.capture('CSS Warning in editor');
-			assert.ok(warning, `Warning squiggle is not shown in 'style.css'.`);
+			await app.code.waitForElement(Problems.getSelectorInEditor(ProblemSeverity.WARNING));
 
 			await app.workbench.problems.showProblemsView();
-			warning = await app.client.waitForElement(Problems.getSelectorInProblemsView(ProblemSeverity.WARNING));
-			await app.screenCapturer.capture('CSS Warning in problems view');
-			assert.ok(warning, 'Warning does not appear in Problems view.');
+			await app.code.waitForElement(Problems.getSelectorInProblemsView(ProblemSeverity.WARNING));
 			await app.workbench.problems.hideProblemsView();
 		});
 
 		it('verifies that warning becomes an error once setting changed', async function () {
-			const app = this.app as SpectronApplication;
+			// settings might take a while to update?
+			this.timeout(40000);
+
+			const app = this.app as Application;
 			await app.workbench.settingsEditor.addUserSetting('css.lint.emptyRules', '"error"');
 			await app.workbench.quickopen.openFile('style.css');
-			await app.workbench.editor.waitForTypeInEditor('style.css', '.foo{}');
 
-			let error = await app.client.waitForElement(Problems.getSelectorInEditor(ProblemSeverity.ERROR));
-			await app.screenCapturer.capture('CSS Error in editor');
-			assert.ok(error, `Warning squiggle is not shown in 'style.css'.`);
+			await app.code.waitForElement(Problems.getSelectorInEditor(ProblemSeverity.ERROR));
 
-			const problems = new Problems(app);
+			const problems = new Problems(app.code, app.workbench);
 			await problems.showProblemsView();
-			error = await app.client.waitForElement(Problems.getSelectorInProblemsView(ProblemSeverity.ERROR));
-			await app.screenCapturer.capture('CSS Error in probles view');
-			assert.ok(error, 'Warning does not appear in Problems view.');
+			await app.code.waitForElement(Problems.getSelectorInProblemsView(ProblemSeverity.ERROR));
 			await problems.hideProblemsView();
 		});
 	});
diff --git a/test/smoke/src/areas/debug/debug.test.ts b/test/smoke/src/areas/debug/debug.test.ts
index 7e924b95b62..b193d856cfa 100644
--- a/test/smoke/src/areas/debug/debug.test.ts
+++ b/test/smoke/src/areas/debug/debug.test.ts
@@ -8,17 +8,12 @@ import * as http from 'http';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as stripJsonComments from 'strip-json-comments';
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Debug', () => {
-		before(async function () {
-			const app = this.app as SpectronApplication;
-			app.suiteName = 'Debug';
-		});
-
 		it('configure launch json', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.debug.openDebugViewlet();
 			await app.workbench.quickopen.openFile('app.js');
@@ -31,7 +26,6 @@ export function setup() {
 			fs.writeFileSync(launchJsonPath, JSON.stringify(config, undefined, 4), 'utf8');
 
 			await app.workbench.editor.waitForEditorContents('launch.json', contents => /"protocol": "inspector"/.test(contents));
-			await app.screenCapturer.capture('launch.json file');
 
 			assert.equal(config.configurations[0].request, 'launch');
 			assert.equal(config.configurations[0].type, 'node');
@@ -43,66 +37,61 @@ export function setup() {
 		});
 
 		it('breakpoints', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.quickopen.openFile('index.js');
 			await app.workbench.debug.setBreakpointOnLine(6);
-			await app.screenCapturer.capture('breakpoints are set');
 		});
 
 		let port: number;
 		it('start debugging', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
+
+			// TODO@isidor
+			await new Promise(c => setTimeout(c, 100));
 
 			port = await app.workbench.debug.startDebugging();
-			await app.screenCapturer.capture('debugging has started');
 
 			await new Promise((c, e) => {
 				const request = http.get(`http://localhost:${port}`);
 				request.on('error', e);
 				app.workbench.debug.waitForStackFrame(sf => sf.name === 'index.js' && sf.lineNumber === 6, 'looking for index.js and line 6').then(c, e);
 			});
-
-			await app.screenCapturer.capture('debugging is paused');
 		});
 
 		it('focus stack frames and variables', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
-			await app.client.waitFor(() => app.workbench.debug.getLocalVariableCount(), c => c === 4, 'there should be 4 local variables');
+			await app.workbench.debug.waitForVariableCount(4);
 
 			await app.workbench.debug.focusStackFrame('layer.js', 'looking for layer.js');
-			await app.client.waitFor(() => app.workbench.debug.getLocalVariableCount(), c => c === 5, 'there should be 5 local variables');
+			await app.workbench.debug.waitForVariableCount(5);
 
 			await app.workbench.debug.focusStackFrame('route.js', 'looking for route.js');
-			await app.client.waitFor(() => app.workbench.debug.getLocalVariableCount(), c => c === 3, 'there should be 3 local variables');
+			await app.workbench.debug.waitForVariableCount(3);
 
 			await app.workbench.debug.focusStackFrame('index.js', 'looking for index.js');
-			await app.client.waitFor(() => app.workbench.debug.getLocalVariableCount(), c => c === 4, 'there should be 4 local variables');
+			await app.workbench.debug.waitForVariableCount(4);
 		});
 
 		it('stepOver, stepIn, stepOut', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.debug.stepIn();
-			await app.screenCapturer.capture('debugging has stepped in');
 
 			const first = await app.workbench.debug.waitForStackFrame(sf => sf.name === 'response.js', 'looking for response.js');
 			await app.workbench.debug.stepOver();
-			await app.screenCapturer.capture('debugging has stepped over');
 
 			await app.workbench.debug.waitForStackFrame(sf => sf.name === 'response.js' && sf.lineNumber === first.lineNumber + 1, `looking for response.js and line ${first.lineNumber + 1}`);
 			await app.workbench.debug.stepOut();
-			await app.screenCapturer.capture('debugging has stepped out');
 
 			await app.workbench.debug.waitForStackFrame(sf => sf.name === 'index.js' && sf.lineNumber === 7, `looking for index.js and line 7`);
 		});
 
 		it('continue', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.debug.continue();
-			await app.screenCapturer.capture('debugging has continued');
 
 			await new Promise((c, e) => {
 				const request = http.get(`http://localhost:${port}`);
@@ -110,20 +99,18 @@ export function setup() {
 				app.workbench.debug.waitForStackFrame(sf => sf.name === 'index.js' && sf.lineNumber === 6, `looking for index.js and line 6`).then(c, e);
 			});
 
-			await app.screenCapturer.capture('debugging is paused');
 		});
 
 		it('debug console', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.debug.waitForReplCommand('2 + 2', r => r === '4');
 		});
 
 		it('stop debugging', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.debug.stopDebugging();
-			await app.screenCapturer.capture('debugging has stopped');
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/debug/debug.ts b/test/smoke/src/areas/debug/debug.ts
index 0f9dfa15582..bf92dd930ff 100644
--- a/test/smoke/src/areas/debug/debug.ts
+++ b/test/smoke/src/areas/debug/debug.ts
@@ -3,13 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Viewlet } from '../workbench/viewlet';
+import { Commands } from '../workbench/workbench';
+import { Code, findElement } from '../../vscode/code';
+import { Editors } from '../editor/editors';
+import { Editor } from '../editor/editor';
+import { IElement } from '../../vscode/driver';
 
 const VIEWLET = 'div[id="workbench.view.debug"]';
 const DEBUG_VIEW = `${VIEWLET} .debug-view-content`;
 const CONFIGURE = `div[id="workbench.parts.sidebar"] .actions-container .configure`;
-const START = `.icon[title="Start Debugging"]`;
 const STOP = `.debug-actions-widget .debug-action.stop`;
 const STEP_OVER = `.debug-actions-widget .debug-action.step-over`;
 const STEP_IN = `.debug-actions-widget .debug-action.step-into`;
@@ -22,150 +25,118 @@ const DEBUG_STATUS_BAR = `.statusbar.debugging`;
 const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;
 const TOOLBAR_HIDDEN = `.debug-actions-widget.monaco-builder-hidden`;
 const STACK_FRAME = `${VIEWLET} .monaco-tree-row .stack-frame`;
+const SPECIFIC_STACK_FRAME = filename => `${STACK_FRAME} .file[title$="${filename}"]`;
 const VARIABLE = `${VIEWLET} .debug-variables .monaco-tree-row .expression`;
-const CONSOLE_OUTPUT = `.repl .output.expression`;
+const CONSOLE_OUTPUT = `.repl .output.expression .value`;
 const CONSOLE_INPUT_OUTPUT = `.repl .input-output-pair .output.expression .value`;
 
 const REPL_FOCUSED = '.repl-input-wrapper .monaco-editor textarea';
 
 export interface IStackFrame {
-	id: string;
 	name: string;
 	lineNumber: number;
 }
 
+function toStackFrame(element: IElement): IStackFrame {
+	const name = findElement(element, e => /\bfile-name\b/.test(e.className))!;
+	const line = findElement(element, e => /\bline-number\b/.test(e.className))!;
+	const lineNumber = line.textContent ? parseInt(line.textContent.split(':').shift() || '0') : 0;
+
+	return {
+		name: name.textContent || '',
+		lineNumber
+	};
+}
+
 export class Debug extends Viewlet {
 
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
+	constructor(code: Code, private commands: Commands, private editors: Editors, private editor: Editor) {
+		super(code);
 	}
 
 	async openDebugViewlet(): Promise<any> {
-		await this.spectron.runCommand('workbench.view.debug');
-		await this.spectron.client.waitForElement(DEBUG_VIEW);
+		await this.commands.runCommand('workbench.view.debug');
+		await this.code.waitForElement(DEBUG_VIEW);
 	}
 
 	async configure(): Promise<any> {
-		await this.spectron.client.waitAndClick(CONFIGURE);
-		await this.spectron.workbench.waitForEditorFocus('launch.json');
+		await this.code.waitAndClick(CONFIGURE);
+		await this.editors.waitForEditorFocus('launch.json');
 	}
 
 	async setBreakpointOnLine(lineNumber: number): Promise<any> {
-		await this.spectron.client.waitForElement(`${GLYPH_AREA}(${lineNumber})`);
-		await this.spectron.client.leftClick(`${GLYPH_AREA}(${lineNumber})`, 5, 5);
-		await this.spectron.client.waitForElement(BREAKPOINT_GLYPH);
+		await this.code.waitForElement(`${GLYPH_AREA}(${lineNumber})`);
+		await this.code.waitAndClick(`${GLYPH_AREA}(${lineNumber})`, 5, 5);
+		await this.code.waitForElement(BREAKPOINT_GLYPH);
 	}
 
 	async startDebugging(): Promise<number> {
-		await this.spectron.client.waitAndClick(START);
-		await this.spectron.client.waitForElement(PAUSE);
-		await this.spectron.client.waitForElement(DEBUG_STATUS_BAR);
+		await this.commands.runCommand('workbench.action.debug.start');
+		await this.code.waitForElement(PAUSE);
+		await this.code.waitForElement(DEBUG_STATUS_BAR);
 		const portPrefix = 'Port: ';
-		await this.spectron.client.waitFor(async () => {
-			const output = await this.getConsoleOutput();
-			return output.join('');
-		}, text => !!text && text.indexOf(portPrefix) >= 0);
-		const output = await this.getConsoleOutput();
-		const lastOutput = output.pop();
+
+		const output = await this.waitForOutput(output => output.some(line => line.indexOf(portPrefix) >= 0));
+		const lastOutput = output.filter(line => line.indexOf(portPrefix) >= 0)[0];
 
 		return lastOutput ? parseInt(lastOutput.substr(portPrefix.length)) : 3000;
 	}
 
 	async stepOver(): Promise<any> {
-		await this.spectron.client.waitAndClick(STEP_OVER);
+		await this.code.waitAndClick(STEP_OVER);
 	}
 
 	async stepIn(): Promise<any> {
-		await this.spectron.client.waitAndClick(STEP_IN);
+		await this.code.waitAndClick(STEP_IN);
 	}
 
 	async stepOut(): Promise<any> {
-		await this.spectron.client.waitAndClick(STEP_OUT);
+		await this.code.waitAndClick(STEP_OUT);
 	}
 
 	async continue(): Promise<any> {
-		await this.spectron.client.waitAndClick(CONTINUE);
+		await this.code.waitAndClick(CONTINUE);
 		await this.waitForStackFrameLength(0);
 	}
 
 	async stopDebugging(): Promise<any> {
-		await this.spectron.client.waitAndClick(STOP);
-		await this.spectron.client.waitForElement(TOOLBAR_HIDDEN);
-		await this.spectron.client.waitForElement(NOT_DEBUG_STATUS_BAR);
+		await this.code.waitAndClick(STOP);
+		await this.code.waitForElement(TOOLBAR_HIDDEN);
+		await this.code.waitForElement(NOT_DEBUG_STATUS_BAR);
 	}
 
 	async waitForStackFrame(func: (stackFrame: IStackFrame) => boolean, message: string): Promise<IStackFrame> {
-		return await this.spectron.client.waitFor(async () => {
-			const stackFrames = await this.getStackFrames();
-			return stackFrames.filter(func)[0];
-		}, void 0, `Waiting for Stack Frame: ${message}`);
+		const elements = await this.code.waitForElements(STACK_FRAME, true, elements => elements.some(e => func(toStackFrame(e))));
+		return elements.map(toStackFrame).filter(s => func(s))[0];
 	}
 
 	async waitForStackFrameLength(length: number): Promise<any> {
-		return await this.spectron.client.waitFor(() => this.getStackFrames(), stackFrames => stackFrames.length === length);
+		await this.code.waitForElements(STACK_FRAME, false, result => result.length === length);
 	}
 
 	async focusStackFrame(name: string, message: string): Promise<any> {
-		const stackFrame = await this.waitForStackFrame(sf => sf.name === name, message);
-		await this.spectron.client.spectron.client.elementIdClick(stackFrame.id);
-		await this.spectron.workbench.waitForTab(name);
+		await this.code.waitAndClick(SPECIFIC_STACK_FRAME(name));
+		await this.editors.waitForTab(name);
 	}
 
 	async waitForReplCommand(text: string, accept: (result: string) => boolean): Promise<void> {
-		await this.spectron.workbench.quickopen.runCommand('Debug: Focus Debug Console');
-		await this.spectron.client.waitForActiveElement(REPL_FOCUSED);
-		await this.spectron.client.setValue(REPL_FOCUSED, text);
+		await this.commands.runCommand('Debug: Focus Debug Console');
+		await this.code.waitForActiveElement(REPL_FOCUSED);
+		await this.code.waitForSetValue(REPL_FOCUSED, text);
 
 		// Wait for the keys to be picked up by the editor model such that repl evalutes what just got typed
-		await this.spectron.workbench.editor.waitForEditorContents('debug:input', s => s.indexOf(text) >= 0);
-		await this.spectron.client.keys(['Enter', 'NULL']);
-		await this.spectron.client.waitForElement(CONSOLE_INPUT_OUTPUT);
-		await this.spectron.client.waitFor(async () => {
-			const result = await this.getConsoleOutput();
-			return result[result.length - 1] || '';
-		}, accept);
+		await this.editor.waitForEditorContents('debug:input', s => s.indexOf(text) >= 0);
+		await this.code.dispatchKeybinding('enter');
+		await this.code.waitForElement(CONSOLE_INPUT_OUTPUT);
+		await this.waitForOutput(output => accept(output[output.length - 1] || ''));
 	}
 
-	async getLocalVariableCount(): Promise<number> {
-		return await this.spectron.webclient.selectorExecute(VARIABLE, div => (Array.isArray(div) ? div : [div]).length);
+	async waitForVariableCount(count: number): Promise<void> {
+		await this.code.waitForElements(VARIABLE, false, els => els.length === count);
 	}
 
-	async getStackFramesLength(): Promise<number> {
-		const stackFrames = await this.getStackFrames();
-		return stackFrames.length;
-	}
-
-	private async getStackFrames(): Promise<IStackFrame[]> {
-		const result = await this.spectron.webclient.selectorExecute(STACK_FRAME,
-			div => (Array.isArray(div) ? div : [div]).map(element => {
-				const name = element.querySelector('.file-name') as HTMLElement;
-				const line = element.querySelector('.line-number') as HTMLElement;
-				const lineNumber = line.textContent ? parseInt(line.textContent.split(':').shift() || '0') : 0;
-
-				return {
-					name: name.textContent,
-					lineNumber,
-					element
-				};
-			})
-		);
-
-		if (!Array.isArray(result)) {
-			return [];
-		}
-
-		return result
-			.map(({ name, lineNumber, element }) => ({ name, lineNumber, id: element.ELEMENT }));
-	}
-
-	private async getConsoleOutput(): Promise<string[]> {
-		const result = await this.spectron.webclient.selectorExecute(CONSOLE_OUTPUT,
-			div => (Array.isArray(div) ? div : [div]).map(element => {
-				const value = element.querySelector('.value') as HTMLElement;
-				return value && value.textContent;
-			}).filter(line => !!line)
-		);
-
-		return result;
+	private async waitForOutput(fn: (output: string[]) => boolean): Promise<string[]> {
+		const elements = await this.code.waitForElements(CONSOLE_OUTPUT, false, elements => fn(elements.map(e => e.textContent)));
+		return elements.map(e => e.textContent);
 	}
 }
diff --git a/test/smoke/src/areas/editor/editor.test.ts b/test/smoke/src/areas/editor/editor.test.ts
index 0911d100100..af9f49cf4c6 100644
--- a/test/smoke/src/areas/editor/editor.test.ts
+++ b/test/smoke/src/areas/editor/editor.test.ts
@@ -3,27 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Editor', () => {
-		before(function () {
-			this.app.suiteName = 'Editor';
-		});
-
 		it('shows correct quick outline', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('www');
 
-			await app.workbench.editor.openOutline();
+			await app.workbench.quickopen.openQuickOutline();
 			await app.workbench.quickopen.waitForQuickOpenElements(names => names.length >= 6);
 		});
 
 		it(`finds 'All References' to 'app'`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('www');
 
-			const references = await app.workbench.editor.findReferences('app', 7);
+			const references = await app.workbench.editor.findReferences('www', 'app', 7);
 
 			await references.waitForReferencesCountInTitle(3);
 			await references.waitForReferencesCount(3);
@@ -31,11 +27,10 @@ export function setup() {
 		});
 
 		it(`renames local 'app' variable`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('www');
 			await app.workbench.editor.rename('www', 7, 'app', 'newApp');
 			await app.workbench.editor.waitForEditorContents('www', contents => contents.indexOf('newApp') > -1);
-			await app.screenCapturer.capture('Rename result');
 		});
 
 		// it('folds/unfolds the code correctly', async function () {
@@ -55,19 +50,19 @@ export function setup() {
 		// });
 
 		it(`verifies that 'Go To Definition' works`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('app.js');
 
-			await app.workbench.editor.gotoDefinition('express', 11);
+			await app.workbench.editor.gotoDefinition('app.js', 'express', 11);
 
-			await app.workbench.waitForActiveTab('index.d.ts');
+			await app.workbench.editors.waitForActiveTab('index.d.ts');
 		});
 
 		it(`verifies that 'Peek Definition' works`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openFile('app.js');
 
-			const peek = await app.workbench.editor.peekDefinition('express', 11);
+			const peek = await app.workbench.editor.peekDefinition('app.js', 'express', 11);
 
 			await peek.waitForFile('index.d.ts');
 		});
diff --git a/test/smoke/src/areas/editor/editor.ts b/test/smoke/src/areas/editor/editor.ts
index 14c95e3ff6b..c3facfe1718 100644
--- a/test/smoke/src/areas/editor/editor.ts
+++ b/test/smoke/src/areas/editor/editor.ts
@@ -3,192 +3,131 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
-import { QuickOutline } from './quickoutline';
 import { References } from './peek';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 const RENAME_BOX = '.monaco-editor .monaco-editor.rename-box';
 const RENAME_INPUT = `${RENAME_BOX} .rename-input`;
+const EDITOR = filename => `.monaco-editor[data-uri$="${filename}"]`;
+const VIEW_LINES = filename => `${EDITOR(filename)} .view-lines`;
+const LINE_NUMBERS = filename => `${EDITOR(filename)} .margin .margin-view-overlays .line-numbers`;
 
 export class Editor {
 
-	private static readonly VIEW_LINES = '.monaco-editor .view-lines';
-	private static readonly LINE_NUMBERS = '.monaco-editor .margin .margin-view-overlays .line-numbers';
 	private static readonly FOLDING_EXPANDED = '.monaco-editor .margin .margin-view-overlays>:nth-child(${INDEX}) .folding';
 	private static readonly FOLDING_COLLAPSED = `${Editor.FOLDING_EXPANDED}.collapsed`;
 
-	constructor(private spectron: SpectronApplication) {
-	}
+	constructor(private code: Code, private commands: Commands) { }
 
-	async openOutline(): Promise<QuickOutline> {
-		const outline = new QuickOutline(this.spectron);
-		await outline.open();
-		return outline;
-	}
-
-	async findReferences(term: string, line: number): Promise<References> {
-		await this.clickOnTerm(term, line);
-		await this.spectron.workbench.quickopen.runCommand('Find All References');
-		const references = new References(this.spectron);
+	async findReferences(filename: string, term: string, line: number): Promise<References> {
+		await this.clickOnTerm(filename, term, line);
+		await this.commands.runCommand('Find All References');
+		const references = new References(this.code);
 		await references.waitUntilOpen();
 		return references;
 	}
 
 	async rename(filename: string, line: number, from: string, to: string): Promise<void> {
-		await this.clickOnTerm(from, line);
-		await this.spectron.workbench.quickopen.runCommand('Rename Symbol');
+		await this.clickOnTerm(filename, from, line);
+		await this.commands.runCommand('Rename Symbol');
 
-		await this.spectron.client.waitForActiveElement(RENAME_INPUT);
-		await this.spectron.client.setValue(RENAME_INPUT, to);
+		await this.code.waitForActiveElement(RENAME_INPUT);
+		await this.code.waitForSetValue(RENAME_INPUT, to);
 
-		await this.spectron.client.keys(['Enter', 'NULL']);
+		await this.code.dispatchKeybinding('enter');
 	}
 
-	async gotoDefinition(term: string, line: number): Promise<void> {
-		await this.clickOnTerm(term, line);
-		await this.spectron.workbench.quickopen.runCommand('Go to Definition');
+	async gotoDefinition(filename: string, term: string, line: number): Promise<void> {
+		await this.clickOnTerm(filename, term, line);
+		await this.commands.runCommand('Go to Definition');
 	}
 
-	async peekDefinition(term: string, line: number): Promise<References> {
-		await this.clickOnTerm(term, line);
-		await this.spectron.workbench.quickopen.runCommand('Peek Definition');
-		const peek = new References(this.spectron);
+	async peekDefinition(filename: string, term: string, line: number): Promise<References> {
+		await this.clickOnTerm(filename, term, line);
+		await this.commands.runCommand('Peek Definition');
+		const peek = new References(this.code);
 		await peek.waitUntilOpen();
 		return peek;
 	}
 
-	async waitForHighlightingLine(line: number): Promise<void> {
-		const currentLineIndex = await this.getViewLineIndex(line);
+	async waitForHighlightingLine(filename: string, line: number): Promise<void> {
+		const currentLineIndex = await this.getViewLineIndex(filename, line);
 		if (currentLineIndex) {
-			await this.spectron.client.waitForElement(`.monaco-editor .view-overlays>:nth-child(${currentLineIndex}) .current-line`);
+			await this.code.waitForElement(`.monaco-editor .view-overlays>:nth-child(${currentLineIndex}) .current-line`);
 			return;
 		}
 		throw new Error('Cannot find line ' + line);
 	}
 
-	async getSelector(term: string, line: number): Promise<string> {
-		const lineIndex = await this.getViewLineIndex(line);
-		const classNames = await this.spectron.client.waitFor(() => this.getClassSelectors(term, lineIndex), classNames => classNames && !!classNames.length, 'Getting class names for editor lines');
-		return `${Editor.VIEW_LINES}>:nth-child(${lineIndex}) span span.${classNames[0]}`;
+	private async getSelector(filename: string, term: string, line: number): Promise<string> {
+		const lineIndex = await this.getViewLineIndex(filename, line);
+		const classNames = await this.getClassSelectors(filename, term, lineIndex);
+
+		return `${VIEW_LINES(filename)}>:nth-child(${lineIndex}) span span.${classNames[0]}`;
 	}
 
-	async foldAtLine(line: number): Promise<any> {
-		const lineIndex = await this.getViewLineIndex(line);
-		await this.spectron.client.waitAndClick(Editor.FOLDING_EXPANDED.replace('${INDEX}', '' + lineIndex));
-		await this.spectron.client.waitForElement(Editor.FOLDING_COLLAPSED.replace('${INDEX}', '' + lineIndex));
+	async foldAtLine(filename: string, line: number): Promise<any> {
+		const lineIndex = await this.getViewLineIndex(filename, line);
+		await this.code.waitAndClick(Editor.FOLDING_EXPANDED.replace('${INDEX}', '' + lineIndex));
+		await this.code.waitForElement(Editor.FOLDING_COLLAPSED.replace('${INDEX}', '' + lineIndex));
 	}
 
-	async unfoldAtLine(line: number): Promise<any> {
-		const lineIndex = await this.getViewLineIndex(line);
-		await this.spectron.client.waitAndClick(Editor.FOLDING_COLLAPSED.replace('${INDEX}', '' + lineIndex));
-		await this.spectron.client.waitForElement(Editor.FOLDING_EXPANDED.replace('${INDEX}', '' + lineIndex));
+	async unfoldAtLine(filename: string, line: number): Promise<any> {
+		const lineIndex = await this.getViewLineIndex(filename, line);
+		await this.code.waitAndClick(Editor.FOLDING_COLLAPSED.replace('${INDEX}', '' + lineIndex));
+		await this.code.waitForElement(Editor.FOLDING_EXPANDED.replace('${INDEX}', '' + lineIndex));
 	}
 
-	async waitUntilHidden(line: number): Promise<void> {
-		await this.spectron.client.waitFor<number>(() => this.getViewLineIndexWithoutWait(line), lineNumber => lineNumber === undefined, 'Waiting until line number is hidden');
+	private async clickOnTerm(filename: string, term: string, line: number): Promise<void> {
+		const selector = await this.getSelector(filename, term, line);
+		await this.code.waitAndClick(selector);
 	}
 
-	async waitUntilShown(line: number): Promise<void> {
-		await this.getViewLineIndex(line);
-	}
+	async waitForEditorFocus(filename: string, lineNumber: number, selectorPrefix = ''): Promise<void> {
+		const editor = [selectorPrefix || '', EDITOR(filename)].join(' ');
+		const line = `${editor} .view-lines > .view-line:nth-child(${lineNumber})`;
+		const textarea = `${editor} textarea`;
 
-	async clickOnTerm(term: string, line: number): Promise<void> {
-		const selector = await this.getSelector(term, line);
-		await this.spectron.client.waitAndClick(selector);
+		await this.code.waitAndClick(line, 0, 0);
+		await this.code.waitForActiveElement(textarea);
 	}
 
 	async waitForTypeInEditor(filename: string, text: string, selectorPrefix = ''): Promise<any> {
-		const editor = [
-			selectorPrefix || '',
-			`.monaco-editor[data-uri$="${filename}"]`
-		].join(' ');
+		const editor = [selectorPrefix || '', EDITOR(filename)].join(' ');
 
-		await this.spectron.client.element(editor);
+		await this.code.waitForElement(editor);
 
 		const textarea = `${editor} textarea`;
-		await this.spectron.client.waitForActiveElement(textarea);
+		await this.code.waitForActiveElement(textarea);
 
-		// https://github.com/Microsoft/vscode/issues/34203#issuecomment-334441786
-		await this.spectron.client.spectron.client.selectorExecute(textarea, (elements, text) => {
-			const textarea = (Array.isArray(elements) ? elements : [elements])[0] as HTMLTextAreaElement;
-			const start = textarea.selectionStart;
-			const newStart = start + text.length;
-			const value = textarea.value;
-			const newValue = value.substr(0, start) + text + value.substr(start);
-
-			textarea.value = newValue;
-			textarea.setSelectionRange(newStart, newStart);
-
-			const event = new Event('input', { 'bubbles': true, 'cancelable': true });
-			textarea.dispatchEvent(event);
-		}, text);
+		await this.code.waitForTypeInEditor(textarea, text);
 
 		await this.waitForEditorContents(filename, c => c.indexOf(text) > -1, selectorPrefix);
 	}
 
 	async waitForEditorContents(filename: string, accept: (contents: string) => boolean, selectorPrefix = ''): Promise<any> {
-		const selector = [
-			selectorPrefix || '',
-			`.monaco-editor[data-uri$="${filename}"] .view-lines`
-		].join(' ');
-
-		return this.spectron.client.waitForTextContent(selector, undefined, c => accept(c.replace(/\u00a0/g, ' ')));
+		const selector = [selectorPrefix || '', `${EDITOR(filename)} .view-lines`].join(' ');
+		return this.code.waitForTextContent(selector, undefined, c => accept(c.replace(/\u00a0/g, ' ')));
 	}
 
-	async waitForActiveEditor(filename: string): Promise<any> {
-		const selector = `.editor-container .monaco-editor[data-uri$="${filename}"] textarea`;
-		return this.spectron.client.waitForActiveElement(selector);
+	private async getClassSelectors(filename: string, term: string, viewline: number): Promise<string[]> {
+		const elements = await this.code.waitForElements(`${VIEW_LINES(filename)}>:nth-child(${viewline}) span span`, false, els => els.some(el => el.textContent === term));
+		const { className } = elements.filter(r => r.textContent === term)[0];
+		return className.split(/\s/g);
 	}
 
-	// async waitForActiveEditorFirstLineText(filename: string): Promise<string> {
-	// 	const selector = `.editor-container .monaco-editor[data-uri$="${filename}"] textarea`;
-	// 	const result = await this.spectron.client.waitFor(
-	// 		() => this.spectron.client.spectron.client.execute(s => {
-	// 			if (!document.activeElement.matches(s)) {
-	// 				return undefined;
-	// 			}
+	private async getViewLineIndex(filename: string, line: number): Promise<number> {
+		const elements = await this.code.waitForElements(LINE_NUMBERS(filename), false, els => {
+			return els.some(el => el.textContent === `${line}`);
+		});
 
-	// 			let element: Element | null = document.activeElement;
-	// 			while (element && !/monaco-editor/.test(element.className) && element !== document.body) {
-	// 				element = element.parentElement;
-	// 			}
-
-	// 			if (element && /monaco-editor/.test(element.className)) {
-	// 				const firstLine = element.querySelector('.view-lines span span:nth-child(1)');
-
-	// 				if (firstLine) {
-	// 					return (firstLine.textContent || '').replace(/\u00a0/g, ' '); // DAMN
-	// 				}
-	// 			}
-
-	// 			return undefined;
-	// 		}, selector),
-	// 		r => typeof r.value === 'string',
-	// 		`wait for active editor first line: ${selector}`
-	// 	);
-
-	// 	return result.value;
-	// }
-
-	private async getClassSelectors(term: string, viewline: number): Promise<string[]> {
-		const result: { text: string, className: string }[] = await this.spectron.webclient.selectorExecute(`${Editor.VIEW_LINES}>:nth-child(${viewline}) span span`,
-			elements => (Array.isArray(elements) ? elements : [elements])
-				.map(element => ({ text: element.textContent, className: element.className })));
-		return result.filter(r => r.text === term).map(({ className }) => className);
-	}
-
-	private async getViewLineIndex(line: number): Promise<number> {
-		return await this.spectron.client.waitFor<number>(() => this.getViewLineIndexWithoutWait(line), void 0, 'Getting line index');
-	}
-
-	private async getViewLineIndexWithoutWait(line: number): Promise<number | undefined> {
-		const lineNumbers = await this.spectron.webclient.selectorExecute(Editor.LINE_NUMBERS,
-			elements => (Array.isArray(elements) ? elements : [elements]).map(element => element.textContent));
-		for (let index = 0; index < lineNumbers.length; index++) {
-			if (lineNumbers[index] === `${line}`) {
+		for (let index = 0; index < elements.length; index++) {
+			if (elements[index].textContent === `${line}`) {
 				return index + 1;
 			}
 		}
-		return undefined;
+
+		throw new Error('Line not found');
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/editor/editors.ts b/test/smoke/src/areas/editor/editors.ts
new file mode 100644
index 00000000000..4ac026780e4
--- /dev/null
+++ b/test/smoke/src/areas/editor/editors.ts
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
+
+export class Editors {
+
+	constructor(private code: Code, private commands: Commands) { }
+
+	async saveOpenedFile(): Promise<any> {
+		await this.commands.runCommand('workbench.action.files.save');
+	}
+
+	async selectTab(tabName: string, untitled: boolean = false): Promise<void> {
+		await this.code.waitAndClick(`.tabs-container div.tab[aria-label="${tabName}, tab"]`);
+		await this.waitForEditorFocus(tabName, untitled);
+	}
+
+	async waitForActiveEditor(filename: string): Promise<any> {
+		const selector = `.editor-container .monaco-editor[data-uri$="${filename}"] textarea`;
+		return this.code.waitForActiveElement(selector);
+	}
+
+	async waitForEditorFocus(fileName: string, untitled: boolean = false): Promise<void> {
+		await this.waitForActiveTab(fileName);
+		await this.waitForActiveEditor(fileName);
+	}
+
+	async waitForActiveTab(fileName: string, isDirty: boolean = false): Promise<void> {
+		await this.code.waitForElement(`.tabs-container div.tab.active${isDirty ? '.dirty' : ''}[aria-selected="true"][aria-label="${fileName}, tab"]`);
+	}
+
+	async waitForTab(fileName: string, isDirty: boolean = false): Promise<void> {
+		await this.code.waitForElement(`.tabs-container div.tab${isDirty ? '.dirty' : ''}[aria-label="${fileName}, tab"]`);
+	}
+
+	async newUntitledFile(): Promise<void> {
+		await this.commands.runCommand('workbench.action.files.newUntitledFile');
+		await this.waitForEditorFocus('Untitled-1', true);
+	}
+}
\ No newline at end of file
diff --git a/test/smoke/src/areas/editor/peek.ts b/test/smoke/src/areas/editor/peek.ts
index 9c912821270..e0f805b441e 100644
--- a/test/smoke/src/areas/editor/peek.ts
+++ b/test/smoke/src/areas/editor/peek.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Code } from '../../vscode/code';
 
 export class References {
 
@@ -12,30 +12,41 @@ export class References {
 	private static readonly REFERENCES_TITLE_COUNT = `${References.REFERENCES_WIDGET} .head .peekview-title .meta`;
 	private static readonly REFERENCES = `${References.REFERENCES_WIDGET} .body .ref-tree.inline .monaco-tree-row .reference`;
 
-	constructor(private spectron: SpectronApplication) {
+	constructor(private code: Code) { }
+
+	async waitUntilOpen(): Promise<void> {
+		await this.code.waitForElement(References.REFERENCES_WIDGET);
 	}
 
-	public async waitUntilOpen(): Promise<void> {
-		await this.spectron.client.waitForElement(References.REFERENCES_WIDGET);
-	}
-
-	public async waitForReferencesCountInTitle(count: number): Promise<void> {
-		await this.spectron.client.waitForText(References.REFERENCES_TITLE_COUNT, void 0, titleCount => {
+	async waitForReferencesCountInTitle(count: number): Promise<void> {
+		await this.code.waitForTextContent(References.REFERENCES_TITLE_COUNT, void 0, titleCount => {
 			const matches = titleCount.match(/\d+/);
 			return matches ? parseInt(matches[0]) === count : false;
 		});
 	}
 
-	public async waitForReferencesCount(count: number): Promise<void> {
-		await this.spectron.client.waitForElements(References.REFERENCES, result => result && result.length === count);
+	async waitForReferencesCount(count: number): Promise<void> {
+		await this.code.waitForElements(References.REFERENCES, false, result => result && result.length === count);
 	}
 
-	public async waitForFile(file: string): Promise<void> {
-		await this.spectron.client.waitForText(References.REFERENCES_TITLE_FILE_NAME, file);
+	async waitForFile(file: string): Promise<void> {
+		await this.code.waitForTextContent(References.REFERENCES_TITLE_FILE_NAME, file);
 	}
 
-	public async close(): Promise<void> {
-		await this.spectron.client.keys(['Escape', 'NULL']);
-		await this.spectron.client.waitForElement(References.REFERENCES_WIDGET, element => !element);
+	async close(): Promise<void> {
+		// Sometimes someone else eats up the `Escape` key
+		let count = 0;
+		while (true) {
+			await this.code.dispatchKeybinding('escape');
+
+			try {
+				await this.code.waitForElement(References.REFERENCES_WIDGET, el => !el, 10);
+				return;
+			} catch (err) {
+				if (++count > 5) {
+					throw err;
+				}
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/editor/quickoutline.ts b/test/smoke/src/areas/editor/quickoutline.ts
deleted file mode 100644
index 852bd8b9145..00000000000
--- a/test/smoke/src/areas/editor/quickoutline.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { SpectronApplication } from '../../spectron/application';
-import { QuickOpen } from '../quickopen/quickopen';
-
-export class QuickOutline extends QuickOpen {
-
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
-	}
-
-	public async open(): Promise<void> {
-		await this.spectron.client.waitFor(async () => {
-			await this.spectron.runCommand('workbench.action.gotoSymbol');
-			const entry = await this.spectron.client.element('div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties div.monaco-tree-row .quick-open-entry');
-			if (entry) {
-				const text = await this.spectron.client.getText('div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties div.monaco-tree-row .quick-open-entry .monaco-icon-label .label-name .monaco-highlighted-label span');
-				if (text !== 'No symbol information for the file') {
-					return entry;
-				}
-			}
-			await this.closeQuickOpen();
-		}, undefined, 'Opening Outline');
-	}
-}
diff --git a/test/smoke/src/areas/explorer/explorer.test.ts b/test/smoke/src/areas/explorer/explorer.test.ts
index ab77642f6dd..946105649b7 100644
--- a/test/smoke/src/areas/explorer/explorer.test.ts
+++ b/test/smoke/src/areas/explorer/explorer.test.ts
@@ -3,16 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Explorer', () => {
-		before(function () {
-			this.app.suiteName = 'Explorer';
-		});
-
 		it('quick open search produces correct result', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			const expectedNames = [
 				'.eslintrc.json',
 				'tasks.json',
@@ -25,11 +21,11 @@ export function setup() {
 
 			await app.workbench.quickopen.openQuickOpen('.js');
 			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
-			await app.client.keys(['Escape', 'NULL']);
+			await app.code.dispatchKeybinding('escape');
 		});
 
 		it('quick open respects fuzzy matching', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			const expectedNames = [
 				'tasks.json',
 				'app.js',
@@ -38,7 +34,7 @@ export function setup() {
 
 			await app.workbench.quickopen.openQuickOpen('a.s');
 			await app.workbench.quickopen.waitForQuickOpenElements(names => expectedNames.every(n => names.some(m => n === m)));
-			await app.client.keys(['Escape', 'NULL']);
+			await app.code.dispatchKeybinding('escape');
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/explorer/explorer.ts b/test/smoke/src/areas/explorer/explorer.ts
index 6159e62c45f..ef9231393ef 100644
--- a/test/smoke/src/areas/explorer/explorer.ts
+++ b/test/smoke/src/areas/explorer/explorer.ts
@@ -3,33 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Viewlet } from '../workbench/viewlet';
-
+import { Editors } from '../editor/editors';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 export class Explorer extends Viewlet {
 
 	private static readonly EXPLORER_VIEWLET = 'div[id="workbench.view.explorer"]';
 	private static readonly OPEN_EDITORS_VIEW = `${Explorer.EXPLORER_VIEWLET} .split-view-view:nth-child(1) .title`;
 
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
+	constructor(code: Code, private commands: Commands, private editors: Editors) {
+		super(code);
 	}
 
-	public openExplorerView(): Promise<any> {
-		return this.spectron.runCommand('workbench.view.explorer');
+	openExplorerView(): Promise<any> {
+		return this.commands.runCommand('workbench.view.explorer');
 	}
 
-	public getOpenEditorsViewTitle(): Promise<string> {
-		return this.spectron.client.waitForText(Explorer.OPEN_EDITORS_VIEW);
+	async waitForOpenEditorsViewTitle(fn: (title: string) => boolean): Promise<void> {
+		await this.code.waitForTextContent(Explorer.OPEN_EDITORS_VIEW, undefined, fn);
 	}
 
-	public async openFile(fileName: string): Promise<any> {
-		await this.spectron.client.doubleClickAndWait(`div[class="monaco-icon-label file-icon ${fileName}-name-file-icon ${this.getExtensionSelector(fileName)} explorer-item"]`);
-		await this.spectron.workbench.waitForEditorFocus(fileName);
+	async openFile(fileName: string): Promise<any> {
+		await this.code.waitAndDoubleClick(`div[class="monaco-icon-label file-icon ${fileName}-name-file-icon ${this.getExtensionSelector(fileName)} explorer-item"]`);
+		await this.editors.waitForEditorFocus(fileName);
 	}
 
-	public getExtensionSelector(fileName: string): string {
+	getExtensionSelector(fileName: string): string {
 		const extension = fileName.split('.')[1];
 		if (extension === 'js') {
 			return 'js-ext-file-icon ext-file-icon javascript-lang-file-icon';
diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
index 33776a25405..2b51741cd52 100644
--- a/test/smoke/src/areas/extensions/extensions.test.ts
+++ b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -3,17 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-import { SpectronApplication, Quality } from '../../spectron/application';
+import { Application, Quality } from '../../application';
 
 export function setup() {
 	describe('Extensions', () => {
-		before(function () {
-			this.app.suiteName = 'Extensions';
-		});
-
 		it(`install and activate vscode-smoketest-check extension`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			if (app.quality === Quality.Dev) {
 				this.skip();
@@ -23,16 +18,12 @@ export function setup() {
 			const extensionName = 'vscode-smoketest-check';
 			await app.workbench.extensions.openExtensionsViewlet();
 
-			const installed = await app.workbench.extensions.installExtension(extensionName);
-			assert.ok(installed);
+			await app.workbench.extensions.installExtension(extensionName);
 
 			await app.reload();
-			await app.workbench.extensions.waitForExtensionsViewlet();
-			await app.workbench.quickopen.runCommand('Smoke Test Check');
-
-			const statusbarText = await app.workbench.statusbar.getStatusbarTextByTitle('smoke test');
-			await app.screenCapturer.capture('Statusbar');
-			assert.equal(statusbarText, 'VS Code Smoke Test Check');
+			await app.workbench.extensions.openExtensionsViewlet();
+			await app.workbench.runCommand('Smoke Test Check');
+			await app.workbench.statusbar.waitForStatusbarText('smoke test', 'VS Code Smoke Test Check');
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/extensions/extensions.ts b/test/smoke/src/areas/extensions/extensions.ts
index d0c3f97320d..a523250e928 100644
--- a/test/smoke/src/areas/extensions/extensions.ts
+++ b/test/smoke/src/areas/extensions/extensions.ts
@@ -3,40 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Viewlet } from '../workbench/viewlet';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 const SEARCH_BOX = 'div.extensions-viewlet[id="workbench.view.extensions"] input.search-box';
 
 export class Extensions extends Viewlet {
 
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
+	constructor(code: Code, private commands: Commands) {
+		super(code);
 	}
 
 	async openExtensionsViewlet(): Promise<any> {
-		await this.spectron.runCommand('workbench.view.extensions');
-		await this.waitForExtensionsViewlet();
-	}
-
-	async waitForExtensionsViewlet(): Promise<any> {
-		await this.spectron.client.waitForActiveElement(SEARCH_BOX);
+		await this.commands.runCommand('workbench.view.extensions');
+		await this.code.waitForActiveElement(SEARCH_BOX);
 	}
 
 	async searchForExtension(name: string): Promise<any> {
-		await this.spectron.client.click(SEARCH_BOX);
-		await this.spectron.client.waitForActiveElement(SEARCH_BOX);
-		await this.spectron.client.setValue(SEARCH_BOX, name);
+		await this.code.waitAndClick(SEARCH_BOX);
+		await this.code.waitForActiveElement(SEARCH_BOX);
+		await this.code.waitForSetValue(SEARCH_BOX, `name:"${name}"`);
 	}
 
-	async installExtension(name: string): Promise<boolean> {
+	async installExtension(name: string): Promise<void> {
 		await this.searchForExtension(name);
-
-		// we might want to wait for a while longer since the Marketplace can be slow
-		// a minute should do
-		await this.spectron.client.waitFor(() => this.spectron.client.click(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.install`), void 0, 'waiting for install button', 600);
-
-		await this.spectron.client.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.reload`);
-		return true;
+		await this.code.waitAndClick(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.install`);
+		await this.code.waitForElement(`div.extensions-viewlet[id="workbench.view.extensions"] .monaco-list-row[aria-label="${name}"] .extension li[class='action-item'] .extension-action.reload`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts
index cc383b9b8c5..498bfd7780e 100644
--- a/test/smoke/src/areas/git/git.test.ts
+++ b/test/smoke/src/areas/git/git.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 const DIFF_EDITOR_LINE_INSERT = '.monaco-diff-editor .editor.modified .line-insert';
 const SYNC_STATUSBAR = 'div[id="workbench.parts.statusbar"] .statusbar-entry a[title$="Synchronize Changes"]';
@@ -12,39 +12,40 @@ const SYNC_STATUSBAR = 'div[id="workbench.parts.statusbar"] .statusbar-entry a[t
 export function setup() {
 	describe('Git', () => {
 		before(async function () {
-			const app = this.app as SpectronApplication;
-			app.suiteName = 'Git';
+			const app = this.app as Application;
+
+			cp.execSync('git config user.name testuser', { cwd: app.workspacePath });
+			cp.execSync('git config user.email monacotools@microsoft.com', { cwd: app.workspacePath });
 		});
 
 		it('reflects working tree changes', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
 
 			await app.workbench.quickopen.openFile('app.js');
 			await app.workbench.editor.waitForTypeInEditor('app.js', '.foo{}');
-			await app.workbench.saveOpenedFile();
+			await app.workbench.editors.saveOpenedFile();
 
 			await app.workbench.quickopen.openFile('index.jade');
 			await app.workbench.editor.waitForTypeInEditor('index.jade', 'hello world');
-			await app.workbench.saveOpenedFile();
+			await app.workbench.editors.saveOpenedFile();
 
 			await app.workbench.scm.refreshSCMViewlet();
 			await app.workbench.scm.waitForChange('app.js', 'Modified');
 			await app.workbench.scm.waitForChange('index.jade', 'Modified');
-			await app.screenCapturer.capture('changes');
 		});
 
 		it('opens diff editor', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
 			await app.workbench.scm.openChange('app.js');
-			await app.client.waitForElement(DIFF_EDITOR_LINE_INSERT);
+			await app.code.waitForElement(DIFF_EDITOR_LINE_INSERT);
 		});
 
 		it('stages correctly', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
 
@@ -58,7 +59,7 @@ export function setup() {
 		});
 
 		it(`stages, commits changes and verifies outgoing change`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.scm.openSCMViewlet();
 
@@ -67,13 +68,13 @@ export function setup() {
 			await app.workbench.scm.waitForChange('app.js', 'Index Modified');
 
 			await app.workbench.scm.commit('first commit');
-			await app.client.waitForText(SYNC_STATUSBAR, ' 0↓ 1↑');
+			await app.code.waitForTextContent(SYNC_STATUSBAR, ' 0↓ 1↑');
 
-			await app.workbench.quickopen.runCommand('Git: Stage All Changes');
+			await app.workbench.runCommand('Git: Stage All Changes');
 			await app.workbench.scm.waitForChange('index.jade', 'Index Modified');
 
 			await app.workbench.scm.commit('second commit');
-			await app.client.waitForText(SYNC_STATUSBAR, ' 0↓ 2↑');
+			await app.code.waitForTextContent(SYNC_STATUSBAR, ' 0↓ 2↑');
 
 			cp.execSync('git reset --hard origin/master', { cwd: app.workspacePath });
 		});
diff --git a/test/smoke/src/areas/git/scm.ts b/test/smoke/src/areas/git/scm.ts
index 7f25c3a3881..9c2a6f3e871 100644
--- a/test/smoke/src/areas/git/scm.ts
+++ b/test/smoke/src/areas/git/scm.ts
@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Viewlet } from '../workbench/viewlet';
+import { Commands } from '../workbench/workbench';
+import { IElement } from '../../vscode/driver';
+import { findElement, findElements, Code } from '../../vscode/code';
 
 const VIEWLET = 'div[id="workbench.view.scm"]';
 const SCM_INPUT = `${VIEWLET} .scm-editor textarea`;
@@ -22,84 +24,61 @@ interface Change {
 	actions: string[];
 }
 
+function toChange(element: IElement): Change {
+	const name = findElement(element, e => /\blabel-name\b/.test(e.className))!;
+	const type = element.attributes['data-tooltip'] || '';
+
+	const actionElementList = findElements(element, e => /\baction-label\b/.test(e.className));
+	const actions = actionElementList.map(e => e.attributes['title']);
+
+	return {
+		name: name.textContent || '',
+		type,
+		actions
+	};
+}
+
+
 export class SCM extends Viewlet {
 
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
+	constructor(code: Code, private commands: Commands) {
+		super(code);
 	}
 
 	async openSCMViewlet(): Promise<any> {
-		await this.spectron.runCommand('workbench.view.scm');
-		await this.spectron.client.waitForElement(SCM_INPUT);
+		await this.commands.runCommand('workbench.view.scm');
+		await this.code.waitForElement(SCM_INPUT);
 	}
 
-	waitForChange(name: string, type?: string): Promise<void> {
-		return this.spectron.client.waitFor(async () => {
-			const changes = await this.queryChanges(name, type);
-			return changes.length;
-		}, l => l > 0, 'Getting SCM changes') as Promise<any> as Promise<void>;
+	async waitForChange(name: string, type?: string): Promise<void> {
+		const func = (change: Change) => change.name === name && (!type || change.type === type);
+		await this.code.waitForElements(SCM_RESOURCE, true, elements => elements.some(e => func(toChange(e))));
 	}
 
 	async refreshSCMViewlet(): Promise<any> {
-		await this.spectron.client.click(REFRESH_COMMAND);
-	}
-
-	private async queryChanges(name: string, type?: string): Promise<Change[]> {
-		const result = await this.spectron.webclient.selectorExecute(SCM_RESOURCE, (div, name, type) => {
-			return (Array.isArray(div) ? div : [div])
-				.map(element => {
-					const name = element.querySelector('.label-name') as HTMLElement;
-					const type = element.getAttribute('data-tooltip') || '';
-					const actionElementList = element.querySelectorAll('.actions .action-label');
-					const actions: string[] = [];
-
-					for (let i = 0; i < actionElementList.length; i++) {
-						const element = actionElementList.item(i) as HTMLElement;
-						actions.push(element.title);
-					}
-
-					return {
-						name: name.textContent,
-						type,
-						actions
-					};
-				})
-				.filter(change => {
-					if (change.name !== name) {
-						return false;
-					}
-
-					if (type && (change.type !== type)) {
-						return false;
-					}
-
-					return true;
-				});
-		}, name, type);
-
-		return result;
+		await this.code.waitAndClick(REFRESH_COMMAND);
 	}
 
 	async openChange(name: string): Promise<void> {
-		await this.spectron.client.waitAndClick(SCM_RESOURCE_CLICK(name));
+		await this.code.waitAndClick(SCM_RESOURCE_CLICK(name));
 	}
 
 	async stage(name: string): Promise<void> {
-		await this.spectron.client.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Stage Changes'));
+		await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Stage Changes'));
 	}
 
 	async stageAll(): Promise<void> {
-		await this.spectron.client.waitAndClick(SCM_RESOURCE_GROUP_COMMAND_CLICK('Stage All Changes'));
+		await this.code.waitAndClick(SCM_RESOURCE_GROUP_COMMAND_CLICK('Stage All Changes'));
 	}
 
 	async unstage(name: string): Promise<void> {
-		await this.spectron.client.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Unstage Changes'));
+		await this.code.waitAndClick(SCM_RESOURCE_ACTION_CLICK(name, 'Unstage Changes'));
 	}
 
 	async commit(message: string): Promise<void> {
-		await this.spectron.client.waitAndClick(SCM_INPUT);
-		await this.spectron.client.waitForActiveElement(SCM_INPUT);
-		await this.spectron.client.setValue(SCM_INPUT, message);
-		await this.spectron.client.waitAndClick(COMMIT_COMMAND);
+		await this.code.waitAndClick(SCM_INPUT);
+		await this.code.waitForActiveElement(SCM_INPUT);
+		await this.code.waitForSetValue(SCM_INPUT, message);
+		await this.code.waitAndClick(COMMIT_COMMAND);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts
index b81df706cf3..86449f54858 100644
--- a/test/smoke/src/areas/multiroot/multiroot.test.ts
+++ b/test/smoke/src/areas/multiroot/multiroot.test.ts
@@ -3,16 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Multiroot', () => {
 
 		before(async function () {
-			this.app.suiteName = 'Multiroot';
-
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			// restart with preventing additional windows from restoring
 			// to ensure the window after restart is the multi-root workspace
@@ -20,7 +17,7 @@ export function setup() {
 		});
 
 		it('shows results from all folders', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.quickopen.openQuickOpen('*.*');
 
 			await app.workbench.quickopen.waitForQuickOpenElements(names => names.length === 6);
@@ -28,10 +25,8 @@ export function setup() {
 		});
 
 		it('shows workspace name in title', async function () {
-			const app = this.app as SpectronApplication;
-			const title = await app.client.getTitle();
-			await app.screenCapturer.capture('window title');
-			assert.ok(title.indexOf('smoketest (Workspace)') >= 0);
+			const app = this.app as Application;
+			await app.code.waitForTitle(title => /smoketest \(Workspace\)/i.test(title));
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/preferences/keybindings.ts b/test/smoke/src/areas/preferences/keybindings.ts
index 1de2eba3470..807a971891e 100644
--- a/test/smoke/src/areas/preferences/keybindings.ts
+++ b/test/smoke/src/areas/preferences/keybindings.ts
@@ -3,26 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 const SEARCH_INPUT = '.settings-search-input input';
 
 export class KeybindingsEditor {
 
-	constructor(private spectron: SpectronApplication) { }
+	constructor(private code: Code, private commands: Commands) { }
 
-	async updateKeybinding(command: string, keys: string[], ariaLabel: string): Promise<any> {
-		await this.spectron.runCommand('workbench.action.openGlobalKeybindings');
-		await this.spectron.client.waitForActiveElement(SEARCH_INPUT);
-		await this.spectron.client.setValue(SEARCH_INPUT, command);
+	async updateKeybinding(command: string, keybinding: string, ariaLabel: string): Promise<any> {
+		await this.commands.runCommand('workbench.action.openGlobalKeybindings');
+		await this.code.waitForActiveElement(SEARCH_INPUT);
+		await this.code.waitForSetValue(SEARCH_INPUT, command);
 
-		await this.spectron.client.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item');
-		await this.spectron.client.waitForElement('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item.focused.selected');
+		await this.code.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item');
+		await this.code.waitForElement('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item.focused.selected');
 
-		await this.spectron.client.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item .action-item .icon.add');
-		await this.spectron.client.waitForElement('.defineKeybindingWidget .monaco-inputbox.synthetic-focus');
+		await this.code.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item .action-item .icon.add');
+		await this.code.waitForElement('.defineKeybindingWidget .monaco-inputbox.synthetic-focus');
 
-		await this.spectron.client.keys([...keys, 'NULL', 'Enter', 'NULL']);
-		await this.spectron.client.waitForElement(`div[aria-label="Keybindings"] div[aria-label="Keybinding is ${ariaLabel}."]`);
+		await this.code.dispatchKeybinding(keybinding);
+		await this.code.dispatchKeybinding('enter');
+		await this.code.waitForElement(`div[aria-label="Keybindings"] div[aria-label="Keybinding is ${ariaLabel}."]`);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/preferences/preferences.test.ts b/test/smoke/src/areas/preferences/preferences.test.ts
index f273d6a9c12..1b2bbbec548 100644
--- a/test/smoke/src/areas/preferences/preferences.test.ts
+++ b/test/smoke/src/areas/preferences/preferences.test.ts
@@ -3,45 +3,34 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 import { ActivityBarPosition } from '../activitybar/activityBar';
 
 export function setup() {
 	describe('Preferences', () => {
-		before(function () {
-			this.app.suiteName = 'Preferences';
-		});
-
 		it('turns off editor line numbers and verifies the live change', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.explorer.openFile('app.js');
-			let lineNumbers = await app.client.waitForElements('.line-numbers');
-			await app.screenCapturer.capture('app.js has line numbers');
-			assert.ok(!!lineNumbers.length, 'Line numbers are not present in the editor before disabling them.');
+			await app.code.waitForElements('.line-numbers', false, elements => !!elements.length);
 
 			await app.workbench.settingsEditor.addUserSetting('editor.lineNumbers', '"off"');
-			await app.workbench.selectTab('app.js');
-			lineNumbers = await app.client.waitForElements('.line-numbers', result => !result || result.length === 0);
-
-			await app.screenCapturer.capture('line numbers hidden');
-			assert.ok(!lineNumbers.length, 'Line numbers are still present in the editor after disabling them.');
+			await app.workbench.editors.selectTab('app.js');
+			await app.code.waitForElements('.line-numbers', false, result => !result || result.length === 0);
 		});
 
 		it(`changes 'workbench.action.toggleSidebarPosition' command key binding and verifies it`, async function () {
-			const app = this.app as SpectronApplication;
-			assert.ok(await app.workbench.activitybar.getActivityBar(ActivityBarPosition.LEFT), 'Activity bar should be positioned on the left.');
+			const app = this.app as Application;
+			await app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.LEFT);
 
-			await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', ['Control', 'u'], 'Control+U');
+			await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', 'ctrl+u', 'Control+U');
 
-			await app.client.keys(['Control', 'u', 'NULL']);
-			assert.ok(await app.workbench.activitybar.getActivityBar(ActivityBarPosition.RIGHT), 'Activity bar was not moved to right after toggling its position.');
+			await app.code.dispatchKeybinding('ctrl+u');
+			await app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.RIGHT);
 		});
 
 		after(async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.settingsEditor.clearUserSettings();
 		});
 	});
diff --git a/test/smoke/src/areas/preferences/settings.ts b/test/smoke/src/areas/preferences/settings.ts
index 657d71357e9..7d398598f30 100644
--- a/test/smoke/src/areas/preferences/settings.ts
+++ b/test/smoke/src/areas/preferences/settings.ts
@@ -5,7 +5,10 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import { SpectronApplication } from '../../spectron/application';
+import { Commands } from '../workbench/workbench';
+import { Editor } from '../editor/editor';
+import { Editors } from '../editor/editors';
+import { Code } from '../../vscode/code';
 
 export enum ActivityBarPosition {
 	LEFT = 0,
@@ -13,33 +16,28 @@ export enum ActivityBarPosition {
 }
 
 const SEARCH_INPUT = '.settings-search-input input';
-const EDITOR = '.editable-preferences-editor-container .monaco-editor textarea';
 
 export class SettingsEditor {
 
-	constructor(private spectron: SpectronApplication) { }
+	constructor(private code: Code, private userDataPath: string, private commands: Commands, private editors: Editors, private editor: Editor) { }
 
 	async addUserSetting(setting: string, value: string): Promise<void> {
-		await this.spectron.runCommand('workbench.action.openGlobalSettings');
-		await this.spectron.client.waitAndClick(SEARCH_INPUT);
-		await this.spectron.client.waitForActiveElement(SEARCH_INPUT);
+		await this.commands.runCommand('workbench.action.openGlobalSettings');
+		await this.code.waitAndClick(SEARCH_INPUT);
+		await this.code.waitForActiveElement(SEARCH_INPUT);
 
-		await this.spectron.client.keys(['ArrowDown', 'NULL']);
-		await this.spectron.client.waitForActiveElement(EDITOR);
+		await this.editor.waitForEditorFocus('settings.json', 1, '.editable-preferences-editor-container');
 
-		await this.spectron.client.keys(['ArrowRight', 'NULL']);
-		await this.spectron.screenCapturer.capture('user settings is open and focused');
-
-		await this.spectron.workbench.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`, '.editable-preferences-editor-container');
-		await this.spectron.workbench.saveOpenedFile();
-
-		await this.spectron.screenCapturer.capture('user settings has changed');
+		await this.code.dispatchKeybinding('right');
+		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value}`, '.editable-preferences-editor-container');
+		await this.editors.saveOpenedFile();
 	}
 
 	async clearUserSettings(): Promise<void> {
-		const settingsPath = path.join(this.spectron.userDataPath, 'User', 'settings.json');
+		const settingsPath = path.join(this.userDataPath, 'User', 'settings.json');
 		await new Promise((c, e) => fs.writeFile(settingsPath, '{}', 'utf8', err => err ? e(err) : c()));
 
-		await this.spectron.workbench.editor.waitForEditorContents('settings.json', c => c.length === 0, '.editable-preferences-editor-container');
+		await this.commands.runCommand('workbench.action.openGlobalSettings');
+		await this.editor.waitForEditorContents('settings.json', c => c === '{}', '.editable-preferences-editor-container');
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/problems/problems.ts b/test/smoke/src/areas/problems/problems.ts
index 64156eced8e..0b82fa6914e 100644
--- a/test/smoke/src/areas/problems/problems.ts
+++ b/test/smoke/src/areas/problems/problems.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 export enum ProblemSeverity {
 	WARNING = 0,
@@ -14,31 +15,20 @@ export class Problems {
 
 	static PROBLEMS_VIEW_SELECTOR = '.panel.markers-panel';
 
-	constructor(private spectron: SpectronApplication) {
-		// noop
-	}
+	constructor(private code: Code, private commands: Commands) { }
 
 	public async showProblemsView(): Promise<any> {
-		if (!await this.isVisible()) {
-			await this.spectron.runCommand('workbench.actions.view.problems');
-			await this.waitForProblemsView();
-		}
+		await this.commands.runCommand('workbench.actions.view.problems');
+		await this.waitForProblemsView();
 	}
 
 	public async hideProblemsView(): Promise<any> {
-		if (await this.isVisible()) {
-			await this.spectron.runCommand('workbench.actions.view.problems');
-			await this.spectron.client.waitForElement(Problems.PROBLEMS_VIEW_SELECTOR, el => !el);
-		}
-	}
-
-	public async isVisible(): Promise<boolean> {
-		const element = await this.spectron.client.element(Problems.PROBLEMS_VIEW_SELECTOR);
-		return !!element;
+		await this.commands.runCommand('workbench.actions.view.problems');
+		await this.code.waitForElement(Problems.PROBLEMS_VIEW_SELECTOR, el => !el);
 	}
 
 	public async waitForProblemsView(): Promise<void> {
-		await this.spectron.client.waitForElement(Problems.PROBLEMS_VIEW_SELECTOR);
+		await this.code.waitForElement(Problems.PROBLEMS_VIEW_SELECTOR);
 	}
 
 	public static getSelectorInProblemsView(problemType: ProblemSeverity): string {
@@ -47,7 +37,7 @@ export class Problems {
 	}
 
 	public static getSelectorInEditor(problemType: ProblemSeverity): string {
-		let selector = problemType === ProblemSeverity.WARNING ? 'squiggly-c-warning' : 'squiggly-d-error';
+		let selector = problemType === ProblemSeverity.WARNING ? 'squiggly-warning' : 'squiggly-error';
 		return `.view-overlays .cdr.${selector}`;
 	}
 }
diff --git a/test/smoke/src/areas/quickopen/quickopen.ts b/test/smoke/src/areas/quickopen/quickopen.ts
index 9d76495c81f..70b60ec7ab7 100644
--- a/test/smoke/src/areas/quickopen/quickopen.ts
+++ b/test/smoke/src/areas/quickopen/quickopen.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Editors } from '../editor/editors';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 export class QuickOpen {
 
@@ -12,77 +14,99 @@ export class QuickOpen {
 	static QUICK_OPEN_INPUT = `${QuickOpen.QUICK_OPEN} .quick-open-input input`;
 	static QUICK_OPEN_FOCUSED_ELEMENT = `${QuickOpen.QUICK_OPEN} .quick-open-tree .monaco-tree-row.focused .monaco-highlighted-label`;
 	static QUICK_OPEN_ENTRY_SELECTOR = 'div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties .monaco-tree-row .quick-open-entry';
+	static QUICK_OPEN_ENTRY_LABEL_SELECTOR = 'div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties .monaco-tree-row .quick-open-entry .label-name';
 
-	constructor(readonly spectron: SpectronApplication) { }
+	constructor(private code: Code, private commands: Commands, private editors: Editors) { }
 
 	async openQuickOpen(value: string): Promise<void> {
-		await this.spectron.runCommand('workbench.action.quickOpen');
-		await this.waitForQuickOpenOpened();
+		let retries = 0;
+
+		// other parts of code might steal focus away from quickopen :(
+		while (retries < 5) {
+			await this.commands.runCommand('workbench.action.quickOpen');
+
+			try {
+				await this.waitForQuickOpenOpened(10);
+				break;
+			} catch (err) {
+				if (++retries > 5) {
+					throw err;
+				}
+
+				await this.code.dispatchKeybinding('escape');
+			}
+		}
 
 		if (value) {
-			await this.spectron.client.setValue(QuickOpen.QUICK_OPEN_INPUT, value);
+			await this.code.waitForSetValue(QuickOpen.QUICK_OPEN_INPUT, value);
 		}
 	}
 
 	async closeQuickOpen(): Promise<void> {
-		await this.spectron.runCommand('workbench.action.closeQuickOpen');
+		await this.commands.runCommand('workbench.action.closeQuickOpen');
 		await this.waitForQuickOpenClosed();
 	}
 
 	async openFile(fileName: string): Promise<void> {
 		await this.openQuickOpen(fileName);
 
-		await this.waitForQuickOpenElements(names => names.some(n => n === fileName));
-		await this.spectron.client.keys(['Enter', 'NULL']);
-		await this.spectron.workbench.waitForActiveTab(fileName);
-		await this.spectron.workbench.waitForEditorFocus(fileName);
+		await this.waitForQuickOpenElements(names => names[0] === fileName);
+		await this.code.dispatchKeybinding('enter');
+		await this.editors.waitForActiveTab(fileName);
+		await this.editors.waitForEditorFocus(fileName);
 	}
 
-	async runCommand(commandText: string): Promise<void> {
-		await this.openQuickOpen(`> ${commandText}`);
-
-		// wait for best choice to be focused
-		await this.spectron.client.waitForTextContent(QuickOpen.QUICK_OPEN_FOCUSED_ELEMENT, commandText);
-
-		// wait and click on best choice
-		await this.spectron.client.waitAndClick(QuickOpen.QUICK_OPEN_FOCUSED_ELEMENT);
-	}
-
-	async waitForQuickOpenOpened(): Promise<void> {
-		await this.spectron.client.waitForActiveElement(QuickOpen.QUICK_OPEN_INPUT);
+	async waitForQuickOpenOpened(retryCount?: number): Promise<void> {
+		await this.code.waitForActiveElement(QuickOpen.QUICK_OPEN_INPUT, retryCount);
 	}
 
 	private async waitForQuickOpenClosed(): Promise<void> {
-		await this.spectron.client.waitForElement(QuickOpen.QUICK_OPEN_HIDDEN);
+		await this.code.waitForElement(QuickOpen.QUICK_OPEN_HIDDEN);
 	}
 
 	async submit(text: string): Promise<void> {
-		await this.spectron.client.setValue(QuickOpen.QUICK_OPEN_INPUT, text);
-		await this.spectron.client.keys(['Enter', 'NULL']);
+		await this.code.waitForSetValue(QuickOpen.QUICK_OPEN_INPUT, text);
+		await this.code.dispatchKeybinding('enter');
 		await this.waitForQuickOpenClosed();
 	}
 
 	async selectQuickOpenElement(index: number): Promise<void> {
 		await this.waitForQuickOpenOpened();
 		for (let from = 0; from < index; from++) {
-			await this.spectron.client.keys(['ArrowDown', 'NULL']);
+			await this.code.dispatchKeybinding('down');
 		}
-		await this.spectron.client.keys(['Enter', 'NULL']);
+		await this.code.dispatchKeybinding('enter');
 		await this.waitForQuickOpenClosed();
 	}
 
 	async waitForQuickOpenElements(accept: (names: string[]) => boolean): Promise<void> {
-		await this.spectron.client.waitFor(() => this.getQuickOpenElements(), accept);
+		await this.code.waitForElements(QuickOpen.QUICK_OPEN_ENTRY_LABEL_SELECTOR, false, els => accept(els.map(e => e.textContent)));
 	}
 
-	private async getQuickOpenElements(): Promise<string[]> {
-		const result = await this.spectron.webclient.selectorExecute(QuickOpen.QUICK_OPEN_ENTRY_SELECTOR,
-			div => (Array.isArray(div) ? div : [div]).map(element => {
-				const name = element.querySelector('.label-name') as HTMLElement;
-				return name.textContent;
-			})
-		);
+	async runCommand(command: string): Promise<void> {
+		await this.openQuickOpen(`> ${command}`);
 
-		return Array.isArray(result) ? result : [];
+		// wait for best choice to be focused
+		await this.code.waitForTextContent(QuickOpen.QUICK_OPEN_FOCUSED_ELEMENT, command);
+
+		// wait and click on best choice
+		await this.code.waitAndClick(QuickOpen.QUICK_OPEN_FOCUSED_ELEMENT);
+	}
+
+	async openQuickOutline(): Promise<void> {
+		let retries = 0;
+
+		while (++retries < 10) {
+			await this.commands.runCommand('workbench.action.gotoSymbol');
+
+			const text = await this.code.waitForTextContent('div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties div.monaco-tree-row .quick-open-entry .monaco-icon-label .label-name .monaco-highlighted-label span');
+
+			if (text !== 'No symbol information for the file') {
+				return;
+			}
+
+			await this.closeQuickOpen();
+			await new Promise(c => setTimeout(c, 250));
+		}
 	}
 }
diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index a0e932298b6..484e428e7b1 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -3,16 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Search', () => {
-		before(function () {
-			this.app.suiteName = 'Search';
-		});
-
 		it('searches for body & checks for correct result number', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.search.openSearchViewlet();
 			await app.workbench.search.searchFor('body');
 
@@ -20,7 +16,7 @@ export function setup() {
 		});
 
 		it('searches only for *.js files & checks for correct result number', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.showQueryDetails();
 			await app.workbench.search.setFilesToIncludeText('*.js');
@@ -32,27 +28,25 @@ export function setup() {
 		});
 
 		it('dismisses result & checks for correct result number', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.removeFileMatch(1);
 			await app.workbench.search.waitForResultText('10 results in 4 files');
 		});
 
 		it('replaces first search result with a replace term', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.search.searchFor('body');
 			await app.workbench.search.expandReplace();
 			await app.workbench.search.setReplaceText('ydob');
 			await app.workbench.search.replaceFileMatch(1);
-			await app.workbench.saveOpenedFile();
 
 			await app.workbench.search.waitForResultText('10 results in 4 files');
 
 			await app.workbench.search.searchFor('ydob');
 			await app.workbench.search.setReplaceText('body');
 			await app.workbench.search.replaceFileMatch(1);
-			await app.workbench.saveOpenedFile();
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/search/search.ts b/test/smoke/src/areas/search/search.ts
index f2d98866b02..9052aaca126 100644
--- a/test/smoke/src/areas/search/search.ts
+++ b/test/smoke/src/areas/search/search.ts
@@ -3,85 +3,77 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Viewlet } from '../workbench/viewlet';
+import { Commands } from '../workbench/workbench';
+import { Code } from '../../vscode/code';
 
 const VIEWLET = 'div[id="workbench.view.search"] .search-view';
 const INPUT = `${VIEWLET} .search-widget .search-container .monaco-inputbox input`;
-const INCLUDE_INPUT = `${VIEWLET} .query-details .monaco-inputbox input[aria-label="Search Include Patterns"]`;
+const INCLUDE_INPUT = `${VIEWLET} .query-details .file-types.includes .monaco-inputbox input`;
 
 export class Search extends Viewlet {
 
-	constructor(spectron: SpectronApplication) {
-		super(spectron);
+	constructor(code: Code, private commands: Commands) {
+		super(code);
 	}
 
 	async openSearchViewlet(): Promise<any> {
-		await this.spectron.runCommand('workbench.view.search');
-		await this.spectron.client.waitForActiveElement(INPUT);
+		await this.commands.runCommand('workbench.view.search');
+		await this.code.waitForActiveElement(INPUT);
 	}
 
 	async searchFor(text: string): Promise<void> {
-		await this.spectron.client.click(INPUT);
-		await this.spectron.client.waitForActiveElement(INPUT);
-		await this.spectron.client.setValue(INPUT, text);
+		await this.code.waitAndClick(INPUT);
+		await this.code.waitForActiveElement(INPUT);
+		await this.code.waitForSetValue(INPUT, text);
 		await this.submitSearch();
 	}
 
 	async submitSearch(): Promise<void> {
-		await this.spectron.client.click(INPUT);
-		await this.spectron.client.waitForActiveElement(INPUT);
+		await this.code.waitAndClick(INPUT);
+		await this.code.waitForActiveElement(INPUT);
 
-		await this.spectron.client.keys(['Enter', 'NULL']);
-		await this.spectron.client.element(`${VIEWLET} .messages[aria-hidden="false"]`);
+		await this.code.dispatchKeybinding('enter');
+		await this.code.waitForElement(`${VIEWLET} .messages[aria-hidden="false"]`);
 	}
 
 	async setFilesToIncludeText(text: string): Promise<void> {
-		await this.spectron.client.click(INCLUDE_INPUT);
-		await this.spectron.client.waitForActiveElement(INCLUDE_INPUT);
-		await this.spectron.client.setValue(INCLUDE_INPUT, text || '');
+		await this.code.waitAndClick(INCLUDE_INPUT);
+		await this.code.waitForActiveElement(INCLUDE_INPUT);
+		await this.code.waitForSetValue(INCLUDE_INPUT, text || '');
 	}
 
 	async showQueryDetails(): Promise<void> {
-		if (!await this.areDetailsVisible()) {
-			await this.spectron.client.waitAndClick(`${VIEWLET} .query-details .more`);
-		}
+		await this.code.waitAndClick(`${VIEWLET} .query-details .more`);
 	}
 
 	async hideQueryDetails(): Promise<void> {
-		if (await this.areDetailsVisible()) {
-			await this.spectron.client.waitAndClick(`${VIEWLET} .query-details.more .more`);
-		}
-	}
-
-	async areDetailsVisible(): Promise<boolean> {
-		const element = await this.spectron.client.element(`${VIEWLET} .query-details.more`);
-		return !!element;
+		await this.code.waitAndClick(`${VIEWLET} .query-details.more .more`);
 	}
 
 	async removeFileMatch(index: number): Promise<void> {
-		await this.spectron.client.waitAndMoveToObject(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch`);
-		const file = await this.spectron.client.waitForText(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch a.label-name`);
-		await this.spectron.client.waitAndClick(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch .action-label.icon.action-remove`);
-		await this.spectron.client.waitForText(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch a.label-name`, void 0, result => result !== file);
+		await this.code.waitAndMove(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch`);
+		const file = await this.code.waitForTextContent(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch a.label-name`);
+		await this.code.waitAndClick(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch .action-label.icon.action-remove`);
+		await this.code.waitForTextContent(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch a.label-name`, void 0, result => result !== file);
 	}
 
 	async expandReplace(): Promise<void> {
-		await this.spectron.client.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.collapse`);
+		await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.collapse`);
 	}
 
 	async setReplaceText(text: string): Promise<void> {
-		await this.spectron.client.waitAndClick(`${VIEWLET} .search-widget .replace-container .monaco-inputbox input[title="Replace"]`);
-		await this.spectron.client.element(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`);
-		await this.spectron.client.setValue(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`, text);
+		await this.code.waitAndClick(`${VIEWLET} .search-widget .replace-container .monaco-inputbox input[title="Replace"]`);
+		await this.code.waitForElement(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`);
+		await this.code.waitForSetValue(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`, text);
 	}
 
 	async replaceFileMatch(index: number): Promise<void> {
-		await this.spectron.client.waitAndMoveToObject(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch`);
-		await this.spectron.client.click(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch .action-label.icon.action-replace-all`);
+		await this.code.waitAndMove(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch`);
+		await this.code.waitAndClick(`${VIEWLET} .results .monaco-tree-rows>:nth-child(${index}) .filematch .action-label.icon.action-replace-all`);
 	}
 
 	async waitForResultText(text: string): Promise<void> {
-		await this.spectron.client.waitForText(`${VIEWLET} .messages[aria-hidden="false"] .message>p`, text);
+		await this.code.waitForTextContent(`${VIEWLET} .messages[aria-hidden="false"] .message>p`, text);
 	}
 }
diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts
index 044af05c8d9..9fcd47bf9b5 100644
--- a/test/smoke/src/areas/statusbar/statusbar.test.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.test.ts
@@ -3,19 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-
-import { SpectronApplication, Quality } from '../../spectron/application';
+import { Application, Quality } from '../../application';
 import { StatusBarElement } from './statusbar';
 
 export function setup() {
 	describe('Statusbar', () => {
-		before(function () {
-			this.app.suiteName = 'Statusbar';
-		});
-
 		it('verifies presence of all default status bar elements', async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.statusbar.waitForStatusbarElement(StatusBarElement.BRANCH_STATUS);
 			if (app.quality !== Quality.Dev) {
@@ -33,7 +27,7 @@ export function setup() {
 		});
 
 		it(`verifies that 'quick open' opens when clicking on status bar elements`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.statusbar.clickOn(StatusBarElement.BRANCH_STATUS);
 			await app.workbench.quickopen.waitForQuickOpenOpened();
@@ -55,25 +49,25 @@ export function setup() {
 		});
 
 		it(`verifies that 'Problems View' appears when clicking on 'Problems' status element`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.statusbar.clickOn(StatusBarElement.PROBLEMS_STATUS);
 			await app.workbench.problems.waitForProblemsView();
 		});
 
 		it(`verifies that 'Tweet us feedback' pop-up appears when clicking on 'Feedback' icon`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			if (app.quality === Quality.Dev) {
 				return this.skip();
 			}
 
 			await app.workbench.statusbar.clickOn(StatusBarElement.FEEDBACK_ICON);
-			assert.ok(!!await app.client.waitForElement('.feedback-form'));
+			await app.code.waitForElement('.feedback-form');
 		});
 
 		it(`checks if 'Go to Line' works if called from the status bar`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.quickopen.openFile('app.js');
 			await app.workbench.statusbar.clickOn(StatusBarElement.SELECTION_STATUS);
@@ -81,11 +75,11 @@ export function setup() {
 			await app.workbench.quickopen.waitForQuickOpenOpened();
 
 			await app.workbench.quickopen.submit(':15');
-			await app.workbench.editor.waitForHighlightingLine(15);
+			await app.workbench.editor.waitForHighlightingLine('app.js', 15);
 		});
 
 		it(`verifies if changing EOL is reflected in the status bar`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			await app.workbench.quickopen.openFile('app.js');
 			await app.workbench.statusbar.clickOn(StatusBarElement.EOL_STATUS);
diff --git a/test/smoke/src/areas/statusbar/statusbar.ts b/test/smoke/src/areas/statusbar/statusbar.ts
index b33121994d6..dd3392a5a9c 100644
--- a/test/smoke/src/areas/statusbar/statusbar.ts
+++ b/test/smoke/src/areas/statusbar/statusbar.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Code } from '../../vscode/code';
 
 export enum StatusBarElement {
 	BRANCH_STATUS = 0,
@@ -23,23 +23,22 @@ export class StatusBar {
 	private readonly leftSelector = '.statusbar-item.left';
 	private readonly rightSelector = '.statusbar-item.right';
 
-	constructor(private spectron: SpectronApplication) {
+	constructor(private code: Code) { }
+
+	async waitForStatusbarElement(element: StatusBarElement): Promise<void> {
+		await this.code.waitForElement(this.getSelector(element));
 	}
 
-	public async waitForStatusbarElement(element: StatusBarElement): Promise<void> {
-		await this.spectron.client.waitForElement(this.getSelector(element));
+	async clickOn(element: StatusBarElement): Promise<void> {
+		await this.code.waitAndClick(this.getSelector(element));
 	}
 
-	public async clickOn(element: StatusBarElement): Promise<void> {
-		await this.spectron.client.waitAndClick(this.getSelector(element));
+	async waitForEOL(eol: string): Promise<string> {
+		return this.code.waitForTextContent(this.getSelector(StatusBarElement.EOL_STATUS), eol);
 	}
 
-	public async waitForEOL(eol: string): Promise<string> {
-		return this.spectron.client.waitForText(this.getSelector(StatusBarElement.EOL_STATUS), eol);
-	}
-
-	public async getStatusbarTextByTitle(title: string): Promise<string> {
-		return await this.spectron.client.waitForText(`${this.mainSelector} span[title="smoke test"]`);
+	async waitForStatusbarText(title: string, text: string): Promise<void> {
+		await this.code.waitForTextContent(`${this.mainSelector} span[title="${title}"]`, text);
 	}
 
 	private getSelector(element: StatusBarElement): string {
diff --git a/test/smoke/src/areas/terminal/terminal.test.ts b/test/smoke/src/areas/terminal/terminal.test.ts
index abbb77e61d5..4c8c27e3794 100644
--- a/test/smoke/src/areas/terminal/terminal.test.ts
+++ b/test/smoke/src/areas/terminal/terminal.test.ts
@@ -3,27 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
-describe('Terminal', () => {
-	// let app: SpectronApplication;
-	// before(() => { app = new SpectronApplication(); return app.start('Terminal'); });
-	// after(() => app.stop());
+export function setup() {
+	describe('Terminal', () => {
+		it(`opens terminal, runs 'echo' and verifies the output`, async function () {
+			const app = this.app as Application;
 
-	// it(`opens terminal, runs 'echo' and verifies the output`, async function () {
-	// 	const expected = new Date().getTime().toString();
-	// 	await app.workbench.terminal.showTerminal();
-
-	// 	await app.workbench.terminal.runCommand(`echo ${expected}`);
-
-	// 	await app.workbench.terminal.waitForTerminalText(terminalText => {
-	// 		// Last line will not contain the output
-	// 		for (let index = terminalText.length - 2; index >= 0; index--) {
-	// 			if (!!terminalText[index] && terminalText[index].trim() === expected) {
-	// 				return true;
-	// 			}
-	// 		}
-	// 		return false;
-	// 	});
-	// });
-});
\ No newline at end of file
+			const expected = new Date().getTime().toString();
+			await app.workbench.terminal.showTerminal();
+			await app.workbench.terminal.runCommand(`echo ${expected}`);
+			await app.workbench.terminal.waitForTerminalText(terminalText => {
+				for (let index = terminalText.length - 2; index >= 0; index--) {
+					if (!!terminalText[index] && terminalText[index].trim() === expected) {
+						return true;
+					}
+				}
+				return false;
+			});
+		});
+	});
+}
\ No newline at end of file
diff --git a/test/smoke/src/areas/terminal/terminal.ts b/test/smoke/src/areas/terminal/terminal.ts
index 951497edccf..6e5e02735ca 100644
--- a/test/smoke/src/areas/terminal/terminal.ts
+++ b/test/smoke/src/areas/terminal/terminal.ts
@@ -3,59 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Code } from '../../vscode/code';
+import { Commands } from '../workbench/workbench';
 
 const PANEL_SELECTOR = 'div[id="workbench.panel.terminal"]';
 const XTERM_SELECTOR = `${PANEL_SELECTOR} .terminal-wrapper`;
+const XTERM_TEXTAREA = `${XTERM_SELECTOR} textarea.xterm-helper-textarea`;
 
 export class Terminal {
 
-	constructor(private spectron: SpectronApplication) { }
+	constructor(private code: Code, private commands: Commands) { }
 
 	async showTerminal(): Promise<void> {
-		if (!await this.isVisible()) {
-			await this.spectron.workbench.quickopen.runCommand('View: Toggle Integrated Terminal');
-			await this.spectron.client.waitForElement(XTERM_SELECTOR);
-			await this.waitForTerminalText(text => text.length > 0, 'Waiting for Terminal to be ready');
-		}
-	}
-
-	async isVisible(): Promise<boolean> {
-		const element = await this.spectron.client.element(PANEL_SELECTOR);
-		return !!element;
+		await this.commands.runCommand('workbench.action.terminal.toggleTerminal');
+		await this.code.waitForActiveElement(XTERM_TEXTAREA);
+		await this.code.waitForTerminalBuffer(XTERM_SELECTOR, lines => lines.some(line => line.length > 0));
 	}
 
 	async runCommand(commandText: string): Promise<void> {
-		// TODO@Tyriar fix this. we should not use type but setValue
-		// await this.spectron.client.type(commandText);
-		await this.spectron.client.keys(['Enter', 'NULL']);
+		await this.code.waitForPaste(XTERM_TEXTAREA, commandText);
+		await this.code.dispatchKeybinding('enter');
 	}
 
-	async waitForTerminalText(fn: (text: string[]) => boolean, timeOutDescription: string = 'Getting Terminal Text'): Promise<string[]> {
-		return this.spectron.client.waitFor(async () => {
-			const terminalText = await this.getTerminalText();
-			if (fn(terminalText)) {
-				return terminalText;
-			}
-			return undefined;
-		}, void 0, timeOutDescription);
-	}
-
-	getCurrentLineNumber(): Promise<number> {
-		return this.getTerminalText().then(text => text.length);
-	}
-
-	private async getTerminalText(): Promise<string[]> {
-		return await this.spectron.webclient.selectorExecute(XTERM_SELECTOR,
-			div => {
-				const xterm = (<any>(Array.isArray(div) ? div[0] : div)).xterm;
-				const buffer = xterm.buffer;
-				const lines: string[] = [];
-				for (let i = 0; i < buffer.lines.length; i++) {
-					lines.push(buffer.translateBufferLineToString(i, true));
-				}
-				return lines;
-			}
-		);
+	async waitForTerminalText(accept: (buffer: string[]) => boolean): Promise<void> {
+		await this.code.waitForTerminalBuffer(XTERM_SELECTOR, accept);
 	}
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/data-loss.test.ts b/test/smoke/src/areas/workbench/data-loss.test.ts
index 8e6cb42d4ab..4dc1e37ab26 100644
--- a/test/smoke/src/areas/workbench/data-loss.test.ts
+++ b/test/smoke/src/areas/workbench/data-loss.test.ts
@@ -3,39 +3,30 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+import { Application } from '../../application';
 
 export function setup() {
 	describe('Dataloss', () => {
-		before(function () {
-			this.app.suiteName = 'Dataloss';
-		});
-
 		it(`verifies that 'hot exit' works for dirty files`, async function () {
-			const app = this.app as SpectronApplication;
-			await app.workbench.newUntitledFile();
+			const app = this.app as Application;
+			await app.workbench.editors.newUntitledFile();
 
 			const untitled = 'Untitled-1';
 			const textToTypeInUntitled = 'Hello, Unitled Code';
 			await app.workbench.editor.waitForTypeInEditor(untitled, textToTypeInUntitled);
-			await app.screenCapturer.capture('Untitled file before reload');
 
 			const readmeMd = 'readme.md';
 			const textToType = 'Hello, Code';
 			await app.workbench.explorer.openFile(readmeMd);
 			await app.workbench.editor.waitForTypeInEditor(readmeMd, textToType);
-			await app.screenCapturer.capture(`${readmeMd} before reload`);
 
 			await app.reload();
-			await app.screenCapturer.capture('After reload');
 
-			await app.workbench.waitForActiveTab(readmeMd, true);
-			await app.screenCapturer.capture(`${readmeMd} after reload`);
+			await app.workbench.editors.waitForActiveTab(readmeMd, true);
 			await app.workbench.editor.waitForEditorContents(readmeMd, c => c.indexOf(textToType) > -1);
 
-			await app.workbench.waitForTab(untitled, true);
-			await app.workbench.selectTab(untitled, true);
-			await app.screenCapturer.capture('Untitled file after reload');
+			await app.workbench.editors.waitForTab(untitled, true);
+			await app.workbench.editors.selectTab(untitled, true);
 			await app.workbench.editor.waitForEditorContents(untitled, c => c.indexOf(textToTypeInUntitled) > -1);
 		});
 	});
diff --git a/test/smoke/src/areas/workbench/data-migration.test.ts b/test/smoke/src/areas/workbench/data-migration.test.ts
index 7a2877ab4ad..f4084ca624b 100644
--- a/test/smoke/src/areas/workbench/data-migration.test.ts
+++ b/test/smoke/src/areas/workbench/data-migration.test.ts
@@ -3,130 +3,109 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-
-import { SpectronApplication, Quality } from '../../spectron/application';
+import { Application, Quality } from '../../application';
 import * as rimraf from 'rimraf';
 
 export interface ICreateAppFn {
-	(quality: Quality): SpectronApplication | null;
+	(quality: Quality): Application;
 }
 
 export function setup(userDataDir: string, createApp: ICreateAppFn) {
 
 	describe('Data Migration', () => {
+
 		afterEach(async function () {
 			await new Promise((c, e) => rimraf(userDataDir, { maxBusyTries: 10 }, err => err ? e(err) : c()));
 		});
 
-		it('checks if the Untitled file is restored migrating from stable to latest', async function () {
-			const stableApp = createApp(Quality.Stable);
+		// it('checks if the Untitled file is restored migrating from stable to latest', async function () {
+		// 	const stableApp = createApp(Quality.Stable);
 
-			if (!stableApp) {
-				this.skip();
-				return;
-			}
+		// 	if (!stableApp) {
+		// 		this.skip();
+		// 		return;
+		// 	}
 
-			await stableApp.start();
-			stableApp.suiteName = 'Data Migration';
+		// 	await stableApp.start();
 
-			const textToType = 'Very dirty file';
+		// 	const textToType = 'Very dirty file';
 
-			await stableApp.workbench.newUntitledFile();
-			await stableApp.workbench.editor.waitForTypeInEditor('Untitled-1', textToType);
+		// 	await stableApp.workbench.editors.newUntitledFile();
+		// 	await stableApp.workbench.editor.waitForTypeInEditor('Untitled-1', textToType);
 
-			await stableApp.stop();
-			await new Promise(c => setTimeout(c, 500)); // wait until all resources are released (e.g. locked local storage)
+		// 	await stableApp.stop();
+		// 	await new Promise(c => setTimeout(c, 500)); // wait until all resources are released (e.g. locked local storage)
 
-			// Checking latest version for the restored state
-			const app = createApp(Quality.Insiders);
+		// 	// Checking latest version for the restored state
+		// 	const app = createApp(Quality.Insiders);
 
-			if (!app) {
-				return assert(false);
-			}
+		// 	await app.start(false);
 
-			await app.start(false);
-			app.suiteName = 'Data Migration';
+		// 	await app.workbench.editors.waitForActiveTab('Untitled-1', true);
+		// 	await app.workbench.editor.waitForEditorContents('Untitled-1', c => c.indexOf(textToType) > -1);
 
-			assert.ok(await app.workbench.waitForActiveTab('Untitled-1', true), `Untitled-1 tab is not present after migration.`);
+		// 	await app.stop();
+		// });
 
-			await app.workbench.editor.waitForEditorContents('Untitled-1', c => c.indexOf(textToType) > -1);
-			await app.screenCapturer.capture('Untitled file text');
+		// it('checks if the newly created dirty file is restored migrating from stable to latest', async function () {
+		// 	const stableApp = createApp(Quality.Stable);
 
-			await app.stop();
-		});
+		// 	if (!stableApp) {
+		// 		this.skip();
+		// 		return;
+		// 	}
 
-		it('checks if the newly created dirty file is restored migrating from stable to latest', async function () {
-			const stableApp = createApp(Quality.Stable);
+		// 	await stableApp.start();
 
-			if (!stableApp) {
-				this.skip();
-				return;
-			}
+		// 	const fileName = 'app.js';
+		// 	const textPart = 'This is going to be an unsaved file';
 
-			await stableApp.start();
-			stableApp.suiteName = 'Data Migration';
+		// 	await stableApp.workbench.quickopen.openFile(fileName);
 
-			const fileName = 'app.js';
-			const textPart = 'This is going to be an unsaved file';
+		// 	await stableApp.workbench.editor.waitForTypeInEditor(fileName, textPart);
 
-			await stableApp.workbench.quickopen.openFile(fileName);
+		// 	await stableApp.stop();
+		// 	await new Promise(c => setTimeout(c, 500)); // wait until all resources are released (e.g. locked local storage)
 
-			await stableApp.workbench.editor.waitForTypeInEditor(fileName, textPart);
+		// 	// Checking latest version for the restored state
+		// 	const app = createApp(Quality.Insiders);
 
-			await stableApp.stop();
-			await new Promise(c => setTimeout(c, 500)); // wait until all resources are released (e.g. locked local storage)
+		// 	await app.start(false);
 
-			// Checking latest version for the restored state
-			const app = createApp(Quality.Insiders);
+		// 	await app.workbench.editors.waitForActiveTab(fileName);
+		// 	await app.workbench.editor.waitForEditorContents(fileName, c => c.indexOf(textPart) > -1);
 
-			if (!app) {
-				return assert(false);
-			}
+		// 	await app.stop();
+		// });
 
-			await app.start(false);
-			app.suiteName = 'Data Migration';
+		// it('checks if opened tabs are restored migrating from stable to latest', async function () {
+		// 	const stableApp = createApp(Quality.Stable);
 
-			assert.ok(await app.workbench.waitForActiveTab(fileName), `dirty file tab is not present after migration.`);
-			await app.workbench.editor.waitForEditorContents(fileName, c => c.indexOf(textPart) > -1);
+		// 	if (!stableApp) {
+		// 		this.skip();
+		// 		return;
+		// 	}
 
-			await app.stop();
-		});
+		// 	await stableApp.start();
 
-		it('checks if opened tabs are restored migrating from stable to latest', async function () {
-			const stableApp = createApp(Quality.Stable);
+		// 	const fileName1 = 'app.js', fileName2 = 'jsconfig.json', fileName3 = 'readme.md';
 
-			if (!stableApp) {
-				this.skip();
-				return;
-			}
+		// 	await stableApp.workbench.quickopen.openFile(fileName1);
+		// 	await stableApp.workbench.runCommand('View: Keep Editor');
+		// 	await stableApp.workbench.quickopen.openFile(fileName2);
+		// 	await stableApp.workbench.runCommand('View: Keep Editor');
+		// 	await stableApp.workbench.quickopen.openFile(fileName3);
+		// 	await stableApp.stop();
 
-			await stableApp.start();
-			stableApp.suiteName = 'Data Migration';
+		// 	const app = createApp(Quality.Insiders);
 
-			const fileName1 = 'app.js', fileName2 = 'jsconfig.json', fileName3 = 'readme.md';
+		// 	await app.start(false);
 
-			await stableApp.workbench.quickopen.openFile(fileName1);
-			await stableApp.workbench.quickopen.runCommand('View: Keep Editor');
-			await stableApp.workbench.quickopen.openFile(fileName2);
-			await stableApp.workbench.quickopen.runCommand('View: Keep Editor');
-			await stableApp.workbench.quickopen.openFile(fileName3);
-			await stableApp.stop();
+		// 	await app.workbench.editors.waitForTab(fileName1);
+		// 	await app.workbench.editors.waitForTab(fileName2);
+		// 	await app.workbench.editors.waitForTab(fileName3);
 
-			const app = createApp(Quality.Insiders);
-
-			if (!app) {
-				return assert(false);
-			}
-
-			await app.start(false);
-			app.suiteName = 'Data Migration';
-
-			assert.ok(await app.workbench.waitForTab(fileName1), `${fileName1} tab was not restored after migration.`);
-			assert.ok(await app.workbench.waitForTab(fileName2), `${fileName2} tab was not restored after migration.`);
-			assert.ok(await app.workbench.waitForTab(fileName3), `${fileName3} tab was not restored after migration.`);
-
-			await app.stop();
-		});
+		// 	await app.stop();
+		// });
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
index 0251a9bf964..ea7a25bf8cf 100644
--- a/test/smoke/src/areas/workbench/localization.test.ts
+++ b/test/smoke/src/areas/workbench/localization.test.ts
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-
-import { SpectronApplication, Quality } from '../../spectron/application';
+import { Application, Quality } from '../../application';
 
 export function setup() {
 	describe('Localization', () => {
 		before(async function () {
-			const app = this.app as SpectronApplication;
-			this.app.suiteName = 'Localization';
+			const app = this.app as Application;
 
 			if (app.quality === Quality.Dev) {
 				return;
@@ -21,36 +18,26 @@ export function setup() {
 		});
 
 		it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () {
-			const app = this.app as SpectronApplication;
+			const app = this.app as Application;
 
 			if (app.quality === Quality.Dev) {
 				this.skip();
 				return;
 			}
 
-			let text = await app.workbench.explorer.getOpenEditorsViewTitle();
-			await app.screenCapturer.capture('Open editors title');
-			assert(/geöffnete editoren/i.test(text));
+			await app.workbench.explorer.waitForOpenEditorsViewTitle(title => /geöffnete editoren/i.test(title));
 
 			await app.workbench.search.openSearchViewlet();
-			text = await app.workbench.search.getTitle();
-			await app.screenCapturer.capture('Search title');
-			assert(/suchen/i.test(text));
+			await app.workbench.search.waitForTitle(title => /suchen/i.test(title));
 
 			await app.workbench.scm.openSCMViewlet();
-			text = await app.workbench.scm.getTitle();
-			await app.screenCapturer.capture('Scm title');
-			assert(/quellcodeverwaltung/i.test(text));
+			await app.workbench.scm.waitForTitle(title => /quellcodeverwaltung/i.test(title));
 
 			await app.workbench.debug.openDebugViewlet();
-			text = await app.workbench.debug.getTitle();
-			await app.screenCapturer.capture('Debug title');
-			assert(/debuggen/i.test(text));
+			await app.workbench.debug.waitForTitle(title => /debuggen/i.test(title));
 
 			await app.workbench.extensions.openExtensionsViewlet();
-			text = await app.workbench.extensions.getTitle();
-			await app.screenCapturer.capture('Extensions title');
-			assert(/erweiterungen/i.test(text));
+			await app.workbench.extensions.waitForTitle(title => /erweiterungen/i.test(title));
 		});
 	});
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/viewlet.ts b/test/smoke/src/areas/workbench/viewlet.ts
index 7eb114edaaf..2293752b705 100644
--- a/test/smoke/src/areas/workbench/viewlet.ts
+++ b/test/smoke/src/areas/workbench/viewlet.ts
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
+'use strict';
+
+import { Code } from '../../vscode/code';
 
 export abstract class Viewlet {
 
-	constructor(protected spectron: SpectronApplication) {
-		// noop
-	}
+	constructor(protected code: Code) { }
 
-	public async getTitle(): Promise<string> {
-		return this.spectron.client.waitForText('.monaco-workbench-container .part.sidebar > .title > .title-label > span');
+	async waitForTitle(fn: (title: string) => boolean): Promise<void> {
+		await this.code.waitForTextContent('.monaco-workbench-container .part.sidebar > .title > .title-label > span', undefined, fn);
 	}
-
 }
\ No newline at end of file
diff --git a/test/smoke/src/areas/workbench/workbench.ts b/test/smoke/src/areas/workbench/workbench.ts
index c2711f449d3..5ea8b5a7f9a 100644
--- a/test/smoke/src/areas/workbench/workbench.ts
+++ b/test/smoke/src/areas/workbench/workbench.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SpectronApplication } from '../../spectron/application';
 import { Explorer } from '../explorer/explorer';
 import { ActivityBar } from '../activitybar/activityBar';
 import { QuickOpen } from '../quickopen/quickopen';
@@ -16,13 +15,20 @@ import { StatusBar } from '../statusbar/statusbar';
 import { Problems } from '../problems/problems';
 import { SettingsEditor } from '../preferences/settings';
 import { KeybindingsEditor } from '../preferences/keybindings';
+import { Editors } from '../editor/editors';
+import { Code } from '../../vscode/code';
 import { Terminal } from '../terminal/terminal';
 
-export class Workbench {
+export interface Commands {
+	runCommand(command: string): Promise<any>;
+}
 
+export class Workbench implements Commands {
+
+	readonly quickopen: QuickOpen;
+	readonly editors: Editors;
 	readonly explorer: Explorer;
 	readonly activitybar: ActivityBar;
-	readonly quickopen: QuickOpen;
 	readonly search: Search;
 	readonly extensions: Extensions;
 	readonly editor: Editor;
@@ -34,47 +40,35 @@ export class Workbench {
 	readonly keybindingsEditor: KeybindingsEditor;
 	readonly terminal: Terminal;
 
-	constructor(private spectron: SpectronApplication) {
-		this.explorer = new Explorer(spectron);
-		this.activitybar = new ActivityBar(spectron);
-		this.quickopen = new QuickOpen(spectron);
-		this.search = new Search(spectron);
-		this.extensions = new Extensions(spectron);
-		this.editor = new Editor(spectron);
-		this.scm = new SCM(spectron);
-		this.debug = new Debug(spectron);
-		this.statusbar = new StatusBar(spectron);
-		this.problems = new Problems(spectron);
-		this.settingsEditor = new SettingsEditor(spectron);
-		this.keybindingsEditor = new KeybindingsEditor(spectron);
-		this.terminal = new Terminal(spectron);
+	constructor(private code: Code, private keybindings: any[], userDataPath: string) {
+		this.editors = new Editors(code, this);
+		this.quickopen = new QuickOpen(code, this, this.editors);
+		this.explorer = new Explorer(code, this.quickopen, this.editors);
+		this.activitybar = new ActivityBar(code);
+		this.search = new Search(code, this);
+		this.extensions = new Extensions(code, this);
+		this.editor = new Editor(code, this);
+		this.scm = new SCM(code, this);
+		this.debug = new Debug(code, this, this.editors, this.editor);
+		this.statusbar = new StatusBar(code);
+		this.problems = new Problems(code, this);
+		this.settingsEditor = new SettingsEditor(code, userDataPath, this, this.editors, this.editor);
+		this.keybindingsEditor = new KeybindingsEditor(code, this);
+		this.terminal = new Terminal(code, this);
 	}
 
-	public async saveOpenedFile(): Promise<any> {
-		await this.spectron.client.waitForElement('.tabs-container div.tab.active.dirty');
-		await this.spectron.workbench.quickopen.runCommand('File: Save');
-	}
+	/**
+	 * Retrieves the command from keybindings file and executes it with WebdriverIO client API
+	 * @param command command (e.g. 'workbench.action.files.newUntitledFile')
+	 */
+	async runCommand(command: string): Promise<void> {
+		const binding = this.keybindings.find(x => x['command'] === command);
 
-	public async selectTab(tabName: string, untitled: boolean = false): Promise<void> {
-		await this.spectron.client.waitAndClick(`.tabs-container div.tab[aria-label="${tabName}, tab"]`);
-		await this.waitForEditorFocus(tabName, untitled);
-	}
-
-	public async waitForEditorFocus(fileName: string, untitled: boolean = false): Promise<void> {
-		await this.waitForActiveTab(fileName);
-		await this.editor.waitForActiveEditor(fileName);
-	}
-
-	public async waitForActiveTab(fileName: string, isDirty: boolean = false): Promise<any> {
-		return this.spectron.client.waitForElement(`.tabs-container div.tab.active${isDirty ? '.dirty' : ''}[aria-selected="true"][aria-label="${fileName}, tab"]`);
-	}
-
-	public async waitForTab(fileName: string, isDirty: boolean = false): Promise<boolean> {
-		return this.spectron.client.waitForElement(`.tabs-container div.tab${isDirty ? '.dirty' : ''}[aria-label="${fileName}, tab"]`).then(() => true);
-	}
-
-	public async newUntitledFile(): Promise<void> {
-		await this.spectron.runCommand('workbench.action.files.newUntitledFile');
-		await this.waitForEditorFocus('Untitled-1', true);
+		if (binding) {
+			await this.code.dispatchKeybinding(binding.key);
+		} else {
+			await this.quickopen.runCommand(command);
+		}
 	}
 }
+
diff --git a/test/smoke/src/helpers/screenshot.ts b/test/smoke/src/helpers/screenshot.ts
deleted file mode 100644
index 18a068ec388..00000000000
--- a/test/smoke/src/helpers/screenshot.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as path from 'path';
-import * as fs from 'fs';
-import * as mkdirp from 'mkdirp';
-import { Application } from 'spectron';
-import { sanitize } from './utilities';
-
-export class ScreenCapturer {
-
-	private static counter = 0;
-
-	constructor(
-		private application: Application,
-		public suiteName: string,
-		private screenshotsDirPath: string | undefined,
-	) { }
-
-	async capture(name: string): Promise<void> {
-		if (!this.screenshotsDirPath) {
-			return;
-		}
-
-		const screenshotPath = path.join(
-			this.screenshotsDirPath,
-			sanitize(this.suiteName),
-			`${ScreenCapturer.counter++}-${sanitize(name)}.png`
-		);
-
-		const image = await this.application.browserWindow.capturePage();
-		await new Promise((c, e) => mkdirp(path.dirname(screenshotPath), err => err ? e(err) : c()));
-		await new Promise((c, e) => fs.writeFile(screenshotPath, image, err => err ? e(err) : c()));
-	}
-}
diff --git a/test/smoke/src/helpers/utilities.ts b/test/smoke/src/helpers/utilities.ts
deleted file mode 100644
index 8b86d31c957..00000000000
--- a/test/smoke/src/helpers/utilities.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as fs from 'fs';
-import { dirname } from 'path';
-
-export function nfcall<R>(fn: Function, ...args): Promise<R> {
-	return new Promise<R>((c, e) => fn(...args, (err, r) => err ? e(err) : c(r)));
-}
-
-export async function mkdirp(path: string, mode?: number): Promise<boolean> {
-	const mkdir = async () => {
-		try {
-			await nfcall(fs.mkdir, path, mode);
-		} catch (err) {
-			if (err.code === 'EEXIST') {
-				const stat = await nfcall<fs.Stats>(fs.stat, path);
-
-				if (stat.isDirectory) {
-					return;
-				}
-
-				throw new Error(`'${path}' exists and is not a directory.`);
-			}
-
-			throw err;
-		}
-	};
-
-	// is root?
-	if (path === dirname(path)) {
-		return true;
-	}
-
-	try {
-		await mkdir();
-	} catch (err) {
-		if (err.code !== 'ENOENT') {
-			throw err;
-		}
-
-		await mkdirp(dirname(path), mode);
-		await mkdir();
-	}
-
-	return true;
-}
-
-export function sanitize(name: string): string {
-	return name.replace(/[&*:\/]/g, '');
-}
\ No newline at end of file
diff --git a/test/smoke/src/logger.ts b/test/smoke/src/logger.ts
new file mode 100644
index 00000000000..b36b502d6ae
--- /dev/null
+++ b/test/smoke/src/logger.ts
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { appendFileSync, writeFileSync } from 'fs';
+import { format } from 'util';
+import { EOL } from 'os';
+
+export interface Logger {
+	log(message: string, ...args: any[]): void;
+}
+
+export class ConsoleLogger implements Logger {
+
+	log(message: string, ...args: any[]): void {
+		console.log('**', message, ...args);
+	}
+}
+
+export class FileLogger implements Logger {
+
+	constructor(private path: string) {
+		writeFileSync(path, '');
+	}
+
+	log(message: string, ...args: any[]): void {
+		const date = new Date().toISOString();
+		appendFileSync(this.path, `[${date}] ${format(message, ...args)}${EOL}`);
+	}
+}
+
+export class MultiLogger implements Logger {
+
+	constructor(private loggers: Logger[]) { }
+
+	log(message: string, ...args: any[]): void {
+		for (const logger of this.loggers) {
+			logger.log(message, ...args);
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
index 8adeab24a78..eb74ad61c79 100644
--- a/test/smoke/src/main.ts
+++ b/test/smoke/src/main.ts
@@ -11,9 +11,9 @@ import * as minimist from 'minimist';
 import * as tmp from 'tmp';
 import * as rimraf from 'rimraf';
 import * as mkdirp from 'mkdirp';
-import { SpectronApplication, Quality } from './spectron/application';
-import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test';
+import { Application, Quality } from './application';
 
+import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test';
 import { setup as setupDataLossTests } from './areas/workbench/data-loss.test';
 import { setup as setupDataExplorerTests } from './areas/explorer/explorer.test';
 import { setup as setupDataPreferencesTests } from './areas/preferences/preferences.test';
@@ -24,9 +24,10 @@ import { setup as setupDataDebugTests } from './areas/debug/debug.test';
 import { setup as setupDataGitTests } from './areas/git/git.test';
 import { setup as setupDataStatusbarTests } from './areas/statusbar/statusbar.test';
 import { setup as setupDataExtensionTests } from './areas/extensions/extensions.test';
+import { setup as setupTerminalTests } from './areas/terminal/terminal.test';
 import { setup as setupDataMultirootTests } from './areas/multiroot/multiroot.test';
 import { setup as setupDataLocalizationTests } from './areas/workbench/localization.test';
-// import './areas/terminal/terminal.test';
+import { MultiLogger, Logger, ConsoleLogger, FileLogger } from './logger';
 
 const tmpDir = tmp.dirSync({ prefix: 't' }) as { name: string; removeCallback: Function; };
 const testDataPath = tmpDir.name;
@@ -37,13 +38,20 @@ const opts = minimist(args, {
 	string: [
 		'build',
 		'stable-build',
-		'log',
-		'wait-time'
-	]
+		'wait-time',
+		'test-repo',
+		'keybindings',
+		'screenshots',
+		'log'
+	],
+	boolean: [
+		'verbose'
+	],
+	default: {
+		verbose: false
+	}
 });
 
-const artifactsPath = opts.log || '';
-
 const workspaceFilePath = path.join(testDataPath, 'smoketest.code-workspace');
 const testRepoUrl = 'https://github.com/Microsoft/vscode-smoketest-express';
 const workspacePath = path.join(testDataPath, 'vscode-smoketest-express');
@@ -51,6 +59,12 @@ const keybindingsPath = path.join(testDataPath, 'keybindings.json');
 const extensionsPath = path.join(testDataPath, 'extensions-dir');
 mkdirp.sync(extensionsPath);
 
+const screenshotsPath = opts.screenshots ? path.resolve(opts.screenshots) : null;
+
+if (screenshotsPath) {
+	mkdirp.sync(screenshotsPath);
+}
+
 function fail(errorMessage): void {
 	console.error(errorMessage);
 	process.exit(1);
@@ -96,16 +110,16 @@ function getBuildElectronPath(root: string): string {
 }
 
 let testCodePath = opts.build;
-let stableCodePath = opts['stable-build'];
+// let stableCodePath = opts['stable-build'];
 let electronPath: string;
-let stablePath: string;
+// let stablePath: string;
 
 if (testCodePath) {
 	electronPath = getBuildElectronPath(testCodePath);
 
-	if (stableCodePath) {
-		stablePath = getBuildElectronPath(stableCodePath);
-	}
+	// if (stableCodePath) {
+	// 	stablePath = getBuildElectronPath(stableCodePath);
+	// }
 } else {
 	testCodePath = getDevElectronPath();
 	electronPath = testCodePath;
@@ -147,96 +161,106 @@ function toUri(path: string): string {
 	return `${path}`;
 }
 
+async function getKeybindings(): Promise<void> {
+	if (opts.keybindings) {
+		console.log('*** Using keybindings: ', opts.keybindings);
+		const rawKeybindings = fs.readFileSync(opts.keybindings);
+		fs.writeFileSync(keybindingsPath, rawKeybindings);
+	} else {
+		const keybindingsUrl = `https://raw.githubusercontent.com/Microsoft/vscode-docs/master/build/keybindings/doc.keybindings.${getKeybindingPlatform()}.json`;
+		console.log('*** Fetching keybindings...');
+
+		await new Promise((c, e) => {
+			https.get(keybindingsUrl, res => {
+				const output = fs.createWriteStream(keybindingsPath);
+				res.on('error', e);
+				output.on('error', e);
+				output.on('close', c);
+				res.pipe(output);
+			}).on('error', e);
+		});
+	}
+}
+
+async function createWorkspaceFile(): Promise<void> {
+	if (fs.existsSync(workspaceFilePath)) {
+		return;
+	}
+
+	console.log('*** Creating workspace file...');
+	const workspace = {
+		folders: [
+			{
+				path: toUri(path.join(workspacePath, 'public'))
+			},
+			{
+				path: toUri(path.join(workspacePath, 'routes'))
+			},
+			{
+				path: toUri(path.join(workspacePath, 'views'))
+			}
+		]
+	};
+
+	fs.writeFileSync(workspaceFilePath, JSON.stringify(workspace, null, '\t'));
+}
+
+async function setupRepository(): Promise<void> {
+	if (opts['test-repo']) {
+		console.log('*** Copying test project repository:', opts['test-repo']);
+		rimraf.sync(workspacePath);
+		// not platform friendly
+		cp.execSync(`cp -R "${opts['test-repo']}" "${workspacePath}"`);
+	} else {
+		if (!fs.existsSync(workspacePath)) {
+			console.log('*** Cloning test project repository...');
+			cp.spawnSync('git', ['clone', testRepoUrl, workspacePath]);
+		} else {
+			console.log('*** Cleaning test project repository...');
+			cp.spawnSync('git', ['fetch'], { cwd: workspacePath });
+			cp.spawnSync('git', ['reset', '--hard', 'FETCH_HEAD'], { cwd: workspacePath });
+			cp.spawnSync('git', ['clean', '-xdf'], { cwd: workspacePath });
+		}
+
+		console.log('*** Running npm install...');
+		cp.execSync('npm install', { cwd: workspacePath, stdio: 'inherit' });
+	}
+}
+
 async function setup(): Promise<void> {
 	console.log('*** Test data:', testDataPath);
 	console.log('*** Preparing smoketest setup...');
 
-	const keybindingsUrl = `https://raw.githubusercontent.com/Microsoft/vscode-docs/master/build/keybindings/doc.keybindings.${getKeybindingPlatform()}.json`;
-	console.log('*** Fetching keybindings...');
-
-	await new Promise((c, e) => {
-		https.get(keybindingsUrl, res => {
-			const output = fs.createWriteStream(keybindingsPath);
-			res.on('error', e);
-			output.on('error', e);
-			output.on('close', c);
-			res.pipe(output);
-		}).on('error', e);
-	});
-
-	if (!fs.existsSync(workspaceFilePath)) {
-		console.log('*** Creating workspace file...');
-		const workspace = {
-			folders: [
-				{
-					path: toUri(path.join(workspacePath, 'public'))
-				},
-				{
-					path: toUri(path.join(workspacePath, 'routes'))
-				},
-				{
-					path: toUri(path.join(workspacePath, 'views'))
-				}
-			]
-		};
-
-		fs.writeFileSync(workspaceFilePath, JSON.stringify(workspace, null, '\t'));
-	}
-
-	if (!fs.existsSync(workspacePath)) {
-		console.log('*** Cloning test project repository...');
-		cp.spawnSync('git', ['clone', testRepoUrl, workspacePath]);
-	} else {
-		console.log('*** Cleaning test project repository...');
-		cp.spawnSync('git', ['fetch'], { cwd: workspacePath });
-		cp.spawnSync('git', ['reset', '--hard', 'FETCH_HEAD'], { cwd: workspacePath });
-		cp.spawnSync('git', ['clean', '-xdf'], { cwd: workspacePath });
-	}
-
-	console.log('*** Running npm install...');
-	cp.execSync('npm install', { cwd: workspacePath, stdio: 'inherit' });
+	await getKeybindings();
+	await createWorkspaceFile();
+	await setupRepository();
 
 	console.log('*** Smoketest setup done!\n');
 }
 
-/**
- * WebDriverIO 4.8.0 outputs all kinds of "deprecation" warnings
- * for common commands like `keys` and `moveToObject`.
- * According to https://github.com/Codeception/CodeceptJS/issues/531,
- * these deprecation warnings are for Firefox, and have no alternative replacements.
- * Since we can't downgrade WDIO as suggested (it's Spectron's dep, not ours),
- * we must suppress the warning with a classic monkey-patch.
- *
- * @see webdriverio/lib/helpers/depcrecationWarning.js
- * @see https://github.com/webdriverio/webdriverio/issues/2076
- */
-// Filter out the following messages:
-const wdioDeprecationWarning = /^WARNING: the "\w+" command will be deprecated soon../; // [sic]
-// Monkey patch:
-const warn = console.warn;
-console.warn = function suppressWebdriverWarnings(message) {
-	if (wdioDeprecationWarning.test(message)) { return; }
-	warn.apply(console, arguments);
-};
+function createApp(quality: Quality): Application {
+	const loggers: Logger[] = [];
 
-function createApp(quality: Quality): SpectronApplication | null {
-	const path = quality === Quality.Stable ? stablePath : electronPath;
-
-	if (!path) {
-		return null;
+	if (opts.verbose) {
+		loggers.push(new ConsoleLogger());
 	}
 
-	return new SpectronApplication({
+	if (opts.log) {
+		loggers.push(new FileLogger(opts.log));
+	}
+
+	return new Application({
 		quality,
-		electronPath: path,
+		codePath: opts.build,
 		workspacePath,
 		userDataDir,
 		extensionsPath,
-		artifactsPath,
 		workspaceFilePath,
-		waitTime: parseInt(opts['wait-time'] || '0') || 20
+		waitTime: parseInt(opts['wait-time'] || '0') || 20,
+		logger: new MultiLogger(loggers)
 	});
 }
+
 before(async function () {
 	// allow two minutes for setup
 	this.timeout(2 * 60 * 1000);
@@ -244,6 +268,7 @@ before(async function () {
 });
 
 after(async function () {
+	await new Promise(c => setTimeout(c, 500)); // wait for shutdown
 	await new Promise((c, e) => rimraf(testDataPath, { maxBusyTries: 10 }, err => err ? e(err) : c()));
 });
 
@@ -251,7 +276,7 @@ describe('Data Migration', () => {
 	setupDataMigrationTests(userDataDir, createApp);
 });
 
-describe('Everything Else', () => {
+describe('Test', () => {
 	before(async function () {
 		const app = createApp(quality);
 		await app!.start();
@@ -262,6 +287,36 @@ describe('Everything Else', () => {
 		await this.app.stop();
 	});
 
+	if (screenshotsPath) {
+		afterEach(async function () {
+			if (this.currentTest.state !== 'failed') {
+				return;
+			}
+
+			const app = this.app as Application;
+			const raw = await app.capturePage();
+			const buffer = new Buffer(raw, 'base64');
+
+			const name = this.currentTest.fullTitle().replace(/[^a-z0-9\-]/ig, '_');
+			const screenshotPath = path.join(screenshotsPath, `${name}.png`);
+
+			if (opts.log) {
+				app.logger.log('*** Screenshot recorded:', screenshotPath);
+			}
+
+			fs.writeFileSync(screenshotPath, buffer);
+		});
+	}
+
+	if (opts.log) {
+		beforeEach(async function () {
+			const app = this.app as Application;
+			const title = this.currentTest.fullTitle();
+
+			app.logger.log('*** Test start:', title);
+		});
+	}
+
 	setupDataLossTests();
 	setupDataExplorerTests();
 	setupDataPreferencesTests();
@@ -272,6 +327,7 @@ describe('Everything Else', () => {
 	setupDataGitTests();
 	setupDataStatusbarTests();
 	setupDataExtensionTests();
+	setupTerminalTests();
 	setupDataMultirootTests();
 	setupDataLocalizationTests();
 });
diff --git a/test/smoke/src/spectron/application.ts b/test/smoke/src/spectron/application.ts
deleted file mode 100644
index 91d742cd159..00000000000
--- a/test/smoke/src/spectron/application.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Application, SpectronClient as WebClient } from 'spectron';
-import { test as testPort } from 'portastic';
-import { SpectronClient } from './client';
-import { ScreenCapturer } from '../helpers/screenshot';
-import { Workbench } from '../areas/workbench/workbench';
-import * as fs from 'fs';
-import * as cp from 'child_process';
-import * as path from 'path';
-import * as mkdirp from 'mkdirp';
-import { sanitize } from '../helpers/utilities';
-
-// Just hope random helps us here, cross your fingers!
-export async function findFreePort(): Promise<number> {
-	for (let i = 0; i < 10; i++) {
-		const port = 10000 + Math.round(Math.random() * 10000);
-
-		if (await testPort(port)) {
-			return port;
-		}
-	}
-
-	throw new Error('Could not find free port!');
-}
-
-export enum Quality {
-	Dev,
-	Insiders,
-	Stable
-}
-
-export interface SpectronApplicationOptions {
-	quality: Quality;
-	electronPath: string;
-	workspacePath: string;
-	userDataDir: string;
-	extensionsPath: string;
-	artifactsPath: string;
-	workspaceFilePath: string;
-	waitTime: number;
-}
-
-/**
- * Wraps Spectron's Application instance with its used methods.
- */
-export class SpectronApplication {
-
-	private static count = 0;
-
-	private _client: SpectronClient;
-	private _workbench: Workbench;
-	private _screenCapturer: ScreenCapturer;
-	private spectron: Application | undefined;
-	private keybindings: any[]; private stopLogCollection: (() => Promise<void>) | undefined;
-
-	constructor(
-		private options: SpectronApplicationOptions
-	) { }
-
-	get quality(): Quality {
-		return this.options.quality;
-	}
-
-	get client(): SpectronClient {
-		return this._client;
-	}
-
-	get webclient(): WebClient {
-		if (!this.spectron) {
-			throw new Error('Application not started');
-		}
-
-		return this.spectron.client;
-	}
-
-	get screenCapturer(): ScreenCapturer {
-		return this._screenCapturer;
-	}
-
-	get workbench(): Workbench {
-		return this._workbench;
-	}
-
-	get workspacePath(): string {
-		return this.options.workspacePath;
-	}
-
-	get extensionsPath(): string {
-		return this.options.extensionsPath;
-	}
-
-	get userDataPath(): string {
-		return this.options.userDataDir;
-	}
-
-	get workspaceFilePath(): string {
-		return this.options.workspaceFilePath;
-	}
-
-	private _suiteName: string = 'Init';
-
-	set suiteName(suiteName: string) {
-		this._suiteName = suiteName;
-		this._screenCapturer.suiteName = suiteName;
-	}
-
-	async start(waitForWelcome: boolean = true): Promise<any> {
-		await this._start();
-
-		if (waitForWelcome) {
-			await this.waitForWelcome();
-		}
-	}
-
-	async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise<any> {
-		await this.stop();
-		await new Promise(c => setTimeout(c, 1000));
-		await this._start(options.workspaceOrFolder, options.extraArgs);
-	}
-
-	private async _start(workspaceOrFolder = this.options.workspacePath, extraArgs: string[] = []): Promise<any> {
-		await this.retrieveKeybindings();
-		cp.execSync('git checkout .', { cwd: this.options.workspacePath });
-		await this.startApplication(workspaceOrFolder, extraArgs);
-		await this.checkWindowReady();
-	}
-
-	async reload(): Promise<any> {
-		await this.workbench.quickopen.runCommand('Reload Window');
-		// TODO @sandy: Find a proper condition to wait for reload
-		await new Promise(c => setTimeout(c, 1500));
-		await this.checkWindowReady();
-	}
-
-	async stop(): Promise<any> {
-		if (this.stopLogCollection) {
-			await this.stopLogCollection();
-			this.stopLogCollection = undefined;
-		}
-
-		if (this.spectron && this.spectron.isRunning()) {
-			await this.spectron.stop();
-			this.spectron = undefined;
-		}
-	}
-
-	private async startApplication(workspaceOrFolder: string, extraArgs: string[] = []): Promise<any> {
-
-		let args: string[] = [];
-		let chromeDriverArgs: string[] = [];
-
-		if (process.env.VSCODE_REPOSITORY) {
-			args.push(process.env.VSCODE_REPOSITORY as string);
-		}
-
-		args.push(workspaceOrFolder);
-
-		// Prevent 'Getting Started' web page from opening on clean user-data-dir
-		args.push('--skip-getting-started');
-
-		// Prevent 'Getting Started' web page from opening on clean user-data-dir
-		args.push('--skip-release-notes');
-
-		// Prevent Quick Open from closing when focus is stolen, this allows concurrent smoketest suite running
-		args.push('--sticky-quickopen');
-
-		// Disable telemetry
-		args.push('--disable-telemetry');
-
-		// Disable updates
-		args.push('--disable-updates');
-
-		// Disable crash reporter
-		// This seems to be the fix for the strange hangups in which Code stays unresponsive
-		// and tests finish badly with timeouts, leaving Code running in the background forever
-		args.push('--disable-crash-reporter');
-
-		// Ensure that running over custom extensions directory, rather than picking up the one that was used by a tester previously
-		args.push(`--extensions-dir=${this.options.extensionsPath}`);
-
-		args.push(...extraArgs);
-
-		chromeDriverArgs.push(`--user-data-dir=${this.options.userDataDir}`);
-
-		// Spectron always uses the same port number for the chrome driver
-		// and it handles gracefully when two instances use the same port number
-		// This works, but when one of the instances quits, it takes down
-		// chrome driver with it, leaving the other instance in DISPAIR!!! :(
-		const port = await findFreePort();
-
-		// We must get a different port for debugging the smoketest express app
-		// otherwise concurrent test runs will clash on those ports
-		const env = { PORT: String(await findFreePort()), ...process.env };
-
-		const opts: any = {
-			path: this.options.electronPath,
-			port,
-			args,
-			env,
-			chromeDriverArgs,
-			startTimeout: 10000,
-			requireName: 'nodeRequire'
-		};
-
-		const runName = String(SpectronApplication.count++);
-		let testsuiteRootPath: string | undefined = undefined;
-		let screenshotsDirPath: string | undefined = undefined;
-
-		if (this.options.artifactsPath) {
-			testsuiteRootPath = path.join(this.options.artifactsPath, sanitize(runName));
-			mkdirp.sync(testsuiteRootPath);
-
-			// Collect screenshots
-			screenshotsDirPath = path.join(testsuiteRootPath, 'screenshots');
-			mkdirp.sync(screenshotsDirPath);
-
-			// Collect chromedriver logs
-			const chromedriverLogPath = path.join(testsuiteRootPath, 'chromedriver.log');
-			opts.chromeDriverLogPath = chromedriverLogPath;
-
-			// Collect webdriver logs
-			const webdriverLogsPath = path.join(testsuiteRootPath, 'webdriver');
-			mkdirp.sync(webdriverLogsPath);
-			opts.webdriverLogPath = webdriverLogsPath;
-		}
-
-		this.spectron = new Application(opts);
-		await this.spectron.start();
-
-		if (testsuiteRootPath) {
-			// Collect logs
-			const mainProcessLogPath = path.join(testsuiteRootPath, 'main.log');
-			const rendererProcessLogPath = path.join(testsuiteRootPath, 'renderer.log');
-
-			const flush = async () => {
-				if (!this.spectron) {
-					return;
-				}
-
-				const mainLogs = await this.spectron.client.getMainProcessLogs();
-				await new Promise((c, e) => fs.appendFile(mainProcessLogPath, mainLogs.join('\n'), { encoding: 'utf8' }, err => err ? e(err) : c()));
-
-				const rendererLogs = (await this.spectron.client.getRenderProcessLogs()).map(m => `${m.timestamp} - ${m.level} - ${m.message}`);
-				await new Promise((c, e) => fs.appendFile(rendererProcessLogPath, rendererLogs.join('\n'), { encoding: 'utf8' }, err => err ? e(err) : c()));
-			};
-
-			let running = true;
-			const loopFlush = async () => {
-				while (true) {
-					await flush();
-
-					if (!running) {
-						return;
-					}
-
-					await new Promise(c => setTimeout(c, 1000));
-				}
-			};
-
-			const loopPromise = loopFlush();
-			this.stopLogCollection = () => {
-				running = false;
-				return loopPromise;
-			};
-		}
-
-		this._screenCapturer = new ScreenCapturer(this.spectron, this._suiteName, screenshotsDirPath);
-		this._client = new SpectronClient(this.spectron, this, this.options.waitTime);
-		this._workbench = new Workbench(this);
-	}
-
-	private async checkWindowReady(): Promise<any> {
-		await this.webclient.waitUntilWindowLoaded();
-
-		// Pick the first workbench window here
-		const count = await this.webclient.getWindowCount();
-
-		for (let i = 0; i < count; i++) {
-			await this.webclient.windowByIndex(i);
-
-			if (/bootstrap\/index\.html/.test(await this.webclient.getUrl())) {
-				break;
-			}
-		}
-
-		await this.client.waitForElement('.monaco-workbench');
-	}
-
-	private async waitForWelcome(): Promise<any> {
-		await this.client.waitForElement('.explorer-folders-view');
-		await this.client.waitForElement(`.editor-container[id="workbench.editor.walkThroughPart"] .welcomePage`);
-	}
-
-	private retrieveKeybindings(): Promise<void> {
-		return new Promise((c, e) => {
-			fs.readFile(process.env.VSCODE_KEYBINDINGS_PATH as string, 'utf8', (err, data) => {
-				if (err) {
-					throw err;
-				}
-				try {
-					this.keybindings = JSON.parse(data);
-					c();
-				} catch (e) {
-					throw new Error(`Error parsing keybindings JSON: ${e}`);
-				}
-			});
-		});
-	}
-
-	/**
-	 * Retrieves the command from keybindings file and executes it with WebdriverIO client API
-	 * @param command command (e.g. 'workbench.action.files.newUntitledFile')
-	 */
-	runCommand(command: string): Promise<any> {
-		const binding = this.keybindings.find(x => x['command'] === command);
-		if (!binding) {
-			return this.workbench.quickopen.runCommand(command);
-		}
-
-		const keys: string = binding.key;
-		let keysToPress: string[] = [];
-
-		const chords = keys.split(' ');
-		chords.forEach((chord) => {
-			const keys = chord.split('+');
-			keys.forEach((key) => keysToPress.push(this.transliterate(key)));
-			keysToPress.push('NULL');
-		});
-
-		return this.client.keys(keysToPress);
-	}
-
-	/**
-	 * Transliterates key names from keybindings file to WebdriverIO keyboard actions defined in:
-	 * https://w3c.github.io/webdriver/webdriver-spec.html#keyboard-actions
-	 */
-	private transliterate(key: string): string {
-		switch (key) {
-			case 'ctrl':
-				return 'Control';
-			case 'cmd':
-				return 'Meta';
-			default:
-				return key.length === 1 ? key : key.charAt(0).toUpperCase() + key.slice(1);
-		}
-	}
-}
diff --git a/test/smoke/src/spectron/client.ts b/test/smoke/src/spectron/client.ts
deleted file mode 100644
index 428d6a18310..00000000000
--- a/test/smoke/src/spectron/client.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Application } from 'spectron';
-import { RawResult, Element } from 'webdriverio';
-import { SpectronApplication } from './application';
-
-/**
- * Abstracts the Spectron's WebdriverIO managed client property on the created Application instances.
- */
-export class SpectronClient {
-
-	// waitFor calls should not take more than 200 * 100 = 20 seconds to complete, excluding
-	// the time it takes for the actual retry call to complete
-	private retryCount: number;
-	private readonly retryDuration = 100; // in milliseconds
-
-	constructor(
-		readonly spectron: Application,
-		private application: SpectronApplication,
-		waitTime: number
-	) {
-		this.retryCount = (waitTime * 1000) / this.retryDuration;
-	}
-
-	keys(keys: string[]): Promise<void> {
-		this.spectron.client.keys(keys);
-		return Promise.resolve();
-	}
-
-	async getText(selector: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.getText(selector);
-	}
-
-	async waitForText(selector: string, text?: string, accept?: (result: string) => boolean): Promise<string> {
-		accept = accept ? accept : result => text !== void 0 ? text === result : !!result;
-		return this.waitFor(() => this.spectron.client.getText(selector), accept, `getText with selector ${selector}`);
-	}
-
-	async waitForTextContent(selector: string, textContent?: string, accept?: (result: string) => boolean): Promise<string> {
-		accept = accept ? accept : (result => textContent !== void 0 ? textContent === result : !!result);
-		const fn = async () => await this.spectron.client.selectorExecute(selector, div => Array.isArray(div) ? div[0].textContent : div.textContent);
-		return this.waitFor(fn, s => accept!(typeof s === 'string' ? s : ''), `getTextContent with selector ${selector}`);
-	}
-
-	async waitForValue(selector: string, value?: string, accept?: (result: string) => boolean): Promise<any> {
-		accept = accept ? accept : result => value !== void 0 ? value === result : !!result;
-		return this.waitFor(() => this.spectron.client.getValue(selector), accept, `getValue with selector ${selector}`);
-	}
-
-	async waitAndClick(selector: string): Promise<any> {
-		return this.waitFor(() => this.spectron.client.click(selector), void 0, `click with selector ${selector}`);
-	}
-
-	async click(selector: string): Promise<any> {
-		return this.spectron.client.click(selector);
-	}
-
-	async doubleClickAndWait(selector: string, capture: boolean = true): Promise<any> {
-		return this.waitFor(() => this.spectron.client.doubleClick(selector), void 0, `doubleClick with selector ${selector}`);
-	}
-
-	async leftClick(selector: string, xoffset: number, yoffset: number, capture: boolean = true): Promise<any> {
-		return this.spectron.client.leftClick(selector, xoffset, yoffset);
-	}
-
-	async rightClick(selector: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.rightClick(selector);
-	}
-
-	async moveToObject(selector: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.moveToObject(selector);
-	}
-
-	async waitAndMoveToObject(selector: string): Promise<any> {
-		return this.waitFor(() => this.spectron.client.moveToObject(selector), void 0, `move to object with selector ${selector}`);
-	}
-
-	async setValue(selector: string, text: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.setValue(selector, text);
-	}
-
-	async waitForElements(selector: string, accept: (result: Element[]) => boolean = result => result.length > 0): Promise<Element[]> {
-		return this.waitFor<RawResult<Element[]>>(() => this.spectron.client.elements(selector), result => accept(result.value), `elements with selector ${selector}`)
-			.then(result => result.value);
-	}
-
-	async waitForElement(selector: string, accept: (result: Element | undefined) => boolean = result => !!result): Promise<Element> {
-		return this.waitFor<RawResult<Element>>(() => this.spectron.client.element(selector), result => accept(result ? result.value : void 0), `element with selector ${selector}`)
-			.then(result => result.value);
-	}
-
-	async waitForVisibility(selector: string, accept: (result: boolean) => boolean = result => result): Promise<any> {
-		return this.waitFor(() => this.spectron.client.isVisible(selector), accept, `isVisible with selector ${selector}`);
-	}
-
-	async element(selector: string): Promise<Element> {
-		return this.spectron.client.element(selector)
-			.then(result => result.value);
-	}
-
-	async waitForActiveElement(selector: string): Promise<any> {
-		return this.waitFor(
-			() => this.spectron.client.execute(s => document.activeElement.matches(s), selector),
-			r => r.value,
-			`wait for active element: ${selector}`
-		);
-	}
-
-	async waitForAttribute(selector: string, attribute: string, accept: (result: string) => boolean = result => !!result): Promise<string> {
-		return this.waitFor<string>(() => this.spectron.client.getAttribute(selector), accept, `attribute with selector ${selector}`);
-	}
-
-	async dragAndDrop(sourceElem: string, destinationElem: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.dragAndDrop(sourceElem, destinationElem);
-	}
-
-	async selectByValue(selector: string, value: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.selectByValue(selector, value);
-	}
-
-	async getValue(selector: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.getValue(selector);
-	}
-
-	async getAttribute(selector: string, attribute: string, capture: boolean = true): Promise<any> {
-		return Promise.resolve(this.spectron.client.getAttribute(selector, attribute));
-	}
-
-	buttonDown(): any {
-		return this.spectron.client.buttonDown();
-	}
-
-	buttonUp(): any {
-		return this.spectron.client.buttonUp();
-	}
-
-	async isVisible(selector: string, capture: boolean = true): Promise<any> {
-		return this.spectron.client.isVisible(selector);
-	}
-
-	async getTitle(): Promise<string> {
-		return this.spectron.client.getTitle();
-	}
-
-	private running = false;
-	async waitFor<T>(func: () => T | Promise<T | undefined>, accept?: (result: T) => boolean | Promise<boolean>, timeoutMessage?: string, retryCount?: number): Promise<T>;
-	async waitFor<T>(func: () => T | Promise<T>, accept: (result: T) => boolean | Promise<boolean> = result => !!result, timeoutMessage?: string, retryCount?: number): Promise<T> {
-		if (this.running) {
-			throw new Error('Not allowed to run nested waitFor calls!');
-		}
-
-		this.running = true;
-
-		try {
-			let trial = 1;
-			retryCount = typeof retryCount === 'number' ? retryCount : this.retryCount;
-
-			while (true) {
-				if (trial > retryCount) {
-					await this.application.screenCapturer.capture('timeout');
-					throw new Error(`${timeoutMessage}: Timed out after ${(retryCount * this.retryDuration) / 1000} seconds.`);
-				}
-
-				let result;
-				try {
-					result = await func();
-				} catch (e) {
-					// console.log(e);
-				}
-
-				if (accept(result)) {
-					return result;
-				}
-
-				await new Promise(resolve => setTimeout(resolve, this.retryDuration));
-				trial++;
-			}
-		} finally {
-			this.running = false;
-		}
-	}
-
-	// type(text: string): Promise<any> {
-	// 	return new Promise((res) => {
-	// 		let textSplit = text.split(' ');
-
-	// 		const type = async (i: number) => {
-	// 			if (!textSplit[i] || textSplit[i].length <= 0) {
-	// 				return res();
-	// 			}
-
-	// 			const toType = textSplit[i + 1] ? `${textSplit[i]} ` : textSplit[i];
-	// 			await this.keys(toType);
-	// 			await this.keys(['NULL']);
-	// 			await type(i + 1);
-	// 		};
-
-	// 		return type(0);
-	// 	});
-	// }
-}
\ No newline at end of file
diff --git a/test/smoke/src/vscode/code.ts b/test/smoke/src/vscode/code.ts
new file mode 100644
index 00000000000..c60984c6441
--- /dev/null
+++ b/test/smoke/src/vscode/code.ts
@@ -0,0 +1,324 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as cp from 'child_process';
+import * as os from 'os';
+import { tmpName } from 'tmp';
+import { IDriver, connect as connectDriver, IDisposable, IElement } from './driver';
+import { Logger } from '../logger';
+
+const repoPath = path.join(__dirname, '../../../..');
+
+function getDevElectronPath(): string {
+	const buildPath = path.join(repoPath, '.build');
+	const product = require(path.join(repoPath, 'product.json'));
+
+	switch (process.platform) {
+		case 'darwin':
+			return path.join(buildPath, 'electron', `${product.nameLong}.app`, 'Contents', 'MacOS', 'Electron');
+		case 'linux':
+			return path.join(buildPath, 'electron', `${product.applicationName}`);
+		case 'win32':
+			return path.join(buildPath, 'electron', `${product.nameShort}.exe`);
+		default:
+			throw new Error('Unsupported platform.');
+	}
+}
+
+function getBuildElectronPath(root: string): string {
+	switch (process.platform) {
+		case 'darwin':
+			return path.join(root, 'Contents', 'MacOS', 'Electron');
+		case 'linux': {
+			const product = require(path.join(root, 'resources', 'app', 'product.json'));
+			return path.join(root, product.applicationName);
+		}
+		case 'win32': {
+			const product = require(path.join(root, 'resources', 'app', 'product.json'));
+			return path.join(root, `${product.nameShort}.exe`);
+		}
+		default:
+			throw new Error('Unsupported platform.');
+	}
+}
+
+function getDevOutPath(): string {
+	return path.join(repoPath, 'out');
+}
+
+function getBuildOutPath(root: string): string {
+	switch (process.platform) {
+		case 'darwin':
+			return path.join(root, 'Contents', 'Resources', 'app', 'out');
+		default:
+			return path.join(root, 'resources', 'app', 'out');
+	}
+}
+
+async function connect(child: cp.ChildProcess, outPath: string, handlePath: string, logger: Logger): Promise<Code> {
+	let errCount = 0;
+
+	while (true) {
+		try {
+			const { client, driver } = await connectDriver(outPath, handlePath);
+			return new Code(child, client, driver, logger);
+		} catch (err) {
+			if (++errCount > 50) {
+				child.kill();
+				throw err;
+			}
+
+			// retry
+			await new Promise(c => setTimeout(c, 100));
+		}
+	}
+}
+
+// Kill all running instances, when dead
+const instances = new Set<cp.ChildProcess>();
+process.once('exit', () => instances.forEach(code => code.kill()));
+
+export interface SpawnOptions {
+	codePath?: string;
+	workspacePath: string;
+	userDataDir: string;
+	extensionsPath: string;
+	logger: Logger;
+	extraArgs?: string[];
+}
+
+async function createDriverHandle(): Promise<string> {
+	if ('win32' === os.platform()) {
+		const name = [...Array(15)].map(() => Math.random().toString(36)[3]).join('');
+		return `\\\\.\\pipe\\${name}`;
+	} else {
+		return await new Promise<string>((c, e) => tmpName((err, handlePath) => err ? e(err) : c(handlePath)));
+	}
+}
+
+export async function spawn(options: SpawnOptions): Promise<Code> {
+	const codePath = options.codePath;
+	const electronPath = codePath ? getBuildElectronPath(codePath) : getDevElectronPath();
+	const outPath = codePath ? getBuildOutPath(codePath) : getDevOutPath();
+	const handle = await createDriverHandle();
+
+	const args = [
+		options.workspacePath,
+		'--skip-getting-started',
+		'--skip-release-notes',
+		'--sticky-quickopen',
+		'--disable-telemetry',
+		'--disable-updates',
+		'--disable-crash-reporter',
+		`--extensions-dir=${options.extensionsPath}`,
+		`--user-data-dir=${options.userDataDir}`,
+		'--driver', handle
+	];
+
+	if (!codePath) {
+		args.unshift(repoPath);
+	}
+
+	if (options.extraArgs) {
+		args.push(...options.extraArgs);
+	}
+
+	const spawnOptions: cp.SpawnOptions = {};
+
+	const child = cp.spawn(electronPath, args, spawnOptions);
+
+	instances.add(child);
+	child.once('exit', () => instances.delete(child));
+
+	return connect(child, outPath, handle, options.logger);
+}
+
+async function poll<T>(
+	fn: () => Promise<T>,
+	acceptFn: (result: T) => boolean,
+	timeoutMessage: string,
+	retryCount: number = 200,
+	retryInterval: number = 100 // millis
+): Promise<T> {
+	let trial = 1;
+
+	while (true) {
+		if (trial > retryCount) {
+			throw new Error(`Timeout: ${timeoutMessage} after ${(retryCount * retryInterval) / 1000} seconds.`);
+		}
+
+		let result;
+		try {
+			result = await fn();
+
+			if (acceptFn(result)) {
+				return result;
+			}
+		} catch (e) {
+			// console.warn(e);
+
+			if (/Method not implemented/.test(e.message)) {
+				throw e;
+			}
+		}
+
+		await new Promise(resolve => setTimeout(resolve, retryInterval));
+		trial++;
+	}
+}
+
+export class Code {
+
+	private _activeWindowId: number | undefined = undefined;
+	private driver: IDriver;
+
+	constructor(
+		private process: cp.ChildProcess,
+		private client: IDisposable,
+		driver: IDriver,
+		readonly logger: Logger
+	) {
+		this.driver = new Proxy(driver, {
+			get(target, prop, receiver) {
+				if (typeof target[prop] !== 'function') {
+					return target[prop];
+				}
+
+				return function (...args) {
+					logger.log(`${prop}`, ...args.filter(a => typeof a === 'string'));
+					return target[prop].apply(this, args);
+				};
+			}
+		});
+	}
+
+	async capturePage(): Promise<string> {
+		const windowId = await this.getActiveWindowId();
+		return await this.driver.capturePage(windowId);
+	}
+
+	async waitForWindowIds(fn: (windowIds: number[]) => boolean): Promise<void> {
+		await poll(() => this.driver.getWindowIds(), fn, `get window ids`);
+	}
+
+	async dispatchKeybinding(keybinding: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await this.driver.dispatchKeybinding(windowId, keybinding);
+	}
+
+	async reload(): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await this.driver.reloadWindow(windowId);
+	}
+
+	async waitForTextContent(selector: string, textContent?: string, accept?: (result: string) => boolean): Promise<string> {
+		const windowId = await this.getActiveWindowId();
+		accept = accept || (result => textContent !== void 0 ? textContent === result : !!result);
+		return await poll(() => this.driver.getElements(windowId, selector).then(els => els[0].textContent), s => accept!(typeof s === 'string' ? s : ''), `get text content '${selector}'`);
+	}
+
+	async waitAndClick(selector: string, xoffset?: number, yoffset?: number): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.click(windowId, selector, xoffset, yoffset), () => true, `click '${selector}'`);
+	}
+
+	async waitAndDoubleClick(selector: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.doubleClick(windowId, selector), () => true, `double click '${selector}'`);
+	}
+
+	async waitAndMove(selector: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.move(windowId, selector), () => true, `move '${selector}'`);
+	}
+
+	async waitForSetValue(selector: string, value: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.setValue(windowId, selector, value), () => true, `set value '${selector}'`);
+	}
+
+	async waitForPaste(selector: string, value: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.paste(windowId, selector, value), () => true, `paste '${selector}'`);
+	}
+
+	async waitForElements(selector: string, recursive: boolean, accept: (result: IElement[]) => boolean = result => result.length > 0): Promise<IElement[]> {
+		const windowId = await this.getActiveWindowId();
+		return await poll(() => this.driver.getElements(windowId, selector, recursive), accept, `get elements '${selector}'`);
+	}
+
+	async waitForElement(selector: string, accept: (result: IElement | undefined) => boolean = result => !!result, retryCount: number = 200): Promise<IElement> {
+		const windowId = await this.getActiveWindowId();
+		return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`, retryCount);
+	}
+
+	async waitForActiveElement(selector: string, retryCount: number = 200): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.isActiveElement(windowId, selector), r => r, `is active element '${selector}'`, retryCount);
+	}
+
+	async waitForTitle(fn: (title: string) => boolean): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.getTitle(windowId), fn, `get title`);
+	}
+
+	async waitForTypeInEditor(selector: string, text: string): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.typeInEditor(windowId, selector, text), () => true, `type in editor '${selector}'`);
+	}
+
+	async waitForTerminalBuffer(selector: string, accept: (result: string[]) => boolean): Promise<void> {
+		const windowId = await this.getActiveWindowId();
+		await poll(() => this.driver.getTerminalBuffer(windowId, selector), accept, `get terminal buffer '${selector}'`);
+	}
+
+	private async getActiveWindowId(): Promise<number> {
+		if (typeof this._activeWindowId !== 'number') {
+			const windows = await this.driver.getWindowIds();
+			this._activeWindowId = windows[0];
+		}
+
+		return this._activeWindowId;
+	}
+
+	dispose(): void {
+		this.client.dispose();
+		this.process.kill();
+	}
+}
+
+export function findElement(element: IElement, fn: (element: IElement) => boolean): IElement | null {
+	const queue = [element];
+
+	while (queue.length > 0) {
+		const element = queue.shift()!;
+
+		if (fn(element)) {
+			return element;
+		}
+
+		queue.push(...element.children);
+	}
+
+	return null;
+}
+
+export function findElements(element: IElement, fn: (element: IElement) => boolean): IElement[] {
+	const result: IElement[] = [];
+	const queue = [element];
+
+	while (queue.length > 0) {
+		const element = queue.shift()!;
+
+		if (fn(element)) {
+			result.push(element);
+		}
+
+		queue.push(...element.children);
+	}
+
+	return result;
+}
\ No newline at end of file
diff --git a/test/smoke/src/vscode/driver.js b/test/smoke/src/vscode/driver.js
new file mode 100644
index 00000000000..24af32d436f
--- /dev/null
+++ b/test/smoke/src/vscode/driver.js
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+
+exports.connect = function (outPath, handle) {
+	const bootstrapPath = path.join(outPath, 'bootstrap-amd.js');
+	const { bootstrap } = require(bootstrapPath);
+	return new Promise((c, e) => bootstrap('vs/platform/driver/node/driver', ({ connect }) => connect(handle).then(c, e), e));
+};
\ No newline at end of file
diff --git a/test/smoke/test/mocha.opts b/test/smoke/test/mocha.opts
index 102d5b65ade..9f769655625 100644
--- a/test/smoke/test/mocha.opts
+++ b/test/smoke/test/mocha.opts
@@ -1,3 +1,3 @@
---timeout 60000
+--timeout 20000
 --slow 20000
 out/main.js
\ No newline at end of file
diff --git a/test/smoke/tools/copy-driver-definition.js b/test/smoke/tools/copy-driver-definition.js
new file mode 100644
index 00000000000..fedf0c28432
--- /dev/null
+++ b/test/smoke/tools/copy-driver-definition.js
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const fs = require('fs');
+const path = require('path');
+
+const root = path.dirname(path.dirname(path.dirname(__dirname)));
+const driverPath = path.join(root, 'src/vs/platform/driver/common/driver.ts');
+
+let contents = fs.readFileSync(driverPath, 'utf8');
+contents = /\/\/\*START([\s\S]*)\/\/\*END/mi.exec(contents)[1].trim();
+contents = contents.replace(/\bTPromise\b/g, 'Promise');
+
+contents = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+${contents}
+
+export interface IDisposable {
+	dispose(): void;
+}
+
+export function connect(outPath: string, handle: string): Promise<{ client: IDisposable, driver: IDriver }>;
+`;
+
+const srcPath = path.join(path.dirname(__dirname), 'src/vscode');
+const outDriverPath = path.join(srcPath, 'driver.d.ts');
+
+fs.writeFileSync(outDriverPath, contents);
\ No newline at end of file
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 0508d361c3b..2f15aec3278 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -58,6 +58,17 @@
   dependencies:
     "@types/node" "*"
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
 ajv@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
@@ -67,56 +78,66 @@ ajv@^5.1.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
-ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
 
-ansi-styles@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
   dependencies:
-    color-convert "^1.9.0"
-
-archiver-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
-  dependencies:
-    glob "^7.0.0"
-    graceful-fs "^4.1.0"
-    lazystream "^1.0.0"
-    lodash "^4.8.0"
+    micromatch "^2.1.5"
     normalize-path "^2.0.0"
-    readable-stream "^2.0.0"
 
-archiver@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.0.tgz#d2df2e8d5773a82c1dcce925ccc41450ea999afd"
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
   dependencies:
-    archiver-utils "^1.3.0"
-    async "^2.0.0"
-    buffer-crc32 "^0.2.1"
-    glob "^7.0.0"
-    lodash "^4.8.0"
-    readable-stream "^2.0.0"
-    tar-stream "^1.5.0"
-    zip-stream "^1.2.0"
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-filter@~0.0.0:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
 
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
 
+array-map@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+
+array-reduce@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -125,29 +146,35 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-async@^2.0.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
-  dependencies:
-    lodash "^4.14.0"
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-atob@~1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
+aws4@^1.2.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+
 aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-runtime@^6.26.0:
+babel-runtime@^6.9.2:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   dependencies:
@@ -164,16 +191,26 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
+binary-extensions@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
   dependencies:
-    readable-stream "^2.0.5"
+    inherits "~2.0.0"
 
 bluebird@^2.9.34:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
 boom@4.x.x:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
@@ -193,14 +230,18 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
 browser-stdout@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
 
-buffer-crc32@^0.2.1:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -220,23 +261,30 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-chalk@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+chalk@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
   dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
 
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+chokidar@^1.6.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
 
 co@^4.6.0:
   version "4.6.0"
@@ -246,22 +294,16 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
-  dependencies:
-    color-name "^1.1.1"
-
-color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
+
 commander@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
@@ -272,15 +314,6 @@ commander@^2.8.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
-compress-commons@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
-  dependencies:
-    buffer-crc32 "^0.2.1"
-    crc32-stream "^2.0.0"
-    normalize-path "^2.0.0"
-    readable-stream "^2.0.0"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -293,6 +326,23 @@ concat-stream@1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concurrently@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.1.tgz#ee8b60018bbe86b02df13e5249453c6ececd2521"
+  dependencies:
+    chalk "0.5.1"
+    commander "2.6.0"
+    date-fns "^1.23.0"
+    lodash "^4.5.1"
+    rx "2.3.24"
+    spawn-command "^0.0.2-1"
+    supports-color "^3.2.3"
+    tree-kill "^1.1.0"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
 core-js@^2.4.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
@@ -301,16 +351,27 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-crc32-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+cpx@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
   dependencies:
-    crc "^3.4.4"
-    readable-stream "^2.0.0"
+    babel-runtime "^6.9.2"
+    chokidar "^1.6.0"
+    duplexer "^0.1.1"
+    glob "^7.0.5"
+    glob2base "^0.0.12"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    resolve "^1.1.7"
+    safe-buffer "^5.0.1"
+    shell-quote "^1.6.1"
+    subarg "^1.0.0"
 
-crc@^3.4.4:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
 
 cryptiles@3.x.x:
   version "3.1.2"
@@ -318,25 +379,6 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
-css-parse@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
-  dependencies:
-    css "^2.0.0"
-
-css-value@~0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/css-value/-/css-value-0.0.1.tgz#5efd6c2eea5ea1fd6b6ac57ec0427b18452424ea"
-
-css@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.1.tgz#73a4c81de85db664d4ee674f7d47085e3b2d55dc"
-  dependencies:
-    inherits "^2.0.1"
-    source-map "^0.1.38"
-    source-map-resolve "^0.3.0"
-    urix "^0.1.0"
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -349,6 +391,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.23.0:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
 debug@2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
@@ -369,17 +415,17 @@ deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
-deepmerge@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
 
-dev-null@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dev-null/-/dev-null-0.1.1.tgz#5a205ce3c2b2ef77b6238d6ba179eb74c6a0e818"
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
 diff@3.2.0:
   version "3.2.0"
@@ -413,23 +459,16 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
   dependencies:
     jsbn "~0.1.0"
 
-ejs@~2.5.6:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-
-electron-chromedriver@~1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.7.1.tgz#008c97976007aa4eb18491ee095e94d17ee47610"
-  dependencies:
-    electron-download "^4.1.0"
-    extract-zip "^1.6.5"
-
 electron-download@^3.0.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8"
@@ -444,20 +483,6 @@ electron-download@^3.0.1:
     semver "^5.3.0"
     sumchecker "^1.2.0"
 
-electron-download@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.0.tgz#bf932c746f2f87ffcc09d1dd472f2ff6b9187845"
-  dependencies:
-    debug "^2.2.0"
-    env-paths "^1.0.0"
-    fs-extra "^2.0.0"
-    minimist "^1.2.0"
-    nugget "^2.0.0"
-    path-exists "^3.0.0"
-    rc "^1.1.2"
-    semver "^5.3.0"
-    sumchecker "^2.0.1"
-
 electron@1.7.7:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.7.tgz#cfd89ca9eba79d763ac0b0c6dcc583792097b9b6"
@@ -466,20 +491,10 @@ electron@1.7.7:
     electron-download "^3.0.1"
     extract-zip "^1.0.3"
 
-end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
-  dependencies:
-    once "^1.4.0"
-
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-env-paths@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0"
-
 error-ex@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
@@ -490,23 +505,39 @@ es6-promise@^4.0.5:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-extend@~3.0.1:
+exec-sh@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  dependencies:
+    merge "^1.1.3"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.5.tgz#52c249a3981b9ba187c7cacf5beb50bf1d91a6bc"
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
   dependencies:
-    iconv-lite "^0.4.17"
-    jschardet "^1.4.2"
-    tmp "^0.0.33"
+    is-extglob "^1.0.0"
 
-extract-zip@^1.0.3, extract-zip@^1.6.5:
+extract-zip@^1.0.3:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c"
   dependencies:
@@ -533,11 +564,23 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
   dependencies:
-    escape-string-regexp "^1.0.5"
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-index@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
 
 find-up@^1.0.0:
   version "1.1.2"
@@ -546,10 +589,28 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
 form-data@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
@@ -568,22 +629,46 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-gaze@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
+fsevents@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
   dependencies:
-    globule "^1.0.0"
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.39"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 get-stdin@^4.0.1:
   version "4.0.1"
@@ -595,6 +680,25 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob2base@^0.0.12:
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+  dependencies:
+    find-index "^0.1.1"
+
 glob@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -606,7 +710,7 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.5, glob@~7.1.1:
+glob@^7.0.5:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -617,15 +721,7 @@ glob@^7.0.0, glob@^7.0.5, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globule@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.4"
-    minimatch "~3.0.2"
-
-graceful-fs@^4.1.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -637,10 +733,21 @@ growl@1.9.2:
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
 
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
@@ -648,13 +755,28 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+hawk@3.1.3, hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
 
 hawk@~6.0.2:
   version "6.0.2"
@@ -669,6 +791,10 @@ he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
 hoek@4.x.x:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
@@ -692,6 +818,14 @@ htmlparser2@^3.9.2:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -700,10 +834,6 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@^0.4.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -717,7 +847,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -725,35 +855,44 @@ ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inquirer@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
 
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@ -766,13 +905,31 @@ is-fullwidth-code-point@^1.0.0:
   dependencies:
     number-is-nan "^1.0.0"
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
 
-is-promise@^2.1.0:
+is-number@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
@@ -786,10 +943,16 @@ isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -798,10 +961,6 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jschardet@^1.4.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
-
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -810,6 +969,12 @@ json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
 
+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -824,6 +989,10 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -833,18 +1002,24 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  dependencies:
-    readable-stream "^2.0.5"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -902,9 +1077,9 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash@^4.14.0, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+lodash@^4.5.1:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
@@ -932,21 +1107,49 @@ meow@^3.1.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
+merge@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
 mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
 mime-types@^2.1.12, mime-types@~2.1.17:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
   dependencies:
     mime-db "~1.30.0"
 
-mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
 
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -960,17 +1163,13 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -997,14 +1196,37 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+nan@^2.3.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
 ncp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+  dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
@@ -1014,15 +1236,20 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0:
+normalize-path@^2.0.0, normalize-path@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-npm-install-package@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-install-package/-/npm-install-package-2.1.0.tgz#d7efe3cfcd7ab00614b896ea53119dc9ab259125"
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
 
 nugget@^2.0.0:
   version "2.0.1"
@@ -1040,11 +1267,11 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.8.2:
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@^4.0.1:
+object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
@@ -1052,29 +1279,43 @@ object-keys@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
 
-once@^1.3.0, once@^1.4.0:
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0, once@^1.3.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  dependencies:
-    mimic-fn "^1.0.0"
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-optimist@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -1087,14 +1328,14 @@ path-exists@^2.0.0, path-exists@^2.1.0:
   dependencies:
     pinkie-promise "^2.0.0"
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -1107,6 +1348,10 @@ pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
 
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -1133,6 +1378,10 @@ portastic@^1.0.1:
     commander "^2.8.1"
     debug "^2.2.0"
 
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
 pretty-bytes@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84"
@@ -1144,6 +1393,10 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
 progress-stream@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77"
@@ -1151,25 +1404,24 @@ progress-stream@^1.1.0:
     speedometer "~0.1.2"
     through2 "~0.2.3"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@~1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
 
 rc@^1.1.2:
   version "1.2.2"
@@ -1180,6 +1432,15 @@ rc@^1.1.2:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+rc@^1.1.7:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -1195,7 +1456,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.2.2:
+readable-stream@^2.0.2, readable-stream@^2.2.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -1207,6 +1468,18 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@^2.0.6, readable-stream@^2.1.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -1216,6 +1489,15 @@ readable-stream@~1.1.9:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -1227,17 +1509,58 @@ regenerator-runtime@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
 
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
 
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
   dependencies:
     is-finite "^1.0.0"
 
-request@^2.45.0, request@^2.81.0, request@~2.83.0:
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+request@^2.45.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -1264,42 +1587,21 @@ request@^2.45.0, request@^2.81.0, request@~2.83.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-resolve-url@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+resolve@^1.1.7:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.0.tgz#2bdf5374811207285df0df652b78f118ab8f3c5e"
   dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
+    path-parse "^1.0.5"
 
-rgb2hex@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/rgb2hex/-/rgb2hex-0.1.0.tgz#ccd55f860ae0c5c4ea37504b958e442d8d12325b"
-
-rimraf@^2.2.8, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
     glob "^7.0.5"
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  dependencies:
-    is-promise "^2.1.0"
-
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+rx@2.3.24:
+  version "2.3.24"
+  resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
 
 safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
@@ -1309,7 +1611,24 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+shell-quote@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
+  dependencies:
+    array-filter "~0.0.0"
+    array-map "~0.0.0"
+    array-reduce "~0.0.0"
+    jsonify "~0.0.0"
+
+signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
@@ -1319,30 +1638,21 @@ single-line-log@^1.1.2:
   dependencies:
     string-width "^1.0.1"
 
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
 sntp@2.x.x:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
   dependencies:
     hoek "4.x.x"
 
-source-map-resolve@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
-  dependencies:
-    atob "~1.1.0"
-    resolve-url "~0.2.1"
-    source-map-url "~0.3.0"
-    urix "~0.1.0"
-
-source-map-url@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-
-source-map@^0.1.38:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
+spawn-command@^0.0.2-1:
+  version "0.0.2-1"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0"
 
 spdx-correct@~1.0.0:
   version "1.0.2"
@@ -1358,26 +1668,10 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
-spectron@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/spectron/-/spectron-3.7.2.tgz#86f41306a9b70ed6ee1500f7f7d3adc389afb446"
-  dependencies:
-    dev-null "^0.1.1"
-    electron-chromedriver "~1.7.1"
-    request "^2.81.0"
-    split "^1.0.0"
-    webdriverio "^4.8.0"
-
 speedometer@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d"
 
-split@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  dependencies:
-    through "2"
-
 sshpk@^1.7.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
@@ -1392,7 +1686,7 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-string-width@^1.0.1:
+string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   dependencies:
@@ -1400,13 +1694,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -1417,22 +1704,28 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.5:
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
-strip-ansi@^3.0.0:
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -1449,6 +1742,12 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+subarg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
+  dependencies:
+    minimist "^1.1.0"
+
 sumchecker@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d"
@@ -1456,38 +1755,42 @@ sumchecker@^1.2.0:
     debug "^2.2.0"
     es6-promise "^4.0.5"
 
-sumchecker@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e"
-  dependencies:
-    debug "^2.2.0"
-
 supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  dependencies:
-    has-flag "^2.0.0"
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
 
-supports-color@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.0.0.tgz#1db26229f6ae02f9acdb5410907c36ce2e362b13"
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
-    has-flag "^2.0.0"
+    has-flag "^1.0.0"
 
-tar-stream@^1.5.0:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
+tar-pack@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
   dependencies:
-    bl "^1.0.0"
-    end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
-    xtend "^4.0.0"
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
 
 throttleit@0.0.2:
   version "0.0.2"
@@ -1500,22 +1803,28 @@ through2@~0.2.3:
     readable-stream "~1.1.9"
     xtend "~2.1.1"
 
-through@2, through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
-tmp@0.0.33, tmp@^0.0.33:
+tmp@0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
     os-tmpdir "~1.0.2"
 
+tough-cookie@~2.3.0:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
 tough-cookie@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
     punycode "^1.4.1"
 
+tree-kill@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -1538,21 +1847,18 @@ typescript@2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34"
 
-urix@^0.1.0, urix@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-
-url@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
+uuid@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
 uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
@@ -1564,10 +1870,6 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validator@~9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-9.1.1.tgz#3bdd1065cbd28f9d96ac806dee01030d32fd97ef"
-
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -1576,53 +1878,23 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-wdio-dot-reporter@~0.0.8:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz#929b2adafd49d6b0534fda068e87319b47e38fe5"
-
-webdriverio@^4.8.0:
-  version "4.9.8"
-  resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-4.9.8.tgz#907180e715d3b9e16cabe20bad59854bec1e44fa"
+watch@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"
   dependencies:
-    archiver "~2.1.0"
-    babel-runtime "^6.26.0"
-    css-parse "~2.0.0"
-    css-value "~0.0.1"
-    deepmerge "~2.0.1"
-    ejs "~2.5.6"
-    gaze "~1.1.2"
-    glob "~7.1.1"
-    inquirer "~3.3.0"
-    json-stringify-safe "~5.0.1"
-    mkdirp "~0.5.1"
-    npm-install-package "~2.1.0"
-    optimist "~0.6.1"
-    q "~1.5.0"
-    request "~2.83.0"
-    rgb2hex "~0.1.0"
-    safe-buffer "~5.1.1"
-    supports-color "~5.0.0"
-    url "~0.11.0"
-    validator "~9.1.1"
-    wdio-dot-reporter "~0.0.8"
-    wgxpath "~1.0.0"
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
 
-wgxpath@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wgxpath/-/wgxpath-1.0.0.tgz#eef8a4b9d558cc495ad3a9a2b751597ecd9af690"
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
 xtend@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
@@ -1634,12 +1906,3 @@ yauzl@2.4.1:
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
   dependencies:
     fd-slicer "~1.0.1"
-
-zip-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
-  dependencies:
-    archiver-utils "^1.3.0"
-    compress-commons "^1.2.0"
-    lodash "^4.8.0"
-    readable-stream "^2.0.0"
diff --git a/tslint.json b/tslint.json
index 31396c2aa56..6e26e8166d0 100644
--- a/tslint.json
+++ b/tslint.json
@@ -409,6 +409,18 @@
 					"*" // node modules
 				]
 			},
+			{
+				"target": "**/vs/code/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"vs/nls",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/code/**",
+					"*" // node modules
+				]
+			},
 			{
 				"target": "**/vs/code/**",
 				"restrictions": [
@@ -430,6 +442,13 @@
 					"*"
 				]
 			},
+			{
+				"target": "**/test/smoke2/**",
+				"restrictions": [
+					"**/test/smoke2/**",
+					"*"
+				]
+			},
 			{
 				"target": "{**/**.test.ts,**/test/**}",
 				"restrictions": "{**/vs/**,assert,sinon,crypto}"
diff --git a/yarn.lock b/yarn.lock
index 29d519dd7b8..139077c5c6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -602,10 +602,6 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
-charenc@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -885,10 +881,6 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-crypt@~0.0.1:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
 cryptiles@0.2.x:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
@@ -2753,10 +2745,6 @@ is-buffer@^1.0.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
 
-is-buffer@~1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -3510,14 +3498,6 @@ math-expression-evaluator@^1.2.14:
   version "1.2.17"
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
-md5@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  dependencies:
-    charenc "~0.0.1"
-    crypt "~0.0.1"
-    is-buffer "~1.1.1"
-
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -3671,16 +3651,6 @@ mksnapshot@^0.3.0:
     fs-extra "0.26.7"
     request "^2.79.0"
 
-mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  dependencies:
-    debug "^2.2.0"
-    md5 "^2.1.0"
-    mkdirp "~0.5.1"
-    strip-ansi "^4.0.0"
-    xml "^1.0.0"
-
 mocha@^2.0.1, mocha@^2.2.5:
   version "2.5.3"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
@@ -5583,9 +5553,9 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
 
 typescript@^2.6.2:
   version "2.6.2"
@@ -5880,9 +5850,9 @@ vscode-chokidar@1.6.2:
   optionalDependencies:
     vscode-fsevents "0.3.8"
 
-vscode-debugprotocol@1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.27.0.tgz#735a43a3cc1235fe587c0ef93fe4e328def7b17c"
+vscode-debugprotocol@1.28.0:
+  version "1.28.0"
+  resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.28.0.tgz#b9fb97c3fb2dadbec78e5c1619ff12bf741ce406"
 
 vscode-fsevents@0.3.8:
   version "0.3.8"
@@ -5920,16 +5890,16 @@ vscode-ripgrep@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-0.8.1.tgz#861d2ac97a3764e9f40f305620423efc50632ad1"
 
-vscode-textmate@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-3.3.2.tgz#43d7722d24ed168d195a1e3c582c6914917a37ab"
+vscode-textmate@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-3.3.3.tgz#8d737f2965046503a4088d47c2793aebe246d355"
   dependencies:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.3.0-beta8:
-  version "3.3.0-beta8"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.3.0-beta8.tgz#092403d293250e09a38d89a53ce120135e92c778"
+vscode-xterm@3.4.0-beta3:
+  version "3.4.0-beta3"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.4.0-beta3.tgz#349db387bd3669ad4d6044a6ea6d699e6d649fb5"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"
@@ -5969,9 +5939,9 @@ windows-mutex@^0.2.0:
     bindings "^1.2.1"
     nan "^2.1.0"
 
-windows-process-tree@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.1.6.tgz#c2d942a944152ea749a4c1c0bdb769b2f570639f"
+windows-process-tree@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.1.tgz#d750f8592bd956e89f8dc565bc47be6430d3df6e"
   dependencies:
     nan "^2.6.2"
 
@@ -6029,10 +5999,6 @@ xml2js@^0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
-xml@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-
 xmlbuilder@0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-0.4.3.tgz#c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"