diff --git a/README.md b/README.md
index 5d5ee55c63a..e45f7ff9e75 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Visual Studio Code - Open Source
 
 [![Build Status](https://travis-ci.org/Microsoft/vscode.svg?branch=master)](https://travis-ci.org/Microsoft/vscode)
-[![Build status](https://ci.appveyor.com/api/projects/status/vuhlhg80tj3e2a0l?svg=true)](https://ci.appveyor.com/project/VSCode/vscode)
+[![Build Status](https://ci.appveyor.com/api/projects/status/vuhlhg80tj3e2a0l/branch/master?svg=true)](https://ci.appveyor.com/project/VSCode/vscode)
 [![Coverage Status](https://img.shields.io/coveralls/Microsoft/vscode/master.svg)](https://coveralls.io/github/Microsoft/vscode?branch=master)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Microsoft/vscode)
 
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index f7ce869e469..3b90f377b7e 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -40,7 +40,7 @@ const nodeModules = ['electron', 'original-fs']
 // Build
 
 const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.11.0' },
+	{ name: 'ms-vscode.node-debug', version: '1.11.1' },
 	{ name: 'ms-vscode.node-debug2', version: '1.11.0' }
 ];
 
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index cb61bfedfce..66078676a5a 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -118,27 +118,32 @@ function reloadTypeScriptNodeModule() {
     });
 }
 function monacodtsTask(out, isWatch) {
-    var timer = null;
-    var runSoon = function (howSoon) {
-        if (timer !== null) {
-            clearTimeout(timer);
-            timer = null;
+    var neededFiles = {};
+    monacodts.getFilesToWatch(out).forEach(function (filePath) {
+        filePath = path.normalize(filePath);
+        neededFiles[filePath] = true;
+    });
+    var inputFiles = {};
+    for (var filePath in neededFiles) {
+        if (/\bsrc(\/|\\)vs\b/.test(filePath)) {
+            // This file is needed from source => simply read it now
+            inputFiles[filePath] = fs.readFileSync(filePath).toString();
+        }
+    }
+    var setInputFile = function (filePath, contents) {
+        if (inputFiles[filePath] === contents) {
+            // no change
+            return;
+        }
+        inputFiles[filePath] = contents;
+        var neededInputFilesCount = Object.keys(neededFiles).length;
+        var availableInputFilesCount = Object.keys(inputFiles).length;
+        if (neededInputFilesCount === availableInputFilesCount) {
+            run();
         }
-        timer = setTimeout(function () {
-            timer = null;
-            runNow();
-        }, howSoon);
     };
-    var runNow = function () {
-        if (timer !== null) {
-            clearTimeout(timer);
-            timer = null;
-        }
-        // if (reporter.hasErrors()) {
-        // 	monacodts.complainErrors();
-        // 	return;
-        // }
-        var result = monacodts.run(out);
+    var run = function () {
+        var result = monacodts.run(out, inputFiles);
         if (!result.isTheSame) {
             if (isWatch) {
                 fs.writeFileSync(result.filePath, result.content);
@@ -150,26 +155,16 @@ function monacodtsTask(out, isWatch) {
     };
     var resultStream;
     if (isWatch) {
-        var filesToWatchMap_1 = {};
-        monacodts.getFilesToWatch(out).forEach(function (filePath) {
-            filesToWatchMap_1[path.normalize(filePath)] = true;
-        });
         watch('build/monaco/*').pipe(es.through(function () {
-            runSoon(5000);
+            run();
         }));
-        resultStream = es.through(function (data) {
-            var filePath = path.normalize(data.path);
-            if (filesToWatchMap_1[filePath]) {
-                runSoon(5000);
-            }
-            this.emit('data', data);
-        });
-    }
-    else {
-        resultStream = es.through(null, function () {
-            runNow();
-            this.emit('end');
-        });
     }
+    resultStream = es.through(function (data) {
+        var filePath = path.normalize(data.path);
+        if (neededFiles[filePath]) {
+            setInputFile(filePath, data.contents.toString());
+        }
+        this.emit('data', data);
+    });
     return resultStream;
 }
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index dd812e6c4ae..be2d8820f5c 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -150,29 +150,36 @@ function reloadTypeScriptNodeModule(): NodeJS.ReadWriteStream {
 }
 
 function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
-	let timer: NodeJS.Timer = null;
 
-	const runSoon = function (howSoon: number) {
-		if (timer !== null) {
-			clearTimeout(timer);
-			timer = null;
+	const neededFiles: { [file: string]: boolean; } = {};
+	monacodts.getFilesToWatch(out).forEach(function (filePath) {
+		filePath = path.normalize(filePath);
+		neededFiles[filePath] = true;
+	});
+
+	const inputFiles: { [file: string]: string; } = {};
+	for (let filePath in neededFiles) {
+		if (/\bsrc(\/|\\)vs\b/.test(filePath)) {
+			// This file is needed from source => simply read it now
+			inputFiles[filePath] = fs.readFileSync(filePath).toString();
+		}
+	}
+
+	const setInputFile = (filePath: string, contents:string) => {
+		if (inputFiles[filePath] === contents) {
+			// no change
+			return;
+		}
+		inputFiles[filePath] = contents;
+		const neededInputFilesCount = Object.keys(neededFiles).length;
+		const availableInputFilesCount = Object.keys(inputFiles).length;
+		if (neededInputFilesCount === availableInputFilesCount) {
+			run();
 		}
-		timer = setTimeout(function () {
-			timer = null;
-			runNow();
-		}, howSoon);
 	};
 
-	const runNow = function () {
-		if (timer !== null) {
-			clearTimeout(timer);
-			timer = null;
-		}
-		// if (reporter.hasErrors()) {
-		// 	monacodts.complainErrors();
-		// 	return;
-		// }
-		const result = monacodts.run(out);
+	const run = () => {
+		const result = monacodts.run(out, inputFiles);
 		if (!result.isTheSame) {
 			if (isWatch) {
 				fs.writeFileSync(result.filePath, result.content);
@@ -185,32 +192,18 @@ function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
 	let resultStream: NodeJS.ReadWriteStream;
 
 	if (isWatch) {
-
-		const filesToWatchMap: { [file: string]: boolean; } = {};
-		monacodts.getFilesToWatch(out).forEach(function (filePath) {
-			filesToWatchMap[path.normalize(filePath)] = true;
-		});
-
 		watch('build/monaco/*').pipe(es.through(function () {
-			runSoon(5000);
+			run();
 		}));
-
-		resultStream = es.through(function (data) {
-			const filePath = path.normalize(data.path);
-			if (filesToWatchMap[filePath]) {
-				runSoon(5000);
-			}
-			this.emit('data', data);
-		});
-
-	} else {
-
-		resultStream = es.through(null, function () {
-			runNow();
-			this.emit('end');
-		});
-
 	}
 
+	resultStream = es.through(function (data) {
+		const filePath = path.normalize(data.path);
+		if (neededFiles[filePath]) {
+			setInputFile(filePath, data.contents.toString());
+		}
+		this.emit('data', data);
+	});
+
 	return resultStream;
 }
diff --git a/build/monaco/api.js b/build/monaco/api.js
index 393aa8b28db..db8852e1f90 100644
--- a/build/monaco/api.js
+++ b/build/monaco/api.js
@@ -34,17 +34,14 @@ function moduleIdToPath(out, moduleId) {
     return path.join(OUT_ROOT, out, moduleId) + '.d.ts';
 }
 var SOURCE_FILE_MAP = {};
-function getSourceFile(out, moduleId) {
+function getSourceFile(out, inputFiles, moduleId) {
     if (!SOURCE_FILE_MAP[moduleId]) {
-        var filePath = moduleIdToPath(out, moduleId);
-        var fileContents = void 0;
-        try {
-            fileContents = fs.readFileSync(filePath).toString();
-        }
-        catch (err) {
-            logErr('CANNOT FIND FILE ' + filePath);
+        var filePath = path.normalize(moduleIdToPath(out, moduleId));
+        if (!inputFiles.hasOwnProperty(filePath)) {
+            logErr('CANNOT FIND FILE ' + filePath + '. YOU MIGHT NEED TO RESTART gulp');
             return null;
         }
+        var fileContents = inputFiles[filePath];
         var sourceFile = ts.createSourceFile(filePath, fileContents, ts.ScriptTarget.ES5);
         SOURCE_FILE_MAP[moduleId] = sourceFile;
     }
@@ -202,7 +199,7 @@ function format(text) {
             insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
             insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: true,
             placeOpenBraceOnNewLineForFunctions: false,
-            placeOpenBraceOnNewLineForControlBlocks: false,
+            placeOpenBraceOnNewLineForControlBlocks: false
         };
     }
 }
@@ -228,7 +225,7 @@ function createReplacer(data) {
         return str;
     };
 }
-function generateDeclarationFile(out, recipe) {
+function generateDeclarationFile(out, inputFiles, recipe) {
     var lines = recipe.split(/\r\n|\n|\r/);
     var result = [];
     lines.forEach(function (line) {
@@ -236,7 +233,7 @@ function generateDeclarationFile(out, recipe) {
         if (m1) {
             CURRENT_PROCESSING_RULE = line;
             var moduleId = m1[1];
-            var sourceFile_1 = getSourceFile(out, moduleId);
+            var sourceFile_1 = getSourceFile(out, inputFiles, moduleId);
             if (!sourceFile_1) {
                 return;
             }
@@ -260,7 +257,7 @@ function generateDeclarationFile(out, recipe) {
         if (m2) {
             CURRENT_PROCESSING_RULE = line;
             var moduleId = m2[1];
-            var sourceFile_2 = getSourceFile(out, moduleId);
+            var sourceFile_2 = getSourceFile(out, inputFiles, moduleId);
             if (!sourceFile_2) {
                 return;
             }
@@ -326,11 +323,11 @@ function getFilesToWatch(out) {
     return result;
 }
 exports.getFilesToWatch = getFilesToWatch;
-function run(out) {
+function run(out, inputFiles) {
     log('Starting monaco.d.ts generation');
     SOURCE_FILE_MAP = {};
     var recipe = fs.readFileSync(RECIPE_PATH).toString();
-    var result = generateDeclarationFile(out, recipe);
+    var result = generateDeclarationFile(out, inputFiles, recipe);
     var currentContent = fs.readFileSync(DECLARATION_PATH).toString();
     log('Finished monaco.d.ts generation');
     return {
diff --git a/build/monaco/api.ts b/build/monaco/api.ts
index ff227fd0156..57be4e5874f 100644
--- a/build/monaco/api.ts
+++ b/build/monaco/api.ts
@@ -31,18 +31,16 @@ function moduleIdToPath(out:string, moduleId:string): string {
 }
 
 let SOURCE_FILE_MAP: {[moduleId:string]:ts.SourceFile;} = {};
-function getSourceFile(out:string, moduleId:string): ts.SourceFile {
+function getSourceFile(out:string, inputFiles: { [file: string]: string; }, moduleId:string): ts.SourceFile {
 	if (!SOURCE_FILE_MAP[moduleId]) {
-		let filePath = moduleIdToPath(out, moduleId);
+		let filePath = path.normalize(moduleIdToPath(out, moduleId));
 
-		let fileContents: string;
-		try {
-			fileContents = fs.readFileSync(filePath).toString();
-		} catch (err) {
-			logErr('CANNOT FIND FILE ' + filePath);
+		if (!inputFiles.hasOwnProperty(filePath)) {
+			logErr('CANNOT FIND FILE ' + filePath + '. YOU MIGHT NEED TO RESTART gulp');
 			return null;
 		}
 
+		let fileContents = inputFiles[filePath];
 		let sourceFile = ts.createSourceFile(filePath, fileContents, ts.ScriptTarget.ES5);
 
 		SOURCE_FILE_MAP[moduleId] = sourceFile;
@@ -262,7 +260,7 @@ function createReplacer(data:string): (str:string)=>string {
 	};
 }
 
-function generateDeclarationFile(out:string, recipe:string): string {
+function generateDeclarationFile(out: string, inputFiles: { [file: string]: string; }, recipe:string): string {
 	let lines = recipe.split(/\r\n|\n|\r/);
 	let result = [];
 
@@ -273,7 +271,7 @@ function generateDeclarationFile(out:string, recipe:string): string {
 		if (m1) {
 			CURRENT_PROCESSING_RULE = line;
 			let moduleId = m1[1];
-			let sourceFile = getSourceFile(out, moduleId);
+			let sourceFile = getSourceFile(out, inputFiles, moduleId);
 			if (!sourceFile) {
 				return;
 			}
@@ -300,7 +298,7 @@ function generateDeclarationFile(out:string, recipe:string): string {
 		if (m2) {
 			CURRENT_PROCESSING_RULE = line;
 			let moduleId = m2[1];
-			let sourceFile = getSourceFile(out, moduleId);
+			let sourceFile = getSourceFile(out, inputFiles, moduleId);
 			if (!sourceFile) {
 				return;
 			}
@@ -383,12 +381,12 @@ export interface IMonacoDeclarationResult {
 	isTheSame: boolean;
 }
 
-export function run(out:string): IMonacoDeclarationResult {
+export function run(out: string, inputFiles: { [file: string]: string; }): IMonacoDeclarationResult {
 	log('Starting monaco.d.ts generation');
 	SOURCE_FILE_MAP = {};
 
 	let recipe = fs.readFileSync(RECIPE_PATH).toString();
-	let result = generateDeclarationFile(out, recipe);
+	let result = generateDeclarationFile(out, inputFiles, recipe);
 
 	let currentContent = fs.readFileSync(DECLARATION_PATH).toString();
 	log('Finished monaco.d.ts generation');
diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index f0a0b4ffd9d..775f46c0b47 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -8,9 +8,9 @@
       "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0.tgz"
     },
     "vscode-html-languageservice": {
-      "version": "2.0.2-next.1",
+      "version": "2.0.2-next.2",
       "from": "vscode-html-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.2-next.1.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.2-next.2.tgz"
     },
     "vscode-jsonrpc": {
       "version": "3.1.0-alpha.1",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index e832be45586..e8c38a75bce 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^2.0.0",
-    "vscode-html-languageservice": "^2.0.2-next.1",
+    "vscode-html-languageservice": "^2.0.2-next.2",
     "vscode-languageserver": "^3.1.0-alpha.1",
     "vscode-nls": "^2.0.2",
     "vscode-uri": "^1.0.0"
diff --git a/extensions/markdown/media/csp.js b/extensions/markdown/media/csp.js
new file mode 100644
index 00000000000..f43b14c8d77
--- /dev/null
+++ b/extensions/markdown/media/csp.js
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+(function () {
+	const settings = JSON.parse(document.getElementById('vscode-markdown-preview-data').getAttribute('data-settings'));
+	const strings = JSON.parse(document.getElementById('vscode-markdown-preview-data').getAttribute('data-strings'));
+
+	let didShow = false;
+
+	document.addEventListener('securitypolicyviolation', () => {
+		if (didShow) {
+			return;
+		}
+		didShow = true;
+		const args = [settings.previewUri];
+
+		const notification = document.createElement('a');
+		notification.innerText = strings.cspAlertMessageText;
+		notification.setAttribute('id', 'code-csp-warning');
+		notification.setAttribute('title', strings.cspAlertMessageTitle);
+
+		notification.setAttribute('role', 'button');
+		notification.setAttribute('aria-label',  strings.cspAlertMessageLabel);
+		notification.setAttribute('href', `command:markdown.showPreviewSecuritySelector?${encodeURIComponent(JSON.stringify(args))}`);
+
+		document.body.appendChild(notification);
+	});
+}());
\ No newline at end of file
diff --git a/extensions/markdown/media/main.js b/extensions/markdown/media/main.js
index c4614d853aa..f927c0fa90f 100644
--- a/extensions/markdown/media/main.js
+++ b/extensions/markdown/media/main.js
@@ -89,7 +89,7 @@
 	function scrollToRevealSourceLine(line) {
 		const {previous, next} = getElementsForSourceLine(line);
 		marker.update(previous && previous.element);
-		if (previous && window.initialData.scrollPreviewWithEditorSelection) {
+		if (previous && settings.scrollPreviewWithEditorSelection) {
 			let scrollTo = 0;
 			if (next) {
 				// Between two elements. Go to percentage offset between them.
@@ -141,10 +141,11 @@
 
 	var scrollDisabled = true;
 	var marker = new ActiveLineMarker();
+	const settings = JSON.parse(document.getElementById('vscode-markdown-preview-data').getAttribute('data-settings'));
 
 	window.onload = () => {
-		if (window.initialData.scrollPreviewWithEditorSelection) {
-			const initialLine = +window.initialData.line;
+		if (settings.scrollPreviewWithEditorSelection) {
+			const initialLine = +settings.line;
 			if (!isNaN(initialLine)) {
 				setTimeout(() => {
 					scrollDisabled = true;
@@ -172,7 +173,7 @@
 	})(), false);
 
 	document.addEventListener('dblclick', event => {
-		if (!window.initialData.doubleClickToSwitchToEditor) {
+		if (!settings.doubleClickToSwitchToEditor) {
 			return;
 		}
 
@@ -186,7 +187,7 @@
 		const offset = event.pageY;
 		const line = getEditorLineNumberForPageOffset(offset);
 		if (!isNaN(line)) {
-			const args = [window.initialData.source, line];
+			const args = [settings.source, line];
 			window.parent.postMessage({
 				command: "did-click-link",
 				data: `command:_markdown.didClick?${encodeURIComponent(JSON.stringify(args))}`
@@ -194,14 +195,14 @@
 		}
 	});
 
-	if (window.initialData.scrollEditorWithPreview) {
+	if (settings.scrollEditorWithPreview) {
 		window.addEventListener('scroll', throttle(() => {
 			if (scrollDisabled) {
 				scrollDisabled = false;
 			} else {
 				const line = getEditorLineNumberForPageOffset(window.scrollY);
 				if (!isNaN(line)) {
-					const args = [window.initialData.source, line];
+					const args = [settings.source, line];
 					window.parent.postMessage({
 						command: "did-click-link",
 						data: `command:_markdown.revealLine?${encodeURIComponent(JSON.stringify(args))}`
diff --git a/extensions/markdown/media/markdown.css b/extensions/markdown/media/markdown.css
index 7cefe421dc6..dfb4666bd19 100644
--- a/extensions/markdown/media/markdown.css
+++ b/extensions/markdown/media/markdown.css
@@ -11,6 +11,28 @@ body {
 	word-wrap: break-word;
 }
 
+#code-csp-warning {
+	position: fixed;
+	top: 0;
+	right: 0;
+	color: white;
+	margin: 16px;
+	text-align: center;
+	font-size: 12px;
+	font-family: sans-serif;
+	background-color:#444444;
+	cursor: pointer;
+	padding: 6px;
+	box-shadow: 1px 1px 1px rgba(0,0,0,.25);
+}
+
+#code-csp-warning:hover {
+	text-decoration: none;
+	background-color:#007acc;
+	box-shadow: 2px 2px 2px rgba(0,0,0,.25);
+}
+
+
 body.scrollBeyondLastLine {
 	margin-bottom: calc(100vh - 22px);
 }
diff --git a/extensions/markdown/npm-shrinkwrap.json b/extensions/markdown/npm-shrinkwrap.json
index 0f93176c555..de14b48e12d 100644
--- a/extensions/markdown/npm-shrinkwrap.json
+++ b/extensions/markdown/npm-shrinkwrap.json
@@ -62,6 +62,11 @@
       "from": "vscode-extension-telemetry@>=0.0.6 <0.0.7",
       "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.6.tgz"
     },
+    "vscode-nls": {
+      "version": "2.0.2",
+      "from": "vscode-nls@latest",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"
+    },
     "winreg": {
       "version": "1.2.3",
       "from": "winreg@1.2.3",
diff --git a/extensions/markdown/package.json b/extensions/markdown/package.json
index 593c213056b..713e53b873d 100644
--- a/extensions/markdown/package.json
+++ b/extensions/markdown/package.json
@@ -69,6 +69,11 @@
 					"light": "./media/ViewSource.svg",
 					"dark": "./media/ViewSource_inverse.svg"
 				}
+			},
+			{
+				"command": "markdown.showPreviewSecuritySelector",
+				"title": "%markdown.showPreviewSecuritySelector.title%",
+				"category": "Markdown"
 			}
 		],
 		"menus": {
@@ -83,6 +88,10 @@
 					"when": "resourceScheme == markdown",
 					"command": "markdown.showSource",
 					"group": "navigation"
+				},
+				{
+					"when": "resourceScheme == markdown",
+					"command": "markdown.showPreviewSecuritySelector"
 				}
 			],
 			"explorer/context": [
@@ -183,7 +192,8 @@
 		"highlight.js": "^9.3.0",
 		"markdown-it": "^8.2.2",
 		"markdown-it-named-headers": "0.0.4",
-		"vscode-extension-telemetry": "^0.0.6"
+		"vscode-extension-telemetry": "^0.0.6",
+		"vscode-nls": "^2.0.2"
 	},
 	"devDependencies": {
 		"@types/node": "^7.0.4"
diff --git a/extensions/markdown/package.nls.json b/extensions/markdown/package.nls.json
index 253ab8910ef..c79bb2952a9 100644
--- a/extensions/markdown/package.nls.json
+++ b/extensions/markdown/package.nls.json
@@ -10,5 +10,6 @@
 	"markdown.previewFrontMatter.dec": "Sets how YAML front matter should be rendered in the markdown preview. 'hide' removes the front matter. Otherwise, the front matter is treated as markdown content.",
 	"markdown.previewSide.title" : "Open Preview to the Side",
 	"markdown.showSource.title" : "Show Source",
-	"markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the markdown file. All '\\' need to be written as '\\\\'."
+	"markdown.styles.dec": "A list of URLs or local paths to CSS style sheets to use from the markdown preview. Relative paths are interpreted relative to the folder open in the explorer. If there is no open folder, they are interpreted relative to the location of the markdown file. All '\\' need to be written as '\\\\'.",
+	"markdown.showPreviewSecuritySelector.title": "Change Markdown Preview Security Settings"
 }
\ No newline at end of file
diff --git a/extensions/markdown/src/extension.ts b/extensions/markdown/src/extension.ts
index 354d380c7fb..1220ffe9f0c 100644
--- a/extensions/markdown/src/extension.ts
+++ b/extensions/markdown/src/extension.ts
@@ -11,9 +11,14 @@ import TelemetryReporter from 'vscode-extension-telemetry';
 import { MarkdownEngine } from './markdownEngine';
 import DocumentLinkProvider from './documentLinkProvider';
 import MDDocumentSymbolProvider from './documentSymbolProvider';
-import { MDDocumentContentProvider, getMarkdownUri, isMarkdownFile } from './previewContentProvider';
+import { MDDocumentContentProvider, getMarkdownUri, isMarkdownFile, ContentSecurityPolicyArbiter } from './previewContentProvider';
 import { TableOfContentsProvider } from './tableOfContentsProvider';
 
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+
 interface IPackageInfo {
 	name: string;
 	version: string;
@@ -25,6 +30,37 @@ interface OpenDocumentLinkArgs {
 	fragment: string;
 }
 
+enum PreviewSecuritySelection {
+	None,
+	DisableEnhancedSecurityForWorkspace,
+	EnableEnhancedSecurityForWorkspace
+}
+
+interface PreviewSecurityPickItem extends vscode.QuickPickItem {
+	id: PreviewSecuritySelection;
+}
+
+class ExtensionContentSecurityProlicyArbiter implements ContentSecurityPolicyArbiter {
+	private readonly key = 'trusted_preview_workspace:';
+
+	constructor(
+		private globalState: vscode.Memento
+	) { }
+
+	public isEnhancedSecurityDisableForWorkspace(): boolean {
+		return this.globalState.get<boolean>(this.key + vscode.workspace.rootPath, false);
+	}
+
+	public addTrustedWorkspace(rootPath: string): Thenable<void> {
+		return this.globalState.update(this.key + rootPath, true);
+	}
+
+	public removeTrustedWorkspace(rootPath: string): Thenable<void> {
+		return this.globalState.update(this.key + rootPath, false);
+	}
+
+}
+
 var telemetryReporter: TelemetryReporter | null;
 
 export function activate(context: vscode.ExtensionContext) {
@@ -34,9 +70,10 @@ export function activate(context: vscode.ExtensionContext) {
 		context.subscriptions.push(telemetryReporter);
 	}
 
+	const cspArbiter = new ExtensionContentSecurityProlicyArbiter(context.globalState);
 	const engine = new MarkdownEngine();
 
-	const contentProvider = new MDDocumentContentProvider(engine, context);
+	const contentProvider = new MDDocumentContentProvider(engine, context, cspArbiter);
 	const contentProviderRegistration = vscode.workspace.registerTextDocumentContentProvider('markdown', contentProvider);
 
 	const symbolsProvider = new MDDocumentSymbolProvider(engine);
@@ -64,7 +101,7 @@ export function activate(context: vscode.ExtensionContext) {
 			});
 	}));
 
-	context.subscriptions.push(vscode.commands.registerCommand('_markdown.didClick', (uri, line) => {
+	context.subscriptions.push(vscode.commands.registerCommand('_markdown.didClick', (uri: string, line) => {
 		const sourceUri = vscode.Uri.parse(decodeURIComponent(uri));
 		return vscode.workspace.openTextDocument(sourceUri)
 			.then(document => vscode.window.showTextDocument(document))
@@ -100,6 +137,68 @@ export function activate(context: vscode.ExtensionContext) {
 		}
 	}));
 
+	context.subscriptions.push(vscode.commands.registerCommand('markdown.showPreviewSecuritySelector', (resource: string | undefined) => {
+		const workspacePath = vscode.workspace.rootPath || resource;
+		if (!workspacePath) {
+			return;
+		}
+
+		let sourceUri: vscode.Uri | null = null;
+		if (resource) {
+			sourceUri = vscode.Uri.parse(decodeURIComponent(resource));
+		}
+
+		if (!sourceUri && vscode.window.activeTextEditor) {
+			const activeDocument = vscode.window.activeTextEditor.document;
+			if (activeDocument.uri.scheme === 'markdown') {
+				sourceUri = activeDocument.uri;
+			} else {
+				sourceUri = getMarkdownUri(activeDocument.uri);
+			}
+		}
+
+		vscode.window.showQuickPick<PreviewSecurityPickItem>(
+			[
+				{
+					id: PreviewSecuritySelection.EnableEnhancedSecurityForWorkspace,
+					label: localize(
+						'preview.showPreviewSecuritySelector.disallowScriptsForWorkspaceTitle',
+						'Disable script execution in markdown previews for this workspace'),
+					description: '',
+					detail: cspArbiter.isEnhancedSecurityDisableForWorkspace()
+						? ''
+						: localize('preview.showPreviewSecuritySelector.currentSelection', 'Current setting')
+				}, {
+					id: PreviewSecuritySelection.DisableEnhancedSecurityForWorkspace,
+					label: localize(
+						'preview.showPreviewSecuritySelector.allowScriptsForWorkspaceTitle',
+						'Enable script execution in markdown previews for this workspace'),
+					description: '',
+					detail: cspArbiter.isEnhancedSecurityDisableForWorkspace()
+						? localize('preview.showPreviewSecuritySelector.currentSelection', 'Current setting')
+						: ''
+				},
+			], {
+				placeHolder: localize('preview.showPreviewSecuritySelector.title', 'Change security settings for the Markdown preview'),
+			}).then(selection => {
+				if (!workspacePath) {
+					return false;
+				}
+				switch (selection && selection.id) {
+					case PreviewSecuritySelection.DisableEnhancedSecurityForWorkspace:
+						return cspArbiter.addTrustedWorkspace(workspacePath).then(() => true);
+
+					case PreviewSecuritySelection.EnableEnhancedSecurityForWorkspace:
+						return cspArbiter.removeTrustedWorkspace(workspacePath).then(() => true);
+				}
+				return false;
+			}).then(shouldUpdate => {
+				if (shouldUpdate && sourceUri) {
+					contentProvider.update(sourceUri);
+				}
+			});
+	}));
+
 	context.subscriptions.push(vscode.workspace.onDidSaveTextDocument(document => {
 		if (isMarkdownFile(document)) {
 			const uri = getMarkdownUri(document.uri);
diff --git a/extensions/markdown/src/previewContentProvider.ts b/extensions/markdown/src/previewContentProvider.ts
index 6a65997b19f..0c50c8727c0 100644
--- a/extensions/markdown/src/previewContentProvider.ts
+++ b/extensions/markdown/src/previewContentProvider.ts
@@ -9,6 +9,13 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import { MarkdownEngine } from './markdownEngine';
 
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+export interface ContentSecurityPolicyArbiter {
+	isEnhancedSecurityDisableForWorkspace(): boolean;
+}
+
 export function isMarkdownFile(document: vscode.TextDocument) {
 	return document.languageId === 'markdown'
 		&& document.uri.scheme !== 'markdown'; // prevent processing of own documents
@@ -24,7 +31,8 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 
 	constructor(
 		private engine: MarkdownEngine,
-		private context: vscode.ExtensionContext
+		private context: vscode.ExtensionContext,
+		private cspArbiter: ContentSecurityPolicyArbiter
 	) { }
 
 	private getMediaPath(mediaFile: string): string {
@@ -60,7 +68,7 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 		return vscode.Uri.file(path.join(path.dirname(resource.fsPath), href)).toString();
 	}
 
-	private computeCustomStyleSheetIncludes(uri: vscode.Uri): string {
+	private computeCustomStyleSheetIncludes(uri: vscode.Uri, _nonce: string): string {
 		const styles = vscode.workspace.getConfiguration('markdown')['styles'];
 		if (styles && Array.isArray(styles) && styles.length > 0) {
 			return styles.map((style) => {
@@ -70,13 +78,13 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 		return '';
 	}
 
-	private getSettingsOverrideStyles(): string {
+	private getSettingsOverrideStyles(nonce: string): string {
 		const previewSettings = vscode.workspace.getConfiguration('markdown')['preview'];
 		if (!previewSettings) {
 			return '';
 		}
 		const { fontFamily, fontSize, lineHeight } = previewSettings;
-		return `<style>
+		return `<style nonce="${nonce}">
 			body {
 				${fontFamily ? `font-family: ${fontFamily};` : ''}
 				${+fontSize > 0 ? `font-size: ${fontSize}px;` : ''}
@@ -100,29 +108,45 @@ export class MDDocumentContentProvider implements vscode.TextDocumentContentProv
 				initialLine = editor.selection.active.line;
 			}
 
+			const initialData = {
+				previewUri: encodeURIComponent(uri.toString(true)),
+				source: encodeURIComponent(sourceUri.toString(true)),
+				line: initialLine,
+				scrollPreviewWithEditorSelection: !!markdownConfig.get('preview.scrollPreviewWithEditorSelection', true),
+				scrollEditorWithPreview: !!markdownConfig.get('preview.scrollEditorWithPreview', true),
+				doubleClickToSwitchToEditor: !!markdownConfig.get('preview.doubleClickToSwitchToEditor', true),
+			};
+
+			const previewStrings = {
+				cspAlertMessageText: localize('preview.securityMessage.text', 'Scripts have been disabled in this document'),
+				cspAlertMessageTitle: localize('preview.securityMessage.title', 'Scripts are disabled in the markdown preview. Change the Markdown preview secuirty setting to enable scripts'),
+				cspAlertMessageLabel: localize('preview.securityMessage.label', 'Scripts Disabled Security Warning')
+			};
+
+			// Content Security Policy
+			const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
+			let csp = `<meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' http: https: data:; media-src 'self' http: https: data:; child-src 'none'; script-src 'nonce-${nonce}'; style-src 'nonce-${nonce}' 'self' 'unsafe-inline' http: https: data:;">`;
+			if (this.cspArbiter.isEnhancedSecurityDisableForWorkspace()) {
+				csp = '';
+			}
+
 			const body = this.engine.render(sourceUri, previewFrontMatter === 'hide', document.getText());
 			return `<!DOCTYPE html>
 				<html>
 				<head>
 					<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+					${csp}
+					<meta id="vscode-markdown-preview-data" data-settings="${JSON.stringify(initialData).replace(/"/g, '&quot;')}" data-strings="${JSON.stringify(previewStrings).replace(/"/g, '&quot;')}">
+					<script src="${this.getMediaPath('csp.js')}" nonce="${nonce}"></script>
 					<link rel="stylesheet" type="text/css" href="${this.getMediaPath('markdown.css')}">
 					<link rel="stylesheet" type="text/css" href="${this.getMediaPath('tomorrow.css')}">
-					${this.getSettingsOverrideStyles()}
-					${this.computeCustomStyleSheetIncludes(uri)}
+					${this.getSettingsOverrideStyles(nonce)}
+					${this.computeCustomStyleSheetIncludes(uri, nonce)}
 					<base href="${document.uri.toString(true)}">
-					<script>
-						window.initialData = {
-							source: "${encodeURIComponent(sourceUri.toString(true))}",
-							line: ${initialLine},
-							scrollPreviewWithEditorSelection: ${!!markdownConfig.get('preview.scrollPreviewWithEditorSelection', true)},
-							scrollEditorWithPreview: ${!!markdownConfig.get('preview.scrollEditorWithPreview', true)},
-							doubleClickToSwitchToEditor: ${!!markdownConfig.get('preview.doubleClickToSwitchToEditor', true)},
-						};
-					</script>
 				</head>
 				<body class="${scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${wordWrap ? 'wordWrap' : ''} ${!!markdownConfig.get('preview.markEditorSelection') ? 'showEditorSelection' : ''}">
 					${body}
-					<script src="${this.getMediaPath('main.js')}"></script>
+					<script src="${this.getMediaPath('main.js')}" nonce="${nonce}"></script>
 				</body>
 				</html>`;
 		});
diff --git a/extensions/markdown/tsconfig.json b/extensions/markdown/tsconfig.json
index 7e8097e8fb4..e877d8142f0 100644
--- a/extensions/markdown/tsconfig.json
+++ b/extensions/markdown/tsconfig.json
@@ -3,7 +3,7 @@
 		"module": "commonjs",
 		"target": "es5",
 		"lib": [
-			"es5",
+			"es6",
 			"es2015.promise"
 		],
 		"outDir": "./out",
diff --git a/extensions/typescript/src/features/implementationsCodeLensProvider.ts b/extensions/typescript/src/features/implementationsCodeLensProvider.ts
index e7ebc0303ef..4155dc0436d 100644
--- a/extensions/typescript/src/features/implementationsCodeLensProvider.ts
+++ b/extensions/typescript/src/features/implementationsCodeLensProvider.ts
@@ -65,19 +65,8 @@ export default class TypeScriptImplementationsCodeLensProvider extends TypeScrip
 	protected extractSymbol(
 		document: TextDocument,
 		item: Proto.NavigationTree,
-		parent: Proto.NavigationTree | null
+		_parent: Proto.NavigationTree | null
 	): Range | null {
-		// Handle children of interfaces
-		if (parent && parent.kind === PConst.Kind.interface) {
-			switch (item.kind) {
-				case PConst.Kind.memberFunction:
-				case PConst.Kind.memberVariable:
-				case PConst.Kind.memberGetAccessor:
-				case PConst.Kind.memberSetAccessor:
-					return super.getSymbolRange(document, item);
-			}
-		}
-
 		switch (item.kind) {
 			case PConst.Kind.interface:
 				return super.getSymbolRange(document, item);
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index ada263d4e5f..3c044bf1dc4 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -328,7 +328,11 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 	}
 
 	private get bundledTypeScriptPath(): string {
-		return require.resolve('typescript/lib/tsserver.js');
+		try {
+			return require.resolve('typescript/lib/tsserver.js');
+		} catch (e) {
+			return '';
+		}
 	}
 
 	private get localTypeScriptPath(): string | null {
@@ -392,9 +396,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 
 				this.info(`Using tsserver from location: ${modulePath}`);
 				if (!fs.existsSync(modulePath)) {
-					window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', path.dirname(modulePath)));
+					window.showWarningMessage(localize('noServerFound', 'The path {0} doesn\'t point to a valid tsserver install. Falling back to bundled TypeScript version.', modulePath ? path.dirname(modulePath) : ''));
+					if (!this.bundledTypeScriptPath) {
+						window.showErrorMessage(localize('noBundledServerFound', 'VSCode\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));
+						return reject(new Error('Could not find bundled tsserver.js'));
+					}
 					modulePath = this.bundledTypeScriptPath;
-					// TODO check again?
 				}
 
 				let version = this.getTypeScriptVersion(modulePath);
@@ -482,9 +489,9 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 		return this.showVersionPicker(false);
 	}
 
-	private showVersionPicker(firstRun: boolean) {
+	private showVersionPicker(firstRun: boolean): Thenable<string> {
 		const modulePath = this.modulePath || this.globalTypescriptPath;
-		if (!workspace.rootPath) {
+		if (!workspace.rootPath || !modulePath) {
 			return Promise.resolve(modulePath);
 		}
 
diff --git a/extensions/vscode-api-tests/src/editor.test.ts b/extensions/vscode-api-tests/src/editor.test.ts
index 0e06cc292eb..0631d2b4b03 100644
--- a/extensions/vscode-api-tests/src/editor.test.ts
+++ b/extensions/vscode-api-tests/src/editor.test.ts
@@ -6,7 +6,8 @@
 'use strict';
 
 import * as assert from 'assert';
-import { workspace, window, Position, Range, commands, TextEditor, TextDocument, TextEditorCursorStyle, TextEditorLineNumbersStyle, SnippetString, Selection } from 'vscode';
+import { join } from 'path';
+import { workspace, window, Position, Range, commands, TextEditor, TextDocument, TextEditorCursorStyle, TextEditorLineNumbersStyle, SnippetString, Selection, ViewColumn } from 'vscode';
 import { createRandomFile, deleteFile, cleanUp } from './utils';
 
 suite('editor tests', () => {
@@ -109,6 +110,66 @@ suite('editor tests', () => {
 		});
 	});
 
+	test('issue #20867: vscode.window.visibleTextEditors returns closed document 1/2', () => {
+
+		return withRandomFileEditor('Hello world!', editor => {
+
+			const p = new Promise((resolve, reject) => {
+				const sub = workspace.onDidCloseTextDocument(doc => {
+					try {
+						sub.dispose();
+						assert.ok(window.activeTextEditor === undefined);
+						assert.equal(window.visibleTextEditors.length, 0);
+						resolve();
+					} catch (e) {
+						reject(e);
+					}
+				});
+			});
+
+			return Promise.all([
+				commands.executeCommand('workbench.action.closeAllEditors'),
+				p
+			]).then(() => undefined);
+		});
+	});
+
+	test('issue #20867: vscode.window.visibleTextEditors returns closed document 2/2', () => {
+
+		const file10Path = join(workspace.rootPath || '', './10linefile.ts');
+		const file30Path = join(workspace.rootPath || '', './30linefile.ts');
+
+		return Promise.all([
+			workspace.openTextDocument(file10Path),
+			workspace.openTextDocument(file30Path)
+		]).then(docs => {
+			return Promise.all([
+				window.showTextDocument(docs[0], ViewColumn.One),
+				window.showTextDocument(docs[1], ViewColumn.Two),
+			]);
+		}).then(editors => {
+
+			const p = new Promise((resolve, reject) => {
+				const sub = workspace.onDidCloseTextDocument(doc => {
+					try {
+						sub.dispose();
+						assert.ok(window.activeTextEditor === editors[1]);
+						assert.ok(window.visibleTextEditors[0] === editors[1]);
+						assert.equal(window.visibleTextEditors.length, 1);
+						resolve();
+					} catch (e) {
+						reject(e);
+					}
+				});
+			});
+
+			// hide doesn't what it means because it triggers a close event and because it
+			// detached the editor. For this test that's what we want.
+			editors[0].hide();
+			return p;
+		});
+	});
+
 	function executeReplace(editor: TextEditor, range: Range, text: string, undoStopBefore: boolean, undoStopAfter: boolean): Thenable<boolean> {
 		return editor.edit((builder) => {
 			builder.replace(range, text);
diff --git a/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index a43fc96b5f0..128118eee78 100644
--- a/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "例如 myFile.txt",
-	"activeFilePath": "例如 /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "e.g. /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "e.g. myFolder/myFile.txt",
+	"activeEditorShort": "例如 myFile.txt",
 	"appName": "例如 VS Code",
 	"assocDescriptionFile": "将所有匹配其文件名内的 glob 模式的文件映射到具有给定标识符的语言。",
 	"assocDescriptionPath": "将所有匹配其路径内绝对路径 glob 模式的文件映射到具有给定标识符的语言。",
diff --git a/i18n/chs/extensions/css/package.i18n.json b/i18n/chs/extensions/css/package.i18n.json
index 307714c97a5..4d50df86f65 100644
--- a/i18n/chs/extensions/css/package.i18n.json
+++ b/i18n/chs/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
 	"css.lint.argumentsInColorFunction.desc": "参数数量无效",
 	"css.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
 	"css.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
@@ -23,6 +24,7 @@
 	"css.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
 	"css.lint.zeroUnits.desc": "零不需要单位",
 	"css.validate.desc": "启用或禁用所有验证",
+	"less.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
 	"less.lint.argumentsInColorFunction.desc": "参数数量无效",
 	"less.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
 	"less.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
@@ -42,6 +44,7 @@
 	"less.lint.vendorPrefix.desc": "使用供应商特定前缀时，还应包括标准属性",
 	"less.lint.zeroUnits.desc": "零不需要单位",
 	"less.validate.desc": "启用或禁用所有验证",
+	"scss.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
 	"scss.lint.argumentsInColorFunction.desc": "参数数量无效",
 	"scss.lint.boxModel.desc": "使用边距或边框时，不要使用宽度或高度",
 	"scss.lint.compatibleVendorPrefixes.desc": "使用供应商特定前缀时，确保同时包括所有其他供应商特定属性",
diff --git a/i18n/chs/extensions/git/out/askpass-main.i18n.json b/i18n/chs/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..cd8bc885e08
--- /dev/null
+++ b/i18n/chs/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "凭据丢失或无效。"
+}
\ 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 a6aac279617..28ab3fa0670 100644
--- a/i18n/chs/extensions/git/out/commands.i18n.json
+++ b/i18n/chs/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "分支名称",
 	"clean": "清理更改",
 	"clean repo": "在签出前，请清理存储库工作树。",
+	"cloning": "正在克隆 GIT 存储库...",
 	"commit message": "提交消息",
 	"confirm clean": "是否确定要清理“{0}”中的更改?",
 	"confirm clean all": "是否确定要清理所有更改?",
+	"confirm revert": "是否确实要还原 {0} 中的已选更改?",
 	"disabled": "此工作区已禁用或不支持 GIT",
 	"never again": "好，永不再显示",
 	"no changes": "没有要提交的更改。",
@@ -19,10 +21,15 @@
 	"nobranch": "请签出一个分支以推送到远程。",
 	"ok": "确定",
 	"open git log": "打开 GIT 日志",
+	"openrepo": "打开存储库",
+	"parent": "父目录",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
+	"proposeopen": "是否要打开已克隆存储库?",
 	"provide branch name": "请提供分支名称",
 	"provide commit message": "请提供提交消息",
 	"remote branch at": "{0} 处的远程分支",
+	"repourl": "存储库 URL",
+	"revert": "还原更改",
 	"sync is unpredictable": "此操作从“{0}”推送和拉取提交。",
 	"tag at": "{0} 处的标记"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/out/main.i18n.json b/i18n/chs/extensions/git/out/main.i18n.json
index b2050835c0e..cf04f8a5c0f 100644
--- a/i18n/chs/extensions/git/out/main.i18n.json
+++ b/i18n/chs/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "似乎已安装 GIT {0}。Code 非常适合 GIT >= 2",
+	"updateGit": "更新 GIT",
 	"using git": "使用 {1} 中的 GIT {0}"
 }
\ No newline at end of file
diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json
index 992c769b08a..01d46905060 100644
--- a/i18n/chs/extensions/git/package.i18n.json
+++ b/i18n/chs/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "创建分支...",
 	"command.checkout": "签出到...",
-	"command.clean": "清理",
-	"command.cleanAll": "全部清理",
+	"command.clean": "清理文件",
+	"command.cleanAll": "清理所有文件",
+	"command.clone": "克隆",
 	"command.commit": "提交",
 	"command.commitAll": "全部提交",
 	"command.commitAllSigned": "全部提交(已注销)",
 	"command.commitStaged": "提交已暂存文件",
 	"command.commitStagedSigned": "提交已暂存文件(已注销)",
-	"command.init": "初始化 GIT 存储库",
+	"command.init": "初始化存储库",
 	"command.openChange": "打开更改",
 	"command.openFile": "打开文件",
 	"command.publish": "发布",
@@ -22,14 +23,15 @@
 	"command.push": "推送",
 	"command.pushTo": "推送到...",
 	"command.refresh": "刷新",
+	"command.revertSelectedRanges": "还原所选更改",
 	"command.showOutput": "显示 GIT 输出",
-	"command.stage": "暂存",
-	"command.stageAll": "全部暂存",
+	"command.stage": "暂存文件",
+	"command.stageAll": "暂存所有文件",
 	"command.stageSelectedRanges": "暂存所选范围",
 	"command.sync": "同步",
 	"command.undoCommit": "撤消上次提交",
-	"command.unstage": "取消暂存",
-	"command.unstageAll": "取消全部暂存",
+	"command.unstage": "取消暂存文件",
+	"command.unstageAll": "取消暂存所有文件",
 	"command.unstageSelectedRanges": "取消暂存所选范围",
 	"config.autofetch": "是否启用了自动提取",
 	"config.autorefresh": "是否已启用自动刷新",
diff --git a/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..1b777756992
--- /dev/null
+++ b/i18n/chs/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
index f2b0b6664a9..d2e24dc3773 100644
--- a/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/chs/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "若要启用 JavaScript/TypeScript IntelliSense，请排除包含许多文件的文件夹，例如: {0}",
-	"hintExclude.generic": "若要启用 JavaScript/TypeScript IntelliSense，请排除包含不需要处理的源文件的大型文件夹。",
-	"hintExclude.tooltip": "若要启用 JavaScript/TypeScript IntelliSense，请排除包含不需要处理的源文件的大型文件夹。",
+	"hintExclude": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含多个文件的文件夹，例如: {0}",
+	"hintExclude.generic": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
+	"hintExclude.tooltip": "若要启用项目范围内的 JavaScript/TypeScript 语言功能，请排除包含不需要处理的源文件的大型文件夹。",
 	"large.label": "配置排除",
 	"open": "配置排除"
 }
\ 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 c26c184ee9b..cd714b45c5a 100644
--- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "控制编辑器是否应该在左括号后自动插入右括号",
 	"codeLens": "控制编辑器是否显示代码滤镜",
 	"cursorBlinking": "控制光标动画样式，可能的值为 \"blink\"、\"smooth\"、\"phase\"、\"expand\" 和 \"solid\"",
-	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"line\" 和 \"underline\"",
+	"cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"",
 	"detectIndentation": "当打开文件时，将基于文件内容检测 \"editor.tabSize\" 和 \"editor.insertSpaces\"。",
+	"dragAndDrop": "控制编辑器是否应该允许通过拖放移动所选项。",
 	"editorConfigurationTitle": "编辑器",
 	"emptySelectionClipboard": "控制没有选择内容的复制是否复制当前行。",
 	"folding": "控制编辑器是否启用代码折叠功能",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "应为 \"boolean\"。注意，值 \"auto\" 已由 \"editor.detectIndentation\" 设置替换。",
 	"lineHeight": "控制行高。使用 0 通过字号计算行高。",
 	"lineNumbers": "控制行号的显示。可能的值为“开”、“关”和“相对”。“相对”将显示从当前光标位置开始计数的行数。",
+	"matchBrackets": "当选择其中一项时，将突出显示匹配的括号。",
 	"minimap.enabled": "控制是否显示 minimap",
+	"minimap.maxColumn": "限制最小映射的宽度，尽量多地呈现特定数量的列",
+	"minimap.renderCharacters": "呈现某行上的实际字符(与颜色块相反)",
 	"mouseWheelScrollSensitivity": "要对鼠标滚轮滚动事件的 \"deltaX\" 和 \"deltaY\" 使用的乘数 ",
 	"mouseWheelZoom": "通过使用鼠标滚轮同时按住 Ctrl 可缩放编辑器的字体",
 	"overviewRulerLanes": "控制可在概述标尺同一位置显示的效果数量",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "建议小组件的字号",
 	"suggestLineHeight": "建议小组件的行高",
 	"suggestOnTriggerCharacters": "控制键入触发器字符时是否应自动显示建议",
-	"tabCompletion": "当其前缀匹配时插入代码段。当 \"quickSuggestions\" 未启用时，效果最佳。",
 	"tabSize": "一个制表符等于的空格数。该设置在 `editor.detectIndentation` 启用时根据文件内容进行重写。",
 	"tabSize.errorMessage": "应为 \"number\"。注意，值\"auto\"已由 \"editor.detectIndentation\" 设置替换。",
 	"trimAutoWhitespace": "删除尾随自动插入的空格",
 	"useTabStops": "在制表位后插入和删除空格",
 	"wordBasedSuggestions": "启用基于字的建议。",
 	"wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符",
-	"wordWrap": "控制是否应换行。换行依据为 min(editor.wrappingColumn, viewportWidthInColumns)。",
-	"wrappingColumn": "控制在多少个字符后编辑器会自动换到下一行。将其设置为 0 则将打开视区宽度换行(自动换行)。将其设置为 -1 则将强制编辑器始终不换行。",
+	"wordWrap": "控制换行方式。可以选择:\n - \"off\" (禁用换行)，\n - \"on\" (视区换行)，\n - \"wordWrapColumn\" (在 \"editor.wordWrapColumn\" 处换行)或\n - \"bounded\" (在最小视区和 \"editor.wordWrapColumn\" 处换行)。",
+	"wordWrap.bounded": "将在最小视区和 \"editor.wordWrapColumn\" 处换行。",
+	"wordWrap.off": "永不换行。",
+	"wordWrap.on": "将在视区宽度处换行。",
+	"wordWrap.wordWrapColumn": "将在 \"editor.wordWrapColumn\" 处换行。",
+	"wordWrapColumn": "在 \"editor.wordWrap\" 为 \"wordWrapColumn\" 或 \"bounded\" 时控制编辑器列的换行。",
 	"wrappingIndent": "控制换行的行的缩进。可以是\"none\"、 \"same\" 或 \"indent\"。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 2351fad08aa..9ee8cbb4ef1 100644
--- a/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "查看定义",
 	"generic.noResults": "找不到定义",
 	"meta.title": " – {0} 定义",
-	"multipleResults": "单击显示 {0} 个定义。"
+	"multipleResults": "单击显示 {0} 个定义。",
+	"noResultWord": "未找到“{0}”的任何定义"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index da0d158cb77..738c5faf321 100644
--- a/i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/chs/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "命令“{0}”多次出现在“命令”部分。",
 	"dupe.command": "菜单项引用与默认和 alt 命令相同的命令",
 	"menuId.invalid": "“{0}”为无效菜单标识符",
+	"menus.commandPalette": "命令面板",
 	"menus.editorContext": "编辑器上下文菜单",
 	"menus.editorTabContext": "编辑器选项卡上下文菜单",
 	"menus.editorTitle": "编辑器标题菜单",
diff --git a/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/chs/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ No newline at end of file
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 1cdffaa72b0..9bffe4874fb 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
@@ -24,26 +24,26 @@
 	"showIcons": "控制打开的编辑器是否随图标一起显示。这还需启用图标主题。",
 	"sideBarLocation": "控制边栏的位置。它可显示在工作台的左侧或右侧。",
 	"statusBarVisibility": "控制工作台底部状态栏的可见性。",
-	"title": "基于活动编辑器控制窗口标题。基于上下文替换变量:\n${activeEditorName}: 例如 myFile.txt\n${activeFilePath}: 例如 /Users/Development/myProject/myFile.txt\n${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\n${appName}: 例如 VS Code\n${dirty}: 一个更新指示器，指示活动编辑器是否更新\n${separator}: 一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
+	"title": "基于活动编辑器控制窗口标题。基于上下文替换变量:\n${activeEditorShort}: 例如 myFile.txt\n${activeEditorMedium}: 例如 myFolder/myFile.txt\n${activeEditorLong}:  例如 /Users/Development/myProject/myFile.txt\n${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\n${appName}: 例如 VS Code\n${dirty}: 一个更新指示器，指示活动编辑器是否更新\n${separator}: 一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
 	"titleBarStyle": "调整窗口标题栏的外观。更改需要在完全重启后才能应用。",
 	"view": "查看",
-	"window.menuBarVisibility.default": "“默认”: 菜单仅在全屏模式下隐藏。",
-	"window.menuBarVisibility.hidden": "“隐藏”: 菜单始终隐藏。",
-	"window.menuBarVisibility.toggle": "“切换”: 菜单隐藏，但可以通过 Alt 键显示。",
-	"window.menuBarVisibility.visible": "“可见”: 菜单始终可见，即使处于全屏模式下。",
-	"window.newWindowDimensions.default": "“默认”: 在屏幕中心打开新窗口。",
-	"window.newWindowDimensions.fullscreen": "“全屏”: 在全屏模式下打开新窗口。",
-	"window.newWindowDimensions.inherit": "“继承”: 以与上一个活动窗口相同的尺寸打开新窗口。",
-	"window.newWindowDimensions.maximized": "“最大化”: 打开最大化的新窗口。",
-	"window.openFilesInNewWindow.default": "“默认”: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非通过平台或从查找程序(仅限 macOS)打开",
-	"window.openFilesInNewWindow.off": "“关闭”: 文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
-	"window.openFilesInNewWindow.on": "“启用”: 文件将在新窗口中打开",
-	"window.openFoldersInNewWindow.default": "“默认”: 文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
-	"window.openFoldersInNewWindow.off": "“关闭”: 文件夹将替换上一个活动窗口",
-	"window.openFoldersInNewWindow.on": "“启用”: 文件夹将在新窗口中打开",
-	"window.reopenFolders.all": "“全部”: 重新打开上一个会话的所有文件夹。",
-	"window.reopenFolders.none": "“无”: 永不重新打开文件夹。",
-	"window.reopenFolders.one": "“一”: 重新打开上一个活动文件夹。",
+	"window.menuBarVisibility.default": "菜单仅在全屏模式下隐藏。",
+	"window.menuBarVisibility.hidden": "菜单始终隐藏。",
+	"window.menuBarVisibility.toggle": "菜单隐藏，但可以通过 Alt 键显示。",
+	"window.menuBarVisibility.visible": "菜单始终可见，即使处于全屏模式下。",
+	"window.newWindowDimensions.default": "在屏幕中心打开新窗口。",
+	"window.newWindowDimensions.fullscreen": "在全屏模式下打开新窗口。",
+	"window.newWindowDimensions.inherit": "以与上一个活动窗口相同的尺寸打开新窗口。",
+	"window.newWindowDimensions.maximized": "打开最大化的新窗口。",
+	"window.openFilesInNewWindow.default": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开，除非通过平台或从查找程序(仅限 macOS)打开",
+	"window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开",
+	"window.openFilesInNewWindow.on": "文件将在新窗口中打开",
+	"window.openFoldersInNewWindow.default": "文件夹在新窗口中打开，除非从应用程序内选取一个文件夹(例如，通过“文件”菜单)",
+	"window.openFoldersInNewWindow.off": "文件夹将替换上一个活动窗口",
+	"window.openFoldersInNewWindow.on": "文件夹将在新窗口中打开",
+	"window.reopenFolders.all": "重新打开上一个会话的所有文件夹。",
+	"window.reopenFolders.none": "永不重新打开文件夹。",
+	"window.reopenFolders.one": "重新打开上一个活动文件夹。",
 	"windowConfigurationTitle": "窗口",
 	"workbenchConfigurationTitle": "工作台",
 	"zenMode.fullScreen": "控制打开 Zen Mode 是否也会将工作台置于全屏模式。",
diff --git a/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..8d31f3e0901
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "不再显示",
+	"wordWrapMigration.ok": "确定",
+	"wordWrapMigration.openSettings": "打开设置",
+	"wordWrapMigration.prompt": "已弃用设置 \"editor.wrappingColumn\"，改用 \"editor.wordWrap\"。"
+}
\ 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 45ebe99ffb5..4ef166e941f 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
@@ -34,6 +34,7 @@
 	"restartDebug": "重启",
 	"restartFrame": "重新启动框架",
 	"reverseContinue": "反向",
+	"selectAndStartDebugging": "选择并开始调试",
 	"setValue": "设置值",
 	"startDebug": "开始调试",
 	"startWithoutDebugging": "开始执行(不调试)",
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..73fb4cb069d
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "键入启动配置的名称以运行。",
+	"entryAriaLabel": "{0}，调试",
+	"noConfigurationsFound": "找不到任何调试配置。请创建一个 \"launch.json\" 文件。",
+	"noConfigurationsMatching": "无任何调试配置匹配"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..da85704372c
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "出现异常"
+}
\ 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 73b9bd7ac99..3f5fa3d7ab9 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
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "允许在任何文件中设置断点",
 	"debug": "调试",
 	"debugCategory": "调试",
+	"debugCommands": "调试配置",
 	"debugConfigurationTitle": "调试",
 	"debugPanel": "调试控制台",
 	"inlineValues": "调试时，在编辑器中显示变量值内联",
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 93dfcc2a4e0..af0ddb8f124 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
@@ -14,5 +14,7 @@
 	"debugServer": "仅用于调试扩展开发: 如果已指定端口，VS 代码会尝试连接到在服务器模式中运行的调试适配器",
 	"debugType": "配置类型。",
 	"debugWindowsConfiguration": "特定于 Windows 的启动配置属性。",
-	"internalConsoleOptions": "内部调试控制台的控制行为。"
+	"deprecatedVariables": "已弃用 \"env.\"、\"config.\" 和 \"command.\"，改用 \"env:\"、\"config:\" 和 \"command:\"。",
+	"internalConsoleOptions": "内部调试控制台的控制行为。",
+	"node2NotSupported": "不再支持 \"node2\"，改用 \"node\"，并将“协议”属性设为“检查器”。"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index 0b9e03f060b..c224d552669 100644
--- a/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "配置语言的文件关联(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
+	"associations": "将文件关联配置为语言(如: \"*.extension\": \"html\")。这些关联的优先级高于已安装语言的默认关联。",
 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
-	"autoSave": "控制已更新文件的自动保存。接受的值:“{0}”、\"{1}”、\"{2}”(编辑器失去焦点)、\"{3}”(窗口失去焦点)。如果设置为“{4}”，则可在 \"files.autoSaveDelay\" 中配置延迟。",
-	"autoSaveDelay": "控制延迟(以秒为单位)，在该延迟后将自动保存更新后的文件。仅在 \"files.autoSave\" 设置为“{0}”时适用。",
+	"autoSave": "控制已更新文件的自动保存。接受的值:“{0}”、\"{1}”、“{2}”(编辑器失去焦点)、“{3}”(窗口失去焦点)。如果设置为“{4}”，则可在 \"files.autoSaveDelay\" 中配置延迟。",
+	"autoSaveDelay": "控制延迟(以秒为单位)，在该延迟后将自动保存更新后的文件。仅在 \"files.autoSave'\" 设置为“{0}”时适用。",
 	"binaryFileEditor": "二进制文件编辑器",
 	"dynamicHeight": "控制打开的编辑器部分的高度是否应动态适应元素数量。",
 	"editorConfigurationTitle": "编辑器",
@@ -17,10 +17,10 @@
 	"exclude": "配置 glob 模式以排除文件和文件夹。",
 	"explore": "资源管理器",
 	"explorerConfigurationTitle": "文件资源管理器",
-	"files.autoSave.afterDelay": "\"afterDelay\": 配置 \"files.autoSaveDelay\" 后自动保存更新的文件。",
-	"files.autoSave.off": "“关闭”: 永不自动保存更新的文件。",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": 编辑器失去焦点时自动保存更新的文件。",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": 窗口失去焦点时自动保存更新的文件。",
+	"files.autoSave.afterDelay": "配置 \"files.autoSaveDelay\" 后自动保存更新后的文件。",
+	"files.autoSave.off": "永不自动保存更新后的文件。",
+	"files.autoSave.onFocusChange": "编辑器失去焦点时自动保存更新后的文件。",
+	"files.autoSave.onWindowChange": "窗口失去焦点时自动保存更新后的文件。",
 	"files.exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。",
 	"files.exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
 	"filesConfigurationTitle": "文件",
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..421ed1cedba
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "插入代码片段"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..58235d9d592
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}，{1}"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..46f43eca776
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "当其前缀匹配时插入代码段。当 \"quickSuggestions\" 未启用时，效果最佳。"
+}
\ 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 6a325423c0a..13c1459f063 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "清除",
 	"workbench.action.terminal.copySelection": "复制所选内容",
 	"workbench.action.terminal.focus": "聚焦于终端",
+	"workbench.action.terminal.focusAtIndex": "焦点终端 {0}",
 	"workbench.action.terminal.focusNext": "聚焦于下一终端",
 	"workbench.action.terminal.focusPrevious": "聚焦于上一终端",
 	"workbench.action.terminal.kill": "终止活动终端实例",
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
new file mode 100644
index 00000000000..adb3d1d576a
--- /dev/null
+++ b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (当前)",
+	"welcomePage.cloneGitRepository": "克隆 GIT 存储库...",
+	"welcomePage.colorTheme": "颜色主题",
+	"welcomePage.colorThemeDescription": "使编辑器和代码呈现你喜欢的外观",
+	"welcomePage.configureSettings": "配置设置",
+	"welcomePage.configureSettingsDescription": "通过调整设置来解锁 VS Code 的全部功能",
+	"welcomePage.editingEvolved": "编辑演变",
+	"welcomePage.gitHubRepository": "GitHub 存储库",
+	"welcomePage.help": "帮助",
+	"welcomePage.installKeymap": "安装 {0}、{1}、{2} 和 {3} 的键盘快捷方式",
+	"welcomePage.installKeymapDescription": "安装键盘快捷方式",
+	"welcomePage.interactivePlayground": "交互式运动场",
+	"welcomePage.interactivePlaygroundDescription": "请在简短演练中试用编辑器的基本功能",
+	"welcomePage.interfaceOverview": "接口概述",
+	"welcomePage.interfaceOverviewDescription": "获取突出显示 UI 主要组件的视觉覆盖",
+	"welcomePage.introductoryVideos": "介绍性视频",
+	"welcomePage.keybindingsReference": "键盘快捷方式引用",
+	"welcomePage.keybindingsReferenceDescription": "包含常见键盘快捷方式的可打印 PDF 文件",
+	"welcomePage.newFile": "新建文件",
+	"welcomePage.noRecentFolders": "无最近使用文件夹",
+	"welcomePage.openFolder": "打开文件夹...",
+	"welcomePage.others": "其他",
+	"welcomePage.productDocumentation": "产品文档",
+	"welcomePage.quickLinks": "快速链接",
+	"welcomePage.recent": "最近",
+	"welcomePage.showCommands": "查找并运行所有命令",
+	"welcomePage.showCommandsDescription": "从控制面板快速访问并搜索命令({0})",
+	"welcomePage.showOnStartup": "启动时显示欢迎页",
+	"welcomePage.stackOverflow": "堆栈溢出",
+	"welcomePage.start": "开始",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (当前)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (当前)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 8b6ad71cd4e..8166a4d61f9 100644
--- a/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -3,4 +3,13 @@
  *  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
+{
+	"cancel": "取消",
+	"ok": "确定",
+	"welcome.title": "欢迎使用",
+	"welcomePage": "欢迎使用",
+	"welcomePage.installingKeymap": "正在安装 {0} 键盘快捷方式...",
+	"welcomePage.keymapAlreadyInstalled": "已安装 {0} 键盘快捷方式。",
+	"welcomePage.keymapNotFound": "找不到 ID 为 {1} 的 {0} 键盘快捷方式。",
+	"welcomePage.willReloadAfterInstallingKeymap": "安装 {0} 键盘快捷方式后，将重载窗口。"
+}
\ No newline at end of file
diff --git a/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 44f0de178b5..f4ce8098a13 100644
--- a/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/cht/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "例如 myFile.txt",
-	"activeFilePath": "例如 /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "例如 /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "例如 myFolder/myFile.txt",
+	"activeEditorShort": "例如 myFile.txt",
 	"appName": "例如 VS Code",
 	"assocDescriptionFile": "將檔案名稱符合 Glob 模式的所有檔案，對應到具有指定識別碼的語言。",
 	"assocDescriptionPath": "將檔案路徑符合絕對路徑 Glob 模式的所有檔案，對應到具有指定識別碼的語言。",
diff --git a/i18n/cht/extensions/css/package.i18n.json b/i18n/cht/extensions/css/package.i18n.json
index 24cef669a74..93b1954f2f9 100644
--- a/i18n/cht/extensions/css/package.i18n.json
+++ b/i18n/cht/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
 	"css.lint.argumentsInColorFunction.desc": "參數數目無效",
 	"css.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
 	"css.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
@@ -23,6 +24,7 @@
 	"css.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
 	"css.lint.zeroUnits.desc": "零不需要任何單位",
 	"css.validate.desc": "啟用或停用所有驗證",
+	"less.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
 	"less.lint.argumentsInColorFunction.desc": "參數數目無效",
 	"less.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
 	"less.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
@@ -42,6 +44,7 @@
 	"less.lint.vendorPrefix.desc": "在使用廠商專屬的前置詞時，也包括標準屬性。",
 	"less.lint.zeroUnits.desc": "零不需要任何單位",
 	"less.validate.desc": "啟用或停用所有驗證",
+	"scss.colorDecorators.enable.desc": "啟用或停用彩色裝飾項目",
 	"scss.lint.argumentsInColorFunction.desc": "參數數目無效",
 	"scss.lint.boxModel.desc": "使用填補或框線時不要使用寬度或高度。",
 	"scss.lint.compatibleVendorPrefixes.desc": "在使用廠商專屬的前置詞時，請確定也包括其他所有的廠商特定屬性。",
diff --git a/i18n/cht/extensions/git/out/askpass-main.i18n.json b/i18n/cht/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..779b8a5ed3f
--- /dev/null
+++ b/i18n/cht/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "缺少認證或其無效。"
+}
\ 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 62af81597a9..977895ef1f4 100644
--- a/i18n/cht/extensions/git/out/commands.i18n.json
+++ b/i18n/cht/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "分支名稱",
 	"clean": "清除變更",
 	"clean repo": "請先清除您的存放庫工作樹狀再簽出。",
+	"cloning": "正在複製 Git 存放庫...",
 	"commit message": "認可訊息",
 	"confirm clean": "確定要清除 {0} 中的變更嗎?",
 	"confirm clean all": "確定要清除所有變更嗎?",
+	"confirm revert": "確定要還原您在 {0} 中選取的變更嗎?",
 	"disabled": "Git 已停用，或在此工作區不受支援",
 	"never again": "確定，不要再顯示",
 	"no changes": "沒有任何變更要認可。",
@@ -19,10 +21,15 @@
 	"nobranch": "請簽出分支以推送到遠端。",
 	"ok": "確定",
 	"open git log": "開啟 Git 記錄",
+	"openrepo": "開啟存放庫",
+	"parent": "父目錄",
 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
+	"proposeopen": "要開啟複製的存放庫嗎?",
 	"provide branch name": "請提供分支名稱",
 	"provide commit message": "請提供認可訊息",
 	"remote branch at": "位於 {0} 的遠端分支",
+	"repourl": "存放庫 URL",
+	"revert": "還原變更",
 	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
 	"tag at": "位於 {0} 的標記"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/out/main.i18n.json b/i18n/cht/extensions/git/out/main.i18n.json
index cae9b19f6f2..712457a7adf 100644
--- a/i18n/cht/extensions/git/out/main.i18n.json
+++ b/i18n/cht/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "您似乎已有安裝 Git {0}。Code 搭配 Git >= 2 的執行效果最佳",
+	"updateGit": "更新 Git",
 	"using git": "正在使用來自 {1} 的 git {0}"
 }
\ No newline at end of file
diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json
index 6b42d87a6c1..b67cc695512 100644
--- a/i18n/cht/extensions/git/package.i18n.json
+++ b/i18n/cht/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "建立分支...",
 	"command.checkout": "簽出至...",
-	"command.clean": "清除",
-	"command.cleanAll": "全部清除",
+	"command.clean": "清除檔案",
+	"command.cleanAll": "清除所有檔案",
+	"command.clone": "複製",
 	"command.commit": "認可",
 	"command.commitAll": "全部認可",
 	"command.commitAllSigned": "全部認可 (已登出)",
 	"command.commitStaged": "認可暫存",
 	"command.commitStagedSigned": "認可暫存 (已登出)",
-	"command.init": "將 Git 存放庫初始化",
+	"command.init": "初始化存放庫",
 	"command.openChange": "開啟變更",
 	"command.openFile": "開啟檔案",
 	"command.publish": "發行",
@@ -22,14 +23,15 @@
 	"command.push": "推送",
 	"command.pushTo": "推送至...",
 	"command.refresh": "重新整理",
+	"command.revertSelectedRanges": "還原選取的範圍",
 	"command.showOutput": "顯示 Git 輸出",
-	"command.stage": "暫存",
-	"command.stageAll": "全部暫存",
+	"command.stage": "暫存檔案",
+	"command.stageAll": "暫存所有檔案",
 	"command.stageSelectedRanges": "暫存選取的範圍",
 	"command.sync": "同步處理",
 	"command.undoCommit": "復原上次認可",
-	"command.unstage": "取消暫存",
-	"command.unstageAll": "全部取消暫存",
+	"command.unstage": "取消暫存檔案",
+	"command.unstageAll": "取消暫存所有檔案",
 	"command.unstageSelectedRanges": "取消暫存選取的範圍",
 	"config.autofetch": "是否啟用自動擷取",
 	"config.autorefresh": "是否啟用自動重新整理",
diff --git a/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..5d4bf2d5fa5
--- /dev/null
+++ b/i18n/cht/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
index 549f205b78c..e4621ae50d6 100644
--- a/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/cht/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "若要啟用 JavaScript/TypeScript IntelliSense，請排除包含大量檔案的資料夾，例如: {0}",
-	"hintExclude.generic": "若要啟用 JavaScript/TypeScript IntelliSense，請排除包含未使用來源檔案的大型資料夾。",
-	"hintExclude.tooltip": "若要啟用 JavaScript/TypeScript IntelliSense，請排除包含未使用來源檔案的大型資料夾。",
+	"hintExclude": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含許多檔案的資料夾，例如: {0}",
+	"hintExclude.generic": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
+	"hintExclude.tooltip": "若要讓整個專案都能使用 JavaScript/TypeScript 語言功能，請排除內含您未使用之來源檔案的大型資料夾。",
 	"large.label": "設定排除項目",
 	"open": "設定排除項目"
 }
\ 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 8d6755586f5..5f71ebfbf8b 100644
--- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "控制編輯器是否應在左括號後自動插入右括號",
 	"codeLens": "控制編輯器是否顯示程式碼濾鏡",
 	"cursorBlinking": "控制游標動畫樣式，可能的值為 'blink'、'smooth'、'phase'、'expand' 和 'solid'",
-	"cursorStyle": "控制游標樣式，接受的值為 'block'、'line' 和 'underline'",
+	"cursorStyle": "控制游標樣式。接受的值為 'block'、'block-outline'、'line'、'line-thin'、'underline' 及 'underline-thin'",
 	"detectIndentation": "開啟檔案時，會依據檔案內容來偵測 `editor.tabSize` 及 `editor.insertSpaces`。",
+	"dragAndDrop": "控制編輯器是否允許透過拖放動作移動選取範圍。",
 	"editorConfigurationTitle": "編輯器",
 	"emptySelectionClipboard": "控制複製時不選取任何項目是否會複製目前程式行。",
 	"folding": "控制編輯器是否已啟用程式碼摺疊功能",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "必須是 'boolean'。請注意，值 \"auto\" 已由 `editor.detect Indentation` 設定取代。",
 	"lineHeight": "控制行高。使用 0 會從 fontSize 計算 lineHeight。",
 	"lineNumbers": "控制行號顯示。可能的值有 'on'、'off' 及 'relative'。'relative' 會從目前的資料指標位置顯示行數。",
+	"matchBrackets": "當選取某側的括號時，強調顯示另一側的配對括號。",
 	"minimap.enabled": "控制是否會顯示迷你地圖",
+	"minimap.maxColumn": "限制迷你地圖的寬度，以呈現最多的資料行",
+	"minimap.renderCharacters": "呈現行內的實際字元 (而不是彩色區塊)",
 	"mouseWheelScrollSensitivity": "滑鼠滾輪捲動事件的 'deltaX' 與 'deltaY' 所使用的乘數",
 	"mouseWheelZoom": "使用滑鼠滾輪並按住 Ctrl 時，縮放編輯器的字型",
 	"overviewRulerLanes": "控制可在概觀尺規中相同位置顯示的裝飾項目數",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "建議小工具的字型大小",
 	"suggestLineHeight": "建議小工具的行高",
 	"suggestOnTriggerCharacters": "控制輸入觸發字元時，是否應自動顯示建議",
-	"tabCompletion": "在前置詞相符時插入程式碼片段。最適用於未啟用 'quickSuggestions' 時。",
 	"tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。",
 	"tabSize.errorMessage": "必須是 'number'。請注意，值 \"auto\" 已由 `editor.detectIndentation` 設定取代。",
 	"trimAutoWhitespace": "移除尾端自動插入的空白字元",
 	"useTabStops": "插入和刪除接在定位停駐點後的空白字元",
 	"wordBasedSuggestions": "啟用字組式建議。",
 	"wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元",
-	"wordWrap": "控制是否應該自動換行。將於 min(editor.wrappingColumn, viewportWidthInColumns) 自動換行。",
-	"wrappingColumn": "控制編輯器換行到下一行的字元數。若將此項目設為 0，將會開啟檢視區寬度換行 (自動換行)。若將此項目設為 -1，將會強制編輯器永不換行。",
+	"wordWrap": "控制是否自動換行。可以是: :\n - [off] (停用換行)、\n - [on] (檢視區換行)、\n - [wordWrapColumn] (於  'editor.wordWrapColumn' 換行) 或\n - [bounded] (當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行)。\n",
+	"wordWrap.bounded": "當檢視區縮至最小並設定 'editor.wordWrapColumn' 時換行。",
+	"wordWrap.off": "一律不換行。",
+	"wordWrap.on": "依檢視區寬度換行。",
+	"wordWrap.wordWrapColumn": "於 'editor.wordWrapColumn' 換行。",
+	"wordWrapColumn": "當 `editor.wordWrap` 為 [wordWrapColumn] 或 [bounded] 時，控制編輯器中的資料行換行。",
 	"wrappingIndent": "控制換行的縮排。可以是 [無]、[相同] 或 [縮排]。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 647c08404cc..afd6e50836d 100644
--- a/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "預覽定義",
 	"generic.noResults": "找不到任何定義",
 	"meta.title": " - {0} 個定義",
-	"multipleResults": "按一下以顯示 {0} 項定義。"
+	"multipleResults": "按一下以顯示 {0} 項定義。",
+	"noResultWord": "找不到 '{0}' 的定義"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index 6b4ca30dab6..a800bf99160 100644
--- a/i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/cht/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "命令 `{0}` 在 `commands` 區段中出現多次。",
 	"dupe.command": "功能表項目參考了與預設相同的命令和替代命令",
 	"menuId.invalid": "`{0}` 不是有效的功能表識別碼",
+	"menus.commandPalette": "命令選擇區",
 	"menus.editorContext": "編輯器操作功能表",
 	"menus.editorTabContext": "編輯器索引標籤操作功能表",
 	"menus.editorTitle": "編輯器標題功能表",
diff --git a/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/cht/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ 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 b4f6e45d52f..d42ccccfaf7 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
@@ -24,26 +24,26 @@
 	"showIcons": "控制開啟的編輯器是否搭配圖示顯示。這需要同時啟用圖示佈景主題。",
 	"sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。",
 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
-	"title": "依據使用中的編輯器控制視窗標題。變數會依內容替換:\n${activeEditorName}: 例如 myFile.txt\n${activeFilePath}: 例如 /Users/Development/myProject/myFile.txt\n${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\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${rootName}: 例如 myProject\n${rootPath}: 例如 /Users/Development/myProject\n${appName}: 例如 VS Code\n${dirty}: 若使用中的編輯器已變更，即為已變更的指標\n${separator}: 條件式分隔符號 (\" - \")，只會在前後有包含值的變數時顯示\n\n",
 	"titleBarStyle": "調整視窗標題列的外觀。變更需要完整重新啟動才會套用。",
 	"view": "檢視",
-	"window.menuBarVisibility.default": "\"default\": 功能表只在全螢幕模式下隱藏。",
-	"window.menuBarVisibility.hidden": "\"hidden\": 功能表一律隱藏。",
-	"window.menuBarVisibility.toggle": "\"toggle\": 功能表會隱藏，但可經由 Alt 鍵顯示。",
-	"window.menuBarVisibility.visible": "\"visible\": 功能表即使在全螢幕模式下也一律顯示。",
-	"window.newWindowDimensions.default": "\"default\": 在螢幕中央開啟新視窗。",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": 在全螢幕模式下開啟新視窗。",
-	"window.newWindowDimensions.inherit": "\"inherit\": 以上一個使用中視窗的相同維度開啟新視窗。",
-	"window.newWindowDimensions.maximized": "\"maximized\": 將新視窗開到最大。",
-	"window.openFilesInNewWindow.default": "\"default\": 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟，除非透過擴充座或從尋找工具開啟 (僅限 macOS)",
-	"window.openFilesInNewWindow.off": "\"off\": 檔案會在視窗中隨檔案的資料夾開啟或在上一個使用中視窗開啟",
-	"window.openFilesInNewWindow.on": "\"on\": 檔案會在新視窗中開啟",
-	"window.openFoldersInNewWindow.default": "\"default\": 除非已從應用程式內挑選資料夾 (例如，透過 [檔案] 功能表)，否則會在新視窗開啟",
-	"window.openFoldersInNewWindow.off": "\"off\": 資料夾會取代上一個使用中的視窗",
-	"window.openFoldersInNewWindow.on": "\"on\": 資料夾會在新視窗中開啟",
-	"window.reopenFolders.all": "\"all\": 重新開啟上一個工作階段的所有資料夾。",
-	"window.reopenFolders.none": "\"none\": 永不重新開啟資料夾。",
-	"window.reopenFolders.one": "\"one\": 重新開啟上一個使用中的資料夾。",
+	"window.menuBarVisibility.default": "只在全螢幕模式時隱藏功能表。",
+	"window.menuBarVisibility.hidden": "一律隱藏功能表。",
+	"window.menuBarVisibility.toggle": "隱藏功能表，但可經由 Alt 鍵加以顯示。",
+	"window.menuBarVisibility.visible": "一律顯示功能表，即使在全螢幕模式時亦然。",
+	"window.newWindowDimensions.default": "在螢幕中央開啟新視窗。",
+	"window.newWindowDimensions.fullscreen": "在全螢幕模式下開啟新視窗。",
+	"window.newWindowDimensions.inherit": "以相同於上一個使用中之視窗的維度開啟新視窗。",
+	"window.newWindowDimensions.maximized": "開啟並最大化新視窗。",
+	"window.openFilesInNewWindow.default": "除非從擴充座或 Finder 中開啟，否則檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟 (僅限 macOS)",
+	"window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟",
+	"window.openFilesInNewWindow.on": "檔案會在新視窗中開啟",
+	"window.openFoldersInNewWindow.default": "除非已從應用程式內挑選了資料夾 (例如透過 [檔案] 功能表)，否則資料夾會在新視窗中開啟",
+	"window.openFoldersInNewWindow.off": "資料夾會取代上一個使用中的視窗",
+	"window.openFoldersInNewWindow.on": "資料夾會在新視窗中開啟",
+	"window.reopenFolders.all": "重新開啟上一個工作階段的所有資料夾。",
+	"window.reopenFolders.none": "一律不重新開啟資料夾。",
+	"window.reopenFolders.one": "重新開啟上一個使用中的資料夾。",
 	"windowConfigurationTitle": "視窗",
 	"workbenchConfigurationTitle": "Workbench",
 	"zenMode.fullScreen": "控制開啟 Zen Mode 是否也會將 Workbench 轉換為全螢幕模式。",
diff --git a/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..a0225aac971
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "不要再顯示",
+	"wordWrapMigration.ok": "確定",
+	"wordWrapMigration.openSettings": "開啟設定",
+	"wordWrapMigration.prompt": "設定 [editor.wrappingColumn] 已標示為即將淘汰，將改為 [editor.wordWrap]。"
+}
\ 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 7712e2b026a..6d265dea20d 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
@@ -34,6 +34,7 @@
 	"restartDebug": "重新啟動",
 	"restartFrame": "重新啟動框架",
 	"reverseContinue": "反向",
+	"selectAndStartDebugging": "選取並開始偵錯",
 	"setValue": "設定值",
 	"startDebug": "開始偵錯",
 	"startWithoutDebugging": "開始但不偵錯",
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..b41721acf97
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "輸入要執行之啟動組態的名稱。",
+	"entryAriaLabel": "{0}，偵錯",
+	"noConfigurationsFound": "找不到任何偵錯組態。請建立'launch.json' 檔案。",
+	"noConfigurationsMatching": "沒有任何相符的偵錯組態"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..ce024d32721
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "發生例外狀況"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 59cea8bb748..c9f35236f3d 100644
--- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "允許在任何檔案設定中斷點",
 	"debug": "偵錯",
 	"debugCategory": "偵錯",
+	"debugCommands": "偵錯組態",
 	"debugConfigurationTitle": "偵錯",
 	"debugPanel": "偵錯主控台",
 	"inlineValues": "在偵錯時於編輯器以內嵌方式顯示變數值",
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 797f240fecd..0ec826eb564 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
@@ -14,5 +14,7 @@
 	"debugServer": "僅限偵錯延伸模組開發: 如果指定了連接埠，VS Code 會嘗試連線至以伺服器模式執行的偵錯配接器",
 	"debugType": "組態的類型。",
 	"debugWindowsConfiguration": "Windows 特定的啟動設定屬性。",
-	"internalConsoleOptions": "內部偵錯主控台的控制項行為。"
+	"deprecatedVariables": "'env.'、'config.' 及 'command.' 已標示為即將淘汰，請改用 'env:'、'config:' 及 'command:'。",
+	"internalConsoleOptions": "內部偵錯主控台的控制項行為。",
+	"node2NotSupported": "\"node2\" 已不再支援，請改用 \"node\"，並將 \"protocol\" 屬性設為 \"inspector\"。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index f928238f5d3..b74a9b1e25f 100644
--- a/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已安裝語言的預設關聯。",
+	"associations": "將檔案關聯設定為語言 (例如 \"*.extension\": \"html\")。這些語言優先於已經安裝之語言的關聯 (預設值)。",
 	"autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。",
-	"autoSave": "控制已變更檔案的自動儲存功能。接受的值: \"{0}\"、\"{1}\"、\"{2}\" (編輯器失去焦點)、\"{3}\" (視窗失去焦點)。如果設為 \"{4}\"，您可以在 \"files.autoSaveDelay\" 中設定延遲。",
-	"autoSaveDelay": "控制經過這段延遲時間後會自動儲存已變更檔案的毫秒數。僅適用於 \"files.autoSave\" 設定為 \"{0}\" 時。",
+	"autoSave": "控制已變更之檔案的自動儲存。接受的值: '{0}'、'{1}、'{2}' (編輯器失去焦點)、'{3}' (視窗失去焦點)。若設為 '{4}'，可以在 \"files.autoSaveDelay\" 中設定延遲。",
+	"autoSaveDelay": "控制要自動儲存已變更之檔案前必須經過的延遲時間 (毫秒)。僅當 'files.autoSave' 設為 \"{0}\" 時才適用。",
 	"binaryFileEditor": "二進位檔案編輯器",
 	"dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。",
 	"editorConfigurationTitle": "編輯器",
@@ -17,10 +17,10 @@
 	"exclude": "設定 Glob 模式可包含檔案及資料夾。",
 	"explore": "檔案總管",
 	"explorerConfigurationTitle": "檔案總管",
-	"files.autoSave.afterDelay": "\"afterDelay\": 已變更的檔案會自動在設定的 \"files.autoSaveDelay\" 後儲存。",
-	"files.autoSave.off": "\"off\": 已變更的檔案永遠不會自動儲存。",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": 已變更的檔案會自動在編輯器遺失焦點時儲存。",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": 已變更的檔案會自動在視窗遺失焦點時儲存。",
+	"files.autoSave.afterDelay": "已變更的檔案會在設定的 'files.autoSaveDelay' 之後自動儲存。",
+	"files.autoSave.off": "已變更的檔案一律不會自動儲存。",
+	"files.autoSave.onFocusChange": "已變更的檔案會在編輯器失去焦點時自動儲存。",
+	"files.autoSave.onWindowChange": "已變更的檔案會在視窗失去焦點時自動儲存。",
 	"files.exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。",
 	"files.exclude.when": "在相符檔案同層級上額外的檢查。請使用 $(basename) 作為相符檔案名稱的變數。",
 	"filesConfigurationTitle": "檔案",
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..de9b42f6ace
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "插入程式碼片段"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..58235d9d592
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}，{1}"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..a4037ced432
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "在前置詞相符時插入程式碼片段。最適用於未啟用 'quickSuggestions' 時。"
+}
\ 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 9e3d51c11d5..3f4e412e68b 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "清除",
 	"workbench.action.terminal.copySelection": "複製選取項目",
 	"workbench.action.terminal.focus": "聚焦終端機",
+	"workbench.action.terminal.focusAtIndex": "聚焦終端機 {0}",
 	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
 	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
 	"workbench.action.terminal.kill": "終止使用中的終端機執行個體",
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
new file mode 100644
index 00000000000..be5d5087ea0
--- /dev/null
+++ b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (目前)",
+	"welcomePage.cloneGitRepository": "複製 Git 存放庫...",
+	"welcomePage.colorTheme": "彩色佈景主題",
+	"welcomePage.colorThemeDescription": "將編輯器及您的程式碼設定成您喜愛的外觀",
+	"welcomePage.configureSettings": "組態設定",
+	"welcomePage.configureSettingsDescription": "微調設定就能發揮 VS Code 的所有功能",
+	"welcomePage.editingEvolved": "編輯進化了",
+	"welcomePage.gitHubRepository": "GitHub 存放庫",
+	"welcomePage.help": "說明",
+	"welcomePage.installKeymap": "安裝鍵盤快速鍵 {0}、{1}、{2} 及 {3}",
+	"welcomePage.installKeymapDescription": "安裝鍵盤快速鍵",
+	"welcomePage.interactivePlayground": "Interactive Playground",
+	"welcomePage.interactivePlaygroundDescription": "嘗試使用逐步解說短片中的一些基本編輯器功能",
+	"welcomePage.interfaceOverview": "介面概觀",
+	"welcomePage.interfaceOverviewDescription": "使用視覺覆疊效果強調顯示 UI 的主要元件",
+	"welcomePage.introductoryVideos": "簡介影片",
+	"welcomePage.keybindingsReference": "鍵盤快速鍵參考",
+	"welcomePage.keybindingsReferenceDescription": "可列印的 PDF，附有最常用的鍵盤快速鍵",
+	"welcomePage.newFile": "新增檔案",
+	"welcomePage.noRecentFolders": "沒有最近使用的資料夾",
+	"welcomePage.openFolder": "開啟資料夾...",
+	"welcomePage.others": "其他",
+	"welcomePage.productDocumentation": "產品文件",
+	"welcomePage.quickLinks": "快速連結",
+	"welcomePage.recent": "最近使用",
+	"welcomePage.showCommands": "尋找並執行所有命令",
+	"welcomePage.showCommandsDescription": "從控制台快速存取及搜尋命令 ({0})",
+	"welcomePage.showOnStartup": "啟動時顯示歡迎頁面",
+	"welcomePage.stackOverflow": "堆疊溢位",
+	"welcomePage.start": "開始",
+	"welcomePage.sublime": "壯麗",
+	"welcomePage.sublimeCurrent": "壯麗 (目前)",
+	"welcomePage.vim": "活力",
+	"welcomePage.vimCurrent": "活力 (目前)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index faf8fee1511..a54e9323e55 100644
--- a/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "取消",
 	"ok": "確定",
 	"welcome.title": "歡迎使用",
 	"welcomePage": "歡迎使用",
+	"welcomePage.installingKeymap": "正在安裝 {0} 鍵盤快速鍵...",
 	"welcomePage.keymapAlreadyInstalled": "已安裝 {0} 鍵盤快速鍵。",
 	"welcomePage.keymapNotFound": "找不到識別碼為 {1} 的 {0} 鍵盤快速鍵。",
-	"welcomePage.willReloadAfterInstallingKeymap": "視窗會在安裝 {0} 鍵盤快速鍵後快速重新載入。"
+	"welcomePage.willReloadAfterInstallingKeymap": "{0} 鍵盤快速鍵安裝完成後，將會重新載入此視窗。"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 02bca4e9dd8..c4ed16ff7b2 100644
--- a/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/deu/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "z. B. myFile.txt",
-	"activeFilePath": "z. B. /Users/Development/myProject/myFile.txt",
+	"activeEditorShort": "z. B. myFile.txt",
 	"appName": "z. B. VS Code",
 	"assocDescriptionFile": "Ordnet alle Dateien, deren Dateinamen mit dem Globmuster übereinstimmen, der Sprache mit dem angegebenen Bezeichner zu.",
 	"assocDescriptionPath": "Ordnet alle Dateien, die mit dem absoluten Pfad des Globmusters in ihrem Pfad übereinstimmen, der Sprache mit dem angegebenen Bezeichner zu.",
diff --git a/i18n/deu/extensions/css/package.i18n.json b/i18n/deu/extensions/css/package.i18n.json
index 30e9e6a8520..1cf636cabe4 100644
--- a/i18n/deu/extensions/css/package.i18n.json
+++ b/i18n/deu/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
 	"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",
@@ -23,6 +24,7 @@
 	"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.validate.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"less.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
 	"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",
@@ -42,6 +44,7 @@
 	"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.desc": "Aktiviert oder deaktiviert alle Überprüfungen.",
+	"scss.colorDecorators.enable.desc": "Aktiviert oder deaktiviert Farb-Decorators",
 	"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",
diff --git a/i18n/deu/extensions/git/out/askpass-main.i18n.json b/i18n/deu/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..a682f91ed91
--- /dev/null
+++ b/i18n/deu/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "Fehlende oder ungültige Anmeldeinformationen."
+}
\ 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 d03a9560350..df8ee13b6b7 100644
--- a/i18n/deu/extensions/git/out/commands.i18n.json
+++ b/i18n/deu/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "Branchname",
 	"clean": "Änderungen bereinigen",
 	"clean repo": "Bereinigen Sie Ihre Repository-Arbeitsstruktur vor Auftragsabschluss.",
+	"cloning": "Git-Repository wird geklont...",
 	"commit message": "Commit-Nachricht",
 	"confirm clean": "Sollen die Änderungen in {0} bereinigt werden?",
 	"confirm clean all": "Möchten Sie alle Änderungen bereinigen?",
+	"confirm revert": "Möchten Sie ausgewählten Änderungen in {0} wirklich zurücksetzen?",
 	"disabled": "Git ist deaktiviert oder wird in diesem Arbeitsbereich nicht unterstützt.",
 	"never again": "OK, nicht mehr anzeigen",
 	"no changes": "Keine Änderungen zum Speichern vorhanden.",
@@ -19,10 +21,14 @@
 	"nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.",
 	"ok": "OK",
 	"open git log": "Git-Protokoll öffnen",
+	"parent": "Übergeordnetes Verzeichnis",
 	"pick remote": "Remotespeicherort auswählen, an dem der Branch \"{0}\" veröffentlicht wird:",
+	"proposeopen": "Möchten Sie das geklonte Repository öffnen?",
 	"provide branch name": "Geben Sie einen Branchnamen an.",
 	"provide commit message": "Geben Sie eine Commit-Nachrichte ein.",
 	"remote branch at": "Remotebranch unter {0}",
+	"repourl": "Repository-URL",
+	"revert": "Änderungen zurücksetzen",
 	"sync is unpredictable": "Mit dieser Aktion werden Commits per Push und Pull an und von \"{0}\" übertragen.",
 	"tag at": "Tag bei {0}"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/out/main.i18n.json b/i18n/deu/extensions/git/out/main.i18n.json
index fa7b011c8af..afc015dd9bb 100644
--- a/i18n/deu/extensions/git/out/main.i18n.json
+++ b/i18n/deu/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "Sie haben anscheinend Git {0} installiert. Der Code funktioniert am besten mit Git >= 2",
+	"updateGit": "Git aktualisieren",
 	"using git": "Verwenden von Git {0} von {1}"
 }
\ No newline at end of file
diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json
index 9306bbd4aef..7cb955bb8ca 100644
--- a/i18n/deu/extensions/git/package.i18n.json
+++ b/i18n/deu/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "Branch wird erstellt...",
 	"command.checkout": "Auschecken an...",
-	"command.clean": "Bereinigen",
-	"command.cleanAll": "Alle bereinigen",
+	"command.clean": "Datei bereinigen",
+	"command.cleanAll": "Alle Dateien bereinigen",
+	"command.clone": "Klonen",
 	"command.commit": "Commit",
 	"command.commitAll": "Alle committen",
 	"command.commitAllSigned": "Alle committen (abgemeldet)",
 	"command.commitStaged": "Gestaffelt committen",
 	"command.commitStagedSigned": "Gestaffelt committen (abgemeldet)",
-	"command.init": "Git-Repository initialisieren",
+	"command.init": "Repository initialisieren",
 	"command.openChange": "Änderung öffnen",
 	"command.openFile": "Datei öffnen",
 	"command.publish": "Veröffentlichen",
@@ -22,14 +23,15 @@
 	"command.push": "Push",
 	"command.pushTo": "Push zu...",
 	"command.refresh": "Aktualisieren",
+	"command.revertSelectedRanges": "Ausgewählte Bereiche zurücksetzen",
 	"command.showOutput": "Git-Ausgabe anzeigen",
-	"command.stage": "Phase",
-	"command.stageAll": "Alle bereitstellen",
+	"command.stage": "Datei bereitstellen",
+	"command.stageAll": "Alle Dateien bereitstellen",
 	"command.stageSelectedRanges": "Gewählte Bereiche staffeln",
 	"command.sync": "Synchronisierung",
 	"command.undoCommit": "Letzten Commit rückgängig machen",
-	"command.unstage": "Bereitstellung aufheben",
-	"command.unstageAll": "Bereitstellung für alle aufheben",
+	"command.unstage": "Bereitstellung der Datei aufheben",
+	"command.unstageAll": "Bereitstellung für alle Dateien aufheben",
 	"command.unstageSelectedRanges": "Staffelung gewählter Bereiche aufheben",
 	"config.autofetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
 	"config.autorefresh": "Gibt an, ob die automatische Aktualisierung aktiviert ist.",
diff --git a/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..908d279da79
--- /dev/null
+++ b/i18n/deu/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
index 24ec88f8e70..41d1cfdfbb4 100644
--- a/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/deu/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "Um JavaScript/TypeScript IntelliSense zu aktivieren, schließen Sie Ordner mit vielen Dateien aus. Beispiel: {0}",
-	"hintExclude.generic": "Um JavaScript/TypeScript IntelliSense zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
-	"hintExclude.tooltip": "Um JavaScript/TypeScript IntelliSense zu aktivieren, schließen Sie große Ordner mit Quelldateien aus, an denen Sie nicht arbeiten.",
+	"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.",
+	"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.",
 	"large.label": "Auszuschließende Elemente konfigurieren",
 	"open": "Auszuschließende Elemente konfigurieren"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/code/electron-main/menus.i18n.json b/i18n/deu/src/vs/code/electron-main/menus.i18n.json
index 846bc2dafd2..ac4d72ce9f4 100644
--- a/i18n/deu/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/deu/src/vs/code/electron-main/menus.i18n.json
@@ -34,7 +34,7 @@
 	"miCloseWindow": "&&Fenster schließen",
 	"miCommandPalette": "&&Befehlspalette...",
 	"miCopy": "&&Kopieren",
-	"miCopyLinesDown": "Zeile nach unten kop&&pieren",
+	"miCopyLinesDown": "Zeile nach unten ko&&pieren",
 	"miCopyLinesUp": "Zeile nach oben &&kopieren",
 	"miCut": "&&Ausschneiden",
 	"miDocumentation": "&&Dokumentation",
diff --git a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 4916c1a75cb..4ac190cacd0 100644
--- a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "Steuert, ob der Editor Klammern automatisch nach dem Öffnen schließt.",
 	"codeLens": "Steuert, ob der Editor CodeLenses anzeigt.",
 	"cursorBlinking": "Steuert den Cursoranimationsstil. Gültige Werte sind \"blink\", \"smooth\", \"phase\", \"expand\" und \"solid\".",
-	"cursorStyle": "Steuert den Cursorstil. Gültige Werte sind \"block\", \"line\" und \"underline\".",
+	"cursorStyle": "Steuert den Cursorstil. Gültige Werte sind  \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" und \"underline-thin\".",
 	"detectIndentation": "Beim Öffnen einer Datei werden \"editor.tabSize\" und \"editor.insertSpaces\" basierend auf den Dateiinhalten erkannt.",
+	"dragAndDrop": "Steuert, ob der Editor das Verschieben einer Auswahl per Drag&Drop zulässt.",
 	"editorConfigurationTitle": "Editor",
 	"emptySelectionClipboard": "Steuert, ob ein Kopiervorgang ohne Auswahl die aktuelle Zeile kopiert.",
 	"folding": "Steuert, ob für den Editor Codefaltung aktiviert ist.",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "\"boolean\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
 	"lineHeight": "Steuert die Zeilenhöhe. Verwenden Sie 0, um LineHeight aus der FontSize-Angabe zu berechnen.",
 	"lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"Ein\", \"Aus\" und \"Relativ\". \"Relativ\" zeigt die Zeilenanzahl ab der aktuellen Cursorposition.",
+	"matchBrackets": "Übereinstimmende Klammern hervorheben, wenn eine davon ausgewählt wird.",
 	"minimap.enabled": "Steuert, ob die Minikarte angezeigt wird",
+	"minimap.maxColumn": "Breite der Minikarte beschränken, um höchstens eine bestimmte Anzahl von Spalten zu rendern",
+	"minimap.renderCharacters": "Die tatsächlichen Zeichen in einer Zeile rendern (im Gegensatz zu Farbblöcken)",
 	"mouseWheelScrollSensitivity": "Ein Multiplikator, der für die Mausrad-Bildlaufereignisse \"deltaX\" und \"deltaY\" verwendet werden soll.",
 	"mouseWheelZoom": "Schriftart des Editors vergrößern, wenn das Mausrad verwendet und die STRG-TASTE gedrückt wird",
 	"overviewRulerLanes": "Steuert die Anzahl von Dekorationen, die an derselben Position im Übersichtslineal angezeigt werden.",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "Schriftgröße für Vorschlagswidget",
 	"suggestLineHeight": "Zeilenhöhe für Vorschlagswidget",
 	"suggestOnTriggerCharacters": "Steuert, ob Vorschläge automatisch bei der Eingabe von Triggerzeichen angezeigt werden.",
-	"tabCompletion": "Fügt Codeausschnitte ein, wenn ihr Präfix übereinstimmt. Funktioniert am besten, wenn \"quickSuggestions\" nicht aktiviert sind.",
 	"tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.",
 	"tabSize.errorMessage": "\"number\" wurde erwartet. Beachten Sie, dass der Wert \"auto\" durch die Einstellung \"editor.detectIndentation\" ersetzt wurde.",
 	"trimAutoWhitespace": "Nachfolgendes automatisch eingefügtes Leerzeichen entfernen",
 	"useTabStops": "Das Einfügen und Löschen von Leerzeichen folgt auf Tabstopps.",
 	"wordBasedSuggestions": "Wortbasierte Vorschläge aktivieren.",
 	"wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.",
-	"wordWrap": "Steuert, ob Zeilen umbrochen werden sollen. Der Zeilenumbruch erfolgt bei \"min(editor.wrappingColumn, ViewportWidthInColumns)\".",
-	"wrappingColumn": "Steuert, nach wie vielen Zeichen der Editor einen Umbruch in die nächste Zeile ausführt. Durch das Festlegen auf 0 wird der Umbruch auf Viewportbreite aktiviert (Zeilenumbruch). Wenn diese Einstellung auf -1 festgelegt wird, führt der Editor nie einen Umbruch aus.",
+	"wordWrap": "Steuert den Zeilenumbruch. Mögliche Einstellungen sind:\n - \"off\" (Umbruch deaktivieren),\n - \"on\" (Anzeigebereichsumbruch),\n - \"wordWrapColumn\" (Umbruch bei \"editor.wordWrapColumn\") oder \n - \"bounded\" (der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\").",
+	"wordWrap.bounded": "Der Zeilenumbruch erfolgt beim Mindestanzeigebereich und \"editor.wordWrapColumn\".",
+	"wordWrap.off": "Zeilenumbrüche erfolgen nie.",
+	"wordWrap.on": "Der Zeilenumbruch erfolgt an der Breite des Anzeigebereichs.",
+	"wordWrap.wordWrapColumn": "Der Zeilenbereich erfolgt bei \"editor.wordWrapColumn\".",
+	"wordWrapColumn": "Steuert die Umbruchspalte des Editors, wenn für \"editor.wordWrap\" die Option \"wordWrapColumn\" oder \"bounded\" festgelegt ist.",
 	"wrappingIndent": "Steuert den Einzug der umbrochenen Zeilen. Der Wert kann \"none\", \"same\" oder \"indent\" sein."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 65fd2aa27f3..79090a115a6 100644
--- a/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "Peek-Definition",
 	"generic.noResults": "Keine Definition gefunden",
 	"meta.title": " – {0} Definitionen",
-	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen."
+	"multipleResults": "Klicken Sie, um {0} Definitionen anzuzeigen.",
+	"noResultWord": "Keine Definition gefunden für \"{0}\"."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index a4480c1b9c6..1f1c93562bf 100644
--- a/i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/deu/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "Der Befehl \"{0}\" ist mehrmals im Abschnitt \"commands\" vorhanden.",
 	"dupe.command": "Das Menüelement verweist auf den gleichen Befehl wie der Standard- und der Alternativbefehl.",
 	"menuId.invalid": "\"{0}\" ist kein gültiger Menübezeichner.",
+	"menus.commandPalette": "Die Befehlspalette ",
 	"menus.editorContext": "Das Editor-Kontextmenü.",
 	"menus.editorTabContext": "Das Kontextmenü für die Editor-Registerkarten",
 	"menus.editorTitle": "Das Editor-Titelmenü.",
diff --git a/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/deu/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ 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 2213253a996..eb1c197bd8a 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
@@ -24,26 +24,26 @@
 	"showIcons": "Steuert, ob geöffnete Editoren mit einem Symbol angezeigt werden sollen. Hierzu muss auch ein Symboldesign aktiviert werden.",
 	"sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.",
 	"statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.",
-	"title": "Steuert den Fenstertitel abhängig vom aktiven Editor. Variablen werden abhängig vom Kontext ersetzt:\n${activeEditorName}: z. B. myFile.txt\n${activeFilePath}: z. B. /Users/Development/myProject/myFile.txt\n${rootName}: z. B. myProject\n${rootPath}: z. B. /Users/Development/myProject\n${appName}: z. B. VS Code\n${dirty}: ein geänderter Indikator, wenn der aktive Editor geändert wurde\n${separator}: ein bedingtes Trennzeichen (\" - \"), das nur in der Umgebung von Variablen mit Werten angezeigt wird",
+	"title": "Steuert den Fenstertitel abhängig vom aktiven Editor. Variablen werden abhängig vom Kontext ersetzt:\n${activeEditorShort}: z. B. myFile.txt\n${activeEditorMedium}: z. B. myFolder/myFile.txt\n${activeEditorLong}: z. B. /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: z. B. myProject\n${rootPath}: z. B. /Users/Development/myProject\n${appName}: z. B. VS Code\n${dirty}: ein geänderter Indikator, wenn der aktive Editor geändert wurde\n${separator}: ein bedingtes Trennzeichen (\" - \"), das nur in der Umgebung von Variablen mit Werten angezeigt wird",
 	"titleBarStyle": "Passt das Aussehen der Titelleiste des Fensters an. Zum Anwenden der Änderungen ist ein vollständiger Neustart erforderlich.",
 	"view": "Anzeigen",
-	"window.menuBarVisibility.default": "\"default\": Menü ist nur im Vollbildmodus ausgeblendet.",
-	"window.menuBarVisibility.hidden": "\"hidden\": Menü ist immer ausgeblendet.",
-	"window.menuBarVisibility.toggle": "\"toggle\": Menu ist ausgeblendet, kann aber mit der Alt-Taste angezeigt werden.",
-	"window.menuBarVisibility.visible": "\"visible\": Menu wird immer angezeigt, auch im Vollbildmodus.",
-	"window.newWindowDimensions.default": "\"default\": Öffnet neue Fenster in der Mitte des Bildschirms.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": Öffnet neue Fenster im Vollbildmodus.",
-	"window.newWindowDimensions.inherit": "\"inherit\": Öffnet neue Fenster mit den gleichen Abmessungen wie das letzte aktive Fenster.",
-	"window.newWindowDimensions.maximized": "\"maximized\": Öffnet neue Fenster maximiert.",
-	"window.openFilesInNewWindow.default": "\"default\": Dateien werden in dem 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).",
-	"window.openFilesInNewWindow.off": "\"off\": Dateien werden in dem Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
-	"window.openFilesInNewWindow.on": "\"on\": Dateien werden in einem neuen Fenster geöffnet.",
-	"window.openFoldersInNewWindow.default": "\"default\": Ordner werden in einem neuen Fenster geöffnet, sofern kein Ordner innerhalb der Anwendung ausgewählt wird (z. B über das Dateimenü)",
-	"window.openFoldersInNewWindow.off": "\"off\": Ordner ersetzen das letzte aktive Fenster.",
-	"window.openFoldersInNewWindow.on": "\"on\": Ordner werden in einem neuen Fenster geöffnet.",
-	"window.reopenFolders.all": "\"all\": Alle Ordner der letzten Sitzung erneut öffnen.",
-	"window.reopenFolders.none": "\"none\": Ordner nie erneut öffnen.",
-	"window.reopenFolders.one": "\"one\": Den letzten aktiven Ordner erneut öffnen.",
+	"window.menuBarVisibility.default": "Das Menü ist nur im Vollbildmodus ausgeblendet.",
+	"window.menuBarVisibility.hidden": "Das Menü ist immer ausgeblendet.",
+	"window.menuBarVisibility.toggle": "Das Menu ist ausgeblendet, kann aber mit der Alt-Taste angezeigt werden.",
+	"window.menuBarVisibility.visible": "Das Menu wird immer angezeigt, auch im Vollbildmodus.",
+	"window.newWindowDimensions.default": "Öffnet neue Fenster in der Mitte des Bildschirms.",
+	"window.newWindowDimensions.fullscreen": "Öffnet neue Fenster im Vollbildmodus.",
+	"window.newWindowDimensions.inherit": "Öffnet neue Fenster mit den gleichen Abmessungen wie das letzte aktive Fenster.",
+	"window.newWindowDimensions.maximized": "Öffnet neue Fenster maximiert.",
+	"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).",
+	"window.openFilesInNewWindow.off": "Dateien werden im Fenster mit dem geöffneten Dateiordner oder im letzten aktiven Fenster geöffnet.",
+	"window.openFilesInNewWindow.on": "Dateien werden in einem neuen Fenster geöffnet.",
+	"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ü).",
+	"window.openFoldersInNewWindow.off": "Ordner ersetzen das letzte aktive Fenster.",
+	"window.openFoldersInNewWindow.on": "Ordner werden in einem neuen Fenster geöffnet.",
+	"window.reopenFolders.all": "Alle Ordner der letzten Sitzung erneut öffnen.",
+	"window.reopenFolders.none": "Ordner nie erneut öffnen.",
+	"window.reopenFolders.one": "Den letzten aktiven Ordner erneut öffnen.",
 	"windowConfigurationTitle": "Fenster",
 	"workbenchConfigurationTitle": "Workbench",
 	"zenMode.fullScreen": "Steuert, ob die Workbench durch das Aktivieren des Zen-Modus in den Vollbildmodus wechselt.",
diff --git a/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..fb18887eeb1
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "Nicht mehr anzeigen",
+	"wordWrapMigration.ok": "OK",
+	"wordWrapMigration.openSettings": "Einstellungen öffnen",
+	"wordWrapMigration.prompt": "Die Einstellung \"editor.wrappingColumn\" ist veraltet und wurde durch \"editor.wordWrap\" ersetzt."
+}
\ 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 0b444924931..f2fe1348451 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
@@ -34,6 +34,7 @@
 	"restartDebug": "Neu starten",
 	"restartFrame": "Frame neu starten",
 	"reverseContinue": "Umkehren",
+	"selectAndStartDebugging": "Debugging auswählen und starten",
 	"setValue": "Wert festlegen",
 	"startDebug": "Debuggen starten",
 	"startWithoutDebugging": "Ohne Debuggen starten",
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..16fc66f8458
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "Geben Sie den Namen einer auszuführenden Startkonfiguration ein.",
+	"entryAriaLabel": "{0}, Debugging",
+	"noConfigurationsFound": "Keine Debugkonfiguration gefunden. Erstellen Sie die Datei \"launch.json\".",
+	"noConfigurationsMatching": "Keine übereinstimmenden Debugkonfigurationen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..59f30de2300
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "Ausnahme aufgetreten"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index baa100cd1b6..595a96b041a 100644
--- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "Ermöglicht das Festlegen von Haltepunkten für alle Dateien.",
 	"debug": "Debuggen",
 	"debugCategory": "Debuggen",
+	"debugCommands": "Debugkonfiguration",
 	"debugConfigurationTitle": "Debuggen",
 	"debugPanel": "Debugging-Konsole",
 	"inlineValues": "Variablenwerte beim Debuggen in Editor eingebunden anzeigen",
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 722adeebb2a..4cfd59fbcbc 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
@@ -14,5 +14,7 @@
 	"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.",
 	"debugType": "Der Typ der Konfiguration.",
 	"debugWindowsConfiguration": "Windows-spezifische Startkonfigurationsattribute.",
-	"internalConsoleOptions": "Steuert das Verhalten der internen Debugging-Konsole."
+	"deprecatedVariables": "\"env.\", \"config.\" und \"command.\" sind veraltet, verwenden Sie stattdessen \"env:\", \"config:\" und \"command:\".",
+	"internalConsoleOptions": "Steuert das Verhalten der internen Debugging-Konsole.",
+	"node2NotSupported": "\"node2\" wird nicht mehr unterstützt, verwenden Sie stattdessen \"node\", und legen Sie das Attribut \"protocol\" auf \"inspector\" fest."
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index 7a861e1327f..a954d8ac285 100644
--- a/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -17,10 +17,10 @@
 	"exclude": "Konfiguriert die Globmuster zum Ausschließen von Dateien und Ordnern.",
 	"explore": "Explorer",
 	"explorerConfigurationTitle": "Datei-Explorer",
-	"files.autoSave.afterDelay": "\"afterDelay\": Geänderte Dateien werden automatisch nach der konfigurierten \"files.autoSaveDelay\" gespeichert.",
-	"files.autoSave.off": "\"off\": Geänderte Dateien werden nie automatisch gespeichert.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": Geänderte Dateien werden automatisch gespeichert, wenn der Editor den Fokus verliert.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": Geänderte Dateien werden automatisch gespeichert, wenn das Fenster den Fokus verliert.",
+	"files.autoSave.afterDelay": "Eine geänderte Datei wird automatisch nach der konfigurierten \"files.autoSaveDelay\" gespeichert.",
+	"files.autoSave.off": "Eine geänderte Datei wird nie automatisch gespeichert.",
+	"files.autoSave.onFocusChange": "Eine geänderte Datei wird automatisch gespeichert, wenn der Editor den Fokus verliert.",
+	"files.autoSave.onWindowChange": "Eine geänderte Datei wird automatisch gespeichert, wenn das Fenster den Fokus verliert.",
 	"files.exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.",
 	"files.exclude.when": "Zusätzliche Überprüfung der gleichgeordneten Elemente einer entsprechenden Datei. Verwenden Sie \"$(basename)\" als Variable für den entsprechenden Dateinamen.",
 	"filesConfigurationTitle": "Dateien",
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..1fb6b028507
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "Codeausschnitt einfügen"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..55da29eee94
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "Fügt Codeausschnitte ein, wenn ihr Präfix übereinstimmt. Funktioniert am besten, wenn \"quickSuggestions\" nicht aktiviert sind."
+}
\ 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
new file mode 100644
index 00000000000..3139090e184
--- /dev/null
+++ b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (aktuell)",
+	"welcomePage.cloneGitRepository": "Git-Repository klonen...",
+	"welcomePage.colorTheme": "Farbdesign",
+	"welcomePage.colorThemeDescription": "Passen Sie das Aussehen des Editors und Ihres Codes an Ihre Wünsche an.",
+	"welcomePage.configureSettings": "Einstellungen konfigurieren",
+	"welcomePage.configureSettingsDescription": "Optimieren Sie die Einstellungen, um VS Code bestmöglich zu nutzen.",
+	"welcomePage.editingEvolved": "Fortschrittliche Bearbeitung",
+	"welcomePage.gitHubRepository": "GitHub-Repository",
+	"welcomePage.help": "Hilfe",
+	"welcomePage.installKeymapDescription": "Tastenkombinationen installieren",
+	"welcomePage.interactivePlayground": "Interaktiver Playground",
+	"welcomePage.interactivePlaygroundDescription": "Testen Sie die wichtigsten Editorfunktionen in einer kurzen exemplarischen Vorgehensweise.",
+	"welcomePage.interfaceOverview": "Überblick über die Schnittstelle",
+	"welcomePage.interfaceOverviewDescription": "Erhalten Sie eine visuelle Überlagerung, die die wichtigsten Komponenten der Benutzeroberfläche hervorhebt.",
+	"welcomePage.introductoryVideos": "Einführungsvideos",
+	"welcomePage.keybindingsReference": "Referenz für Tastenkombinationen",
+	"welcomePage.keybindingsReferenceDescription": "Eine druckbare PDF mit den wichtigsten Tastenkombinationen",
+	"welcomePage.newFile": "Neue Datei",
+	"welcomePage.noRecentFolders": "Keine kürzlich verwendeten Ordner",
+	"welcomePage.openFolder": "Ordner öffnen...",
+	"welcomePage.others": "Andere",
+	"welcomePage.productDocumentation": "Produktdokumentation",
+	"welcomePage.quickLinks": "Direktlinks",
+	"welcomePage.recent": "Zuletzt verwendet",
+	"welcomePage.showCommands": "Alle Befehle suchen und ausführen",
+	"welcomePage.showCommandsDescription": "Über die Einstellungen ({0}) können Sie Befehle schnell suchen und darauf zugreifen.",
+	"welcomePage.showOnStartup": "Willkommensseite beim Start anzeigen",
+	"welcomePage.stackOverflow": "Stapelüberlauf",
+	"welcomePage.start": "Starten",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (aktuell)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (aktuell)",
+	"welcomePage.vscode": "Visual Studio-Code"
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 6fbc1952ab3..710962d7c8b 100644
--- a/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "Abbrechen",
 	"ok": "OK",
 	"welcome.title": "Willkommen",
 	"welcomePage": "Willkommen",
 	"welcomePage.keymapAlreadyInstalled": "Die {0} Tastenkombinationen sind bereits installiert.",
 	"welcomePage.keymapNotFound": "Die {0} Tastenkombinationen mit der ID {1} wurden nicht gefunden.",
-	"welcomePage.willReloadAfterInstallingKeymap": "Das Fenster wird nach der Installation der {0} Tastaturbefehle neu geladen."
+	"welcomePage.willReloadAfterInstallingKeymap": "Das Fenster wird nach der Installation der {0}-Tastaturbefehle neu geladen."
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index bf6c56d9f23..19e11429a02 100644
--- a/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/esn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "p. ej. myFile.txt",
-	"activeFilePath": "p. ej. /Users/Development/myProject/myFile.txt",
+	"activeEditorShort": "p. ej. myFile.txt",
 	"appName": "p. ej. VS Code",
 	"assocDescriptionFile": "Asigna todos los archivos cuyo nombre coincide con el patrón global al lenguaje con el identificador especificado.",
 	"assocDescriptionPath": "Asigna todos los archivos cuya ruta de acceso al lenguaje con el identificador especificado coincide con el patrón global de ruta de acceso absoluta.",
diff --git a/i18n/esn/extensions/css/package.i18n.json b/i18n/esn/extensions/css/package.i18n.json
index b7ad252e0db..98a57854bcc 100644
--- a/i18n/esn/extensions/css/package.i18n.json
+++ b/i18n/esn/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
 	"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.",
@@ -23,6 +24,7 @@
 	"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.validate.desc": "Habilita o deshabilita todas las validaciones",
+	"less.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
 	"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.",
@@ -42,6 +44,7 @@
 	"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.desc": "Habilita o deshabilita todas las validaciones",
+	"scss.colorDecorators.enable.desc": "Habilita o deshabilita decoradores de color",
 	"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.",
diff --git a/i18n/esn/extensions/git/out/askpass-main.i18n.json b/i18n/esn/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..1c3a1d90636
--- /dev/null
+++ b/i18n/esn/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "Faltan las credenciales o no son válidas."
+}
\ 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 c232e0b9e0b..3655227eb48 100644
--- a/i18n/esn/extensions/git/out/commands.i18n.json
+++ b/i18n/esn/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "Nombre de rama",
 	"clean": "Limpiar cambios",
 	"clean repo": "Limpie el árbol de trabajo del repositorio antes de la desprotección.",
+	"cloning": "Clonando el repositorio GIT...",
 	"commit message": "Mensaje de confirmación",
 	"confirm clean": "¿Seguro que quiere limpiar los cambios de \"{0}\"?",
 	"confirm clean all": "¿Seguro que quiere limpiar todos los cambios?",
+	"confirm revert": "¿Está seguro de que desea revertir los cambios seleccionados en {0}?",
 	"disabled": "GIT está deshabilitado o no se admite en esta área de trabajo",
 	"never again": "De acuerdo, no volver a mostrar este mensaje",
 	"no changes": "No hay cambios para confirmar.",
@@ -19,10 +21,14 @@
 	"nobranch": "Extraiga del repositorio una rama para insertar un remoto.",
 	"ok": "Aceptar",
 	"open git log": "Abrir registro de GIT",
+	"parent": "Directorio principal",
 	"pick remote": "Seleccione un elemento remoto para publicar la rama \"{0}\" en:",
+	"proposeopen": "¿Desea abrir el repositorio clonado?",
 	"provide branch name": "Especifique un nombre para la rama",
 	"provide commit message": "Proporcione un mensaje de confirmación",
 	"remote branch at": "Rama remota en {0}",
+	"repourl": "URL del repositorio",
+	"revert": "Revertir cambios",
 	"sync is unpredictable": "Esta acción insertará y extraerá confirmaciones en '{0}'.",
 	"tag at": "Etiqueta en {0}"
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/out/main.i18n.json b/i18n/esn/extensions/git/out/main.i18n.json
index bc89ad95d38..e8f184f6370 100644
--- a/i18n/esn/extensions/git/out/main.i18n.json
+++ b/i18n/esn/extensions/git/out/main.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"updateGit": "Actualizar GIT",
 	"using git": "Usando GIT {0} desde {1}"
 }
\ No newline at end of file
diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json
index ba54359d5f1..f1d0fed8f2e 100644
--- a/i18n/esn/extensions/git/package.i18n.json
+++ b/i18n/esn/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "Crear rama...",
 	"command.checkout": "Desproteger en...",
-	"command.clean": "Limpiar",
-	"command.cleanAll": "Limpiar todo",
+	"command.clean": "Limpiar archivo",
+	"command.cleanAll": "Limpiar todos los archivos",
+	"command.clone": "Clonar",
 	"command.commit": "Confirmar",
 	"command.commitAll": "Confirmar todo",
 	"command.commitAllSigned": "Confirmar todo (aprobado)",
 	"command.commitStaged": "Confirmar almacenados provisionalmente",
 	"command.commitStagedSigned": "Confirmar archivos almacenados provisionalmente (aprobados)",
-	"command.init": "Inicializar repositorio de GIT",
+	"command.init": "Inicializar el repositorio",
 	"command.openChange": "Abrir cambio",
 	"command.openFile": "Abrir archivo",
 	"command.publish": "Publicar",
@@ -22,14 +23,15 @@
 	"command.push": "Insertar",
 	"command.pushTo": "Insertar en...",
 	"command.refresh": "Actualizar",
+	"command.revertSelectedRanges": "Revertir los intervalos seleccionados",
 	"command.showOutput": "Mostrar salida de GIT",
-	"command.stage": "Almacenar provisionalmente",
-	"command.stageAll": "Almacenar todo provisionalmente",
+	"command.stage": "Almacenar archivo provisionalmente",
+	"command.stageAll": "Almacenar todos los archivos provisionalmente",
 	"command.stageSelectedRanges": "Realizar copia intermedia de los intervalos seleccionados",
 	"command.sync": "Sincronizar",
 	"command.undoCommit": "Deshacer última confirmación",
-	"command.unstage": "Cancelar almacenamiento provisional",
-	"command.unstageAll": "Cancelar almacenamiento provisional de todo",
+	"command.unstage": "Cancelar almacenamiento provisional del archivo",
+	"command.unstageAll": "Cancelar almacenamiento provisional de todos los archivos",
 	"command.unstageSelectedRanges": "Cancelar almacenamiento provisional de los intervalos seleccionados",
 	"config.autofetch": "Si la búsqueda automática está habilitada",
 	"config.autorefresh": "Si la actualización automática está habilitada",
diff --git a/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..d095fa6eb33
--- /dev/null
+++ b/i18n/esn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
index 73c59ecf789..3b3c008edd4 100644
--- a/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/esn/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "Para habilitar JavaScript/TypeScript IntelliSense, excluya las carpetas con muchos archivos, como: {0}",
-	"hintExclude.generic": "Para habilitar JavaScript/TypeScript IntelliSense, excluya las carpetas de gran tamaño con archivos de origen en los que no trabaja.",
-	"hintExclude.tooltip": "Para habilitar JavaScript/TypeScript IntelliSense, excluya las carpetas de gran tamaño con archivos de origen en los que no trabaja.",
+	"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.",
+	"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.",
 	"large.label": "Configurar exclusiones",
 	"open": "Configurar exclusiones"
 }
\ 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 6a7bf3775c4..7da1034ee01 100644
--- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "Controla si el editor debe cerrar automáticamente los corchetes después de abrirlos",
 	"codeLens": "Controla si el editor muestra lentes de código",
 	"cursorBlinking": "Controlar el estilo de animación del cursor. Los valores posibles son \"blink\", \"smooth\", \"phase\", \"expand\" y \"solid\".",
-	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"line\" y \"underline\".",
+	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" y \"underline-thin\"",
 	"detectIndentation": "Al abrir un archivo, se detectarán `editor.tabSize` y `editor.insertSpaces` en función del contenido del archivo.",
+	"dragAndDrop": "Controla si el editor debe permitir mover selecciones mediante arrastrar y colocar.",
 	"editorConfigurationTitle": "Editor",
 	"emptySelectionClipboard": "Controla si al copiar sin selección se copia la línea actual.",
 	"folding": "Controla si el editor tiene habilitado el plegado de código.",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "Se esperaba \"boolean\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
 	"lineHeight": "Controla la altura de línea. Utilice 0 para calcular el valor de lineHeight a partir de fontSize.",
 	"lineNumbers": "Controla la presentación de los números de línea. Los valores posibles son \"on\", \"off\" y \"relative\". \"relative\" muestra el número de líneas desde la posición actual del cursor.",
+	"matchBrackets": "Resaltar corchetes coincidentes cuando se seleccione uno de ellos.",
 	"minimap.enabled": "Controla si se muestra el minimapa",
+	"minimap.maxColumn": "Limitar el ancho del minimapa para presentar como mucho un número de columnas determinado",
+	"minimap.renderCharacters": "Presentar los caracteres reales en una línea (por oposición a bloques de color)",
 	"mouseWheelScrollSensitivity": "Se utilizará un multiplicador en los eventos de desplazamiento de la rueda del mouse `deltaX` y `deltaY`",
 	"mouseWheelZoom": "Ampliar la fuente del editor cuando se use la rueda del mouse mientras se presiona Ctrl",
 	"overviewRulerLanes": "Controla el número de decoraciones que pueden aparecer en la misma posición en la regla de visión general",
@@ -50,14 +54,15 @@
 	"suggestFontSize": "Tamaño de fuente para el widget de sugerencias",
 	"suggestLineHeight": "Alto de línea para el widget de sugerencias",
 	"suggestOnTriggerCharacters": "Controla si las sugerencias deben aparecer de forma automática al escribir caracteres desencadenadores",
-	"tabCompletion": "Inserta fragmentos de código cuando el prefijo coincide. Funciona mejor si la opción 'quickSuggestions' no está habilitada.",
 	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
 	"tabSize.errorMessage": "Se esperaba \"number\". Tenga en cuenta que el ajuste \"editor.detectIndentation\" ha reemplazado al valor \"auto\".",
 	"trimAutoWhitespace": "Quitar espacio en blanco final autoinsertado",
 	"useTabStops": "La inserción y eliminación del espacio en blanco sigue a las tabulaciones.",
 	"wordBasedSuggestions": "Habilita sugerencias basadas en palabras.",
 	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
-	"wordWrap": "Controla si las líneas deben ajustarse. Las líneas se ajustarán en min(editor.wrappingColumn, viewportWidthInColumns).",
-	"wrappingColumn": "Controla el número de caracteres tras los cuales el editor salta a la línea siguiente. Si el valor se establece en 0, se activa el ajuste del ancho de la ventanilla (ajuste de línea). Si se establece en -1, hace que el editor no ajuste las líneas nunca.",
+	"wordWrap": "Controla cómo se deben ajustar las líneas. Pueden ser:\n - \"off\" (deshabilitar ajuste),\n - \"on\" (ajuste de ventanilla),\n - \"wordWrapColumn\" (ajustar en \"editor.wordWrapColumn\") o\n - 'bounded' (ajustar en la parte mínima de la ventanilla y \"editor.wordWrapColumn\").",
+	"wordWrap.off": "Las líneas no se ajustarán nunca.",
+	"wordWrap.on": "Las líneas se ajustarán en el ancho de la ventanilla.",
+	"wordWrap.wordWrapColumn": "Las líneas se ajustarán en \"editor.wordWrapColumn\".",
 	"wrappingIndent": "Controla el sangrado de las líneas ajustadas. Puede ser uno los valores 'none', 'same' o 'indent'."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 42248309e5c..6d344bec8ee 100644
--- a/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "Ver la definición",
 	"generic.noResults": "No se encontró ninguna definición",
 	"meta.title": " – {0} definiciones",
-	"multipleResults": "Haga clic para mostrar {0} definiciones."
+	"multipleResults": "Haga clic para mostrar {0} definiciones.",
+	"noResultWord": "No se encontró ninguna definición para \"{0}\""
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index 87286a5e3cd..eb8ef5b2caf 100644
--- a/i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/esn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "El comando `{0}` aparece varias veces en la sección 'commands'.",
 	"dupe.command": "El elemento de menú hace referencia al mismo comando que el comando predeterminado y el comando alternativo",
 	"menuId.invalid": "`{0}` no es un identificador de menú válido",
+	"menus.commandPalette": "La paleta de comandos",
 	"menus.editorContext": "El menú conextual del editor",
 	"menus.editorTabContext": "Menú contextual de pestañas del editor",
 	"menus.editorTitle": "El menú de título del editor",
diff --git a/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/esn/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ No newline at end of file
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 09ab9f53192..08905d9318a 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
@@ -24,26 +24,26 @@
 	"showIcons": "Controla si los editores abiertos deben mostrarse o no con un icono. Requiere que también se habilite un tema de icono.",
 	"sideBarLocation": "Controla la ubicación de la barra lateral. Puede mostrarse a la izquierda o a la derecha del área de trabajo.",
 	"statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.",
-	"title": "Controla el título de la ventana en función del editor activo. Las variables se sustituyen según el contexto:\n${activeEditorName}: p.ej. myFile.txt\n${activeFilePath}: p.ej. /Users/Development/myProject/myFile.txt\n${rootName}: p.ej. myProject\n${rootPath}: p.ej. /Users/Development/myProject\n${appName}: p.ej. VS Code\n${dirty}: un indicador con modificaciones si el editor activo tiene modificaciones\n${separator}: un separador condicional (\" - \") que aparece solo cuando está rodeado de variables con valores",
+	"title": "Controla el título de la ventana según el editor activo. Las variables se sustituyen según el contexto:\n${activeEditorShort}: por ejemplo, myFile.txt\n${activeEditorMedium}: por ejemplo, myFolder/myFile.txt\n${activeEditorLong}: por ejemplo, /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: por ejemplo, myProject\n${rootPath}: por ejemplo, /Users/Development/myProject\n${appName}: por ejemplo, VS Code\n${dirty}: un indicador con modificaciones si el editor activo está desfasado\n${separator}: un separador condicional (\" - \") que solo se muestra cuando está rodeado por variables con valores",
 	"titleBarStyle": "Ajuste la apariencia de la barra de título de la ventana. Se debe realizar un reinicio completo para aplicar los cambios.",
 	"view": "Ver",
-	"window.menuBarVisibility.default": "\"default\": el menú solo está oculto en modo de pantalla completa.",
-	"window.menuBarVisibility.hidden": "\"hidden\": el menú se oculta siempre.",
-	"window.menuBarVisibility.toggle": "\"toggle\": el menú está oculto pero se puede mostrar con la tecla Alt.",
-	"window.menuBarVisibility.visible": "\"visible\": el menú está siempre visible, incluso en modo de pantalla completa.",
-	"window.newWindowDimensions.default": "\"default\": abrir ventanas nuevas en el centro de la pantalla.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": abrir ventanas nuevas en modo de pantalla completa.",
-	"window.newWindowDimensions.inherit": "\"inherit\": abrir nuevas ventanas con la misma dimensión que la última activa.",
-	"window.newWindowDimensions.maximized": "\"maximized\": abrir nuevas ventanas maximizadas.",
-	"window.openFilesInNewWindow.default": "\"default\": los archivos se abrirán en la ventana con la carpeta de archivos abierta o la última ventana activa, a menos que se abran mediante el Dock o desde Finder (solo macOS)",
-	"window.openFilesInNewWindow.off": "\"off\": los archivos se abrirán en la ventana con la carpeta de archivos abierta o en la última ventana activa",
-	"window.openFilesInNewWindow.on": "\"on\": los archivos se abrirán en una nueva ventana",
-	"window.openFoldersInNewWindow.default": "\"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)",
-	"window.openFoldersInNewWindow.off": "\"off\": las carpetas reemplazarán la ventana activa más reciente",
-	"window.openFoldersInNewWindow.on": "\"on\": las carpetas se abrirán en una nueva ventana",
-	"window.reopenFolders.all": "\"all\": volver a abrir todas las carpetas de la sesión más reciente.",
-	"window.reopenFolders.none": "\"none\": no volver a abrir nunca una carpeta.",
-	"window.reopenFolders.one": "\"one\": reabrir la carpeta activa más reciente.",
+	"window.menuBarVisibility.default": "El menú solo está oculto en modo de pantalla completa.",
+	"window.menuBarVisibility.hidden": "El menú está siempre oculto.",
+	"window.menuBarVisibility.toggle": "El menú está oculto pero se puede mostrar mediante la tecla Alt.",
+	"window.menuBarVisibility.visible": "El menú está siempre visible incluso en modo de pantalla completa.",
+	"window.newWindowDimensions.default": "Abrir las nuevas ventanas en el centro de la pantalla.",
+	"window.newWindowDimensions.fullscreen": "Abrir las nuevas ventanas en modo de pantalla completa.",
+	"window.newWindowDimensions.inherit": "Abrir las nuevas ventanas con la misma dimensión que la última activa.",
+	"window.newWindowDimensions.maximized": "Abrir las nuevas ventanas maximizadas.",
+	"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)",
+	"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.on": "Los archivos se abrirán en una nueva ventana",
+	"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)",
+	"window.openFoldersInNewWindow.off": "Las carpetas reemplazarán la ventana activa más reciente",
+	"window.openFoldersInNewWindow.on": "Las carpetas se abrirán en una nueva ventana",
+	"window.reopenFolders.all": "Volver a abrir todas las carpetas de la sesión más reciente.",
+	"window.reopenFolders.none": "No volver a abrir nunca una carpeta.",
+	"window.reopenFolders.one": "Volver a abrir la carpeta activa más reciente.",
 	"windowConfigurationTitle": "Ventana",
 	"workbenchConfigurationTitle": "Área de trabajo",
 	"zenMode.fullScreen": "Controla si activar el modo Zen pone también el trabajo en modo de pantalla completa.",
diff --git a/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..2497ccbedc2
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "No volver a mostrar",
+	"wordWrapMigration.ok": "Aceptar",
+	"wordWrapMigration.openSettings": "Abrir configuración",
+	"wordWrapMigration.prompt": "El valor de configuración \"editor.wrappingColumn\" se ha dejado de usar en favor de \"editor.wordWrap\"."
+}
\ 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 a6c9ef17484..d7c74389d23 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
@@ -34,6 +34,7 @@
 	"restartDebug": "Reiniciar",
 	"restartFrame": "Reiniciar marco",
 	"reverseContinue": "Invertir",
+	"selectAndStartDebugging": "Seleccionar e iniciar la depuración",
 	"setValue": "Establecer valor",
 	"startDebug": "Iniciar depuración",
 	"startWithoutDebugging": "Iniciar sin depurar",
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..b64e95b3778
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "Escriba un nombre de una configuración de inicio para ejecutar.",
+	"noConfigurationsFound": "No se encontró ninguna configuración de inicio. Cree un archivo \"launch.json\".",
+	"noConfigurationsMatching": "No hay ninguna configuración de depuración coincidente"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..a0a8c10a078
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "Se produjo una excepción"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 4d64960ccff..6e74943ed25 100644
--- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "Permite establecer un punto de interrupción en cualquier archivo.",
 	"debug": "Depurar",
 	"debugCategory": "Depurar",
+	"debugCommands": "Configuración de depuración",
 	"debugConfigurationTitle": "Depurar",
 	"debugPanel": "Consola de depuración",
 	"inlineValues": "Mostrar valores de variable en línea en el editor durante la depuración",
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 e63c1324156..795336f65a8 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
@@ -14,5 +14,7 @@
 	"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",
 	"debugType": "Tipo de configuración.",
 	"debugWindowsConfiguration": "Atributos de configuración de inicio específicos de Windows.",
-	"internalConsoleOptions": "Controla el comportamiento de la consola de depuración interna."
+	"deprecatedVariables": "\"env.\", \"config.\" y \"command.\" están en desuso, utilice en su lugar \"env:\", \"config:\" y \"command:\".",
+	"internalConsoleOptions": "Controla el comportamiento de la consola de depuración interna.",
+	"node2NotSupported": "\"node2\" ya no se admite; use \"node\" en su lugar y establezca el atributo \"protocol\" en \"inspector\"."
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index edc323c9c4a..b4a153aed71 100644
--- a/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -7,7 +7,7 @@
 	"associations": "Configure asociaciones de archivo para los lenguajes (por ejemplo, \"*.extension\": \"html\"). Estas asociaciones tienen prioridad sobre las asociaciones predeterminadas de los lenguajes instalados.",
 	"autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.",
 	"autoSave": "Controla el guardado automático de los archivos modificados. Valores aceptados: \"{0}\", \"{1}\", \"{2}\" (el editor pierde el foco), \"{3}\" (la ventana pierde el foco) . Si se establece en \"{4}\", puede configurar el retraso en \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Controla el retraso en MS tras el cual un archivo con modificaciones se guarda automáticamente. Solo se aplica si \"files.autoSave\" está establecido en \"{0}\".",
+	"autoSaveDelay": "Controla el retraso en MS tras el cual un archivo con modificaciones se guarda automáticamente. Solo se aplica si \"files.autoSave\" está establecido en \"{0}\"",
 	"binaryFileEditor": "Editor de archivos binarios",
 	"dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.",
 	"editorConfigurationTitle": "Editor",
@@ -17,10 +17,10 @@
 	"exclude": "Configurar patrones globales para excluir archivos y carpetas.",
 	"explore": "Explorador",
 	"explorerConfigurationTitle": "Explorador de archivos",
-	"files.autoSave.afterDelay": "\"afterDelay\": un archivo con modificaciones se guarda automáticamente tras la propiedad \"files.autoSaveDelay\" configurada.",
+	"files.autoSave.afterDelay": "Un archivo con modificaciones se guarda automáticamente tras la propiedad \"files.autoSaveDelay\" configurada.",
 	"files.autoSave.off": "\"off\": un archivo con modificaciones no se guarda nunca automáticamente.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": un archivo con modificaciones se guarda automáticamente cuando el editor deja de fijarse en él.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": un archivo con modificaciones se guarda automáticamente cuando la ventana deja de fijarse en él.",
+	"files.autoSave.onFocusChange": "Un archivo con modificaciones se guarda automáticamente cuando el editor deja de fijarse en él.",
+	"files.autoSave.onWindowChange": "Un archivo con modificaciones se guarda automáticamente cuando la ventana deja de fijarse en él.",
 	"files.exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.",
 	"files.exclude.when": "Comprobación adicional de los elementos del mismo nivel de un archivo coincidente. Use $(nombreBase) como variable para el nombre de archivo que coincide.",
 	"filesConfigurationTitle": "Archivos",
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..ef56f7f84bd
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "Insertar fragmento de código"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..98d6e882b75
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "Inserta fragmentos de código cuando el prefijo coincide. Funciona mejor si la opción 'quickSuggestions' no está habilitada."
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..615870fefe5
--- /dev/null
+++ b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (actual)",
+	"welcomePage.cloneGitRepository": "Clonar el repositorio GIT...",
+	"welcomePage.colorTheme": "Tema de color",
+	"welcomePage.colorThemeDescription": "Modifique a su gusto la apariencia del editor y el código",
+	"welcomePage.configureSettings": "Definir la configuración",
+	"welcomePage.configureSettingsDescription": "Revele el poder total de VS Code cambiando la configuración",
+	"welcomePage.editingEvolved": "Edición mejorada",
+	"welcomePage.gitHubRepository": "Repositorio de GitHub",
+	"welcomePage.help": "Ayuda",
+	"welcomePage.installKeymapDescription": "Instalar los métodos abreviados de teclado",
+	"welcomePage.interactivePlayground": "Área de juegos interactiva",
+	"welcomePage.interactivePlaygroundDescription": "Pruebe las características esenciales del editor en un tutorial corto",
+	"welcomePage.interfaceOverview": "Introducción a la interfaz",
+	"welcomePage.interfaceOverviewDescription": "Obtenga una superposición que resalta los componentes principales de la interfaz de usuario",
+	"welcomePage.introductoryVideos": "Vídeos de introducción",
+	"welcomePage.keybindingsReference": "Referencia de métodos abreviados de teclado",
+	"welcomePage.keybindingsReferenceDescription": "Un PDF imprimible con los métodos abreviados de teclado más comunes",
+	"welcomePage.newFile": "Nuevo archivo",
+	"welcomePage.noRecentFolders": "No hay ninguna carpeta reciente",
+	"welcomePage.openFolder": "Abrir carpeta...",
+	"welcomePage.others": "otros",
+	"welcomePage.productDocumentation": "Documentación del producto",
+	"welcomePage.quickLinks": "Vínculos rápidos",
+	"welcomePage.recent": "Reciente",
+	"welcomePage.showCommands": "Buscar y ejecutar todos los comandos",
+	"welcomePage.showCommandsDescription": "Acceda rápidamente y busque comandos desde el panel de control ({0})",
+	"welcomePage.showOnStartup": "Mostrar página principal al inicio",
+	"welcomePage.stackOverflow": "Desbordamiento de la pila",
+	"welcomePage.start": "3Iniciar",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (actual)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (actual)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index f0736edf5ea..13de56fa050 100644
--- a/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "Cancelar",
 	"ok": "Aceptar",
 	"welcome.title": "Bienvenido",
 	"welcomePage": "Bienvenido",
 	"welcomePage.keymapAlreadyInstalled": "Los métodos abreviados de teclado {0} ya están instalados.",
 	"welcomePage.keymapNotFound": "No se pudieron encontrar los métodos abreviados de teclado {0} con el identificador {1}.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La ventana se volverá a cargar rápidamente después de instalar los métodos abreviados de teclado {0}."
+	"welcomePage.willReloadAfterInstallingKeymap": "La ventana se volverá a cargar después de instalar los métodos abreviados de teclado {0}."
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 385789234f8..fd6dfb45307 100644
--- a/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/fra/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "exemple : myFile.txt",
-	"activeFilePath": "exemple : /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "exemple : /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "exemple : myFolder/myFile.txt",
+	"activeEditorShort": "exemple : myFile.txt",
 	"appName": "exemple : VS Code",
 	"assocDescriptionFile": "Mappez au langage ayant l'identificateur spécifié tous les fichiers dont le nom correspond au modèle Glob.",
 	"assocDescriptionPath": "Mappez au langage ayant l'identificateur spécifié tous les fichiers dont le chemin correspond au modèle Glob de chemin absolu.",
diff --git a/i18n/fra/extensions/css/package.i18n.json b/i18n/fra/extensions/css/package.i18n.json
index 165d5112615..c4786a573bc 100644
--- a/i18n/fra/extensions/css/package.i18n.json
+++ b/i18n/fra/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
 	"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",
@@ -23,6 +24,7 @@
 	"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.validate.desc": "Active ou désactive toutes les validations",
+	"less.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
 	"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",
@@ -42,6 +44,7 @@
 	"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.desc": "Active ou désactive toutes les validations",
+	"scss.colorDecorators.enable.desc": "Active ou désactive les éléments décoratifs de couleurs",
 	"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",
diff --git a/i18n/fra/extensions/git/out/askpass-main.i18n.json b/i18n/fra/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..c06e0fff306
--- /dev/null
+++ b/i18n/fra/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "Informations d'identification manquantes ou non valides."
+}
\ 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 7227100d355..723f51d0997 100644
--- a/i18n/fra/extensions/git/out/commands.i18n.json
+++ b/i18n/fra/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "Nom de la branche",
 	"clean": "Nettoyer les modifications",
 	"clean repo": "Nettoyez l'arborescence de travail de votre dépôt avant l'extraction.",
+	"cloning": "Clonage du dépôt git...",
 	"commit message": "Message de validation",
 	"confirm clean": "Voulez-vous vraiment supprimer les modifications apportées à {0} ?",
 	"confirm clean all": "Voulez-vous vraiment supprimer toutes les modifications ?",
+	"confirm revert": "Voulez-vous vraiment restaurer les changements sélectionnés dans {0} ?",
 	"disabled": "Git est désactivé ou non pris en charge dans cet espace de travail",
 	"never again": "OK, ne plus afficher",
 	"no changes": "Il n'existe aucun changement à valider.",
@@ -19,10 +21,15 @@
 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
 	"ok": "OK",
 	"open git log": "Ouvrir le journal Git",
+	"openrepo": "Ouvrir le dépôt",
+	"parent": "Répertoire parent",
 	"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
+	"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
 	"provide branch name": "Fournissez un nom de branche",
 	"provide commit message": "Indiquez un message de validation",
 	"remote branch at": "Branche distante à {0}",
+	"repourl": "URL du dépôt",
+	"revert": "Restaurer les modifications",
 	"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
 	"tag at": "Étiquette à {0}"
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/out/main.i18n.json b/i18n/fra/extensions/git/out/main.i18n.json
index df53544a5c1..3ccf0c3936c 100644
--- a/i18n/fra/extensions/git/out/main.i18n.json
+++ b/i18n/fra/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "Il semble que git {0} soit installé. Code fonctionne mieux avec git >= 2",
+	"updateGit": "Mettre à jour Git",
 	"using git": "Utilisation de git {0} à partir de {1}"
 }
\ No newline at end of file
diff --git a/i18n/fra/extensions/git/package.i18n.json b/i18n/fra/extensions/git/package.i18n.json
index ca9cfc0bdc3..15f2f220555 100644
--- a/i18n/fra/extensions/git/package.i18n.json
+++ b/i18n/fra/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "Créer une branche...",
 	"command.checkout": "Extraire vers...",
-	"command.clean": "Nettoyer",
-	"command.cleanAll": "Nettoyer tout",
+	"command.clean": "Nettoyer le fichier",
+	"command.cleanAll": "Nettoyer tous les fichiers",
+	"command.clone": "Cloner",
 	"command.commit": "Valider",
 	"command.commitAll": "Valider tout",
 	"command.commitAllSigned": "Valider tout (signé)",
 	"command.commitStaged": "Valider les modifications en attente",
 	"command.commitStagedSigned": "Valider les modifications en attente (signé)",
-	"command.init": "Initialiser le dépôt Git",
+	"command.init": "Initialiser le dépôt",
 	"command.openChange": "Ouvrir la modification",
 	"command.openFile": "Ouvrir le fichier",
 	"command.publish": "Publier",
@@ -22,14 +23,15 @@
 	"command.push": "Push",
 	"command.pushTo": "Transfert (Push) vers...",
 	"command.refresh": "Actualiser",
+	"command.revertSelectedRanges": "Restaurer les portées sélectionnées",
 	"command.showOutput": "Afficher la sortie Git",
-	"command.stage": "Mettre en attente",
-	"command.stageAll": "Tout mettre en attente",
+	"command.stage": "Mettre en attente le fichier",
+	"command.stageAll": "Mettre en attente tous les fichiers",
 	"command.stageSelectedRanges": "Mettre en attente les plages sélectionnées",
 	"command.sync": "Synchroniser",
 	"command.undoCommit": "Annuler la dernière validation",
-	"command.unstage": "Annuler la mise en attente",
-	"command.unstageAll": "Annuler toute mise en attente",
+	"command.unstage": "Annuler la mise en attente du fichier",
+	"command.unstageAll": "Annuler la mise en attente des fichiers",
 	"command.unstageSelectedRanges": "Annuler la mise en attente des plages sélectionnées",
 	"config.autofetch": "Indique si la récupération automatique est activée",
 	"config.autorefresh": "Indique si l'actualisation automatique est activée",
diff --git a/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..78f45a70234
--- /dev/null
+++ b/i18n/fra/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
index 6c52b1d802e..2398ef98161 100644
--- a/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/fra/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "Pour activer JavaScript /TypeScript IntelliSense, excluez les dossiers contenant de nombreux fichiers, comme : {0}",
-	"hintExclude.generic": "Pour activer JavaScript/TypeScript IntelliSense, excluez les dossiers volumineux contenant des fichiers sources inutiles.",
-	"hintExclude.tooltip": "Pour activer JavaScript/TypeScript IntelliSense, excluez les dossiers volumineux contenant des fichiers sources inutiles.",
+	"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.",
+	"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.",
 	"large.label": "Configurer les exclusions",
 	"open": "Configurer les exclusions"
 }
\ 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 a53637e8b16..6797b0346b2 100644
--- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "Contrôle si l'éditeur doit automatiquement fermer les crochets après les avoir ouverts",
 	"codeLens": "Contrôle si l'éditeur affiche les indicateurs CodeLens",
 	"cursorBlinking": "Contrôle le style d'animation du curseur. Valeurs possibles : 'blink', 'smooth', 'phase', 'expand' et 'solid'",
-	"cursorStyle": "Contrôle le style du curseur. Valeurs acceptées : 'block', 'line' et 'underline'",
+	"cursorStyle": "Contrôle le style du curseur. Les valeurs acceptées sont 'block', 'block-outline', 'line', 'line-thin', 'underline' et 'underline-thin'",
 	"detectIndentation": "Quand vous ouvrez un fichier, 'editor.tabSize' et 'editor.insertSpaces' sont détectés en fonction du contenu du fichier.",
+	"dragAndDrop": "Contrôle si l'éditeur autorise le déplacement des sélections par glisser-déplacer.",
 	"editorConfigurationTitle": "Éditeur",
 	"emptySelectionClipboard": "Contrôle si la copie sans sélection permet de copier la ligne actuelle.",
 	"folding": "Contrôle si le pliage de code est activé dans l'éditeur",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "'boolean' attendu. Notez que la valeur \"auto\" a été remplacée par le paramètre 'editor.detectIndentation'.",
 	"lineHeight": "Contrôle la hauteur de ligne. Utilisez 0 pour calculer lineHeight à partir de fontSize.",
 	"lineNumbers": "Contrôle l'affichage des numéros de ligne. Les valeurs possibles sont 'activé', 'désactivé' et 'relatif'. La valeur 'relatif' indique le numéro de ligne à partir de la position actuelle du curseur.",
+	"matchBrackets": "Met en surbrillance les crochets correspondants quand l'un d'eux est sélectionné.",
 	"minimap.enabled": "Contrôle si la minicarte est affichée",
+	"minimap.maxColumn": "Limiter la largeur de la minicarte pour afficher au maximum un certain nombre de colonnes",
+	"minimap.renderCharacters": "Afficher les caractères réels sur une ligne (par opposition aux blocs de couleurs)",
 	"mouseWheelScrollSensitivity": "Multiplicateur à utiliser pour le 'deltaX' et le 'deltaY' des événements de défilement de la roulette de la souris",
 	"mouseWheelZoom": "Agrandir ou réduire la police de l'éditeur quand l'utilisateur fait tourner la roulette de la souris tout en maintenant la touche Ctrl enfoncée",
 	"overviewRulerLanes": "Contrôle le nombre d'ornements pouvant s'afficher à la même position dans la règle d'aperçu",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "Taille de police du widget de suggestion",
 	"suggestLineHeight": "Hauteur de ligne du widget de suggestion",
 	"suggestOnTriggerCharacters": "Contrôle si les suggestions doivent s'afficher automatiquement durant la saisie de caractères de déclenchement",
-	"tabCompletion": "Insérez les extraits de code quand leurs préfixes correspondent. Fonctionne mieux quand la fonctionnalité 'quickSuggestions' n'est pas activée.",
 	"tabSize": "Nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
 	"tabSize.errorMessage": "'number' attendu. Notez que la valeur \"auto\" a été remplacée par le paramètre 'editor.detectIndentation'.",
 	"trimAutoWhitespace": "Supprimer l'espace blanc de fin inséré automatiquement",
 	"useTabStops": "L'insertion et la suppression d'un espace blanc suit les taquets de tabulation",
 	"wordBasedSuggestions": "Activez les suggestions basées sur les mots.",
 	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
-	"wordWrap": "Contrôle le retour automatique à la ligne. Le retour automatique à la ligne s'effectue à min(editor.wrappingColumn, viewportWidthInColumns).",
-	"wrappingColumn": "Contrôle le nombre de caractères après lesquels l'éditeur effectue un retour automatique à la ligne suivante. Si vous affectez la valeur 0, le retour automatique à la ligne s'effectue en fonction de la largeur de la fenêtre d'affichage (retour automatique à la ligne). Si vous affectez la valeur -1, l'éditeur n'effectue jamais de retour automatique à la ligne.",
+	"wordWrap": "Contrôle le retour automatique à la ligne. Valeurs possibles :\n - 'off' (désactive le retour automatique à la ligne) ;\n - 'on' (retour automatique à la ligne dans la fenêtre d'affichage) ;\n - 'wordWrapColumn' (retour automatique à la ligne en fonction de 'editor.wordWrapColumn') ou ;\n - 'bounded' (retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn').",
+	"wordWrap.bounded": "Retour automatique à la ligne au minimum en fonction de la fenêtre d'affichage et de 'editor.wordWrapColumn'.",
+	"wordWrap.off": "Le retour automatique à la ligne n'est jamais effectué.",
+	"wordWrap.on": "Le retour automatique à la ligne s'effectue en fonction de la largeur de la fenêtre d'affichage.",
+	"wordWrap.wordWrapColumn": "Le retour automatique à la ligne s'effectue en fonction de 'editor.wordWrapColumn'.",
+	"wordWrapColumn": "Contrôle la colonne de retour automatique à la ligne de l'éditeur quand 'editor.wordWrap' a la valeur 'wordWrapColumn' ou 'bounded'.",
 	"wrappingIndent": "Contrôle le retrait des lignes renvoyées. La valeur peut être 'none', 'same' ou 'indent'."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index fe11365a49b..7cc1c6bd334 100644
--- a/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "Apercu de définition",
 	"generic.noResults": "Définition introuvable",
 	"meta.title": " – {0} définitions",
-	"multipleResults": "Cliquez pour afficher {0} définitions."
+	"multipleResults": "Cliquez pour afficher {0} définitions.",
+	"noResultWord": "Définition introuvable pour '{0}'"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index fdd6b9b5dde..8999bb1b0f2 100644
--- a/i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/fra/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "La commande '{0}' apparaît plusieurs fois dans la section 'commands'.",
 	"dupe.command": "L'élément de menu fait référence à la même commande que la commande par défaut et la commande alt",
 	"menuId.invalid": "'{0}' est un identificateur de menu non valide",
+	"menus.commandPalette": "Palette de commandes",
 	"menus.editorContext": "Menu contextuel de l'éditeur",
 	"menus.editorTabContext": "Menu contextuel des onglets de l'éditeur",
 	"menus.editorTitle": "Menu de titre de l'éditeur",
diff --git a/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/fra/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ No newline at end of file
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 f4ad9b60c49..f6f7a655c23 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
@@ -24,26 +24,26 @@
 	"showIcons": "Contrôle si les éditeurs ouverts doivent s'afficher ou non avec une icône. Cela implique notamment l'activation d'un thème d'icône.",
 	"sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.",
 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
-	"title": "Contrôle le titre de la fenêtre en fonction de l'éditeur actif. Les variables sont remplacées en fonction du contexte :\n${activeEditorName} : exemple : myFile.txt\n${activeFilePath} : exemple : /Users/Development/myProject/myFile.txt\n${rootName} : exemple : myProject\n${rootPath} : exemple : /Users/Development/myProject\n${appName} : exemple : VS Code\n${dirty} : indicateur d'intégrité si l'intégrité de l'éditeur actif est compromise\n${separator} : séparateur conditionnel (\" - \") qui s'affiche uniquement quand il est entouré de variables avec des valeurs",
+	"title": "Contrôle le titre de la fenêtre en fonction de l'éditeur actif. Les variables sont remplacées en fonction du contexte :\n${activeEditorShort} : exemple : myFile.txt\n${activeEditorMedium} : exemple : myFolder/myFile.txt\n${activeEditorLong} : exemple : /Users/Development/myProject/myFolder/myFile.txt\n${rootName} : exemple : myProject\n${rootPath} : exemple : /Users/Development/myProject\n${appName} : exemple : VS Code\n${dirty} : indicateur d'intégrité si l'intégrité de l'éditeur actif est compromise\n${separator} : séparateur conditionnel (\" - \") qui s'affiche uniquement quand il est entouré de variables avec des valeurs",
 	"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.",
 	"view": "Affichage",
-	"window.menuBarVisibility.default": "\"default\" : le menu n'est masqué qu'en mode plein écran.",
-	"window.menuBarVisibility.hidden": "\"hidden\" : le menu est toujours masqué.",
-	"window.menuBarVisibility.toggle": "\"toggle\" : le menu est masqué mais il peut être affiché via la touche Alt.",
-	"window.menuBarVisibility.visible": "\"visible\" : le menu est toujours visible même en mode plein écran.",
-	"window.newWindowDimensions.default": "\"default\" : permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\" : permet d'ouvrir les nouvelles fenêtres en mode plein écran.",
-	"window.newWindowDimensions.inherit": "\"inherit\" : permet d'ouvrir les nouvelles fenêtres avec la même dimension que la dernière fenêtre active.",
-	"window.newWindowDimensions.maximized": "\"maximized\" : permet d'ouvrir les nouvelles fenêtres de manière agrandie.",
-	"window.openFilesInNewWindow.default": "\"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)",
-	"window.openFilesInNewWindow.off": "\"off\" : les fichiers s'ouvrent dans la fenêtre du dossier conteneur ouvert ou dans la dernière fenêtre active",
-	"window.openFilesInNewWindow.on": "\"on\" : les fichiers s'ouvrent dans une nouvelle fenêtre",
-	"window.openFoldersInNewWindow.default": "\"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)",
-	"window.openFoldersInNewWindow.off": "\"off\" : les dossiers remplacent la dernière fenêtre active",
-	"window.openFoldersInNewWindow.on": "\"on\" : les dossiers s'ouvrent dans une nouvelle fenêtre",
-	"window.reopenFolders.all": "\"all\" : permet de rouvrir tous les dossiers de la dernière session.",
-	"window.reopenFolders.none": "\"none\" : permet de ne jamais rouvrir un dossier.",
-	"window.reopenFolders.one": "\"one\" : permet de rouvrir le dernier dossier actif.",
+	"window.menuBarVisibility.default": "Le menu n'est masqué qu'en mode plein écran.",
+	"window.menuBarVisibility.hidden": "Le menu est toujours masqué.",
+	"window.menuBarVisibility.toggle": "Le menu est masqué mais il peut être affiché via la touche Alt.",
+	"window.menuBarVisibility.visible": "Le menu est toujours visible même en mode plein écran.",
+	"window.newWindowDimensions.default": "Permet d'ouvrir les nouvelles fenêtres au centre de l'écran.",
+	"window.newWindowDimensions.fullscreen": "Permet d'ouvrir les nouvelles fenêtres en mode plein é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.",
+	"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)",
+	"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.on": "Les fichiers s'ouvrent dans une nouvelle fenêtre",
+	"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)",
+	"window.openFoldersInNewWindow.off": "Les dossiers remplacent la dernière fenêtre active",
+	"window.openFoldersInNewWindow.on": "Les dossiers s'ouvrent dans une nouvelle fenêtre",
+	"window.reopenFolders.all": "Permet de rouvrir tous les dossiers de la dernière session.",
+	"window.reopenFolders.none": "Permet de ne jamais rouvrir un dossier.",
+	"window.reopenFolders.one": "Permet de rouvrir le dernier dossier actif.",
 	"windowConfigurationTitle": "Fenêtre",
 	"workbenchConfigurationTitle": "Workbench",
 	"zenMode.fullScreen": "Contrôle si l'activation de Zen Mode met également le banc d'essai en mode plein écran.",
diff --git a/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..251568ee120
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "Ne plus afficher",
+	"wordWrapMigration.ok": "OK",
+	"wordWrapMigration.openSettings": "Ouvrir les paramètres",
+	"wordWrapMigration.prompt": "Le paramètre 'editor.wrappingColumn' est déconseillé et doit être remplacé par 'editor.wordWrap'."
+}
\ 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 aecc3dc1423..99652aa5fd7 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
@@ -34,6 +34,7 @@
 	"restartDebug": "Redémarrer",
 	"restartFrame": "Redémarrer le frame",
 	"reverseContinue": "Inverser",
+	"selectAndStartDebugging": "Sélectionner et démarrer le débogage",
 	"setValue": "Définir la valeur",
 	"startDebug": "Démarrer le débogage",
 	"startWithoutDebugging": "Exécuter sans débogage",
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..dbe91328fdd
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "Tapez le nom d'une configuration de lancement à exécuter.",
+	"entryAriaLabel": "{0}, débogage",
+	"noConfigurationsFound": "Configurations de débogage introuvables. Créez un fichier 'launch.json'.",
+	"noConfigurationsMatching": "Aucune configuration de débogage correspondante"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..1f6ec23605a
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "Une exception s'est produite"
+}
\ 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 e979351ae3d..68b603a249a 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
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "Permet de définir un point d'arrêt dans un fichier",
 	"debug": "Déboguer",
 	"debugCategory": "Déboguer",
+	"debugCommands": "Configuration de débogage",
 	"debugConfigurationTitle": "Déboguer",
 	"debugPanel": "Console de débogage",
 	"inlineValues": "Afficher les valeurs des variables inline dans l'éditeur pendant le débogage",
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 54a1d6b40ac..e15c7e67f74 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
@@ -14,5 +14,7 @@
 	"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",
 	"debugType": "Type de configuration.",
 	"debugWindowsConfiguration": "Attributs de configuration de lancement spécifiques à Windows.",
-	"internalConsoleOptions": "Contrôle le comportement de la console de débogage interne."
+	"deprecatedVariables": "env.', 'config.' et 'command.' sont déconseillés. Utilisez 'env:', 'config:' et 'command:' à la place.",
+	"internalConsoleOptions": "Contrôle le comportement de la console de débogage interne.",
+	"node2NotSupported": "\"node2\" n'est plus pris en charge. Utilisez \"node\" à la place, et affectez la valeur \"inspector\" à l'attribut \"protocol\"."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index b29845955db..484484e9a5b 100644
--- a/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "Configurez les associations entre les fichiers et les langages (par exemple, \"*.extension\": \"html\"). Celles-ci ont priorité sur les associations par défaut des langages installés.",
+	"associations": "Configurez les associations entre les fichiers et les langages (exemple : '*.extension' : 'html'). Celles-ci sont prioritaires sur les associations par défaut des langages installés.",
 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
-	"autoSave": "Contrôle l'enregistrement automatique des fichiers dont l'intégrité est compromise. Valeur acceptées : \"{0}\", \"{1}\", \"{2}\" (l'éditeur perd le focus), \"{3}\" (la fenêtre perd le focus). Si la valeur est \"{4}\", vous pouvez configurer le délai dans \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Contrôle le délai en ms au bout duquel un fichier à l'intégrité compromise est enregistré automatiquement. S'applique uniquement quand \"files.autoSave\" a la valeur \"{0}\"",
+	"autoSave": "Contrôle l'enregistrement automatique des fichiers dont l'intégrité est compromise. Valeurs acceptées : '{0}', '{1}', '{2}' (l'éditeur perd le focus), '{3}' (la fenêtre perd le focus). Si la valeur est '{4}', vous pouvez configurer le délai dans 'files.autoSaveDelay'.",
+	"autoSaveDelay": "Contrôle le délai en ms au bout duquel un fichier à l'intégrité compromise est enregistré automatiquement. S'applique uniquement quand 'files.autoSave' a la valeur '{0}'",
 	"binaryFileEditor": "Éditeur de fichier binaire",
 	"dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.",
 	"editorConfigurationTitle": "Éditeur",
@@ -17,10 +17,10 @@
 	"exclude": "Configurez les modèles Glob pour l'exclusion des fichiers et des dossiers.",
 	"explore": "Explorateur",
 	"explorerConfigurationTitle": "Explorateur de fichiers",
-	"files.autoSave.afterDelay": "\"afterDelay\" : un fichier dont l'intégrité est compromise est automatiquement enregistré après la configuration de \"files.autoSaveDelay\".",
-	"files.autoSave.off": "\"off\" : un fichier dont l'intégrité est compromise n'est jamais enregistré automatiquement.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\" : un fichier dont l'intégrité est compromise est automatiquement enregistré quand l'éditeur perd le focus.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\" : un fichier dont l'intégrité est compromise est automatiquement enregistré quand la fenêtre perd le focus.",
+	"files.autoSave.afterDelay": "Un fichier dont l'intégrité est compromise est automatiquement enregistré après la configuration de 'files.autoSaveDelay'.",
+	"files.autoSave.off": "Un fichier dont l'intégrité est compromise n'est jamais enregistré automatiquement.",
+	"files.autoSave.onFocusChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand l'éditeur perd le focus.",
+	"files.autoSave.onWindowChange": "Un fichier dont l'intégrité est compromise est automatiquement enregistré quand la fenêtre perd le focus.",
 	"files.exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.",
 	"files.exclude.when": "Vérification supplémentaire des frères d'un fichier correspondant. Utilisez $(basename) comme variable pour le nom de fichier correspondant.",
 	"filesConfigurationTitle": "Fichiers",
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..27c0397de03
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "Insérer un extrait de code"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..b20280d6000
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "Insérez les extraits de code quand leurs préfixes correspondent. Fonctionne mieux quand la fonctionnalité 'quickSuggestions' n'est pas activée."
+}
\ 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 0d5743f209f..45c79c51f98 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "Effacer",
 	"workbench.action.terminal.copySelection": "Copier la sélection",
 	"workbench.action.terminal.focus": "Focus sur le terminal",
+	"workbench.action.terminal.focusAtIndex": "Focus sur le terminal {0}",
 	"workbench.action.terminal.focusNext": "Focus sur le terminal suivant",
 	"workbench.action.terminal.focusPrevious": "Focus sur le terminal précédent",
 	"workbench.action.terminal.kill": "Tuer l'instance active du terminal",
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
new file mode 100644
index 00000000000..5838f1b85c3
--- /dev/null
+++ b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (actuel)",
+	"welcomePage.cloneGitRepository": "Cloner le dépôt Git...",
+	"welcomePage.colorTheme": "Thème de couleur",
+	"welcomePage.colorThemeDescription": "Personnalisez l'apparence de l'éditeur et de votre code",
+	"welcomePage.configureSettings": "Configurer les paramètres",
+	"welcomePage.configureSettingsDescription": "Déverrouillez toute la puissance de VS Code en adaptant les paramètres",
+	"welcomePage.editingEvolved": "Édition évoluée",
+	"welcomePage.gitHubRepository": "Dépôt GitHub",
+	"welcomePage.help": "Aide",
+	"welcomePage.installKeymap": "Installez les raccourcis clavier de {0}, {1}, {2} et {3}",
+	"welcomePage.installKeymapDescription": "Installer les raccourcis clavier",
+	"welcomePage.interactivePlayground": "Terrain de jeu interactif",
+	"welcomePage.interactivePlaygroundDescription": "Essayez les fonctionnalités essentielles de l'éditeur en suivant une brève procédure pas à pas",
+	"welcomePage.interfaceOverview": "Vue d'ensemble de l'interface",
+	"welcomePage.interfaceOverviewDescription": "Obtenez une superposition visuelle mettant en évidence les principaux composants de l'IU",
+	"welcomePage.introductoryVideos": "Vidéos d'introduction",
+	"welcomePage.keybindingsReference": "Référence des raccourcis clavier",
+	"welcomePage.keybindingsReferenceDescription": "Fichier PDF imprimable avec les raccourcis clavier les plus usuels",
+	"welcomePage.newFile": "Nouveau fichier",
+	"welcomePage.noRecentFolders": "Aucun dossier récent",
+	"welcomePage.openFolder": "Ouvrir un dossier...",
+	"welcomePage.others": "autres",
+	"welcomePage.productDocumentation": "Documentation du produit",
+	"welcomePage.quickLinks": "Liens rapides",
+	"welcomePage.recent": "Récent",
+	"welcomePage.showCommands": "Rechercher et exécuter toutes les commandes",
+	"welcomePage.showCommandsDescription": "Utilisez et recherchez rapidement des commandes dans le Panneau de configuration ({0})",
+	"welcomePage.showOnStartup": "Afficher la page d'accueil au démarrage",
+	"welcomePage.stackOverflow": "Dépassement de la capacité de la pile",
+	"welcomePage.start": "Démarrer",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (actuel)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (actuel)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 16f4398fb3d..303a3f6b574 100644
--- a/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "Annuler",
 	"ok": "OK",
 	"welcome.title": "Bienvenue",
 	"welcomePage": "Bienvenue",
+	"welcomePage.installingKeymap": "Installation des {0} raccourcis clavier...",
 	"welcomePage.keymapAlreadyInstalled": "Les raccourcis clavier {0} sont déjà installés.",
 	"welcomePage.keymapNotFound": "Les raccourcis clavier {0} ayant l'ID {1} sont introuvables.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La fenêtre se recharge rapidement après l'installation des raccourcis clavier {0}."
+	"welcomePage.willReloadAfterInstallingKeymap": "La fenêtre se recharge après l'installation des raccourcis clavier {0}."
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index aeca7d4a14d..e3b56af7c75 100644
--- a/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/ita/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "ad esempio myFile.txt",
-	"activeFilePath": "ad esempio /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "ad esempio /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "ad esempio myFolder/myFile.txt",
+	"activeEditorShort": "ad esempio myFile.txt",
 	"appName": "ad esempio VS Code",
 	"assocDescriptionFile": "Esegue il mapping di tutti i file il cui nome file corrisponde al criterio GLOB alla lingua con l'identificatore specificato.",
 	"assocDescriptionPath": "Esegue il mapping di tutti i file il cui percorso assoluto corrisponde al criterio GLOB alla lingua con l'identificatore specificato.",
diff --git a/i18n/ita/extensions/css/package.i18n.json b/i18n/ita/extensions/css/package.i18n.json
index 272c95c954d..2148be66729 100644
--- a/i18n/ita/extensions/css/package.i18n.json
+++ b/i18n/ita/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
 	"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",
@@ -23,6 +24,7 @@
 	"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.validate.desc": "Abilita o disabilita tutte le convalide",
+	"less.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
 	"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",
@@ -42,6 +44,7 @@
 	"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.desc": "Abilita o disabilita tutte le convalide",
+	"scss.colorDecorators.enable.desc": "Abilita o disabilita gli elementi Decorator di tipo colore",
 	"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",
diff --git a/i18n/ita/extensions/git/out/askpass-main.i18n.json b/i18n/ita/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..4160c1353c3
--- /dev/null
+++ b/i18n/ita/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "Credenziali mancanti o non valide."
+}
\ 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 6920e2f5cbd..6ff7beff990 100644
--- a/i18n/ita/extensions/git/out/commands.i18n.json
+++ b/i18n/ita/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "Nome ramo",
 	"clean": "Pulisci modifiche",
 	"clean repo": "Pulire l'albero di lavoro del repository prima dell'estrazione.",
+	"cloning": "Clonazione del repository GIT...",
 	"commit message": "Messaggio di commit",
 	"confirm clean": "Pulire le modifiche in {0}?",
 	"confirm clean all": "Pulire tutte le modifiche?",
+	"confirm revert": "Ripristinare le modifiche selezionate in {0}?",
 	"disabled": "GIT è disabilitato oppure non supportato in quest'area di lavoro",
 	"never again": "OK, non visualizzare più",
 	"no changes": "Non ci sono modifiche di cui eseguire il commit.",
@@ -19,10 +21,15 @@
 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
 	"ok": "OK",
 	"open git log": "Apri log GIT",
+	"openrepo": "Apri repository",
+	"parent": "Directory padre",
 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
+	"proposeopen": "Aprire il repository clonato?",
 	"provide branch name": "Specificare un nome di ramo",
 	"provide commit message": "Specificare un messaggio di commit",
 	"remote branch at": "Ramo remoto in {0}",
+	"repourl": "URL del repository",
+	"revert": "Annulla modifiche",
 	"sync is unpredictable": "Questa azione consentirà di effettuare il push e il pull di commit da e verso '{0}'.",
 	"tag at": "Tag in {0}"
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/out/main.i18n.json b/i18n/ita/extensions/git/out/main.i18n.json
index 3f14966ad88..fbc3060d6c4 100644
--- a/i18n/ita/extensions/git/out/main.i18n.json
+++ b/i18n/ita/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "La versione installata di GIT è la {0}. Per il corretto funzionamento di Code è consigliabile usare una versione di GIT non inferiore alla 2.",
+	"updateGit": "Aggiorna GIT",
 	"using git": "Uso di GIT {0} da {1}"
 }
\ No newline at end of file
diff --git a/i18n/ita/extensions/git/package.i18n.json b/i18n/ita/extensions/git/package.i18n.json
index d24293dc90d..9a0acb845eb 100644
--- a/i18n/ita/extensions/git/package.i18n.json
+++ b/i18n/ita/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "Crea ramo...",
 	"command.checkout": "Estrai in...",
-	"command.clean": "Pulisci",
-	"command.cleanAll": "Pulisci tutto",
+	"command.clean": "Pulisci file",
+	"command.cleanAll": "Pulisci tutti i file",
+	"command.clone": "Clona",
 	"command.commit": "Commit",
 	"command.commitAll": "Esegui commit di tutto",
 	"command.commitAllSigned": "Esegui commit di tutto (approvazione)",
 	"command.commitStaged": "Esegui commit dei file preparati",
 	"command.commitStagedSigned": "Esegui commit dei file preparati (approvazione)",
-	"command.init": "Inizializza repository GIT",
+	"command.init": "Inizializza repository",
 	"command.openChange": "Apri modifica",
 	"command.openFile": "Apri file",
 	"command.publish": "Pubblica",
@@ -22,14 +23,15 @@
 	"command.push": "Esegui push",
 	"command.pushTo": "Esegui push in...",
 	"command.refresh": "Aggiorna",
+	"command.revertSelectedRanges": "Ripristina intervalli selezionati",
 	"command.showOutput": "Mostra output GIT",
-	"command.stage": "Prepara per commit",
-	"command.stageAll": "Prepara tutto per commit",
+	"command.stage": "Prepara file per commit",
+	"command.stageAll": "Prepara tutti i file per commit",
 	"command.stageSelectedRanges": "Prepara per il commit intervalli selezionati",
 	"command.sync": "Sincronizza",
 	"command.undoCommit": "Annulla ultimo commit",
-	"command.unstage": "Annulla preparazione per commit",
-	"command.unstageAll": "Annulla preparazione per commit di tutto",
+	"command.unstage": "Annulla preparazione file per commit",
+	"command.unstageAll": "Annulla preparazione di tutti i file per commit",
 	"command.unstageSelectedRanges": "Annulla preparazione per il commit di intervalli selezionati",
 	"config.autofetch": "Indica se il recupero automatico è abilitato",
 	"config.autorefresh": "Indica se l'aggiornamento automatico è abilitato",
diff --git a/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..a7f4367cff3
--- /dev/null
+++ b/i18n/ita/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
index 8aef4f5870f..83ffc0b5d59 100644
--- a/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/ita/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "Per abilitare IntelliSense in JavaScript/TypeScript, escludere le cartelle che contengono molti file, come {0}",
-	"hintExclude.generic": "Per abilitare IntelliSense in JavaScript/TypeScript, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
-	"hintExclude.tooltip": "Per abilitare IntelliSense in JavaScript/TypeScript, escludere le cartelle di grandi dimensioni che contengono file di origine su cui non si lavora.",
+	"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.",
+	"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.",
 	"large.label": "Configura esclusioni",
 	"open": "Configura esclusioni"
 }
\ 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 0d71b067b63..3d7e7dc0f05 100644
--- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "Controlla se l'editor deve chiudere automaticamente le parentesi quadre dopo che sono state aperte",
 	"codeLens": "Controlla se nell'editor sono visualizzate le finestre di CodeLens",
 	"cursorBlinking": "Controlla lo stile di animazione del cursore. I valori possibili sono: 'blink', 'smooth', 'phase', 'expand' e 'solid'",
-	"cursorStyle": "Controlla lo stile del cursore. I valori accettati sono 'block', 'line' e 'underline'",
+	"cursorStyle": "Controlla lo stile del cursore. I valori accettati sono 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'",
 	"detectIndentation": "All'apertura di un file, `editor.tabSize` e `editor.insertSpaces` verranno rilevati in base al contenuto del file.",
+	"dragAndDrop": "Controlla se l'editor consentire lo spostamento di selezioni tramite trascinamento della selezione.",
 	"editorConfigurationTitle": "Editor",
 	"emptySelectionClipboard": "Consente di controllare se, quando si copia senza aver effettuato una selezione, viene copiata la riga corrente.",
 	"folding": "Controlla se per l'editor è abilitata la riduzione del codice",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "È previsto 'boolean'. Nota: il valore \"auto\" è stato sostituito dall'impostazione `editor.detectIndentation`.",
 	"lineHeight": "Controlla l'altezza della riga. Usare 0 per calcolare l'altezza della riga dalle dimensioni del carattere.",
 	"lineNumbers": "Consente di controllare la visualizzazione dei numeri di riga. I valori possibili sono 'on', 'off' e 'relative'. Con 'relative' viene visualizzato il conteggio delle righe a partire dalla posizione corrente del cursore.",
+	"matchBrackets": "Evidenzia le parentesi corrispondenti quando se ne seleziona una.",
 	"minimap.enabled": "Controlla se la mini mappa è visualizzata",
+	"minimap.maxColumn": "Limita la larghezza della mini mappa in modo da eseguire il rendering al massimo di un certo numero di colonne",
+	"minimap.renderCharacters": "Esegue il rendering dei caratteri effettivi di una riga (in contrapposizione ai blocchi colore)",
 	"mouseWheelScrollSensitivity": "Moltiplicatore da usare sui valori `deltaX` e `deltaY` degli eventi di scorrimento della rotellina del mouse",
 	"mouseWheelZoom": "Ingrandisce il carattere dell'editor quando si usa la rotellina del mouse e si tiene premuto CTRL",
 	"overviewRulerLanes": "Controlla il numero di effetti che possono essere visualizzati nella stessa posizione nel righello delle annotazioni",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "Dimensioni del carattere per il widget dei suggerimenti",
 	"suggestLineHeight": "Altezza della riga per il widget dei suggerimenti",
 	"suggestOnTriggerCharacters": "Controlla se i suggerimenti devono essere visualizzati automaticamente durante la digitazione dei caratteri trigger",
-	"tabCompletion": "Inserisce frammenti di codice quando il prefisso corrisponde. Funziona in modo ottimale quando non sono abilitati i suggerimenti rapidi.",
 	"tabSize": "Numero di spazi a cui equivale una tabulazione. Quando `editor.detectIndentation` è attivo, questa impostazione viene sostituita in base al contenuto del file.",
 	"tabSize.errorMessage": "È previsto 'number'. Nota: il valore \"auto\" è stato sostituito dall'impostazione `editor.detectIndentation`.",
 	"trimAutoWhitespace": "Rimuovi lo spazio vuoto finale inserito automaticamente",
 	"useTabStops": "Inserimento ed eliminazione dello spazio vuoto dopo le tabulazioni",
 	"wordBasedSuggestions": "Abilita i suggerimenti basati su parole.",
 	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
-	"wordWrap": "Controlla se le righe devono andare a capo. Le righe andranno a capo alla posizione definita da min(editor.wrappingColumn, viewportWidthInColumns).",
-	"wrappingColumn": "Controlla il numero di caratteri dopo i quali l'editor attiverà l'a capo automatico alla riga successiva. Se è impostato su 0, verrà attivato l'a capo automatico in base alla larghezza del viewport (ritorno a capo automatico). Se è impostato su -1, forzerà l'editor a non eseguire mai il wrapping.",
+	"wordWrap": "Controlla il wrapping delle righe. Valori possibili:\n - 'off' (disabilita il wrapping),\n - 'on' (wrapping del viewport),\n - 'wordWrapColumn' (esegue il wrapping alla posizione corrispondente a `editor.wordWrapColumn`) o\n - 'bounded' (esegue il wrapping alla posizione minima del viewport e di `editor.wordWrapColumn`).",
+	"wordWrap.bounded": "Verrà eseguito il wrapping delle righe alla posizione minima del viewport e di `editor.wordWrapColumn`.",
+	"wordWrap.off": "Il wrapping delle righe non viene eseguito.",
+	"wordWrap.on": "Verrà eseguito il wrapping delle righe in base alla larghezza del viewport.",
+	"wordWrap.wordWrapColumn": "Verrà eseguito il wrapping delle righe alla posizione corrispondente a `editor.wordWrapColumn`.",
+	"wordWrapColumn": "Controlla la colonna di wrapping dell'editor quando il valore di `editor.wordWrap` è 'wordWrapColumn' o 'bounded'.",
 	"wrappingIndent": "Controlla il rientro delle righe con ritorno a capo. Può essere uno dei valori seguenti: 'none', 'same' o 'indent'."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 6ca7a2392b7..903542366b3 100644
--- a/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/ita/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "Visualizza la definizione",
 	"generic.noResults": "Non è stata trovata alcuna definizione",
 	"meta.title": " - Definizioni di {0}",
-	"multipleResults": "Fare clic per visualizzare {0} definizioni."
+	"multipleResults": "Fare clic per visualizzare {0} definizioni.",
+	"noResultWord": "Non è stata trovata alcuna definizione per '{0}'"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index 1374817fc56..5f62ecddd4e 100644
--- a/i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/ita/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "Il comando `{0}` è presente più volte nella sezione `commands`.",
 	"dupe.command": "La voce di menu fa riferimento allo stesso comando come comando predefinito e come comando alternativo",
 	"menuId.invalid": "`{0}` non è un identificatore di menu valido",
+	"menus.commandPalette": "Riquadro comandi",
 	"menus.editorContext": "Menu di scelta rapida dell'editor",
 	"menus.editorTabContext": "Menu di scelta rapida delle schede dell'editor",
 	"menus.editorTitle": "Menu del titolo dell'editor",
diff --git a/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/ita/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ 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 61a3cdb3670..dc7b14ad027 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
@@ -24,26 +24,26 @@
 	"showIcons": "Controlla se visualizzare o meno un'icona per gli editor aperti. Richiede l'abilitazione anche di un tema dell'icona.",
 	"sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.",
 	"statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.",
-	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite a seconda del contesto:\n${activeEditorName}: ad esempio myFile.txt\n${activeFilePath}: ad esempio /Users/Development/myProject/myFile.txt\n${rootName}: ad esempio myProject\n${rootPath}: ad esempio /Users/Development/myProject\n${appName}: ad esempio VS Code\n${dirty}: un indicatore dirty se l'editor attivo è dirty\n${separator}: un separatore condizionale (' - ') visualizzato solo se circondato da variabili con valori",
+	"title": "Controlla il titolo della finestra in base all'editor attivo. Le variabili vengono sostituite a seconda del contesto:\n${activeEditorShort}: ad esempio myFile.txt\n${activeEditorMedium}: ad esempio myFolder/myFile.txt\n${activeEditorLong}: ad esempio /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: ad esempio myProject\n${rootPath}: ad esempio /Users/Development/myProject\n${appName}: ad esempio VS Code\n${dirty}: un indicatore dirty se l'editor attivo è dirty\n${separator}: un separatore condizionale (\" - \") visualizzato solo se circondato da variabili con valori",
 	"titleBarStyle": "Consente di modificare l'aspetto della barra del titolo della finestra. Per applicare le modifiche, è necessario un riavvio completo.",
 	"view": "Visualizza",
-	"window.menuBarVisibility.default": "\"default\": il menu è nascosto solo nella modalità a schermo intero.",
-	"window.menuBarVisibility.hidden": "\"hidden\": il menu è sempre nascosto.",
-	"window.menuBarVisibility.toggle": "\"toggle\": il menu è nascosto ma può essere visualizzato premendo ALT.",
-	"window.menuBarVisibility.visible": "\"visible\": il menu è sempre visibile, anche nella modalità a schermo intero.",
-	"window.newWindowDimensions.default": "\"default\": apre nuove finestre al centro della schermata.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": apre nuove finestre nella modalità a schermo intero.",
-	"window.newWindowDimensions.inherit": "\"inherit\": apre nuove finestre le cui dimensioni sono uguali a quelle dell'ultima finestra attiva.",
-	"window.newWindowDimensions.maximized": "\"maximized\": apre nuove finestre ingrandite a schermo intero.",
-	"window.openFilesInNewWindow.default": "\"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)",
-	"window.openFilesInNewWindow.off": "\"off\": i file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
-	"window.openFilesInNewWindow.on": "\"on\": i file verranno aperti in una nuova finestra",
-	"window.openFoldersInNewWindow.default": "\"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",
-	"window.openFoldersInNewWindow.off": "\"off\": le cartelle sostituiranno l'ultima finestra attiva",
-	"window.openFoldersInNewWindow.on": "\"on\": le cartelle verranno aperte in una nuova finestra",
-	"window.reopenFolders.all": "\"all\": riapre tutte le cartelle dell'ultima sessione.",
-	"window.reopenFolders.none": "\"none\": non apre nessuna cartella.",
-	"window.reopenFolders.one": "\"one\": riapre l'ultima cartella attiva.",
+	"window.menuBarVisibility.default": "Il menu è nascosto solo nella modalità a schermo intero.",
+	"window.menuBarVisibility.hidden": "Il menu è sempre nascosto.",
+	"window.menuBarVisibility.toggle": "Il menu è nascosto ma può essere visualizzato premendo ALT.",
+	"window.menuBarVisibility.visible": "Il menu è sempre visibile, anche nella modalità a schermo intero.",
+	"window.newWindowDimensions.default": "Apre nuove finestre al centro della schermata.",
+	"window.newWindowDimensions.fullscreen": "Apre nuove finestre nella modalità a schermo intero.",
+	"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.",
+	"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)",
+	"window.openFilesInNewWindow.off": "I file verranno aperti nella finestra con la cartella dei file aperta o nell'ultima finestra attiva",
+	"window.openFilesInNewWindow.on": "I file verranno aperti in una nuova finestra",
+	"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",
+	"window.openFoldersInNewWindow.off": "Le cartelle sostituiranno l'ultima finestra attiva",
+	"window.openFoldersInNewWindow.on": "Le cartelle verranno aperte in una nuova finestra",
+	"window.reopenFolders.all": "Riapre tutte le cartelle dell'ultima sessione.",
+	"window.reopenFolders.none": "Non apre nessuna cartella.",
+	"window.reopenFolders.one": "Riapre l'ultima cartella attiva.",
 	"windowConfigurationTitle": "Finestra",
 	"workbenchConfigurationTitle": "Workbench",
 	"zenMode.fullScreen": "Consente di controllare se attivando la modalità Zen anche l'area di lavoro passa alla modalità schermo intero.",
diff --git a/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..8ab960273a9
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "Non visualizzare più questo messaggio",
+	"wordWrapMigration.ok": "OK",
+	"wordWrapMigration.openSettings": "Apri impostazioni",
+	"wordWrapMigration.prompt": "L'impostazione `editor.wrappingColumn` è stata deprecata e sostituita da `editor.wordWrap`."
+}
\ 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 b9774c799ab..8c029608d14 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
@@ -34,6 +34,7 @@
 	"restartDebug": "Riavvia",
 	"restartFrame": "Riavvia frame",
 	"reverseContinue": "Inverti",
+	"selectAndStartDebugging": "Seleziona e avvia il debug",
 	"setValue": "Imposta valore",
 	"startDebug": "Avvia debug",
 	"startWithoutDebugging": "Avvia senza eseguire debug",
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..e944499eb9c
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "Digitare il nome di una configurazione di avvio da eseguire.",
+	"entryAriaLabel": "{0}, debug",
+	"noConfigurationsFound": "Non è stata trovata alcuna configurazione di debug. Creare un file 'launch.json'.",
+	"noConfigurationsMatching": "Non esistono configurazioni di debug corrispondenti"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..e10aea77126
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "Si è verificata un'eccezione"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index ce8b07347a2..be4ec0ee9a7 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "Consente l'impostazione del punto di interruzione in qualsiasi file",
 	"debug": "Debug",
 	"debugCategory": "Debug",
+	"debugCommands": "Configurazione di debug",
 	"debugConfigurationTitle": "Debug",
 	"debugPanel": "Console di debug",
 	"inlineValues": "Mostra i valori delle variabili inline nell'editor durante il debug",
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 d836b1daaad..a0cdd73da98 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
@@ -14,5 +14,7 @@
 	"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",
 	"debugType": "Tipo di configurazione.",
 	"debugWindowsConfiguration": "Attributi della configurazione di avvio specifici di Windows.",
-	"internalConsoleOptions": "Controlla il comportamento della console di debug interna."
+	"deprecatedVariables": "'env.', 'config.' e 'command.' sono deprecati. In alternativa, usare 'env:', 'config:' e 'command:'.",
+	"internalConsoleOptions": "Controlla il comportamento della console di debug interna.",
+	"node2NotSupported": "\"node2\" non è più supportato. In alternativa, usare \"node\" e impostare l'attributo \"protocol\" su \"inspector\"."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index 03acbba49a0..eb2b8c585fb 100644
--- a/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio \"*.extension\": \"html\". Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
+	"associations": "Consente di configurare le associazioni tra file e linguaggi, ad esempio '*.extension': 'html'. Queste hanno la precedenza sulle associazioni predefinite dei linguaggi installate.",
 	"autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.",
-	"autoSave": "Controlla il salvataggio automatico dei file modificati ma non salvati. Valori accettati: \"{0}\", \"{1}\", \"{2}\" (l'editor perde lo stato attivo), \"{3}\" (la finestra perde lo stato attivo). Se è impostato su \"{4}\", è possibile configurare il ritardo in \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Controlla il ritardo in ms dopo il quale un file modificato ma non salvato viene salvato automaticamente. Si applica solo quando \"files.autoSave\" è impostato su \"{0}\"",
+	"autoSave": "Controlla il salvataggio automatico dei file dirty. Valori accettati: '{0}', '{1}', '{2}' (l'editor perde lo stato attivo), '{3}' (la finestra perde lo stato attivo). Se è impostato su '{4}', è possibile configurare il ritardo in 'files.autoSaveDelay'.",
+	"autoSaveDelay": "Controlla il ritardo in ms dopo il quale un file dirty viene salvato automaticamente. Si applica solo quando 'files.autoSave' è impostato su '{0}'",
 	"binaryFileEditor": "Editor file binari",
 	"dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.",
 	"editorConfigurationTitle": "Editor",
@@ -17,10 +17,10 @@
 	"exclude": "Consente di configurare i criteri di ricerca GLOB per escludere file e cartelle.",
 	"explore": "Esplora risorse",
 	"explorerConfigurationTitle": "Esplora file",
-	"files.autoSave.afterDelay": "\"afterDelay\": un file dirty viene salvato automaticamente in base al valore configurato di \"files.autoSaveDelay\".",
-	"files.autoSave.off": "\"off\": un file dirty non viene mai salvato automaticamente.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": un file dirty viene salvato automaticamente quando l'editor perde lo stato attivo.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": un file dirty viene salvato automaticamente quando la finestra perde lo stato attivo.",
+	"files.autoSave.afterDelay": "Un file dirty viene salvato automaticamente in base al valore configurato di 'files.autoSaveDelay'.",
+	"files.autoSave.off": "Un file dirty non viene mai salvato automaticamente.",
+	"files.autoSave.onFocusChange": "Un file dirty viene salvato automaticamente quando l'editor perde lo stato attivo.",
+	"files.autoSave.onWindowChange": "Un file dirty viene salvato automaticamente quando la finestra perde lo stato attivo.",
 	"files.exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.",
 	"files.exclude.when": "Controllo aggiuntivo sugli elementi di pari livello di un file corrispondente. Usare $(basename) come variabile del nome file corrispondente.",
 	"filesConfigurationTitle": "File",
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..f501a03d135
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "Inserisci frammento"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..5ebb0b85ade
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "Inserisce frammenti di codice quando il prefisso corrisponde. Funziona in modo ottimale quando non sono abilitati i suggerimenti rapidi."
+}
\ 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 5be35d17891..72d75851e9e 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "Cancella",
 	"workbench.action.terminal.copySelection": "Copia selezione",
 	"workbench.action.terminal.focus": "Sposta stato attivo su terminale",
+	"workbench.action.terminal.focusAtIndex": "Sposta stato attivo su terminale {0}",
 	"workbench.action.terminal.focusNext": "Sposta stato attivo su terminale successivo",
 	"workbench.action.terminal.focusPrevious": "Sposta stato attivo su terminale precedente",
 	"workbench.action.terminal.kill": "Termina istanza attiva del terminale",
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
new file mode 100644
index 00000000000..d1b977c3f8f
--- /dev/null
+++ b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (corrente)",
+	"welcomePage.cloneGitRepository": "Clona repository GIT...",
+	"welcomePage.colorTheme": "Tema colori",
+	"welcomePage.colorThemeDescription": "Tutto quel che serve per configurare editor e codice nel modo desiderato",
+	"welcomePage.configureSettings": "Configura le impostazioni",
+	"welcomePage.configureSettingsDescription": "Perfeziona le impostazioni per sfruttare appieno tutta la potenza di Visual Studio Code",
+	"welcomePage.editingEvolved": "Evoluzione dell'editor",
+	"welcomePage.gitHubRepository": "Repository GitHub",
+	"welcomePage.help": "Guida",
+	"welcomePage.installKeymap": "Installa i tasti di scelta rapida di {0}, {1}, {2} e {3}",
+	"welcomePage.installKeymapDescription": "Installa i tasti di scelta rapida",
+	"welcomePage.interactivePlayground": "Playground interattivo",
+	"welcomePage.interactivePlaygroundDescription": "Breve panoramica delle funzionalità essenziali dell'editor",
+	"welcomePage.interfaceOverview": "Panoramica dell'interfaccia",
+	"welcomePage.interfaceOverviewDescription": "Immagine in sovrimpressione che evidenzia i principali componenti dell'interfaccia utente",
+	"welcomePage.introductoryVideos": "Video introduttivi",
+	"welcomePage.keybindingsReference": "Riferimento per tasti di scelta rapida",
+	"welcomePage.keybindingsReferenceDescription": "PDF stampabile con i tasti di scelta rapida più comuni",
+	"welcomePage.newFile": "Nuovo file",
+	"welcomePage.noRecentFolders": "Non ci sono cartelle recenti",
+	"welcomePage.openFolder": "Apri cartella...",
+	"welcomePage.others": "altri",
+	"welcomePage.productDocumentation": "Documentazione del prodotto",
+	"welcomePage.quickLinks": "Collegamenti rapidi",
+	"welcomePage.recent": "Recenti",
+	"welcomePage.showCommands": "Trova ed esegui tutti i comandi",
+	"welcomePage.showCommandsDescription": "Accesso e ricerca rapida di comandi dal pannello di controllo ({0})",
+	"welcomePage.showOnStartup": "Mostra la pagina iniziale all'avvio",
+	"welcomePage.stackOverflow": "Overflow dello stack",
+	"welcomePage.start": "Avvia",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (corrente)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (corrente)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index fb7db53b2d0..5bbdd1e0a41 100644
--- a/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "Annulla",
 	"ok": "OK",
 	"welcome.title": "Benvenuti",
 	"welcomePage": "Benvenuti",
+	"welcomePage.installingKeymap": "Installazione dei tasti di scelta rapida di {0}...",
 	"welcomePage.keymapAlreadyInstalled": "I tasti di scelta rapida di {0} sono già installati.",
 	"welcomePage.keymapNotFound": "I tasti di scelta rapida di {0} con ID {1} non sono stati trovati.",
-	"welcomePage.willReloadAfterInstallingKeymap": "La finestra verrà ricaricata rapidamente dopo l'installazione dei tasti di scelta rapida di {0}."
+	"welcomePage.willReloadAfterInstallingKeymap": "La finestra verrà ricaricata dopo l'installazione dei tasti di scelta rapida di {0}."
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 99f22556fa8..8d08dd55da2 100644
--- a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "例: myFile.txt",
-	"activeFilePath": "例: /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "例: /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "例: myFolder/myFile.txt",
+	"activeEditorShort": "例: myFile.txt",
 	"appName": "例: VS Code",
 	"assocDescriptionFile": "ファイル名が glob パターンに一致するすべてのファイルを、指定された識別子の言語にマップします。",
 	"assocDescriptionPath": "絶対パスの glob パターンがパスに一致するすべてのファイルを、指定した識別子の言語にマップします。",
diff --git a/i18n/jpn/extensions/css/package.i18n.json b/i18n/jpn/extensions/css/package.i18n.json
index c5ad6cddd13..05720c99de8 100644
--- a/i18n/jpn/extensions/css/package.i18n.json
+++ b/i18n/jpn/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
 	"css.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
 	"css.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
 	"css.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
@@ -23,6 +24,7 @@
 	"css.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
 	"css.lint.zeroUnits.desc": "0 の単位は必要ありません",
 	"css.validate.desc": "すべての検証を有効または無効にします",
+	"less.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
 	"less.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
 	"less.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
 	"less.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
@@ -42,6 +44,7 @@
 	"less.lint.vendorPrefix.desc": "ベンダー固有のプレフィックスを使用する場合は、標準のプロパティも含めます",
 	"less.lint.zeroUnits.desc": "0 の単位は必要ありません",
 	"less.validate.desc": "すべての検証を有効または無効にします",
+	"scss.colorDecorators.enable.desc": "カラー デコレーターを有効または無効にします",
 	"scss.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数",
 	"scss.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください",
 	"scss.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください",
diff --git a/i18n/jpn/extensions/git/out/askpass-main.i18n.json b/i18n/jpn/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..fbc0d0f2c5b
--- /dev/null
+++ b/i18n/jpn/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "資格情報が見つからないか、無効です。"
+}
\ 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 0e7d9d4140f..ceb0c5f68c9 100644
--- a/i18n/jpn/extensions/git/out/commands.i18n.json
+++ b/i18n/jpn/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "ブランチ名",
 	"clean": "変更を取り除く",
 	"clean repo": "チェックアウトの前に、リポジトリの作業ツリーを消去してください。",
+	"cloning": "Git リポジトリを複製しています...",
 	"commit message": "コミット メッセージ",
 	"confirm clean": "{0} の変更を消去しますか?",
 	"confirm clean all": "変更をすべて消去しますか?",
+	"confirm revert": "{0} で選択した変更を元に戻しますか?",
 	"disabled": "このワークスペースでは、Git が無効になっているか、サポートされていません",
 	"never again": "OK、今後は表示しない",
 	"no changes": "コミットする必要のある変更はありません。",
@@ -19,10 +21,15 @@
 	"nobranch": "リモートにプッシュするブランチをチェックアウトしてください。",
 	"ok": "OK",
 	"open git log": "Git ログを開く",
+	"openrepo": "リポジトリを開く",
+	"parent": "親ディレクトリ",
 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
+	"proposeopen": "複製したリポジトリを開きますか?",
 	"provide branch name": "ブランチ名を指定してください",
 	"provide commit message": "コミット メッセージを入力してください",
 	"remote branch at": "{0} でのリモート ブランチ",
+	"repourl": "リポジトリ URL",
+	"revert": "変更を元に戻す",
 	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
 	"tag at": "{0} のタグ"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/out/main.i18n.json b/i18n/jpn/extensions/git/out/main.i18n.json
index 748e51709b0..45c7902ff12 100644
--- a/i18n/jpn/extensions/git/out/main.i18n.json
+++ b/i18n/jpn/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "Git {0} がインストールされているようです。Code は Git 2 以上で最適に動作します",
+	"updateGit": "Git の更新",
 	"using git": "{1} から Git {0} を使用しています"
 }
\ No newline at end of file
diff --git a/i18n/jpn/extensions/git/package.i18n.json b/i18n/jpn/extensions/git/package.i18n.json
index b3e0caede4c..e7e1386c07d 100644
--- a/i18n/jpn/extensions/git/package.i18n.json
+++ b/i18n/jpn/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "分岐の作成...",
 	"command.checkout": "チェックアウト先...",
-	"command.clean": "クリーン",
-	"command.cleanAll": "すべてクリーン",
+	"command.clean": "ファイルのクリーン",
+	"command.cleanAll": "すべてのファイルのクリーン",
+	"command.clone": "複製",
 	"command.commit": "コミット",
 	"command.commitAll": "すべてコミット",
 	"command.commitAllSigned": "すべてコミット (サインオフ)",
 	"command.commitStaged": "ステージング済みをコミット",
 	"command.commitStagedSigned": "ステージング済みをコミット (サインオフ)",
-	"command.init": "Git リポジトリの初期化",
+	"command.init": "リポジトリの初期化",
 	"command.openChange": "変更を開く",
 	"command.openFile": "ファイルを開く",
 	"command.publish": "公開",
@@ -22,14 +23,15 @@
 	"command.push": "プッシュ",
 	"command.pushTo": "プッシュ先...",
 	"command.refresh": "最新の情報に更新",
+	"command.revertSelectedRanges": "選択範囲を元に戻す",
 	"command.showOutput": "Git 出力の表示",
-	"command.stage": "ステージング",
-	"command.stageAll": "すべてステージング",
+	"command.stage": "ファイルのステージング",
+	"command.stageAll": "すべてのファイルのステージング",
 	"command.stageSelectedRanges": "選択した範囲をステージする",
 	"command.sync": "同期",
 	"command.undoCommit": "前回のコミットを元に戻す",
-	"command.unstage": "ステージング解除",
-	"command.unstageAll": "すべてステージング解除",
+	"command.unstage": "ファイルのステージング解除",
+	"command.unstageAll": "すべてのファイルのステージング解除",
 	"command.unstageSelectedRanges": "選択した範囲をアンステージする",
 	"config.autofetch": "自動フェッチが有効かどうか",
 	"config.autorefresh": "自動更新が有効かどうか",
diff --git a/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..ddf54ae6ac9
--- /dev/null
+++ b/i18n/jpn/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
index aa52e2e4049..173d4bf5b4a 100644
--- a/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/jpn/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "JavaScript/TypeScript IntelliSense を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
-	"hintExclude.generic": "JavaScript/TypeScript IntelliSense を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
-	"hintExclude.tooltip": "JavaScript/TypeScript IntelliSense を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
+	"hintExclude": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、多数のファイルが含まれるフォルダーを除外します。例: {0}",
+	"hintExclude.generic": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
+	"hintExclude.tooltip": "プロジェクト全体の JavaScript/TypeScript 言語機能を有効にするには、作業していないソース ファイルが含まれるサイズの大きなフォルダーを除外します。",
 	"large.label": "除外の構成",
 	"open": "除外の構成"
 }
\ 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 120074e372f..7f5d6055665 100644
--- a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "エディターで左角かっこの後に自動的に右角かっこを挿入するかどうかを制御します",
 	"codeLens": "エディターでコード レンズを表示するかをどうかを制御する",
 	"cursorBlinking": "カーソルのアニメーション スタイルを制御します。指定できる値は 'blink'、'smooth'、'phase'、'expand'、'solid' です",
-	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'line'、'underline' です",
+	"cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です",
 	"detectIndentation": "ファイルを開くと、そのファイルの内容に基づいて `editor.tabSize` と `editor.insertSpaces` が検出されます。",
+	"dragAndDrop": "ドラッグ アンド ドロップによる選択範囲の移動をエディターが許可する必要があるかどうかを制御します。",
 	"editorConfigurationTitle": "エディター",
 	"emptySelectionClipboard": "選択範囲を指定しないでコピーする場合に現在の行をコピーするかどうかを制御します。",
 	"folding": "エディターでコードの折りたたみを有効にするかどうかを制御します",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "'boolean' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
 	"lineHeight": "行の高さを制御します。fontSize に基づいて lineHeight を計算する場合には、0 を使用します。",
 	"lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、および 'relative' です。'relative' は現在のカーソル位置からの行数を示します。",
+	"matchBrackets": "かっこを選択すると、対応するかっこを強調表示します。",
 	"minimap.enabled": "ミニマップを表示するかどうかを制御します",
+	"minimap.maxColumn": "表示するミニマップの最大幅を特定の桁数に制限します",
+	"minimap.renderCharacters": "行に (カラー ブロックではなく) 実際の文字を表示します",
 	"mouseWheelScrollSensitivity": "マウス ホイール スクロール イベントの `deltaX` と `deltaY` で使用される乗数",
 	"mouseWheelZoom": "Ctrl キーを押しながらマウス ホイールを使用してエディターのフォントをズームします",
 	"overviewRulerLanes": "概要ルーラーの同じ位置に表示できる装飾の数を制御します",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "候補のウィジェットのフォント サイズ",
 	"suggestLineHeight": "候補のウィジェットの行の高さ",
 	"suggestOnTriggerCharacters": "トリガー文字の入力時に候補が自動的に表示されるようにするかどうかを制御します",
-	"tabCompletion": "プレフィックスが一致する場合にスニペットを挿入します。'quickSuggestions' が無効な場合に最適です。",
 	"tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。",
 	"tabSize.errorMessage": "'number' が必要です。`editor.detectIndentation` 設定によって値 \"auto\" が置き換えられていることに注意してください。",
 	"trimAutoWhitespace": "自動挿入された末尾の空白を削除する",
 	"useTabStops": "空白の挿入や削除はタブ位置に従って行われます",
 	"wordBasedSuggestions": "単語ベースの修正候補を有効にします。",
 	"wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字",
-	"wordWrap": "行を折り返すかどうかを制御します。行は min(editor.wrappingColumn, viewportWidthInColumns) で折り返します。",
-	"wrappingColumn": "エディターで次の行に折り返される文字数を制御します。これを 0 に設定すると、ビューポートの幅での折り返しがオンになります (ワード ラップ)。これを -1 に設定するとエディターによる折り返しが禁止されます。",
+	"wordWrap": "行の折り返し方法を制御します。次の値を指定できます。\n - 'off' (折り返さない)\n - 'on' (ビューポート折り返し)\n - 'wordWrapColumn' ('editor.wordWrapColumn' で折り返し)\n - 'bounded' (ビューポートと 'editor.wordWrapColumn' の最小値で折り返し)。",
+	"wordWrap.bounded": "ビューポートと 'editor.wordWrapColumn' の最小値で行を折り返します。",
+	"wordWrap.off": "行を折り返しません。",
+	"wordWrap.on": "行をビューポートの幅で折り返します。",
+	"wordWrap.wordWrapColumn": "行を 'editor.wordWrapColumn' で折り返します。",
+	"wordWrapColumn": "'editor.wordWrap' が 'wordWrapColumn' または 'bounded' の場合に、エディターの折り返し桁を制御します。",
 	"wrappingIndent": "折り返し行のインデントを制御します。'none'、'same'、または 'indent' のいずれかを指定できます。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 89a78a92bd0..10d3fcec8d6 100644
--- a/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/jpn/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "定義をここに表示",
 	"generic.noResults": "定義が見つかりません",
 	"meta.title": " - {0} の定義",
-	"multipleResults": "クリックして、{0} の定義を表示します。"
+	"multipleResults": "クリックして、{0} の定義を表示します。",
+	"noResultWord": "'{0}' の定義は見つかりません"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index c84a780b8ac..b32fb37bcc8 100644
--- a/i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/jpn/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "コマンド `{0}` が `commands` セクションで複数回出現します。",
 	"dupe.command": "メニュー項目において、既定と alt コマンドが同じコマンドを参照しています",
 	"menuId.invalid": "`{0}` は有効なメニュー識別子ではありません",
+	"menus.commandPalette": "コマンド パレット",
 	"menus.editorContext": "エディターのコンテキスト メニュー",
 	"menus.editorTabContext": "エディターのタブのコンテキスト メニュー",
 	"menus.editorTitle": "エディターのタイトル メニュー",
diff --git a/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/jpn/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ No newline at end of file
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 997a4dbac83..1c652d170cc 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
@@ -24,26 +24,26 @@
 	"showIcons": "開いているエディターをアイコンで表示するかどうかを制御します。これには、アイコンのテーマを有効にする必要もあります。",
 	"sideBarLocation": "サイド バーの位置を制御します。ワークベンチの左右のいずれかに表示できます。",
 	"statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。",
-	"title": "アクティブなエディターに基づいてウィンドウのタイトルを制御します。変数は、コンテキストに基づいて置換されます:\n${activeEditorName}: 例: myFile.txt\n${activeFilePath}: 例: /Users/Development/myProject/myFile.txt\n${rootName}: 例: myProject\n${rootPath}: 例: /Users/Development/myProject\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${rootName}: 例: myProject\n${rootPath}: 例: /Users/Development/myProject\n${appName}: 例: VS Code\n${dirty}: アクティブなエディターがダーティである場合のダーティ インジケーター\n${separator}: 値のある変数で囲まれた場合にのみ表示される条件付き区切り記号 (\" - \")",
 	"titleBarStyle": "ウィンドウのタイトル バーの外観を調整します。変更を適用するには、完全に再起動する必要があります。",
 	"view": "表示",
-	"window.menuBarVisibility.default": "\"default\": 全画面表示モードの場合にのみメニューが非表示になります。",
-	"window.menuBarVisibility.hidden": "\"hidden\": メニューは常に非表示になります。",
-	"window.menuBarVisibility.toggle": "\"toggle\": メニューは非表示になりますが、Alt キーを押すと表示できます。",
-	"window.menuBarVisibility.visible": "\"visible\": 全画面表示モードの場合も含めて、常にメニューが表示されます。",
-	"window.newWindowDimensions.default": "\"default\": 新しいウィンドウを画面の中央に開きます。",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": 新しいウィンドウを全画面表示モードで開きます。",
-	"window.newWindowDimensions.inherit": "\"inherit\": 新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
-	"window.newWindowDimensions.maximized": "\"maximized\": 新しいウィンドウを最大化した状態で開きます。",
-	"window.openFilesInNewWindow.default": "\"default\": ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ)",
-	"window.openFilesInNewWindow.off": "\"off\": ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
-	"window.openFilesInNewWindow.on": "\"on\": 新しいウィンドウでファイルを開きます",
-	"window.openFoldersInNewWindow.default": "\"default\": フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
-	"window.openFoldersInNewWindow.off": "\"off\": フォルダーは、最後のアクティブ ウィンドウで開きます",
-	"window.openFoldersInNewWindow.on": "\"on\": 新しいウィンドウでフォルダーを開きます",
-	"window.reopenFolders.all": "\"all\": 最後のセッションの全フォルダーを再び開きます。",
-	"window.reopenFolders.none": "\"none\": フォルダーを再度開きません。",
-	"window.reopenFolders.one": "\"one\": 最後にアクティブだったフォルダーを再び開きます。",
+	"window.menuBarVisibility.default": "メニューは全画面表示モードの場合にのみ非表示です。",
+	"window.menuBarVisibility.hidden": "メニューは常に非表示です。",
+	"window.menuBarVisibility.toggle": "メニューは非表示ですが、Alt キーを押すと表示できます。",
+	"window.menuBarVisibility.visible": "全画面表示モードの場合も含めて、常にメニューが表示されます。",
+	"window.newWindowDimensions.default": "新しいウィンドウを画面の中央に開きます。",
+	"window.newWindowDimensions.fullscreen": "新しいウィンドウを全画面表示モードで開きます。",
+	"window.newWindowDimensions.inherit": "新しいウィンドウを、最後にアクティブだったウィンドウと同じサイズで開きます。",
+	"window.newWindowDimensions.maximized": "新しいウィンドウを最大化した状態で開きます。",
+	"window.openFilesInNewWindow.default": "ファイルのフォルダーが開かれていたウィンドウでファイルを開くか、Dock または Finder を使用して開く場合以外は最後のアクティブ ウィンドウでファイルを開きます (macOS のみ)",
+	"window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます",
+	"window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます",
+	"window.openFoldersInNewWindow.default": "フォルダーがアプリケーション内から (たとえば、[ファイル] メニューから) 選択された場合を除いて、新しいウィンドウでフォルダーを開きます",
+	"window.openFoldersInNewWindow.off": "フォルダーは、最後のアクティブ ウィンドウで開きます",
+	"window.openFoldersInNewWindow.on": "新しいウィンドウでフォルダーを開きます",
+	"window.reopenFolders.all": "最後のセッションの全フォルダーを再び開きます。",
+	"window.reopenFolders.none": "フォルダーを再度開きません。",
+	"window.reopenFolders.one": "最後にアクティブだったフォルダーを再び開きます。",
 	"windowConfigurationTitle": "ウィンドウ",
 	"workbenchConfigurationTitle": "ワークベンチ",
 	"zenMode.fullScreen": "Zen Mode をオンにするとワークベンチを自動的に全画面モードに切り替えるかどうかを制御します。",
diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..161d12ad247
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "今後は表示しない",
+	"wordWrapMigration.ok": "OK",
+	"wordWrapMigration.openSettings": "設定を開く",
+	"wordWrapMigration.prompt": "設定 'editor.wrappingColumn' は使用されなくなりました。'editor.wordWrap' を使用してください。"
+}
\ 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 0ea68516fe5..2620509f341 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
@@ -34,6 +34,7 @@
 	"restartDebug": "再起動",
 	"restartFrame": "フレームの再起動",
 	"reverseContinue": "反転",
+	"selectAndStartDebugging": "選択してデバッグを開始",
 	"setValue": "値の設定",
 	"startDebug": "デバッグの開始",
 	"startWithoutDebugging": "デバッグなしで開始",
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..0e8b2cb411c
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "実行する起動構成の名前を入力してください。",
+	"entryAriaLabel": "{0}、デバッグ",
+	"noConfigurationsFound": "デバッグ構成が見つかりません。'launch.json' ファイルを作成してください。",
+	"noConfigurationsMatching": "一致するデバッグ構成はありません"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..620f6347732
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "例外が発生しました"
+}
\ 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 423147e358e..7a4fcf4bf9b 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
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "任意のファイルにブレークポイントを設定できるようにする",
 	"debug": "デバッグ",
 	"debugCategory": "デバッグ",
+	"debugCommands": "デバッグ構成",
 	"debugConfigurationTitle": "デバッグ",
 	"debugPanel": "デバッグ コンソール",
 	"inlineValues": "デバッグ中にエディターの行内に変数値を表示します",
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 3bdeceb3ae2..e4ff59c07c5 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
@@ -14,5 +14,7 @@
 	"debugServer": "デバッグ拡張機能の開発のみ。ポートが指定の VS Code の場合、サーバー モードで実行中のデバッグ アダプターへの接続が試行されます。",
 	"debugType": "構成の種類。",
 	"debugWindowsConfiguration": "Windows 固有の起動構成の属性。",
-	"internalConsoleOptions": "内部デバッグ コンソールの動作を制御します。"
+	"deprecatedVariables": "'env.'、'config.'、'command.' は使用されていません。代わりに、'env:'、'config:'、'command:' を使用してください。",
+	"internalConsoleOptions": "内部デバッグ コンソールの動作を制御します。",
+	"node2NotSupported": "\"node2\" はサポートされていません。代わりに \"node\" を使用し、\"protocol\" 属性を \"inspector\" に設定してください。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index aa0545246f0..b405bf8daa6 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "言語に対するファイルの関連付け (例 \"*.extension\": \"html\") を構成します。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
+	"associations": "言語に対するファイルの関連付けを構成します (例: '*.extension': 'html')。これらの関連付けは、インストールされている言語の既定の関連付けより優先されます。",
 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
-	"autoSave": "ダーティ ファイルの自動保存を制御します。有効な値: \"{0}\"、\"{1}\"、\"{2}\" (エディターがフォーカスを失います)、\"{3}\" (ウィンドウがフォーカスを失います)。\"{4}\" に設定すると、\"files.autoSaveDelay\" で遅延を構成できます。",
-	"autoSaveDelay": "ダーティ ファイルの自動保存の遅延をミリ秒単位で制御します。\"files.autoSave\" が \"{0}\" に設定されている場合のみ適用されます",
+	"autoSave": "ダーティ ファイルの自動保存を制御します。有効な値: '{0}'、'{1}'、'{2}' (エディターがフォーカスを失います)、'{3}' (ウィンドウがフォーカスを失います)。'{4}' に設定すると、'files.autoSaveDelay' で遅延を構成できます。",
+	"autoSaveDelay": "ダーティ ファイルの自動保存の遅延をミリ秒単位で制御します。'files.autoSave' が '{0}' に設定されている場合のみ適用されます",
 	"binaryFileEditor": "バイナリ ファイル エディター",
 	"dynamicHeight": "開いているエディターのセクションの高さを要素の数に合わせて動的に調整するかどうかを制御します。",
 	"editorConfigurationTitle": "エディター",
@@ -17,10 +17,10 @@
 	"exclude": "ファイルとフォルダーを除外するための glob パターンを構成します。",
 	"explore": "エクスプローラー",
 	"explorerConfigurationTitle": "エクスプローラー",
-	"files.autoSave.afterDelay": "\"afterDelay\": \"files.autoSaveDelay\" で構成された時間を経過後に、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.off": "\"オフ\": ダーティ ファイルを自動的に保存することはしません。",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": エディターがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": ウィンドウがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
+	"files.autoSave.afterDelay": "'files.autoSaveDelay' で構成された時間の経過後に、ダーティ ファイルを自動的に保存します。",
+	"files.autoSave.off": "ダーティ ファイルを自動的に保存することはしません。",
+	"files.autoSave.onFocusChange": "エディターがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
+	"files.autoSave.onWindowChange": "ウィンドウがフォーカスを失った時点で、ダーティ ファイルを自動的に保存します。",
 	"files.exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。",
 	"files.exclude.when": "一致するファイルの兄弟をさらにチェックします。一致するファイル名の変数として $(basename) を使用します。",
 	"filesConfigurationTitle": "ファイル",
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..c3de7d0fb34
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "スニペットの挿入"
+}
\ 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
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..d9cf695f161
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "プレフィックスが一致する場合にスニペットを挿入します。'quickSuggestions' が無効な場合に最適です。"
+}
\ 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 53eb0b67842..07a404ae900 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "クリア",
 	"workbench.action.terminal.copySelection": "選択内容のコピー",
 	"workbench.action.terminal.focus": "端末にフォーカス",
+	"workbench.action.terminal.focusAtIndex": "ターミナル {0} にフォーカス",
 	"workbench.action.terminal.focusNext": "次の端末にフォーカス",
 	"workbench.action.terminal.focusPrevious": "前の端末にフォーカス",
 	"workbench.action.terminal.kill": "アクティブな端末インスタンスを強制終了",
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
new file mode 100644
index 00000000000..80be3aff22b
--- /dev/null
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (最新)",
+	"welcomePage.cloneGitRepository": "Git リポジトリを複製...",
+	"welcomePage.colorTheme": "配色テーマ",
+	"welcomePage.colorThemeDescription": "エディターとコードの外観を自由に設定します",
+	"welcomePage.configureSettings": "設定を構成する",
+	"welcomePage.configureSettingsDescription": "VS Code の全機能を活用するために設定を微調整します",
+	"welcomePage.editingEvolved": "進化した編集",
+	"welcomePage.gitHubRepository": "GitHub リポジトリ",
+	"welcomePage.help": "ヘルプ",
+	"welcomePage.installKeymap": "{0}、{1}、{2}、{3} のキーボード ショートカットをインストール",
+	"welcomePage.installKeymapDescription": "キーボード ショートカットをインストールします",
+	"welcomePage.interactivePlayground": "対話型プレイグラウンド",
+	"welcomePage.interactivePlaygroundDescription": "エディターの基本機能を簡潔なチュートリアルで体験します",
+	"welcomePage.interfaceOverview": "インターフェイスの概要",
+	"welcomePage.interfaceOverviewDescription": "UI の主要コンポーネントを解説した視覚オーバーレイを表示します",
+	"welcomePage.introductoryVideos": "紹介ビデオ",
+	"welcomePage.keybindingsReference": "キーボード ショートカットの参照資料",
+	"welcomePage.keybindingsReferenceDescription": "最も一般的なキーボード ショートカットを掲載した印刷可能な PDF です",
+	"welcomePage.newFile": "新しいファイル",
+	"welcomePage.noRecentFolders": "最近使用したフォルダーなし",
+	"welcomePage.openFolder": "フォルダーを開く...",
+	"welcomePage.others": "その他",
+	"welcomePage.productDocumentation": "製品ドキュメント",
+	"welcomePage.quickLinks": "クイック リンク",
+	"welcomePage.recent": "最近",
+	"welcomePage.showCommands": "すべてのコマンドの検索と実行",
+	"welcomePage.showCommandsDescription": "コントロール パネルからコマンドを検索してすばやくアクセスします ({0})",
+	"welcomePage.showOnStartup": "起動時にウェルカム ページを表示",
+	"welcomePage.stackOverflow": "Stack Overflow",
+	"welcomePage.start": "開始",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (最新)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (最新)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 649e9e879fe..649bf12156b 100644
--- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "キャンセル",
 	"ok": "OK",
 	"welcome.title": "ようこそ",
 	"welcomePage": "ようこそ",
+	"welcomePage.installingKeymap": "{0} のキーボード ショートカットをインストールしています...",
 	"welcomePage.keymapAlreadyInstalled": "キーボード ショートカット {0} は既にインストールされています。",
 	"welcomePage.keymapNotFound": "ID {1} のキーボード ショートカット {0} は見つかりませんでした。",
-	"welcomePage.willReloadAfterInstallingKeymap": "キーボード ショートカット {0} をインストールすると、その後すぐにウィンドウが再度読み込みされます。"
+	"welcomePage.willReloadAfterInstallingKeymap": "キーボード ショートカット {0} をインストールした後、ウィンドウが再度読み込まれます。"
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 5e80739ecc3..20c5e0777c4 100644
--- a/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/kor/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "예: myFile.txt",
-	"activeFilePath": "예: /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "예: /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "예: myFolder/myFile.txt",
+	"activeEditorShort": "예: myFile.txt",
 	"appName": "예: VS Code",
 	"assocDescriptionFile": "파일 이름에서 GLOB 패턴과 일치하는 모든 파일을 지정된 ID를 사용하는 언어에 매핑합니다.",
 	"assocDescriptionPath": "경로에서 절대 경로 GLOB 패턴과 일치하는 모든 파일을 지정된 ID를 사용하는 언어에 매핑합니다.",
diff --git a/i18n/kor/extensions/css/package.i18n.json b/i18n/kor/extensions/css/package.i18n.json
index 7a6e3d10873..6fe604b4028 100644
--- a/i18n/kor/extensions/css/package.i18n.json
+++ b/i18n/kor/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
 	"css.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
 	"css.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
 	"css.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
@@ -23,6 +24,7 @@
 	"css.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
 	"css.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
 	"css.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"less.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
 	"less.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
 	"less.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
 	"less.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
@@ -42,6 +44,7 @@
 	"less.lint.vendorPrefix.desc": "공급업체 관련 접두사를 사용할 때 표준 속성도 포함합니다.",
 	"less.lint.zeroUnits.desc": "0에는 단위가 필요하지 않습니다.",
 	"less.validate.desc": "모든 유효성 검사 사용 또는 사용 안 함",
+	"scss.colorDecorators.enable.desc": "색 데코레이터 사용 또는 사용 안 함",
 	"scss.lint.argumentsInColorFunction.desc": "잘못된 매개 변수 수",
 	"scss.lint.boxModel.desc": "패딩 또는 테두리를 사용하는 경우 너비 또는 높이를 사용하지 마세요.",
 	"scss.lint.compatibleVendorPrefixes.desc": "공급업체 관련 접두사를 사용할 경우 다른 모든 공급업체 관련 속성도 포함합니다.",
diff --git a/i18n/kor/extensions/git/out/askpass-main.i18n.json b/i18n/kor/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..445155ebb53
--- /dev/null
+++ b/i18n/kor/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "자격 증명이 없거나 잘못되었습니다."
+}
\ 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 71b018dbb2c..8dec8fe1c5e 100644
--- a/i18n/kor/extensions/git/out/commands.i18n.json
+++ b/i18n/kor/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "분기 이름",
 	"clean": "변경 내용 정리",
 	"clean repo": "체크 아웃하기 전에 리포지토리 작업 트리를 정리하세요.",
+	"cloning": "Git 리포지토리를 복제하는 중...",
 	"commit message": "커밋 메시지",
 	"confirm clean": "{0}의 변경 내용을 정리하시겠습니까?",
 	"confirm clean all": "모든 변경 내용을 정리하시겠습니까?",
+	"confirm revert": "{0}에서 선택한 변경 내용을 되돌리시겠습니까?",
 	"disabled": "Git은 이 작업 영역에서 사용하지 않도록 설정되어 있거나 지원되지 않습니다.",
 	"never again": "다시 표시 안 함",
 	"no changes": "커밋할 변경 내용이 없습니다.",
@@ -19,10 +21,15 @@
 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
 	"ok": "확인",
 	"open git log": "Git 로그 열기",
+	"openrepo": "리포지토리 열기",
+	"parent": "부모 디렉터리",
 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
+	"proposeopen": "복제된 리포지토리를 여시겠습니까?",
 	"provide branch name": "분기 이름을 입력하세요.",
 	"provide commit message": "커밋 메시지를 제공하세요.",
 	"remote branch at": "{0}에서 원격 분기",
+	"repourl": "리포지토리 URL",
+	"revert": "변경 내용 되돌리기",
 	"sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.",
 	"tag at": "{0}의 태그"
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/out/main.i18n.json b/i18n/kor/extensions/git/out/main.i18n.json
index 0b7dced80e4..5797c2736c9 100644
--- a/i18n/kor/extensions/git/out/main.i18n.json
+++ b/i18n/kor/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "Git {0}이(가) 설치된 것 같습니다. 코드는 2 이하의 Git에서 최적으로 작동합니다.",
+	"updateGit": "Git 업데이트",
 	"using git": "{1}에서 git {0}을(를) 사용하는 중"
 }
\ No newline at end of file
diff --git a/i18n/kor/extensions/git/package.i18n.json b/i18n/kor/extensions/git/package.i18n.json
index 316688ba2a1..e7ddc474486 100644
--- a/i18n/kor/extensions/git/package.i18n.json
+++ b/i18n/kor/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "분기 만들기...",
 	"command.checkout": "다음으로 체크 아웃...",
-	"command.clean": "정리",
-	"command.cleanAll": "모두 정리",
+	"command.clean": "파일 정리",
+	"command.cleanAll": "모든 파일 정리",
+	"command.clone": "복제",
 	"command.commit": "커밋",
 	"command.commitAll": "모두 커밋",
 	"command.commitAllSigned": "모두 커밋(로그오프됨)",
 	"command.commitStaged": "스테이징된 항목 커밋",
 	"command.commitStagedSigned": "스테이징된 항목 커밋(로그오프됨)",
-	"command.init": "Git 리포지토리 초기화",
+	"command.init": "리포지토리 초기화",
 	"command.openChange": "변경 내용 열기",
 	"command.openFile": "파일 열기",
 	"command.publish": "게시",
@@ -22,14 +23,15 @@
 	"command.push": "푸시",
 	"command.pushTo": "다음으로 푸시...",
 	"command.refresh": "새로 고침",
+	"command.revertSelectedRanges": "선택한 범위 되돌리기",
 	"command.showOutput": "Git 출력 표시",
-	"command.stage": "스테이징",
-	"command.stageAll": "모두 스테이징",
+	"command.stage": "파일 스테이징",
+	"command.stageAll": "모든 파일 스테이징",
 	"command.stageSelectedRanges": "선택한 범위 스테이징",
 	"command.sync": "동기화",
 	"command.undoCommit": "마지막 커밋 실행 취소",
-	"command.unstage": "스테이징 취소",
-	"command.unstageAll": "모두 스테이징 취소",
+	"command.unstage": "파일 스테이징 취소",
+	"command.unstageAll": "모든 파일 스테이징 취소",
 	"command.unstageSelectedRanges": "선택한 범위 스테이징 취소",
 	"config.autofetch": "자동 가져오기 사용 여부",
 	"config.autorefresh": "자동 새로 고침 사용 여부",
diff --git a/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..cf25d73230c
--- /dev/null
+++ b/i18n/kor/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
index 3239c9dc361..630d98d5028 100644
--- a/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/kor/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "JavaScript/TypeScript IntelliSense를 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
-	"hintExclude.generic": "JavaScript/TypeScript IntelliSense를 사용하도록 설정하려면 작업하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
-	"hintExclude.tooltip": "JavaScript/TypeScript IntelliSense를 사용하도록 설정하려면 작업하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
+	"hintExclude": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 {0}과(와) 같이 파일이 많은 폴더를 제외하세요.",
+	"hintExclude.generic": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
+	"hintExclude.tooltip": "프로젝트 전체에서 JavaScript/TypeScript 언어 기능을 사용하도록 설정하려면 사용하지 않는 소스 파일이 포함된 큰 폴더를 제외하세요.",
 	"large.label": "제외 구성",
 	"open": "제외 구성"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 7fde3af1e85..fee11a8488c 100644
--- a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "괄호를 연 다음에 편집기에서 괄호를 자동으로 닫을지 여부를 제어합니다.",
 	"codeLens": "편집기에서 코드 필터를 표시하는지 여부를 제어합니다.",
 	"cursorBlinking": "커서 애니메이션 스타일을 제어합니다. 가능한 값은 'blink', 'smooth', 'phase', 'expand' 및 'solid'입니다.",
-	"cursorStyle": "커서 스타일을 제어합니다. 허용되는 값은 '블록', '줄' 및 '밑줄'입니다.",
+	"cursorStyle": "커서 스타일을 제어합니다. 허용되는 값은 '블록', '블록-윤곽', '줄', '줄-가늘게', '밑줄' 및 '밑줄-가늘게'입니다.",
 	"detectIndentation": "파일을 열면 파일 콘텐츠를 기반으로 하여 'editor.tabSize'와 'editor.insertSpaces'가 검색됩니다.",
+	"dragAndDrop": "편집기에서 끌어서 놓기로 선택 영역을 이동할 수 있는지 여부를 제어합니다.",
 	"editorConfigurationTitle": "편집기",
 	"emptySelectionClipboard": "선택 영역 없이 현재 줄 복사 여부를 제어합니다.",
 	"folding": "편집기에서 코드 접기를 사용할지 여부를 제어합니다.",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "'boolean'이 필요합니다. 값 \"auto\"는 `editor.detectIndentation` 설정에 의해 바뀌었습니다.",
 	"lineHeight": "줄 높이를 제어합니다. fontSize의 lineHeight를 계산하려면 0을 사용합니다.",
 	"lineNumbers": "줄 번호의 표시 여부를 제어합니다. 가능한 값은 'on', 'off', 'relative'입니다. 'relative'는 현재 커서 위치에서 줄 수를 표시합니다.",
+	"matchBrackets": "대괄호 중 하나를 선택할 때 일치하는 대괄호를 강조 표시합니다.",
 	"minimap.enabled": "미니맵 표시 여부를 제어합니다.",
+	"minimap.maxColumn": "최대 특정 수의 열을 렌더링하도록 미니맵의 너비를 제한합니다.",
+	"minimap.renderCharacters": "줄의 실제 문자(색 블록 아님) 렌더링",
 	"mouseWheelScrollSensitivity": "마우스 휠 스크롤 이벤트의 `deltaX` 및 `deltaY`에서 사용할 승수",
 	"mouseWheelZoom": "마우스 휠을 사용할 때 Ctrl 키를 누르고 있으면 편집기의 글꼴 확대/축소",
 	"overviewRulerLanes": "개요 눈금자에서 동일한 위치에 표시될 수 있는 장식 수를 제어합니다.",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "제안 위젯의 글꼴 크기",
 	"suggestLineHeight": "제안 위젯의 줄 높이",
 	"suggestOnTriggerCharacters": "트리거 문자를 입력할 때 제안을 자동으로 표시할지 여부를 제어합니다.",
-	"tabCompletion": "접두사가 일치하는 경우 코드 조각을 삽입합니다. 'quickSuggestions'를 사용하지 않을 때 가장 잘 작동합니다.",
 	"tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.",
 	"tabSize.errorMessage": "'number'가 필요합니다. 값 \"auto\"는 `editor.detectIndentation` 설정에 의해 바뀌었습니다.",
 	"trimAutoWhitespace": "끝에 자동 삽입된 공백 제거",
 	"useTabStops": "탭 정지 뒤에 공백 삽입 및 삭제",
 	"wordBasedSuggestions": "단어 기반 추천을 사용합니다.",
 	"wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.",
-	"wordWrap": "줄 바꿈 여부를 제어합니다. 줄 바꿈은 min(editor.wrappingColumn, viewportWidthInColumns)에서 수행됩니다.",
-	"wrappingColumn": "편집기에서 몇 개의 문자 이후에 줄을 바꿀지를 제어합니다. 이 값을 0으로 설정하면 뷰포트 너비 줄 바꿈이 설정됩니다(자동 줄바꿈). -1로 설정하면 편집기에서 줄바꿈을 하지 않습니다.",
+	"wordWrap": "줄 바꿈 여부를 제어합니다. 다음 중 하나일 수 있습니다.\n - 'off'(줄 바꿈 사용 안 함),\n - 'on'(뷰포트 줄 바꿈),\n - 'wordWrapColumn'(`editor.wordWrapColumn`에서 줄 바꿈) 또는\n - 'bounded'(뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄 바꿈)",
+	"wordWrap.bounded": "뷰포트의 최소값 및 `editor.wordWrapColumn`에서 줄이 바뀝니다.",
+	"wordWrap.off": "줄이 바뀌지 않습니다.",
+	"wordWrap.on": "뷰포트 너비에서 줄이 바뀝니다.",
+	"wordWrap.wordWrapColumn": "`editor.wordWrapColumn`에서 줄이 바뀝니다.",
+	"wordWrapColumn": "`editor.wordWrap`이 'wordWrapColumn' 또는 'bounded'인 경우 편집기의 열 줄 바꿈을 제어합니다.",
 	"wrappingIndent": "줄 바꿈 행의 들여쓰기를 제어합니다. 'none', 'same' 또는 'indent' 중 하나일 수 있습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index aaa8a4e2223..756cb263eca 100644
--- a/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/kor/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "정의 피킹(Peeking)",
 	"generic.noResults": "정의를 찾을 수 없음",
 	"meta.title": " – 정의 {0}개",
-	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요."
+	"multipleResults": "{0}개 정의를 표시하려면 클릭하세요.",
+	"noResultWord": "'{0}'에 대한 정의를 찾을 수 없습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index ee860687c51..39f69d64552 100644
--- a/i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/kor/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "`명령` 섹션에 `{0}` 명령이 여러 번 나타납니다.",
 	"dupe.command": "메뉴 항목이 동일한 명령을 기본값과 alt 명령으로 참조합니다.",
 	"menuId.invalid": "`{0}`은(는) 유효한 메뉴 식별자가 아닙니다.",
+	"menus.commandPalette": "명령 팔레트",
 	"menus.editorContext": "편집기 상황에 맞는 메뉴",
 	"menus.editorTabContext": "편집기 탭 상황에 맞는 메뉴",
 	"menus.editorTitle": "편집기 제목 메뉴",
diff --git a/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/kor/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ 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 ceff939e9b2..c94c16d6e3d 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
@@ -24,26 +24,26 @@
 	"showIcons": "열린 편집기를 아이콘과 함께 표시할지 여부를 제어합니다. 이를 위해서는 아이콘 테마도 사용하도록 설정해야 합니다.",
 	"sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.",
 	"statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.",
-	"title": "활성 편집기를 기반으로 창 제목을 제어합니다. 변수는 컨텍스트를 기반으로 대체됩니다.\n${activeEditorName}, 예: myFile.txt\n${activeFilePath}, 예: /Users/Development/myProject/myFile.txt\n${rootName}, 예: myProject\n${rootPath}, 예: /Users/Development/myProject\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${rootName}, 예: myProject\n${rootPath}, 예: /Users/Development/myProject\n${appName}, 예: VS Code\n${dirty}(활성 편집기가 더티인 경우 더티 표시기)\n${separator}(값이 있는 변수로 둘러싸인 경우에만 표시되는 조건부 구분 기호(\" - \"))",
 	"titleBarStyle": "창 제목 표시줄의 모양을 조정합니다. 변경 내용을 적용하려면 전체 다시 시작해야 합니다.",
 	"view": "보기",
-	"window.menuBarVisibility.default": "\"default\": 메뉴가 전체 화면 모드에서만 숨겨집니다.",
-	"window.menuBarVisibility.hidden": "\"hidden\": 메뉴가 항상 숨겨집니다.",
-	"window.menuBarVisibility.toggle": "\"toggle\": 메뉴가 숨겨져 있지만 <Alt> 키를 통해 메뉴를 표시할 수 있습니다.",
-	"window.menuBarVisibility.visible": "\"visible\": 메뉴가 전체 화면 모드에서도 항상 표시됩니다.",
-	"window.newWindowDimensions.default": "\"default\": 화면 가운데에서 새 창을 엽니다.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": 전체 화면 모드에서 새 창을 엽니다.",
-	"window.newWindowDimensions.inherit": "\"inherit\": 마지막 활성 창과 동일한 차원의 새 창을 엽니다.",
-	"window.newWindowDimensions.maximized": "\"maximized\": 최대화된 새 창을 엽니다.",
-	"window.openFilesInNewWindow.default": "\"default\": Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.off": "\"off\": 파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
-	"window.openFilesInNewWindow.on": "\"on\": 파일이 새 창에서 열립니다.",
-	"window.openFoldersInNewWindow.default": "\"default\": 폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
-	"window.openFoldersInNewWindow.off": "\"off\": 폴더가 마지막 활성 창을 바꿉니다.",
-	"window.openFoldersInNewWindow.on": "\"on\": 폴더가 새 창에서 열립니다.",
-	"window.reopenFolders.all": "\"all\": 마지막 세션의 모든 폴더를 다시 엽니다.",
-	"window.reopenFolders.none": "\"none\": 폴더를 다시 열지 않습니다.",
-	"window.reopenFolders.one": "\"one\": 마지막 활성 폴더를 다시 엽니다.",
+	"window.menuBarVisibility.default": "메뉴가 전체 화면 모드에서만 숨겨집니다.",
+	"window.menuBarVisibility.hidden": "메뉴가 항상 숨겨집니다.",
+	"window.menuBarVisibility.toggle": "\"메뉴가 숨겨져 있지만 <Alt> 키를 통해 메뉴를 표시할 수 있습니다.",
+	"window.menuBarVisibility.visible": "메뉴가 전체 화면 모드에서도 항상 표시됩니다.",
+	"window.newWindowDimensions.default": "화면 가운데에서 새 창을 엽니다.",
+	"window.newWindowDimensions.fullscreen": "전체 화면 모드에서 새 창을 엽니다.",
+	"window.newWindowDimensions.inherit": "마지막 활성 창과 동일한 크기로 새 창을 엽니다.",
+	"window.newWindowDimensions.maximized": "최대화된 새 창을 엽니다.",
+	"window.openFilesInNewWindow.default": "Dock 또는 Finder(macOS 전용)를 통해 파일을 연 경우를 제외하고 파일이 파일의 폴더가 열린 창 또는 마지막 활성 창에서 열립니다.",
+	"window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.",
+	"window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.",
+	"window.openFoldersInNewWindow.default": "폴더를 응용 프로그램 내에서 선택(예: 파일 메뉴를 통해)하는 경우를 제외하고 폴더가 새 창에서 열립니다.",
+	"window.openFoldersInNewWindow.off": "폴더가 마지막 활성 창을 바꿉니다.",
+	"window.openFoldersInNewWindow.on": "폴더가 새 창에서 열립니다.",
+	"window.reopenFolders.all": "마지막 세션의 모든 폴더를 다시 엽니다.",
+	"window.reopenFolders.none": "폴더를 다시 열지 않습니다.",
+	"window.reopenFolders.one": "마지막 활성 폴더를 다시 엽니다.",
 	"windowConfigurationTitle": "창",
 	"workbenchConfigurationTitle": "워크벤치",
 	"zenMode.fullScreen": "Zen 모드를 켜면 워크벤치도 전체 화면 모드로 전환되는지 여부를 제어합니다.",
diff --git a/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..27bed4f90e7
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "다시 표시 안 함",
+	"wordWrapMigration.ok": "확인",
+	"wordWrapMigration.openSettings": "설정 열기",
+	"wordWrapMigration.prompt": "`editor.wrappingColumn` 설정은 `editor.wordWrap`을 위해 사용되지 않습니다."
+}
\ 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 0ede5c9b8c6..61e3b5d4dc7 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
@@ -34,6 +34,7 @@
 	"restartDebug": "다시 시작",
 	"restartFrame": "프레임 다시 시작",
 	"reverseContinue": "반전",
+	"selectAndStartDebugging": "디버깅 선택 및 시작",
 	"setValue": "값 설정",
 	"startDebug": "디버깅 시작",
 	"startWithoutDebugging": "디버깅하지 않고 시작",
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..2d54b7fca89
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "실행할 시작 구성의 이름을 입력하세요.",
+	"entryAriaLabel": "{0}, 디버그",
+	"noConfigurationsFound": "디버그 구성을 찾을 수 없습니다. 'launch.json' 파일을 만드세요.",
+	"noConfigurationsMatching": "일치하는 디버그 구성 없음"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..44cea43570a
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "예외가 발생함"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 91e9f16e71a..ae12ae26296 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "모든 파일에 대한 중단점을 설정할 수 있습니다.",
 	"debug": "디버그",
 	"debugCategory": "디버그",
+	"debugCommands": "디버그 구성",
 	"debugConfigurationTitle": "디버그",
 	"debugPanel": "디버그 콘솔",
 	"inlineValues": "디버그하는 동안 편집기에서 변수 값을 인라인으로 표시합니다.",
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 87aa04051c7..f3719fa5291 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
@@ -14,5 +14,7 @@
 	"debugServer": "디버그 확장 배포 전용입니다. 포트가 지정된 경우 VS Code에서는 서버 모드로 실행하는 디버그 어댑터에 연결을 시도합니다.",
 	"debugType": "구성의 형식입니다.",
 	"debugWindowsConfiguration": "Windows 특정 시작 구성 특성입니다.",
-	"internalConsoleOptions": "내부 디버그 콘솔의 동작을 제어합니다."
+	"deprecatedVariables": "'env.', 'config.' 및 'command.'는 사용되지 않습니다. 대신 'env:', 'config:' 및 'command:'를 사용하세요.",
+	"internalConsoleOptions": "내부 디버그 콘솔의 동작을 제어합니다.",
+	"node2NotSupported": "\"node2\"는 더 이상 지원되지 않습니다. 대신 \"node\"를 사용하고 \"protocol\" 특성을 \"inspector\"로 설정하세요."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index b5f64c4c8a3..673449b25e8 100644
--- a/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"associations": "파일과 언어의 연결을 구성하세요(예: \"*.extension\": \"html\"). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
+	"associations": "파일과 언어의 연결을 구성하세요(예: '*.extension': 'html'). 이러한 구성은 설치된 언어의 기본 연결보다 우선 순위가 높습니다.",
 	"autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.",
-	"autoSave": "더티 파일 자동 저장을 제어합니다. 허용되는 값은 \"{0}\", \"{1}\", \"{2}\"(편집기가 포커스를 잃음), \"{3}\"(창이 포커스를 잃음)입니다. \"{4}\"(으)로 설정하는 경우 \"files.autoSaveDelay\"에서 지연을 구성할 수 있습니다.",
-	"autoSaveDelay": "더티 파일을 자동으로 저장할 때까지의 지연(ms)을 제어합니다. \"files.autoSave\"를 \"{0}\"(으)로 설정한 경우에만 적용됩니다.",
+	"autoSave": "더티 파일 자동 저장을 제어합니다. 허용되는 값은 '{0}', '{1}', '{2}'(편집기가 포커스를 잃음), '{3}'(창이 포커스를 잃음)입니다. '{4}'(으)로 설정하는 경우 'files.autoSaveDelay'에서 지연을 구성할 수 있습니다.",
+	"autoSaveDelay": "더티 파일을 자동으로 저장할 때까지의 지연(밀리초)을 제어합니다. 'files.autoSave'를 '{0}'(으)로 설정한 경우에만 적용됩니다.",
 	"binaryFileEditor": "이진 파일 편집기",
 	"dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.",
 	"editorConfigurationTitle": "편집기",
@@ -17,10 +17,10 @@
 	"exclude": "파일과 폴더를 제외하기 위한 GLOB 패턴을 구성합니다.",
 	"explore": "탐색기",
 	"explorerConfigurationTitle": "파일 탐색기",
-	"files.autoSave.afterDelay": "\"afterDelay\": \"files.autoSaveDelay\" 구성 후 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.off": "\"off\": 더티 파일이 자동으로 저장되지 않습니다.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": 편집기가 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": 창이 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
+	"files.autoSave.afterDelay": "'files.autoSaveDelay' 구성 후 더티 파일이 자동으로 저장됩니다.",
+	"files.autoSave.off": "더티 파일이 자동으로 저장되지 않습니다.",
+	"files.autoSave.onFocusChange": "편집기가 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
+	"files.autoSave.onWindowChange": "창이 포커스를 잃으면 더티 파일이 자동으로 저장됩니다.",
 	"files.exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.",
 	"files.exclude.when": "일치하는 파일의 형제에 대한 추가 검사입니다. $(basename)을 일치하는 파일 이름에 대한 변수로 사용하세요.",
 	"filesConfigurationTitle": "파일",
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..7fd318c3ac3
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "코드 조각 삽입"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..40160128bd8
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "접두사가 일치하는 경우 코드 조각을 삽입합니다. 'quickSuggestions'를 사용하지 않을 때 가장 잘 작동합니다."
+}
\ 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 52abb53fbeb..e56a4e13e75 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "지우기",
 	"workbench.action.terminal.copySelection": "선택 영역 복사",
 	"workbench.action.terminal.focus": "터미널에 포커스",
+	"workbench.action.terminal.focusAtIndex": "{0} 터미널로 포커스 이동",
 	"workbench.action.terminal.focusNext": "다음 터미널에 포커스",
 	"workbench.action.terminal.focusPrevious": "이전 터미널에 포커스",
 	"workbench.action.terminal.kill": "활성 터미널 인스턴스 종료",
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
new file mode 100644
index 00000000000..7fa8a91e476
--- /dev/null
+++ b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom(현재)",
+	"welcomePage.cloneGitRepository": "Git 리포지토리 복제...",
+	"welcomePage.colorTheme": "색 테마",
+	"welcomePage.colorThemeDescription": "편집기 및 코드가 좋아하는 방식으로 표시되게 만들기",
+	"welcomePage.configureSettings": "설정 구성",
+	"welcomePage.configureSettingsDescription": "설정을 조정하여 VS Code 의 전체 기능 잠금 해제",
+	"welcomePage.editingEvolved": "편집 향상됨",
+	"welcomePage.gitHubRepository": "GitHub 리포지토리",
+	"welcomePage.help": "도움말",
+	"welcomePage.installKeymap": "{0}, {1}, {2} 및 {3}의 바로 가기 키 설치",
+	"welcomePage.installKeymapDescription": "바로 가기 키 설치",
+	"welcomePage.interactivePlayground": "대화형 실습",
+	"welcomePage.interactivePlaygroundDescription": "짧은 연습에서 기본 편집기 기능 사용해 보기",
+	"welcomePage.interfaceOverview": "인터페이스 개요",
+	"welcomePage.interfaceOverviewDescription": "UI의 주요 구성 요소를 강조 표시하는 시각적 오버레이 가져오기",
+	"welcomePage.introductoryVideos": "소개 비디오",
+	"welcomePage.keybindingsReference": "바로 가기 키 참조",
+	"welcomePage.keybindingsReferenceDescription": "가장 일반적인 바로 가기 키가 포함된 인쇄 가능한 PDF",
+	"welcomePage.newFile": "새 파일",
+	"welcomePage.noRecentFolders": "최근 폴더 없음",
+	"welcomePage.openFolder": "폴더 열기...",
+	"welcomePage.others": "기타",
+	"welcomePage.productDocumentation": "제품 설명서",
+	"welcomePage.quickLinks": "빠른 링크",
+	"welcomePage.recent": "최근 항목",
+	"welcomePage.showCommands": "모든 명령 찾기 및 실행",
+	"welcomePage.showCommandsDescription": "제어판에서 명령을 빠르게 검색 및 액세스({0})",
+	"welcomePage.showOnStartup": "시작 시 시작 페이지 표시",
+	"welcomePage.stackOverflow": "스택 오버플로",
+	"welcomePage.start": "시작",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime(현재)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim(현재)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 1d4d83ceee6..15e765a854f 100644
--- a/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cancel": "취소",
 	"ok": "확인",
 	"welcome.title": "시작",
 	"welcomePage": "시작",
+	"welcomePage.installingKeymap": "{0} 바로 가기 키를 설치하는 중...",
 	"welcomePage.keymapAlreadyInstalled": "{0} 바로 가기 키가 이미 설치되어 있습니다.",
 	"welcomePage.keymapNotFound": "ID가 {1}인 {0} 바로 가기 키를 찾을 수 없습니다.",
-	"welcomePage.willReloadAfterInstallingKeymap": "{0} 바로 가기 키를 설치한 후 창이 빠르게 다시 로드됩니다."
+	"welcomePage.willReloadAfterInstallingKeymap": "{0} 바로 가기 키를 설치한 후 창이 다시 로드됩니다."
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
index 69227045624..d57f7a25c00 100644
--- a/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
+++ b/i18n/rus/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"activeEditorName": "например, myFile.txt",
-	"activeFilePath": "например, /Users/Development/myProject/myFile.txt",
+	"activeEditorLong": "например, /Users/Development/myProject/myFolder/myFile.txt",
+	"activeEditorMedium": "например, myFolder/myFile.txt",
+	"activeEditorShort": "например, myFile.txt",
 	"appName": "например, VS Code",
 	"assocDescriptionFile": "Сопоставить все файлы, соответствующие стандартной маске в имени файла, с языком с указанным идентификатором.",
 	"assocDescriptionPath": "Сопоставить все файлы, соответствующие стандартной маске в абсолютном пути, с языком с указанным идентификатором.",
diff --git a/i18n/rus/extensions/css/package.i18n.json b/i18n/rus/extensions/css/package.i18n.json
index 019c0cb4a12..7ef7e9bb3d4 100644
--- a/i18n/rus/extensions/css/package.i18n.json
+++ b/i18n/rus/extensions/css/package.i18n.json
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"css.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
 	"css.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
 	"css.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
 	"css.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
@@ -23,6 +24,7 @@
 	"css.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
 	"css.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
 	"css.validate.desc": "Включает или отключает все проверки",
+	"less.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
 	"less.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
 	"less.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
 	"less.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
@@ -42,6 +44,7 @@
 	"less.lint.vendorPrefix.desc": "При использовании зависящего от поставщика префикса также указывайте стандартное свойство",
 	"less.lint.zeroUnits.desc": "Для нуля не требуется единица измерения",
 	"less.validate.desc": "Включает или отключает все проверки",
+	"scss.colorDecorators.enable.desc": "Включает или отключает декораторы цвета.",
 	"scss.lint.argumentsInColorFunction.desc": "Недопустимое число параметров",
 	"scss.lint.boxModel.desc": "Не использовать ширину или высоту при использовании поля или границы",
 	"scss.lint.compatibleVendorPrefixes.desc": "При использовании зависящего от поставщика префикса также указывайте все остальные свойства поставщика",
diff --git a/i18n/rus/extensions/git/out/askpass-main.i18n.json b/i18n/rus/extensions/git/out/askpass-main.i18n.json
new file mode 100644
index 00000000000..024ac9fb55a
--- /dev/null
+++ b/i18n/rus/extensions/git/out/askpass-main.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"missOrInvalid": "Учетные данные отсутствуют или недопустимы."
+}
\ 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 934de25675f..d8c8134d3ae 100644
--- a/i18n/rus/extensions/git/out/commands.i18n.json
+++ b/i18n/rus/extensions/git/out/commands.i18n.json
@@ -7,9 +7,11 @@
 	"branch name": "Имя ветви",
 	"clean": "Отменить изменения",
 	"clean repo": "Очистите рабочее дерево репозитория перед извлечением.",
+	"cloning": "Клонируется репозиторий Git...",
 	"commit message": "Сообщение о фиксации",
 	"confirm clean": "Действительно отменить изменения в {0}?",
 	"confirm clean all": "Действительно отменить все изменения?",
+	"confirm revert": "Вы действительно хотите отменить выбранные изменения в {0}?",
 	"disabled": "GIT отключен или не поддерживается в этой рабочей области",
 	"never again": "ОК. Больше не показывать",
 	"no changes": "Нет изменений для фиксации.",
@@ -19,10 +21,15 @@
 	"nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.",
 	"ok": "ОК",
 	"open git log": "Открыть журнал GIT",
+	"openrepo": "Открыть репозиторий",
+	"parent": "Родительский каталог",
 	"pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":",
+	"proposeopen": "Вы хотите открыть клонированный репозиторий?",
 	"provide branch name": "Укажите имя ветви.",
 	"provide commit message": "Введите сообщение фиксации.",
 	"remote branch at": "Удаленная ветвь в {0}",
+	"repourl": "URL-адрес репозитория",
+	"revert": "Отменить изменения",
 	"sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.",
 	"tag at": "Тег в {0}"
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/out/main.i18n.json b/i18n/rus/extensions/git/out/main.i18n.json
index b928d15d657..1a5f4788a2d 100644
--- a/i18n/rus/extensions/git/out/main.i18n.json
+++ b/i18n/rus/extensions/git/out/main.i18n.json
@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"git20": "У вас установлен Git {0}. Код лучше всего работает с Git >= 2.",
+	"updateGit": "Обновить Git",
 	"using git": "Использование GIT {0} из {1}"
 }
\ No newline at end of file
diff --git a/i18n/rus/extensions/git/package.i18n.json b/i18n/rus/extensions/git/package.i18n.json
index 569d98ab338..17035d6a302 100644
--- a/i18n/rus/extensions/git/package.i18n.json
+++ b/i18n/rus/extensions/git/package.i18n.json
@@ -6,14 +6,15 @@
 {
 	"command.branch": "Создать ветвь...",
 	"command.checkout": "Извлечь в...",
-	"command.clean": "Очистить",
-	"command.cleanAll": "Очистить все",
+	"command.clean": "Очистить файл",
+	"command.cleanAll": "Очистить все файлы",
+	"command.clone": "Клонировать",
 	"command.commit": "Зафиксировать",
 	"command.commitAll": "Зафиксировать все",
 	"command.commitAllSigned": "Зафиксировать все (завершено)",
 	"command.commitStaged": "Зафиксировать промежуточные",
 	"command.commitStagedSigned": "Зафиксировать промежуточные (завершено)",
-	"command.init": "Инициализировать репозиторий GIT",
+	"command.init": "Инициализировать репозиторий",
 	"command.openChange": "Открыть изменение",
 	"command.openFile": "Открыть файл",
 	"command.publish": "Опубликовать",
@@ -22,14 +23,15 @@
 	"command.push": "Отправить",
 	"command.pushTo": "Отправить в...",
 	"command.refresh": "Обновить",
+	"command.revertSelectedRanges": "Отменить выбранные диапазоны",
 	"command.showOutput": "Показать выходные данные GIT",
-	"command.stage": "Промежуточно сохранить",
-	"command.stageAll": "Промежуточно сохранить все",
+	"command.stage": "Промежуточно хранить файл",
+	"command.stageAll": "Промежуточно хранить все файлы",
 	"command.stageSelectedRanges": "Разместить выбранные диапазоны",
 	"command.sync": "Синхронизация",
 	"command.undoCommit": "Отменить последнюю фиксацию",
-	"command.unstage": "Отменить промежуточное сохранение",
-	"command.unstageAll": "Отменить промежуточное сохранение всего",
+	"command.unstage": "Отменить промежуточное хранение файла",
+	"command.unstageAll": "Отменить промежуточное хранение всех файлов",
 	"command.unstageSelectedRanges": "Отменить размещение выбранных диапазонов",
 	"config.autofetch": "Включено ли автоматическое получение",
 	"config.autorefresh": "Включено ли автоматическое обновление",
diff --git a/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
new file mode 100644
index 00000000000..b7c9fb342de
--- /dev/null
+++ b/i18n/rus/extensions/typescript/out/features/jsDocCompletionProvider.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  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/out/utils/projectStatus.i18n.json b/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
index 6314518f0ee..9f6687c1202 100644
--- a/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
+++ b/i18n/rus/extensions/typescript/out/utils/projectStatus.i18n.json
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hintExclude": "Чтобы включить JavaScript/TypeScript IntelliSense, исключите папки с несколькими файлами, например: {0}",
-	"hintExclude.generic": "Чтобы включить JavaScript/TypeScript IntelliSense, исключите большие папки с исходными файлами, с которыми вы не работаете.",
-	"hintExclude.tooltip": "Чтобы включить JavaScript/TypeScript IntelliSense, исключите большие папки с исходными файлами, с которыми вы не работаете.",
+	"hintExclude": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите папки с большим числом файлов, например: {0}.",
+	"hintExclude.generic": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
+	"hintExclude.tooltip": "Чтобы включить языковые функции JavaScript/TypeScript IntelliSense во всем проекте, исключите большие папки с исходными файлами, с которыми вы не работаете.",
 	"large.label": "Настройка исключений",
 	"open": "Настроить исключения"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/code/electron-main/menus.i18n.json b/i18n/rus/src/vs/code/electron-main/menus.i18n.json
index db88fca8eca..aed5d8a6dc9 100644
--- a/i18n/rus/src/vs/code/electron-main/menus.i18n.json
+++ b/i18n/rus/src/vs/code/electron-main/menus.i18n.json
@@ -79,7 +79,7 @@
 	"miOpenKeymapExtensions": "&&Расширения раскладки клавиатуры",
 	"miOpenRecent": "Открыть &&последние",
 	"miOpenSettings": "&&Параметры",
-	"miOpenSnippets": "&&Фрагменты пользователя",
+	"miOpenSnippets": "&&Фрагменты кода пользователя",
 	"miPaste": "&&Вставить",
 	"miPreferences": "&&Параметры",
 	"miPreviousEditor": "&&Предыдущий редактор",
diff --git a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
index b3e5ee15895..7e3d03f643d 100644
--- a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -9,8 +9,9 @@
 	"autoClosingBrackets": "Определяет, должен ли редактор автоматически закрывать скобки после открытия.",
 	"codeLens": "Управляет показом групп связанных элементов кода в редакторе",
 	"cursorBlinking": "Управляет стилем анимации курсора. Допустимые значения: \"blink\", \"smooth\", \"phase\", \"expand\" и \"solid\"",
-	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"line\" и \"underline\"",
+	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" и \"underline-thin\"",
 	"detectIndentation": "При открытии файла editor.tabSize и editor.insertSpaces будут определяться на основе содержимого файла.",
+	"dragAndDrop": "Определяет, следует ли редактору разрешить перемещение выделенных элементов с помощью перетаскивания.",
 	"editorConfigurationTitle": "Редактор",
 	"emptySelectionClipboard": "Управляет тем, копируется ли текущая строка при копировании без выделения.",
 	"folding": "Определяет, включено ли сворачивание кода в редакторе.",
@@ -27,7 +28,10 @@
 	"insertSpaces.errorMessage": "Ожидается логическое значение. Обратите внимание, что значение auto заменено параметром editor.detectIndentation.",
 	"lineHeight": "Управляет высотой строк. Укажите 0 для вычисления высоты строки по размеру шрифта.",
 	"lineNumbers": "Управляет видимостью номеров строк. Возможные значения: \"on\", \"off\" и \"relative\". Значение \"relative\" показывает количество строк, начиная с текущего положения курсора.",
+	"matchBrackets": "Выделяет соответствующие скобки при выборе одной из них.",
 	"minimap.enabled": "Определяет, отображается ли мини-карта",
+	"minimap.maxColumn": "Ограничивает ширину мини-карты для отображения числа столбцов не больше определенного.",
+	"minimap.renderCharacters": "Отображает фактические символы в строке вместо цветных блоков.",
 	"mouseWheelScrollSensitivity": "Множитель, используемый для параметров deltaX и deltaY событий прокрутки колесика мыши.",
 	"mouseWheelZoom": "Изменение размера шрифта в редакторе при нажатой клавише CTRL и движении колесика мыши",
 	"overviewRulerLanes": "Определяет, сколько украшений могут отображаться на одном месте в обзорной линейке.",
@@ -50,14 +54,17 @@
 	"suggestFontSize": "Размер шрифта мини-приложения предложений",
 	"suggestLineHeight": "Высота строки мини-приложения с предложениями",
 	"suggestOnTriggerCharacters": "Определяет, должны ли при вводе триггерных символов автоматически отображаться предложения.",
-	"tabCompletion": "Вставка фрагментов при совпадении их префиксов. Функция работает оптимально, если параметр \"quickSuggestions\" отключен.",
 	"tabSize": "Число пробелов в табуляции. Эта настройка переопределяется на основании содержимого файла, когда включен параметр \"editor.detectIndentation\".",
 	"tabSize.errorMessage": "Ожидается число. Обратите внимание, что значение auto заменено параметром editor.detectIndentation.",
 	"trimAutoWhitespace": "Удалить автоматически вставляемый конечный пробел",
 	"useTabStops": "Вставка и удаление пробелов после позиции табуляции",
 	"wordBasedSuggestions": "Включите предложения на основе слов.",
 	"wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.",
-	"wordWrap": "Определяет, должны ли строки переноситься. Строки будут переноситься по значению min(editor.wrappingColumn, viewportWidthInColumns).",
-	"wrappingColumn": "Определяет число символов, после которых текст будет перенесен на следующую строку. Если этот параметр имеет значение 0, используется перенос по ширине окна просмотра (перенос по словам). Если задать значение –1, то в редакторе не будет выполняться перенос по словам.",
+	"wordWrap": "Определяет, как должны переноситься строки. Допустимые значения:\n — \"off\" (отключить перенос);\n — \"on\" (перенос окна просмотра);\n — \"wordWrapColumn\" (перенос в \"editor.wordWrapColumn\");\n — \"bounded\" (перенос при минимальной ширине окна просмотра и \"editor.wordWrapColumn\").",
+	"wordWrap.bounded": "Строки будут перенесены по минимальному значению из двух: ширина окна просмотра и \"editor.wordWrapColumn\".",
+	"wordWrap.off": "Строки не будут переноситься никогда.",
+	"wordWrap.on": "Строки будут переноситься по ширине окна просмотра.",
+	"wordWrap.wordWrapColumn": "Строки будут переноситься по \"editor.wordWrapColumn\".",
+	"wordWrapColumn": "Определяет столбец переноса редактора, если значение \"editor.wordWrap\" — \"wordWrapColumn\" или \"bounded\".",
 	"wrappingIndent": "Управляет отступом строк с переносом по словам. Допустимые значения: \"none\", \"same\" или \"indent\"."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json b/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
index 48cd58e421d..9540824eaf5 100644
--- a/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
+++ b/i18n/rus/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json
@@ -13,5 +13,6 @@
 	"actions.previewDecl.label": "Показать определение",
 	"generic.noResults": "Определения не найдены.",
 	"meta.title": " — определения {0}",
-	"multipleResults": "Щелкните, чтобы отобразить определения ({0})."
+	"multipleResults": "Щелкните, чтобы отобразить определения ({0}).",
+	"noResultWord": "Определение для \"{0}\" не найдено."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json b/i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
index 485caa87c1c..c8cca95f220 100644
--- a/i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
+++ b/i18n/rus/src/vs/platform/actions/browser/menusExtensionPoint.i18n.json
@@ -7,6 +7,7 @@
 	"dup": "Команда \"{0}\" встречается несколько раз в разделе commands.",
 	"dupe.command": "Элемент меню ссылается на одну и ту же команду как команду по умолчанию и альтернативную команду",
 	"menuId.invalid": "\"{0}\" не является допустимым идентификатором меню",
+	"menus.commandPalette": "Палитра команд",
 	"menus.editorContext": "Контекстное меню редактора",
 	"menus.editorTabContext": "Контекстное меню вкладок редактора",
 	"menus.editorTitle": "Главное меню редактора",
diff --git a/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
index 8b6ad71cd4e..3a1051dcfda 100644
--- a/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
+++ b/i18n/rus/src/vs/workbench/electron-browser/commands.i18n.json
@@ -3,4 +3,6 @@
  *  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
+{
+	"diffLeftRightLabel": "{0} ⟷ {1}"
+}
\ 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 dd9ba516a2e..081f4679aee 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
@@ -24,26 +24,26 @@
 	"showIcons": "Определяет, должны ли открытые редакторы отображаться со значком. Требует включить тему значков.",
 	"sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.",
 	"statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.",
-	"title": "Определяет заголовок окна в зависимости от активного редактора. Переменные заменяются на основании контекста.\n${activeEditorName}: например, myFile.txt\n${activeFilePath}: например, /Users/Development/myProject/myFile.txt\n${rootName}: например, myProject\n${rootPath}: например, /Users/Development/myProject\n${appName}: например, VS Code\n${dirty}: индикатор dirty, если активный редактор является \"грязным\"\n${separator}: условный разделитель (-), который отображается, только если окружен переменными со значениями.",
+	"title": "Определяет заголовок окна в зависимости от активного редактора. Переменные заменяются на основании контекста.\n${activeEditorShort}: например, myFile.txt\n${activeEditorMedium}: например, myFolder/myFile.txt\n${activeEditorLong}: например, /Users/Development/myProject/myFolder/myFile.txt\n${rootName}: например, myProject\n${rootPath}: например, /Users/Development/myProject\n${appName}: например, VS Code\n${dirty}: индикатор \"грязного\", если активный редактор является \"грязным\"\n${separator}: условный разделитель (\" - \"), который отображается, только если окружен переменными со значениями.",
 	"titleBarStyle": "Настройка внешнего вида заголовка окна. Чтобы применить изменения, потребуется полный перезапуск.",
 	"view": "Просмотреть",
-	"window.menuBarVisibility.default": "\"default\": меню скрыто только в полноэкранном режиме.",
-	"window.menuBarVisibility.hidden": "\"hidden\": меню всегда скрыто.",
-	"window.menuBarVisibility.toggle": "\"toggle\": меню скрыто, но его можно вывести с помощью клавиши ALT.",
-	"window.menuBarVisibility.visible": "\"visible\": меню всегда видимо, даже в полноэкранном режиме.",
-	"window.newWindowDimensions.default": "\"default\": открывать новые окна в центре экрана.",
-	"window.newWindowDimensions.fullscreen": "\"fullscreen\": открывать новые окна в полноэкранном режиме.",
-	"window.newWindowDimensions.inherit": "\"inherit\": открывать новые окна того же размера, что и последнее активное окно.",
-	"window.newWindowDimensions.maximized": "\"maximized\": открывать новые окна в развернутом состоянии.",
-	"window.openFilesInNewWindow.default": "\"default\": файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).",
-	"window.openFilesInNewWindow.off": "\"off\": файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
-	"window.openFilesInNewWindow.on": "\"on\": файлы будут открываться в новом окне.",
-	"window.openFoldersInNewWindow.default": "\"default\": папки будут открываться в новом окне, если папка не выбрана из приложения (например, из меню \"Файл\").",
-	"window.openFoldersInNewWindow.off": "\"off\": папки будут заменять последнее активное окно.",
-	"window.openFoldersInNewWindow.on": "\"on\": папки будут открываться в новом окне.",
-	"window.reopenFolders.all": "\"all\": повторное открытие всех папок последнего сеанса.",
-	"window.reopenFolders.none": "\"none\": запрет повторного открытия папки.",
-	"window.reopenFolders.one": "\"one\": повторное открытие последней активной папки.",
+	"window.menuBarVisibility.default": "Меню скрыто только в полноэкранном режиме.",
+	"window.menuBarVisibility.hidden": "Меню всегда скрыто.",
+	"window.menuBarVisibility.toggle": "Меню скрыто, но его можно вывести с помощью клавиши ALT.",
+	"window.menuBarVisibility.visible": "Меню всегда видимо, даже в полноэкранном режиме.",
+	"window.newWindowDimensions.default": "Открывать новые окна в центре экрана.",
+	"window.newWindowDimensions.fullscreen": "Открывать новые окна в полноэкранном режиме.",
+	"window.newWindowDimensions.inherit": "Открывать новые окна того же размера, что и последнее активное окно.",
+	"window.newWindowDimensions.maximized": "Открывать новые окна в развернутом состоянии.",
+	"window.openFilesInNewWindow.default": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне, если они не открываются из панели Dock или системы поиска (только macOS).",
+	"window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.",
+	"window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.",
+	"window.openFoldersInNewWindow.default": "Папки будут открываться в новом окне, если папка не выбрана в приложении (например, в меню \"Файл\").",
+	"window.openFoldersInNewWindow.off": "Папки будут заменять последнее активное окно.",
+	"window.openFoldersInNewWindow.on": "Папки будут открываться в новом окне.",
+	"window.reopenFolders.all": "Повторное открытие всех папок последнего сеанса.",
+	"window.reopenFolders.none": "Запрет повторного открытия папки.",
+	"window.reopenFolders.one": "Повторное открытие последней активной папки.",
 	"windowConfigurationTitle": "Окно",
 	"workbenchConfigurationTitle": "Workbench",
 	"zenMode.fullScreen": "Определяет, будет ли переключение в режим Zen переключать рабочее пространство в полноэкранный режим.",
diff --git a/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json
new file mode 100644
index 00000000000..a596e42d202
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.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.
+{
+	"wordWrapMigration.dontShowAgain": "Больше не показывать",
+	"wordWrapMigration.ok": "ОК",
+	"wordWrapMigration.openSettings": "Открыть параметры",
+	"wordWrapMigration.prompt": "Параметр \"editor.wrappingColumn\" устарел и заменен на \"editor.wordWrap\"."
+}
\ 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 e6ae136434c..92151a89c58 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
@@ -34,6 +34,7 @@
 	"restartDebug": "Перезапустить",
 	"restartFrame": "Перезапустить кадр",
 	"reverseContinue": "Обратно",
+	"selectAndStartDebugging": "Выбрать и начать отладку",
 	"setValue": "Задать значение",
 	"startDebug": "Начать отладку",
 	"startWithoutDebugging": "Начать без отладки",
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json
new file mode 100644
index 00000000000..a2190a88a0a
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/debugQuickOpen.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.
+{
+	"debugAriaLabel": "Введите имя используемой конфигурации запуска.",
+	"entryAriaLabel": "Отладка: {0}",
+	"noConfigurationsFound": "Конфигурации отладки не найдены. Создайте файл \"launch.json\".",
+	"noConfigurationsMatching": "Нет соответствующих конфигураций отладки."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
new file mode 100644
index 00000000000..1dc57409136
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/debug/browser/exceptionWidget.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"exceptionThrown": "Произошло исключение."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
index 828fa59d73e..30089dcc0f8 100644
--- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json
@@ -7,6 +7,7 @@
 	"allowBreakpointsEverywhere": "Разрешает задание точки останова в любом файле",
 	"debug": "Отладка",
 	"debugCategory": "Отладка",
+	"debugCommands": "Конфигурация отладки",
 	"debugConfigurationTitle": "Отладка",
 	"debugPanel": "Консоль отладки",
 	"inlineValues": "Показывать значения переменных в редакторе во время отладки",
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 b9025207020..b60a452e4ae 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
@@ -14,5 +14,7 @@
 	"debugServer": "Только для разработки расширений отладки: если указан порт, VS Code пытается подключиться к адаптеру отладки, запущенному в режиме сервера.",
 	"debugType": "Тип конфигурации.",
 	"debugWindowsConfiguration": "Атрибуты конфигурации запуска для Windows.",
-	"internalConsoleOptions": "Управляет поведением внутренней консоли отладки."
+	"deprecatedVariables": "\"env.\", \"config.\" и \"command.\" устарели, используйте \"env:\", \"config:\" и \"command:\".",
+	"internalConsoleOptions": "Управляет поведением внутренней консоли отладки.",
+	"node2NotSupported": "Значение \"node2\" больше не поддерживается; используйте \"node\" и задайте для атрибута \"protocol\" значение \"inspector\"."
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
index 8e3fe41052a..be1005e3cce 100644
--- a/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/files/browser/files.contribution.i18n.json
@@ -6,8 +6,8 @@
 {
 	"associations": "Настройте сопоставления файлов с языками (например, \"*.extension\": \"html\"). У них будет приоритет перед заданными по умолчанию сопоставлениями установленных языков.",
 	"autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.",
-	"autoSave": "Управляет автоматическим сохранением измененных файлов. Допустимые значения: \"{0}\", \"{1}\", \"{2}\" (редактор теряет фокус) и \"{3}\" (окно теряет фокус). Если задано значение \"{4}\", можно настроить задержку в \"files.autoSaveDelay\".",
-	"autoSaveDelay": "Определяет задержку в мс, после которой измененный файл сохраняется автоматически. Действует, только если параметр files.autoSave имеет значение \"{0}\".",
+	"autoSave": "Управляет автоматическим сохранением \"грязных\" файлов. Допустимые значения: \"{0}\", \"{1}\", \"{2}\" (редактор теряет фокус) и \"{3}\" (окно теряет фокус). Если задано значение \"{4}\", можно настроить задержку в \"files.autoSaveDelay\".",
+	"autoSaveDelay": "Определяет задержку в мс, после которой измененный файл сохраняется автоматически. Действует, только если параметр \"files.autoSave\" имеет значение \"{0}\".",
 	"binaryFileEditor": "Редактор двоичных файлов",
 	"dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.",
 	"editorConfigurationTitle": "Редактор",
@@ -17,10 +17,10 @@
 	"exclude": "Настройка стандартных масок для исключения файлов и папок.",
 	"explore": "Проводник",
 	"explorerConfigurationTitle": "Проводник",
-	"files.autoSave.afterDelay": "\"afterDelay\": \"грязный\" файл автоматически сохраняется по истечении настроенного значения files.autoSaveDelay.",
-	"files.autoSave.off": "\"off\": \"грязный\" файл никогда не сохраняется автоматически.",
-	"files.autoSave.onFocusChange": "\"onFocusChange\": \"грязный\" файл автоматически сохраняется при потере фокуса редактором.",
-	"files.autoSave.onWindowChange": "\"onWindowChange\": \"грязный\" файл автоматически сохраняется при потере фокуса окном.",
+	"files.autoSave.afterDelay": "\"Грязный\" файл автоматически сохраняется по истечении срока \"files.autoSaveDelay\".",
+	"files.autoSave.off": "\"Грязный\" файл не сохраняется автоматически.",
+	"files.autoSave.onFocusChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса редактором.",
+	"files.autoSave.onWindowChange": "\"Грязный\" файл автоматически сохраняется при потере фокуса окном.",
 	"files.exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.",
 	"files.exclude.when": "Дополнительная проверка элементов того же уровня соответствующего файла. Используйте $(basename) в качестве переменной для соответствующего имени файла.",
 	"filesConfigurationTitle": "Файлы",
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 e4561ea1aa0..dee882a01ef 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
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"configureLanguageBasedSettings": "Настроить параметры, определяемые языком...",
+	"configureLanguageBasedSettings": "Настроить параметры языка...",
 	"languageDescriptionConfigured": "({0})",
 	"openGlobalKeybindings": "Открыть сочетания клавиш",
 	"openGlobalSettings": "Открыть пользовательские параметры",
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
new file mode 100644
index 00000000000..8b6ad71cd4e
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/TMSnippets.i18n.json
@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
new file mode 100644
index 00000000000..8c220bbce30
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/insertSnippet.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippet.suggestions.label": "Вставить фрагмент кода"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
index bbb3eac74ad..0b1f01a36a9 100644
--- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
@@ -6,7 +6,7 @@
 {
 	"openSnippet.errorOnCreate": "Не удалось создать {0}.",
 	"openSnippet.label": "Открыть пользовательские фрагменты",
-	"openSnippet.pickLanguage": "Выберите язык для фрагмента.",
+	"openSnippet.pickLanguage": "Выберите язык для фрагментов кода",
 	"preferences": "Параметры",
 	"snippetSchema.json": "Настройка фрагмента пользователя",
 	"snippetSchema.json.body": "Содержимое фрагмента. Используйте \"${id}\", \"${id:label}\", \"${1:label}\" для переменных и \"$0\", \"$1\" для положений курсора",
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
new file mode 100644
index 00000000000..eefed0e4d58
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"snippetSuggest.longLabel": "{0}, {1}"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
new file mode 100644
index 00000000000..7d237682df5
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/tabCompletion.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"tabCompletion": "Вставка фрагментов при совпадении их префиксов. Функция работает оптимально, если параметр \"quickSuggestions\" отключен."
+}
\ 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 70a4c6a5f7d..2ee18b6d6a5 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
@@ -7,6 +7,7 @@
 	"workbench.action.terminal.clear": "Очистить",
 	"workbench.action.terminal.copySelection": "Скопировать выделение",
 	"workbench.action.terminal.focus": "Фокус на терминале",
+	"workbench.action.terminal.focusAtIndex": "Фокус на терминале {0}",
 	"workbench.action.terminal.focusNext": "Фокус на следующем терминале",
 	"workbench.action.terminal.focusPrevious": "Фокус на предыдущем терминале",
 	"workbench.action.terminal.kill": "Завершить активный экземпляр терминала",
diff --git a/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
index fc526f33044..8fc1802f29c 100644
--- a/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/themes/electron-browser/themes.contribution.i18n.json
@@ -10,7 +10,7 @@
 	"preferences": "Параметры",
 	"problemChangingIconTheme": "Проблема при задании темы значка: {0}",
 	"problemChangingTheme": "Проблема при задании темы: {0}",
-	"selectIconTheme.label": "Тема значка файла",
+	"selectIconTheme.label": "Тема значков файлов",
 	"selectTheme.label": "Цветовая тема",
 	"themes.selectIconTheme": "Выбрать тему значка файла",
 	"themes.selectTheme": "Выберите цветовую тему"
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
new file mode 100644
index 00000000000..335265710b0
--- /dev/null
+++ b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.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.
+{
+	"welcomePage.atom": "Atom",
+	"welcomePage.atomCurrent": "Atom (текущий)",
+	"welcomePage.cloneGitRepository": "Клонировать репозиторий Git...",
+	"welcomePage.colorTheme": "Цветовая тема",
+	"welcomePage.colorThemeDescription": "Настройте редактор и код удобным образом.",
+	"welcomePage.configureSettings": "Настройка параметров",
+	"welcomePage.configureSettingsDescription": "Используйте все возможности VS Code, подобрав нужные параметры.",
+	"welcomePage.editingEvolved": "Улучшенное редактирование",
+	"welcomePage.gitHubRepository": "Репозиторий GitHub",
+	"welcomePage.help": "Справка",
+	"welcomePage.installKeymap": "Установите сочетания клавиш {0}, {1}, {2} и {3}.",
+	"welcomePage.installKeymapDescription": "Установка сочетаний клавиш",
+	"welcomePage.interactivePlayground": "Интерактивная площадка",
+	"welcomePage.interactivePlaygroundDescription": "Опробуйте основные функции редактора в ходе краткого пошагового руководства.",
+	"welcomePage.interfaceOverview": "Общие сведения об интерфейсе",
+	"welcomePage.interfaceOverviewDescription": "Используйте визуальное наложение с выделением основных компонентов пользовательского интерфейса.",
+	"welcomePage.introductoryVideos": "Вступительные видео",
+	"welcomePage.keybindingsReference": "Справочник по сочетаниям клавиш",
+	"welcomePage.keybindingsReferenceDescription": "Подготовленный к печати PDF-файл с самыми частыми сочетаниями клавиш",
+	"welcomePage.newFile": "Создать файл",
+	"welcomePage.noRecentFolders": "Нет последних папок.",
+	"welcomePage.openFolder": "Открыть папку...",
+	"welcomePage.others": "Другие",
+	"welcomePage.productDocumentation": "Документация по продукту",
+	"welcomePage.quickLinks": "Быстрые ссылки",
+	"welcomePage.recent": "Последние",
+	"welcomePage.showCommands": "Найти и выполнить все команды",
+	"welcomePage.showCommandsDescription": "Быстрый доступ и поиск команд на панели управления ({0})",
+	"welcomePage.showOnStartup": "Отображать страницу приветствия при запуске",
+	"welcomePage.stackOverflow": "Переполнение стека",
+	"welcomePage.start": "Запустить",
+	"welcomePage.sublime": "Sublime",
+	"welcomePage.sublimeCurrent": "Sublime (текущий)",
+	"welcomePage.vim": "Vim",
+	"welcomePage.vimCurrent": "Vim (текущий)",
+	"welcomePage.vscode": "Visual Studio Code"
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
index 8b6ad71cd4e..9e0ab6a0b2c 100644
--- a/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.i18n.json
@@ -3,4 +3,13 @@
  *  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
+{
+	"cancel": "Отмена",
+	"ok": "ОК",
+	"welcome.title": "Добро пожаловать",
+	"welcomePage": "Добро пожаловать",
+	"welcomePage.installingKeymap": "Устанавливаются сочетания клавиш {0}...",
+	"welcomePage.keymapAlreadyInstalled": "Сочетания клавиш {0} уже установлены.",
+	"welcomePage.keymapNotFound": "Не удалось найти сочетания клавиш {0} с идентификатором {1}.",
+	"welcomePage.willReloadAfterInstallingKeymap": "Окно перезагрузится после установки сочетаний клавиш {0}."
+}
\ No newline at end of file
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 2c4168256e7..48f10666974 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -430,9 +430,9 @@
       "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz"
     },
     "xterm": {
-      "version": "2.3.2",
-      "from": "Tyriar/xterm.js#vscode-release/1.10",
-      "resolved": "git+https://github.com/Tyriar/xterm.js.git#cc53428c1cfd0265d1f8e48d08157269e65cb65f"
+      "version": "2.4.0",
+      "from": "Tyriar/xterm.js#vscode-release/1.11",
+      "resolved": "git+https://github.com/Tyriar/xterm.js.git#432393d53661fe5160ef3deb3ba58b77e4ca3baf"
     },
     "yauzl": {
       "version": "2.3.1",
diff --git a/package.json b/package.json
index 85670f8a999..d9b2d70a786 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "vscode-debugprotocol": "1.17.0",
     "vscode-textmate": "^3.1.1",
     "winreg": "1.2.0",
-    "xterm": "Tyriar/xterm.js#vscode-release/1.10",
+    "xterm": "Tyriar/xterm.js#vscode-release/1.11",
     "yauzl": "2.3.1"
   },
   "devDependencies": {
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index 176cc70a501..6364fd43318 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -66,6 +66,52 @@ export function findFirst<T>(array: T[], p: (x: T) => boolean): number {
 	return low;
 }
 
+/**
+ * Takes two *sorted* arrays and computes their delta (removed, added elements).
+ * Finishes in `Math.min(before.length, after.length)` steps.
+ * @param before
+ * @param after
+ * @param compare
+ */
+export function delta<T>(before: T[], after: T[], compare: (a: T, b: T) => number) {
+
+	const removed: T[] = [];
+	const added: T[] = [];
+
+	let beforeIdx = 0;
+	let afterIdx = 0;
+
+	while (true) {
+		if (beforeIdx === before.length) {
+			added.push(...after.slice(afterIdx));
+			break;
+		}
+		if (afterIdx === after.length) {
+			removed.push(...before.slice(beforeIdx));
+			break;
+		}
+
+		const beforeElement = before[beforeIdx];
+		const afterElement = after[afterIdx];
+		const n = compare(beforeElement, afterElement);
+		if (n === 0) {
+			// equal
+			beforeIdx += 1;
+			afterIdx += 1;
+		} else if (n < 0) {
+			// beforeElement is smaller -> before element removed
+			removed.push(beforeElement);
+			beforeIdx += 1;
+		} else if (n > 0) {
+			// beforeElement is greater -> after element added
+			added.push(afterElement);
+			afterIdx += 1;
+		}
+	}
+
+	return { removed, added };
+}
+
 /**
  * Returns the top N elements from the array.
  *
diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts
index 09624ac1069..d9378acae53 100644
--- a/src/vs/base/common/comparers.ts
+++ b/src/vs/base/common/comparers.ts
@@ -7,15 +7,27 @@
 import scorer = require('vs/base/common/scorer');
 import strings = require('vs/base/common/strings');
 
-let intlFileNameComparer: Intl.Collator;
+let intlFileNameCollator: Intl.Collator;
+let intlFileNameCollatorIsNumeric: boolean;
 
 export function setFileNameComparer(collator: Intl.Collator): void {
-	intlFileNameComparer = collator;
+	intlFileNameCollator = collator;
+	intlFileNameCollatorIsNumeric = collator.resolvedOptions().numeric;
 }
 
 export function compareFileNames(one: string, other: string): number {
-	if (intlFileNameComparer) {
-		return intlFileNameComparer.compare(one || '', other || '');
+	if (intlFileNameCollator) {
+		const a = one || '';
+		const b = other || '';
+		const result = intlFileNameCollator.compare(a, b);
+
+		// Using the numeric option in the collator will
+		// make compare(`foo1`, `foo01`) === 0. We must disambiguate.
+		if (intlFileNameCollatorIsNumeric && result === 0 && a !== b) {
+			return a < b ? -1 : 1;
+		}
+
+		return result;
 	}
 
 	return noIntlCompareFileNames(one, other);
diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts
index ee1bc226698..d7c7fd04b1f 100644
--- a/src/vs/base/parts/tree/browser/treeView.ts
+++ b/src/vs/base/parts/tree/browser/treeView.ts
@@ -945,7 +945,7 @@ export class TreeView extends HeightMap {
 
 			} else if (skipDiff || diff.length) {
 				this.onRemoveItems(new ArrayIterator(previousChildrenIds));
-				this.onInsertItems(new ArrayIterator(afterModelItems));
+				this.onInsertItems(new ArrayIterator(afterModelItems), item.getDepth() > 0 ? item.id : null);
 			}
 
 			if (skipDiff || diff.length) {
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index 46d1177dfb4..95b7108f988 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -33,6 +33,40 @@ suite('Arrays', () => {
 		assert.equal(array[idx], 1);
 	});
 
+	test('delta', function () {
+		function compare(a: number, b: number): number {
+			return a - b;
+		}
+
+		let d = arrays.delta([1, 2, 4], [], compare);
+		assert.deepEqual(d.removed, [1, 2, 4]);
+		assert.deepEqual(d.added, []);
+
+		d = arrays.delta([], [1, 2, 4], compare);
+		assert.deepEqual(d.removed, []);
+		assert.deepEqual(d.added, [1, 2, 4]);
+
+		d = arrays.delta([1, 2, 4], [1, 2, 4], compare);
+		assert.deepEqual(d.removed, []);
+		assert.deepEqual(d.added, []);
+
+		d = arrays.delta([1, 2, 4], [2, 3, 4, 5], compare);
+		assert.deepEqual(d.removed, [1]);
+		assert.deepEqual(d.added, [3, 5]);
+
+		d = arrays.delta([2, 3, 4, 5], [1, 2, 4], compare);
+		assert.deepEqual(d.removed, [3, 5]);
+		assert.deepEqual(d.added, [1]);
+
+		d = arrays.delta([1, 3, 5, 7], [5, 9, 11], compare);
+		assert.deepEqual(d.removed, [1, 3, 7]);
+		assert.deepEqual(d.added, [9, 11]);
+
+		d = arrays.delta([1, 3, 7], [5, 9, 11], compare);
+		assert.deepEqual(d.removed, [1, 3, 7]);
+		assert.deepEqual(d.added, [5, 9, 11]);
+	});
+
 	test('binarySearch', function () {
 		function compare(a: number, b: number): number {
 			return a - b;
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 481bf0457a2..ebf7e362782 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -1064,11 +1064,11 @@ export class VSCodeMenu {
 			// the keybinding is not native so we cannot show it as part of the accelerator of
 			// the menu item. we fallback to a different strategy so that we always display it
 			else {
-				const bindingIndex = options.label.indexOf('〔');
+				const bindingIndex = options.label.indexOf('(');
 				if (bindingIndex >= 0) {
-					options.label = `${options.label.substr(0, bindingIndex)} 〔${binding.label}〕`;
+					options.label = `${options.label.substr(0, bindingIndex)} (${binding.label})`;
 				} else {
-					options.label = `${options.label} 〔${binding.label}〕`;
+					options.label = `${options.label} (${binding.label})`;
 				}
 			}
 		}
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 7bd99b35c91..0fa1a2e0b35 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -141,6 +141,8 @@ export class WindowsManager implements IWindowsMainService {
 	private windowsState: IWindowsState;
 	private lastClosedWindowState: IWindowState;
 
+	private firstWindowLoading: boolean;
+
 	private _onRecentPathsChange = new Emitter<void>();
 	onRecentPathsChange: CommonEvent<void> = this._onRecentPathsChange.event;
 
@@ -171,8 +173,6 @@ export class WindowsManager implements IWindowsMainService {
 
 		this.initialUserEnv = initialUserEnv;
 		this.windowsState = this.storageService.getItem<IWindowsState>(WindowsManager.windowsStateStorageKey) || { openedFolders: [] };
-
-		this.updateWindowsJumpList();
 	}
 
 	private registerListeners(): void {
@@ -862,6 +862,7 @@ export class WindowsManager implements IWindowsMainService {
 			vscodeWindow.win.webContents.removeAllListeners('devtools-reload-page'); // remove built in listener so we can handle this on our own
 			vscodeWindow.win.webContents.on('devtools-reload-page', () => this.reload(vscodeWindow));
 			vscodeWindow.win.webContents.on('crashed', () => this.onWindowError(vscodeWindow, WindowError.CRASHED));
+			vscodeWindow.win.webContents.on('did-start-loading', () => this.onWindowStartLoading(vscodeWindow));
 			vscodeWindow.win.on('unresponsive', () => this.onWindowError(vscodeWindow, WindowError.UNRESPONSIVE));
 			vscodeWindow.win.on('closed', () => this.onWindowClosed(vscodeWindow));
 
@@ -1264,11 +1265,26 @@ export class WindowsManager implements IWindowsMainService {
 		return pathA === pathB;
 	}
 
+	private onWindowStartLoading(win: VSCodeWindow): void {
+		if (!this.firstWindowLoading) {
+			this.firstWindowLoading = true;
+
+			// Apply jump list when our first window is loading. We do this because
+			// setJumpList() seems to take quite a bit of time and would block window
+			// loading ( = startup performance) significantly otherwise
+			setTimeout(() => this.updateWindowsJumpList()); // unwind from onWindowStartLoading event
+		}
+	}
+
 	private updateWindowsJumpList(): void {
 		if (!platform.isWindows) {
 			return; // only on windows
 		}
 
+		if (!this.firstWindowLoading) {
+			return; // push this out until a window starts loading for perf reasons
+		}
+
 		const jumpList: Electron.JumpListCategory[] = [];
 
 		// Tasks
diff --git a/src/vs/editor/browser/controller/keyboardHandler.ts b/src/vs/editor/browser/controller/keyboardHandler.ts
index b2b70df5d2e..00258d23cb5 100644
--- a/src/vs/editor/browser/controller/keyboardHandler.ts
+++ b/src/vs/editor/browser/controller/keyboardHandler.ts
@@ -17,7 +17,7 @@ import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
 import { IViewController } from 'vs/editor/browser/editorBrowser';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { VisibleRange } from 'vs/editor/common/view/renderingContext';
+import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
 import { TextAreaWrapper } from 'vs/editor/browser/controller/input/textAreaWrapper';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 import { FastDomNode } from 'vs/base/browser/fastDomNode';
@@ -25,10 +25,22 @@ import { FastDomNode } from 'vs/base/browser/fastDomNode';
 export interface IKeyboardHandlerHelper {
 	viewDomNode: FastDomNode<HTMLElement>;
 	textArea: FastDomNode<HTMLTextAreaElement>;
-	visibleRangeForPositionRelativeToEditor(lineNumber: number, column: number): VisibleRange;
+	visibleRangeForPositionRelativeToEditor(lineNumber: number, column: number): HorizontalRange;
+	getVerticalOffsetForLineNumber(lineNumber: number): number;
 	flushAnyAccumulatedEvents(): void;
 }
 
+class TextAreaVisiblePosition {
+	_textAreaVisiblePosition: void;
+
+	public readonly top: number;
+	public readonly left: number;
+
+	constructor(top: number, left: number) {
+		this.top = top;
+		this.left = left;
+	}
+}
 export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 
 	private _context: ViewContext;
@@ -41,8 +53,9 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 	private contentLeft: number;
 	private contentWidth: number;
 	private scrollLeft: number;
+	private scrollTop: number;
 
-	private visibleRange: VisibleRange;
+	private visiblePosition: TextAreaVisiblePosition;
 
 	constructor(context: ViewContext, viewController: IViewController, viewHelper: IKeyboardHandlerHelper) {
 		super();
@@ -52,10 +65,12 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 		this.textArea = new TextAreaWrapper(viewHelper.textArea);
 		Configuration.applyFontInfo(this.textArea.actual, this._context.configuration.editor.fontInfo);
 		this.viewHelper = viewHelper;
+		this.visiblePosition = null;
 
 		this.contentLeft = this._context.configuration.editor.layoutInfo.contentLeft;
 		this.contentWidth = this._context.configuration.editor.layoutInfo.contentWidth;
 		this.scrollLeft = 0;
+		this.scrollTop = 0;
 
 		this.textAreaHandler = new TextAreaHandler(browser, this._getStrategy(), this.textArea, this._context.model, () => this.viewHelper.flushAnyAccumulatedEvents());
 
@@ -72,8 +87,8 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 			}
 		}));
 		this._toDispose.push(this.textAreaHandler.onCompositionStart((e) => {
-			let lineNumber = e.showAtLineNumber;
-			let column = e.showAtColumn;
+			const lineNumber = e.showAtLineNumber;
+			const column = e.showAtColumn;
 
 			this._context.privateViewEventBus.emit(new viewEvents.ViewRevealRangeRequestEvent(
 				new Range(lineNumber, column, lineNumber, column),
@@ -83,11 +98,15 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 			));
 
 			// Find range pixel position
-			this.visibleRange = this.viewHelper.visibleRangeForPositionRelativeToEditor(lineNumber, column);
+			const visibleRange = this.viewHelper.visibleRangeForPositionRelativeToEditor(lineNumber, column);
 
-			if (this.visibleRange) {
-				this.textArea.actual.setTop(this.visibleRange.top);
-				this.textArea.actual.setLeft(this.contentLeft + this.visibleRange.left - this.scrollLeft);
+			if (visibleRange) {
+				this.visiblePosition = new TextAreaVisiblePosition(
+					this.viewHelper.getVerticalOffsetForLineNumber(lineNumber),
+					visibleRange.left
+				);
+				this.textArea.actual.setTop(this.visiblePosition.top - this.scrollTop);
+				this.textArea.actual.setLeft(this.contentLeft + this.visiblePosition.left - this.scrollLeft);
 			}
 
 			// Show the textarea
@@ -127,7 +146,7 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 			this.textArea.actual.setTop(0);
 			this.viewHelper.viewDomNode.removeClassName('ime-input');
 
-			this.visibleRange = null;
+			this.visiblePosition = null;
 
 			this.viewController.compositionEnd('keyboard');
 		}));
@@ -190,9 +209,10 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
 
 	public onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
 		this.scrollLeft = e.scrollLeft;
-		if (this.visibleRange) {
-			this.textArea.actual.setTop(this.visibleRange.top);
-			this.textArea.actual.setLeft(this.contentLeft + this.visibleRange.left - this.scrollLeft);
+		this.scrollTop = e.scrollTop;
+		if (this.visiblePosition) {
+			this.textArea.actual.setTop(this.visiblePosition.top - this.scrollTop);
+			this.textArea.actual.setLeft(this.contentLeft + this.visiblePosition.left - this.scrollLeft);
 		}
 		return false;
 	}
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
index 606ce03b03f..de21648ca07 100644
--- a/src/vs/editor/browser/controller/mouseHandler.ts
+++ b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -16,7 +16,7 @@ import { MouseTarget, MouseTargetFactory } from 'vs/editor/browser/controller/mo
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { TimeoutTimer, RunOnceScheduler } from 'vs/base/common/async';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { VisibleRange } from 'vs/editor/common/view/renderingContext';
+import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
 import { EditorMouseEventFactory, GlobalEditorMouseMoveMonitor, EditorMouseEvent, createEditorPagePosition, ClientCoordinates } from 'vs/editor/browser/editorDom';
 import { StandardMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
@@ -108,7 +108,7 @@ export interface IPointerHandlerHelper {
 	 */
 	getPositionFromDOMInfo(spanNode: HTMLElement, offset: number): Position;
 
-	visibleRangeForPosition2(lineNumber: number, column: number): VisibleRange;
+	visibleRangeForPosition2(lineNumber: number, column: number): HorizontalRange;
 	getLineWidth(lineNumber: number): number;
 }
 
diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
index e1211b9092f..295b2fe1169 100644
--- a/src/vs/editor/browser/controller/mouseTarget.ts
+++ b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -502,11 +502,20 @@ export class MouseTargetFactory {
 			for (let i = 0, len = lastViewCursorsRenderData.length; i < len; i++) {
 				const d = lastViewCursorsRenderData[i];
 
+				if (mouseContentHorizontalOffset < d.contentLeft) {
+					// mouse position is to the left of the cursor
+					continue;
+				}
+				if (mouseContentHorizontalOffset > d.contentLeft + d.width) {
+					// mouse position is to the right of the cursor
+					continue;
+				}
+
+				const cursorVerticalOffset = ctx.getVerticalOffsetForLineNumber(d.position.lineNumber);
+
 				if (
-					d.contentLeft <= mouseContentHorizontalOffset
-					&& mouseContentHorizontalOffset <= d.contentLeft + d.width
-					&& d.contentTop <= mouseVerticalOffset
-					&& mouseVerticalOffset <= d.contentTop + d.height
+					cursorVerticalOffset <= mouseVerticalOffset
+					&& mouseVerticalOffset <= cursorVerticalOffset + d.height
 				) {
 					return request.fulfill(MouseTargetType.CONTENT_TEXT, d.position);
 				}
diff --git a/src/vs/editor/browser/view/dynamicViewOverlay.ts b/src/vs/editor/browser/view/dynamicViewOverlay.ts
index 40c085f9e1e..acdc241cc24 100644
--- a/src/vs/editor/browser/view/dynamicViewOverlay.ts
+++ b/src/vs/editor/browser/view/dynamicViewOverlay.ts
@@ -6,13 +6,13 @@
 'use strict';
 
 import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 
 export abstract class DynamicViewOverlay extends ViewEventHandler {
 
 	public abstract dispose(): void;
 
-	public abstract prepareRender(ctx: IRenderingContext): void;
+	public abstract prepareRender(ctx: RenderingContext): void;
 
 	public abstract render(startLineNumber: number, lineNumber: number): string;
 
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
index 57ac6405e1a..1a0424515ed 100644
--- a/src/vs/editor/browser/view/viewImpl.ts
+++ b/src/vs/editor/browser/view/viewImpl.ts
@@ -21,7 +21,7 @@ import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { ViewController, TriggerCursorHandler } from 'vs/editor/browser/view/viewController';
 import { ViewEventDispatcher } from 'vs/editor/common/view/viewEventDispatcher';
 import { ContentViewOverlays, MarginViewOverlays } from 'vs/editor/browser/view/viewOverlays';
-import { LayoutProvider } from 'vs/editor/browser/viewLayout/layoutProvider';
+import { LayoutProvider } from 'vs/editor/common/viewLayout/viewLayout';
 import { ViewContentWidgets } from 'vs/editor/browser/viewParts/contentWidgets/contentWidgets';
 import { CurrentLineHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight';
 import { CurrentLineMarginHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight';
@@ -395,7 +395,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 					throw new Error('ViewImpl.pointerHandler.visibleRangeForPosition2: View is disposed');
 				}
 				this._flushAccumulatedAndRenderNow();
-				let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(lineNumber, column, lineNumber, column), 0);
+				let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(lineNumber, column, lineNumber, column));
 				if (!visibleRanges) {
 					return null;
 				}
@@ -421,13 +421,18 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 					throw new Error('ViewImpl.keyboardHandler.visibleRangeForPositionRelativeToEditor: View is disposed');
 				}
 				this._flushAccumulatedAndRenderNow();
-				let linesViewPortData = this.layoutProvider.getLinesViewportData();
-				let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(lineNumber, column, lineNumber, column), linesViewPortData.visibleRangesDeltaTop);
+				let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(lineNumber, column, lineNumber, column));
 				if (!visibleRanges) {
 					return null;
 				}
 				return visibleRanges[0];
 			},
+			getVerticalOffsetForLineNumber: (lineNumber: number) => {
+				if (this._isDisposed) {
+					throw new Error('ViewImpl.keyboardHandler.getVerticalOffsetForLineNumber: View is disposed');
+				}
+				return this.layoutProvider.getVerticalOffsetForLineNumber(lineNumber);
+			},
 			flushAnyAccumulatedEvents: () => {
 				this._flushAnyAccumulatedEvents();
 			}
@@ -618,7 +623,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 					});
 					let viewPosition = this._context.model.coordinatesConverter.convertModelPositionToViewPosition(modelPosition);
 					this._flushAccumulatedAndRenderNow();
-					let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(viewPosition.lineNumber, viewPosition.column, viewPosition.lineNumber, viewPosition.column), 0);
+					let visibleRanges = this.viewLines.visibleRangesForRange2(new Range(viewPosition.lineNumber, viewPosition.column, viewPosition.lineNumber, viewPosition.column));
 					if (!visibleRanges) {
 						return -1;
 					}
@@ -642,14 +647,12 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 			throw new Error('ViewImpl.getCompletelyVisibleLinesRangeInViewport: View is disposed');
 		}
 
-		let partialData = this.layoutProvider.getLinesViewportData();
-		let startLineNumber = partialData.startLineNumber === partialData.endLineNumber || partialData.relativeVerticalOffset[0] >= partialData.viewportTop ? partialData.startLineNumber : partialData.startLineNumber + 1;
-		let endLineNumber = partialData.relativeVerticalOffset[partialData.relativeVerticalOffset.length - 1] + this._context.configuration.editor.lineHeight <= partialData.viewportTop + partialData.viewportHeight ? partialData.endLineNumber : partialData.endLineNumber - 1;
-		let completelyVisibleLinesRange = new Range(
-			startLineNumber,
+		const partialData = this.layoutProvider.getLinesViewportData();
+		const completelyVisibleLinesRange = new Range(
+			partialData.completelyVisibleStartLineNumber,
 			1,
-			endLineNumber,
-			this._context.model.getLineMaxColumn(endLineNumber)
+			partialData.completelyVisibleEndLineNumber,
+			this._context.model.getLineMaxColumn(partialData.completelyVisibleEndLineNumber)
 		);
 
 		return this._context.model.coordinatesConverter.convertViewRangeToModelRange(completelyVisibleLinesRange);
@@ -903,7 +906,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 			this.keyboardHandler.writeToTextArea();
 		}
 
-		let renderingContext = new RenderingContext(this.viewLines, this.layoutProvider, viewportData);
+		let renderingContext = new RenderingContext(this.layoutProvider, viewportData, this.viewLines);
 
 		// Render the rest of the parts
 		for (let i = 0, len = viewPartsToRender.length; i < len; i++) {
diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts
index 46f2676f3b2..61f6e0419e2 100644
--- a/src/vs/editor/browser/view/viewLayer.ts
+++ b/src/vs/editor/browser/view/viewLayer.ts
@@ -4,9 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
-import { ViewContext } from 'vs/editor/common/view/viewContext';
 import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
@@ -32,28 +30,23 @@ export interface IVisibleLine {
 	layoutLine(lineNumber: number, deltaTop: number): void;
 }
 
-interface IRendererContext<T extends IVisibleLine> {
-	readonly domNode: HTMLElement;
-	rendLineNumberStart: number;
-	lines: T[];
-	linesLength: number;
-	readonly viewportData: ViewportData;
-}
-
 export interface ILine {
 	onContentChanged(): void;
 	onTokensChanged(): void;
 }
 
 export class RenderedLinesCollection<T extends ILine> {
+	private readonly _createLine: () => T;
 	private _lines: T[];
 	private _rendLineNumberStart: number;
-	private _createLine: () => T;
 
 	constructor(createLine: () => T) {
-		this._lines = [];
-		this._rendLineNumberStart = 1;
 		this._createLine = createLine;
+		this._set(1, []);
+	}
+
+	public flush(): void {
+		this._set(1, []);
 	}
 
 	_set(rendLineNumberStart: number, lines: T[]): void {
@@ -251,27 +244,29 @@ export class RenderedLinesCollection<T extends ILine> {
 	}
 }
 
-export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
+export interface IVisibleLinesHost<T extends IVisibleLine> {
+	createVisibleLine(): T;
+}
 
-	protected domNode: FastDomNode<HTMLElement>;
-	protected _linesCollection: RenderedLinesCollection<T>;
-	private _renderer: ViewLayerRenderer<T>;
+export class VisibleLinesCollection<T extends IVisibleLine> {
 
-	constructor(context: ViewContext) {
-		super(context);
+	private readonly _host: IVisibleLinesHost<T>;
+	public readonly domNode: FastDomNode<HTMLElement>;
+	private readonly _linesCollection: RenderedLinesCollection<T>;
 
+	constructor(host: IVisibleLinesHost<T>) {
+		this._host = host;
 		this.domNode = this._createDomNode();
-
-		this._linesCollection = new RenderedLinesCollection<T>(() => this._createLine());
-
-		this._renderer = new ViewLayerRenderer<T>(
-			() => this._createLine()
-		);
+		this._linesCollection = new RenderedLinesCollection<T>(() => this._host.createVisibleLine());
 	}
 
-	public dispose(): void {
-		super.dispose();
-		this._linesCollection = null;
+	private _createDomNode(): FastDomNode<HTMLElement> {
+		let domNode = createFastDomNode(document.createElement('div'));
+		domNode.setClassName('view-layer');
+		domNode.setPosition('absolute');
+		domNode.domNode.setAttribute('role', 'presentation');
+		domNode.domNode.setAttribute('aria-hidden', 'true');
+		return domNode;
 	}
 
 	// ---- begin view event handlers
@@ -281,7 +276,7 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
 	}
 
 	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
-		this._linesCollection = new RenderedLinesCollection<T>(() => this._createLine());
+		this._linesCollection.flush();
 		// No need to clear the dom node because a full .innerHTML will occur in ViewLayerRenderer._render
 		return true;
 	}
@@ -334,56 +329,61 @@ export abstract class ViewLayer<T extends IVisibleLine> extends ViewPart {
 
 	// ---- end view event handlers
 
-	public _renderLines(viewportData: ViewportData): void {
+	public getStartLineNumber(): number {
+		return this._linesCollection.getStartLineNumber();
+	}
+
+	public getEndLineNumber(): number {
+		return this._linesCollection.getEndLineNumber();
+	}
+
+	public getVisibleLine(lineNumber: number): T {
+		return this._linesCollection.getLine(lineNumber);
+	}
+
+	public renderLines(viewportData: ViewportData): void {
 
 		let inp = this._linesCollection._get();
 
+		let renderer = new ViewLayerRenderer<T>(this.domNode.domNode, this._host, viewportData);
+
 		let ctx: IRendererContext<T> = {
-			domNode: this.domNode.domNode,
 			rendLineNumberStart: inp.rendLineNumberStart,
 			lines: inp.lines,
-			linesLength: inp.lines.length,
-			viewportData: viewportData
+			linesLength: inp.lines.length
 		};
 
 		// Decide if this render will do a single update (single large .innerHTML) or many updates (inserting/removing dom nodes)
-		let resCtx = this._renderer.renderWithManyUpdates(ctx, viewportData.startLineNumber, viewportData.endLineNumber, viewportData.relativeVerticalOffset);
+		let resCtx = renderer.render(ctx, viewportData.startLineNumber, viewportData.endLineNumber, viewportData.relativeVerticalOffset);
 
 		this._linesCollection._set(resCtx.rendLineNumberStart, resCtx.lines);
 	}
+}
 
-	private _createDomNode(): FastDomNode<HTMLElement> {
-		let domNode = createFastDomNode(document.createElement('div'));
-		domNode.setClassName('view-layer');
-		domNode.setPosition('absolute');
-		domNode.domNode.setAttribute('role', 'presentation');
-		domNode.domNode.setAttribute('aria-hidden', 'true');
-		return domNode;
-	}
-
-	protected abstract _createLine(): T;
+interface IRendererContext<T extends IVisibleLine> {
+	rendLineNumberStart: number;
+	lines: T[];
+	linesLength: number;
 }
 
 class ViewLayerRenderer<T extends IVisibleLine> {
 
-	private _createLine: () => T;
+	readonly domNode: HTMLElement;
+	readonly host: IVisibleLinesHost<T>;
+	readonly viewportData: ViewportData;
 
-	constructor(createLine: () => T) {
-		this._createLine = createLine;
+	constructor(domNode: HTMLElement, host: IVisibleLinesHost<T>, viewportData: ViewportData) {
+		this.domNode = domNode;
+		this.host = host;
+		this.viewportData = viewportData;
 	}
 
-	public renderWithManyUpdates(ctx: IRendererContext<T>, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext<T> {
-		return this._render(ctx, startLineNumber, stopLineNumber, deltaTop);
-	}
-
-	private _render(inContext: IRendererContext<T>, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext<T> {
+	public render(inContext: IRendererContext<T>, startLineNumber: number, stopLineNumber: number, deltaTop: number[]): IRendererContext<T> {
 
 		let ctx: IRendererContext<T> = {
-			domNode: inContext.domNode,
 			rendLineNumberStart: inContext.rendLineNumberStart,
 			lines: inContext.lines.slice(0),
-			linesLength: inContext.linesLength,
-			viewportData: inContext.viewportData,
+			linesLength: inContext.linesLength
 		};
 
 		if ((ctx.rendLineNumberStart + ctx.linesLength - 1 < startLineNumber) || (stopLineNumber < ctx.rendLineNumberStart)) {
@@ -392,7 +392,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 			ctx.linesLength = stopLineNumber - startLineNumber + 1;
 			ctx.lines = [];
 			for (let x = startLineNumber; x <= stopLineNumber; x++) {
-				ctx.lines[x - startLineNumber] = this._createLine();
+				ctx.lines[x - startLineNumber] = this.host.createVisibleLine();
 			}
 			this._finishRendering(ctx, true, deltaTop);
 			return ctx;
@@ -467,7 +467,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		let newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this._createLine();
+			newLines[newLinesLen++] = this.host.createVisibleLine();
 		}
 		ctx.lines = newLines.concat(ctx.lines);
 	}
@@ -476,7 +476,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		for (let i = 0; i < removeCount; i++) {
 			let lineDomNode = ctx.lines[i].getDomNode();
 			if (lineDomNode) {
-				ctx.domNode.removeChild(lineDomNode);
+				this.domNode.removeChild(lineDomNode);
 			}
 		}
 		ctx.lines.splice(0, removeCount);
@@ -486,7 +486,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		let newLines: T[] = [];
 		let newLinesLen = 0;
 		for (let lineNumber = fromLineNumber; lineNumber <= toLineNumber; lineNumber++) {
-			newLines[newLinesLen++] = this._createLine();
+			newLines[newLinesLen++] = this.host.createVisibleLine();
 		}
 		ctx.lines = ctx.lines.concat(newLines);
 	}
@@ -497,21 +497,21 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		for (let i = 0; i < removeCount; i++) {
 			let lineDomNode = ctx.lines[removeIndex + i].getDomNode();
 			if (lineDomNode) {
-				ctx.domNode.removeChild(lineDomNode);
+				this.domNode.removeChild(lineDomNode);
 			}
 		}
 		ctx.lines.splice(removeIndex, removeCount);
 	}
 
 	private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string[], wasNew: boolean[]): void {
-		let lastChild = <HTMLElement>ctx.domNode.lastChild;
+		let lastChild = <HTMLElement>this.domNode.lastChild;
 		if (domNodeIsEmpty || !lastChild) {
-			ctx.domNode.innerHTML = newLinesHTML.join('');
+			this.domNode.innerHTML = newLinesHTML.join('');
 		} else {
 			lastChild.insertAdjacentHTML('afterend', newLinesHTML.join(''));
 		}
 
-		let currChild = <HTMLElement>ctx.domNode.lastChild;
+		let currChild = <HTMLElement>this.domNode.lastChild;
 		for (let i = ctx.linesLength - 1; i >= 0; i--) {
 			let line = ctx.lines[i];
 			if (wasNew[i]) {
@@ -553,7 +553,7 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 			wasNew[i] = false;
 			wasInvalid[i] = false;
 
-			let renderResult = line.renderLine(lineNumber, deltaTop[i], ctx.viewportData);
+			let renderResult = line.renderLine(lineNumber, deltaTop[i], this.viewportData);
 
 			if (renderResult !== null) {
 				// Line needs rendering
@@ -581,4 +581,3 @@ class ViewLayerRenderer<T extends IVisibleLine> {
 		}
 	}
 }
-
diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts
index c20feb12cf6..512bd62f2ab 100644
--- a/src/vs/editor/browser/view/viewOverlays.ts
+++ b/src/vs/editor/browser/view/viewOverlays.ts
@@ -7,22 +7,28 @@
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IConfiguration } from 'vs/editor/common/editorCommon';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
-import { IVisibleLine, ViewLayer } from 'vs/editor/browser/view/viewLayer';
+import { IVisibleLine, VisibleLinesCollection, IVisibleLinesHost } from 'vs/editor/browser/view/viewLayer';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
+import { ViewPart } from 'vs/editor/browser/view/viewPart';
 
-export class ViewOverlays extends ViewLayer<ViewOverlayLine> {
+export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOverlayLine> {
 
+	private readonly _visibleLines: VisibleLinesCollection<ViewOverlayLine>;
+	protected readonly domNode: FastDomNode<HTMLElement>;
 	private _dynamicOverlays: DynamicViewOverlay[];
 	private _isFocused: boolean;
 
 	constructor(context: ViewContext) {
 		super(context);
 
+		this._visibleLines = new VisibleLinesCollection<ViewOverlayLine>(this);
+		this.domNode = this._visibleLines.domNode;
+
 		this._dynamicOverlays = [];
 		this._isFocused = false;
 
@@ -58,6 +64,14 @@ export class ViewOverlays extends ViewLayer<ViewOverlayLine> {
 		return this.domNode.domNode;
 	}
 
+	// ---- begin IVisibleLinesHost
+
+	public createVisibleLine(): ViewOverlayLine {
+		return new ViewOverlayLine(this._context.configuration, this._dynamicOverlays);
+	}
+
+	// ---- end IVisibleLinesHost
+
 	public addDynamicOverlay(overlay: DynamicViewOverlay): void {
 		this._dynamicOverlays.push(overlay);
 	}
@@ -65,29 +79,44 @@ export class ViewOverlays extends ViewLayer<ViewOverlayLine> {
 	// ----- event handlers
 
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
-		super.onConfigurationChanged(e);
-		let startLineNumber = this._linesCollection.getStartLineNumber();
-		let endLineNumber = this._linesCollection.getEndLineNumber();
+		this._visibleLines.onConfigurationChanged(e);
+		let startLineNumber = this._visibleLines.getStartLineNumber();
+		let endLineNumber = this._visibleLines.getEndLineNumber();
 		for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
-			let line = this._linesCollection.getLine(lineNumber);
+			let line = this._visibleLines.getVisibleLine(lineNumber);
 			line.onConfigurationChanged(e);
 		}
 		return true;
 	}
-
+	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
+		return this._visibleLines.onFlushed(e);
+	}
 	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this._isFocused = e.isFocused;
 		return true;
 	}
+	public onLinesChanged(e: viewEvents.ViewLinesChangedEvent): boolean {
+		return this._visibleLines.onLinesChanged(e);
+	}
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		return this._visibleLines.onLinesDeleted(e);
+	}
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		return this._visibleLines.onLinesInserted(e);
+	}
+	public onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
+		return this._visibleLines.onScrollChanged(e) || true;
+	}
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+		return this._visibleLines.onTokensChanged(e);
+	}
+	public onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
+		return this._visibleLines.onZonesChanged(e);
+	}
 
 	// ----- end event handlers
 
-	_createLine(): ViewOverlayLine {
-		return new ViewOverlayLine(this._context.configuration, this._dynamicOverlays);
-	}
-
-
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		let toRender = this._dynamicOverlays.filter(overlay => overlay.shouldRender());
 
 		for (let i = 0, len = toRender.length; i < len; i++) {
@@ -99,15 +128,15 @@ export class ViewOverlays extends ViewLayer<ViewOverlayLine> {
 		return null;
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		// Overwriting to bypass `shouldRender` flag
 		this._viewOverlaysRender(ctx);
 
 		this.domNode.toggleClassName('focused', this._isFocused);
 	}
 
-	_viewOverlaysRender(ctx: IRestrictedRenderingContext): void {
-		super._renderLines(ctx.viewportData);
+	_viewOverlaysRender(ctx: RestrictedRenderingContext): void {
+		this._visibleLines.renderLines(ctx.viewportData);
 	}
 }
 
@@ -201,7 +230,7 @@ export class ContentViewOverlays extends ViewOverlays {
 
 	// --- end event handlers
 
-	_viewOverlaysRender(ctx: IRestrictedRenderingContext): void {
+	_viewOverlaysRender(ctx: RestrictedRenderingContext): void {
 		super._viewOverlaysRender(ctx);
 
 		this.domNode.setWidth(Math.max(ctx.scrollWidth, this._contentWidth));
@@ -211,13 +240,11 @@ export class ContentViewOverlays extends ViewOverlays {
 export class MarginViewOverlays extends ViewOverlays {
 
 	private _contentLeft: number;
-	private _canUseTranslate3d: boolean;
 
 	constructor(context: ViewContext) {
 		super(context);
 
 		this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft;
-		this._canUseTranslate3d = this._context.configuration.editor.viewInfo.canUseTranslate3d;
 
 		this.domNode.setClassName(editorBrowser.ClassNames.MARGIN_VIEW_OVERLAYS);
 		this.domNode.setWidth(1);
@@ -231,10 +258,6 @@ export class MarginViewOverlays extends ViewOverlays {
 			Configuration.applyFontInfo(this.domNode, this._context.configuration.editor.fontInfo);
 			shouldRender = true;
 		}
-		if (e.viewInfo.canUseTranslate3d) {
-			this._canUseTranslate3d = this._context.configuration.editor.viewInfo.canUseTranslate3d;
-			shouldRender = true;
-		}
 		if (e.layoutInfo) {
 			this._contentLeft = this._context.configuration.editor.layoutInfo.contentLeft;
 			shouldRender = true;
@@ -246,7 +269,7 @@ export class MarginViewOverlays extends ViewOverlays {
 		return super.onScrollChanged(e) || e.scrollHeightChanged;
 	}
 
-	_viewOverlaysRender(ctx: IRestrictedRenderingContext): void {
+	_viewOverlaysRender(ctx: RestrictedRenderingContext): void {
 		super._viewOverlaysRender(ctx);
 		let height = Math.min(ctx.scrollHeight, 1000000);
 		this.domNode.setHeight(height);
diff --git a/src/vs/editor/browser/view/viewPart.ts b/src/vs/editor/browser/view/viewPart.ts
index 8ca7825c45b..6fddbabd064 100644
--- a/src/vs/editor/browser/view/viewPart.ts
+++ b/src/vs/editor/browser/view/viewPart.ts
@@ -6,7 +6,7 @@
 
 import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 
 export abstract class ViewPart extends ViewEventHandler {
 
@@ -23,8 +23,8 @@ export abstract class ViewPart extends ViewEventHandler {
 		this._context = null;
 	}
 
-	public abstract prepareRender(ctx: IRenderingContext): void;
-	public abstract render(ctx: IRestrictedRenderingContext): void;
+	public abstract prepareRender(ctx: RenderingContext): void;
+	public abstract render(ctx: RestrictedRenderingContext): void;
 }
 
 export const enum PartFingerprint {
diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
index 2984e2dd23b..0a7b9790bbb 100644
--- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
+++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
@@ -11,7 +11,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ClassNames, ContentWidgetPositionPreference, IContentWidget } from 'vs/editor/browser/editorBrowser';
 import { ViewPart, PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { VisibleRange, IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { Position } from 'vs/editor/common/core/position';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
@@ -45,6 +45,18 @@ interface IMyRenderData {
 	[id: string]: IMyWidgetRenderData;
 }
 
+class Coordinate {
+	_coordinateBrand: void;
+
+	public readonly top: number;
+	public readonly left: number;
+
+	constructor(top: number, left: number) {
+		this.top = top;
+		this.left = left;
+	}
+}
+
 export class ViewContentWidgets extends ViewPart {
 
 	private _widgets: IWidgetMap;
@@ -203,15 +215,15 @@ export class ViewContentWidgets extends ViewPart {
 		return false;
 	}
 
-	private _layoutBoxInViewport(visibleRange: VisibleRange, width: number, height: number, ctx: IRenderingContext): IBoxLayoutResult {
+	private _layoutBoxInViewport(topLeft: Coordinate, width: number, height: number, ctx: RenderingContext): IBoxLayoutResult {
 		// Our visible box is split horizontally by the current line => 2 boxes
 
 		// a) the box above the line
-		let aboveLineTop = visibleRange.top;
+		let aboveLineTop = topLeft.top;
 		let heightAboveLine = aboveLineTop;
 
 		// b) the box under the line
-		let underLineTop = visibleRange.top + this._lineHeight;
+		let underLineTop = topLeft.top + this._lineHeight;
 		let heightUnderLine = ctx.viewportHeight - underLineTop;
 
 		let aboveTop = aboveLineTop - height;
@@ -220,12 +232,12 @@ export class ViewContentWidgets extends ViewPart {
 		let fitsBelow = (heightUnderLine >= height);
 
 		// And its left
-		let actualLeft = visibleRange.left;
-		if (actualLeft + width > ctx.viewportLeft + ctx.viewportWidth) {
-			actualLeft = ctx.viewportLeft + ctx.viewportWidth - width;
+		let actualLeft = topLeft.left;
+		if (actualLeft + width > ctx.scrollLeft + ctx.viewportWidth) {
+			actualLeft = ctx.scrollLeft + ctx.viewportWidth - width;
 		}
-		if (actualLeft < ctx.viewportLeft) {
-			actualLeft = ctx.viewportLeft;
+		if (actualLeft < ctx.scrollLeft) {
+			actualLeft = ctx.scrollLeft;
 		}
 
 		return {
@@ -237,15 +249,15 @@ export class ViewContentWidgets extends ViewPart {
 		};
 	}
 
-	private _layoutBoxInPage(visibleRange: VisibleRange, width: number, height: number, ctx: IRenderingContext): IBoxLayoutResult {
-		let left0 = visibleRange.left - ctx.viewportLeft;
+	private _layoutBoxInPage(topLeft: Coordinate, width: number, height: number, ctx: RenderingContext): IBoxLayoutResult {
+		let left0 = topLeft.left - ctx.scrollLeft;
 
 		if (left0 + width < 0 || left0 > this._contentWidth) {
 			return null;
 		}
 
-		let aboveTop = visibleRange.top - height;
-		let belowTop = visibleRange.top + this._lineHeight;
+		let aboveTop = topLeft.top - height;
+		let belowTop = topLeft.top + this._lineHeight;
 		let left = left0 + this._contentLeft;
 
 		let domNodePosition = dom.getDomNodePagePosition(this._viewDomNode.domNode);
@@ -283,26 +295,30 @@ export class ViewContentWidgets extends ViewPart {
 		return { aboveTop, fitsAbove, belowTop, fitsBelow, left };
 	}
 
-	private _prepareRenderWidgetAtExactPosition(position: Position, ctx: IRenderingContext): IMyWidgetRenderData {
-		let visibleRange = ctx.visibleRangeForPosition(position);
-
-		if (!visibleRange) {
-			return null;
-		}
-
+	private _prepareRenderWidgetAtExactPosition(topLeft: Coordinate): IMyWidgetRenderData {
 		return {
-			top: visibleRange.top,
-			left: visibleRange.left
+			top: topLeft.top,
+			left: topLeft.left
 		};
 	}
 
-	private _prepareRenderWidgetAtExactPositionOverflowing(position: Position, ctx: IRenderingContext): IMyWidgetRenderData {
-		let r = this._prepareRenderWidgetAtExactPosition(position, ctx);
+	private _prepareRenderWidgetAtExactPositionOverflowing(topLeft: Coordinate): IMyWidgetRenderData {
+		let r = this._prepareRenderWidgetAtExactPosition(topLeft);
 		r.left += this._contentLeft;
 		return r;
 	}
 
-	private _prepareRenderWidget(widgetData: IWidgetData, ctx: IRenderingContext): IMyWidgetRenderData {
+	private _getTopLeft(ctx: RenderingContext, position: Position): Coordinate {
+		const visibleRange = ctx.visibleRangeForPosition(position);
+		if (!visibleRange) {
+			return null;
+		}
+
+		const top = ctx.getVerticalOffsetForLineNumber(position.lineNumber) - ctx.scrollTop;
+		return new Coordinate(top, visibleRange.left);
+	}
+
+	private _prepareRenderWidget(widgetData: IWidgetData, ctx: RenderingContext): IMyWidgetRenderData {
 		if (!widgetData.position || !widgetData.preference) {
 			return null;
 		}
@@ -323,8 +339,8 @@ export class ViewContentWidgets extends ViewPart {
 				return;
 			}
 
-			const visibleRange = ctx.visibleRangeForPosition(position);
-			if (!visibleRange) {
+			const topLeft = this._getTopLeft(ctx, position);
+			if (!topLeft) {
 				return null;
 			}
 
@@ -333,9 +349,9 @@ export class ViewContentWidgets extends ViewPart {
 			const height = domNode.clientHeight;
 
 			if (widgetData.allowEditorOverflow) {
-				placement = this._layoutBoxInPage(visibleRange, width, height, ctx);
+				placement = this._layoutBoxInPage(topLeft, width, height, ctx);
 			} else {
-				placement = this._layoutBoxInViewport(visibleRange, width, height, ctx);
+				placement = this._layoutBoxInViewport(topLeft, width, height, ctx);
 			}
 		};
 
@@ -368,18 +384,23 @@ export class ViewContentWidgets extends ViewPart {
 						};
 					}
 				} else {
+					const topLeft = this._getTopLeft(ctx, position);
+					if (!topLeft) {
+						// Widget outside of viewport
+						return null;
+					}
 					if (widgetData.allowEditorOverflow) {
-						return this._prepareRenderWidgetAtExactPositionOverflowing(position, ctx);
+						return this._prepareRenderWidgetAtExactPositionOverflowing(topLeft);
 					} else {
-						return this._prepareRenderWidgetAtExactPosition(position, ctx);
+						return this._prepareRenderWidgetAtExactPosition(topLeft);
 					}
 				}
 			}
 		}
-		return undefined;
+		return null;
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		let data: IMyRenderData = {};
 
 		let keys = Object.keys(this._widgets);
@@ -394,7 +415,7 @@ export class ViewContentWidgets extends ViewPart {
 		this._renderData = data;
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		let data = this._renderData;
 
 		let keys = Object.keys(this._widgets);
@@ -408,7 +429,7 @@ export class ViewContentWidgets extends ViewPart {
 					domNode.setTop(data[widgetId].top);
 					domNode.setLeft(data[widgetId].left);
 				} else {
-					domNode.setTop(data[widgetId].top + ctx.viewportTop - ctx.bigNumbersDelta);
+					domNode.setTop(data[widgetId].top + ctx.scrollTop - ctx.bigNumbersDelta);
 					domNode.setLeft(data[widgetId].left);
 				}
 				if (!widget.isVisible) {
diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
index 7df1084b4a5..d4b6062b155 100644
--- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
+++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./currentLineHighlight';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
@@ -100,7 +100,7 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
 	}
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		this._scrollWidth = ctx.scrollWidth;
 	}
 
diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts
index 33d6aa311f2..3aa633175fe 100644
--- a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts
+++ b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./currentLineMarginHighlight';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
@@ -79,7 +79,7 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
 	}
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 	}
 
 	public render(startLineNumber: number, lineNumber: number): string {
diff --git a/src/vs/editor/browser/viewParts/decorations/decorations.ts b/src/vs/editor/browser/viewParts/decorations/decorations.ts
index 396faea341b..9da39ab08dd 100644
--- a/src/vs/editor/browser/viewParts/decorations/decorations.ts
+++ b/src/vs/editor/browser/viewParts/decorations/decorations.ts
@@ -9,7 +9,7 @@ import 'vs/css!./decorations';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { Range } from 'vs/editor/common/core/range';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import { ViewModelDecoration } from 'vs/editor/common/viewModel/viewModel';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
@@ -74,7 +74,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 	}
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		let _decorations = ctx.getDecorationsInViewport();
 
 		// Keep only decorations with `className`
@@ -115,7 +115,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 		this._renderResult = output;
 	}
 
-	private _renderWholeLineDecorations(ctx: IRenderingContext, decorations: ViewModelDecoration[], output: string[]): void {
+	private _renderWholeLineDecorations(ctx: RenderingContext, decorations: ViewModelDecoration[], output: string[]): void {
 		let lineHeight = String(this._lineHeight);
 		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
 		let visibleEndLineNumber = ctx.visibleRange.endLineNumber;
@@ -144,7 +144,7 @@ export class DecorationsOverlay extends DynamicViewOverlay {
 		}
 	}
 
-	private _renderNormalDecorations(ctx: IRenderingContext, decorations: ViewModelDecoration[], output: string[]): void {
+	private _renderNormalDecorations(ctx: RenderingContext, decorations: ViewModelDecoration[], output: string[]): void {
 		let lineHeight = String(this._lineHeight);
 		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
 
diff --git a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
index 628d4c6135e..2559a7dd8fe 100644
--- a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
+++ b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts
@@ -14,7 +14,7 @@ import { ViewPart, PartFingerprint, PartFingerprints } from 'vs/editor/browser/v
 import { Scrollable } from 'vs/base/common/scrollable';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 
 export class EditorScrollbar extends ViewPart {
@@ -193,11 +193,11 @@ export class EditorScrollbar extends ViewPart {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to do
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		this.scrollbar.renderNow();
 	}
 }
diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 5e6b5e89351..a001ce2918b 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./glyphMargin';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class DecorationToRender {
@@ -148,7 +148,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
 
 	// --- end event handlers
 
-	protected _getDecorations(ctx: IRenderingContext): DecorationToRender[] {
+	protected _getDecorations(ctx: RenderingContext): DecorationToRender[] {
 		let decorations = ctx.getDecorationsInViewport();
 		let r: DecorationToRender[] = [];
 		for (let i = 0, len = decorations.length; i < len; i++) {
@@ -161,7 +161,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
 		return r;
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		if (!this._glyphMargin) {
 			this._renderResult = null;
 			return;
diff --git a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
index 9fe44920c81..5f0ec9e4e83 100644
--- a/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+++ b/src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./indentGuides';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class IndentGuidesOverlay extends DynamicViewOverlay {
@@ -71,7 +71,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		if (!this._enabled) {
 			this._renderResult = null;
 			return;
diff --git a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
index de888beca3c..17c9b91102a 100644
--- a/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
+++ b/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
@@ -10,7 +10,7 @@ import * as platform from 'vs/base/common/platform';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ClassNames } from 'vs/editor/browser/editorBrowser';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class LineNumbersOverlay extends DynamicViewOverlay {
@@ -95,7 +95,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		if (!this._renderLineNumbers) {
 			this._renderResult = null;
 			return;
diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.ts b/src/vs/editor/browser/viewParts/lines/viewLines.ts
index 27639a375e5..1358ffc1b44 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLines.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLines.ts
@@ -11,24 +11,22 @@ import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ClassNames } from 'vs/editor/browser/editorBrowser';
-import { ViewLayer } from 'vs/editor/browser/view/viewLayer';
+import { VisibleLinesCollection, IVisibleLinesHost } from 'vs/editor/browser/view/viewLayer';
 import { ViewLineOptions, DomReadingContext, ViewLine } from 'vs/editor/browser/viewParts/lines/viewLine';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
 import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
-import { IViewLines, VisibleRange, LineVisibleRanges } from 'vs/editor/common/view/renderingContext';
+import { IViewLines, HorizontalRange, LineVisibleRanges } from 'vs/editor/common/view/renderingContext';
 import { IViewLayout } from 'vs/editor/common/viewModel/viewModel';
-import { PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
+import { ViewPart, PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 class LastRenderedData {
 
 	private _currentVisibleRange: Range;
-	private _bigNumbersDelta: number;
 
 	constructor() {
 		this._currentVisibleRange = new Range(1, 1, 1, 1);
-		this._bigNumbersDelta = 0;
 	}
 
 	public getCurrentVisibleRange(): Range {
@@ -38,17 +36,9 @@ class LastRenderedData {
 	public setCurrentVisibleRange(currentVisibleRange: Range): void {
 		this._currentVisibleRange = currentVisibleRange;
 	}
-
-	public getBigNumbersDelta(): number {
-		return this._bigNumbersDelta;
-	}
-
-	public setBigNumbersDelta(bigNumbersDelta: number): void {
-		this._bigNumbersDelta = bigNumbersDelta;
-	}
 }
 
-export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
+export class ViewLines extends ViewPart implements IVisibleLinesHost<ViewLine>, IViewLines {
 	/**
 	 * Width to extends a line to render the line feed at the end of the line
 	 */
@@ -58,9 +48,11 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 	 */
 	private static HORIZONTAL_EXTRA_PX = 30;
 
-	private _linesContent: FastDomNode<HTMLElement>;
-	private _viewLayout: IViewLayout;
-	private _textRangeRestingSpot: HTMLElement;
+	private readonly _linesContent: FastDomNode<HTMLElement>;
+	private readonly _viewLayout: IViewLayout;
+	private readonly _textRangeRestingSpot: HTMLElement;
+	private readonly _visibleLines: VisibleLinesCollection<ViewLine>;
+	private readonly domNode: FastDomNode<HTMLElement>;
 
 	// --- config
 	private _lineHeight: number;
@@ -79,12 +71,16 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 	constructor(context: ViewContext, linesContent: FastDomNode<HTMLElement>, viewLayout: IViewLayout) {
 		super(context);
 		this._linesContent = linesContent;
+		this._viewLayout = viewLayout;
+		this._textRangeRestingSpot = document.createElement('div');
+		this._visibleLines = new VisibleLinesCollection(this);
+		this.domNode = this._visibleLines.domNode;
+
 		this._lineHeight = this._context.configuration.editor.lineHeight;
 		this._isViewportWrapping = this._context.configuration.editor.wrappingInfo.isViewportWrapping;
 		this._revealHorizontalRightPadding = this._context.configuration.editor.viewInfo.revealHorizontalRightPadding;
 		this._canUseTranslate3d = this._context.configuration.editor.viewInfo.canUseTranslate3d;
 		this._viewLineOptions = new ViewLineOptions(this._context.configuration);
-		this._viewLayout = viewLayout;
 
 		PartFingerprints.write(this.domNode.domNode, PartFingerprint.ViewLines);
 		this.domNode.setClassName(ClassNames.VIEW_LINES);
@@ -99,13 +95,10 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		this._lastRenderedData = new LastRenderedData();
 
 		this._lastCursorRevealRangeHorizontallyEvent = null;
-		this._textRangeRestingSpot = document.createElement('div');
-		this._textRangeRestingSpot.className = 'textRangeRestingSpot';
 	}
 
 	public dispose(): void {
 		this._asyncUpdateLineWidths.dispose();
-		this._viewLayout = null;
 		super.dispose();
 	}
 
@@ -113,10 +106,18 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		return this.domNode.domNode;
 	}
 
+	// ---- begin IVisibleLinesHost
+
+	public createVisibleLine(): ViewLine {
+		return new ViewLine(this._viewLineOptions);
+	}
+
+	// ---- end IVisibleLinesHost
+
 	// ---- begin view event handlers
 
 	public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
-		super.onConfigurationChanged(e);
+		this._visibleLines.onConfigurationChanged(e);
 		if (e.wrappingInfo) {
 			this._maxLineWidth = 0;
 		}
@@ -141,10 +142,10 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		if (!this._viewLineOptions.equals(newViewLineOptions)) {
 			this._viewLineOptions = newViewLineOptions;
 
-			let startLineNumber = this._linesCollection.getStartLineNumber();
-			let endLineNumber = this._linesCollection.getEndLineNumber();
+			let startLineNumber = this._visibleLines.getStartLineNumber();
+			let endLineNumber = this._visibleLines.getEndLineNumber();
 			for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
-				let line = this._linesCollection.getLine(lineNumber);
+				let line = this._visibleLines.getVisibleLine(lineNumber);
 				line.onOptionsChanged(this._viewLineOptions);
 			}
 		}
@@ -156,21 +157,29 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		return true;
 	}
 	public onDecorationsChanged(e: viewEvents.ViewDecorationsChangedEvent): boolean {
-		let shouldRender = super.onDecorationsChanged(e);
 		if (true/*e.inlineDecorationsChanged*/) {
-			let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-			let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+			let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+			let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 			for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
-				this._linesCollection.getLine(lineNumber).onDecorationsChanged();
+				this._visibleLines.getVisibleLine(lineNumber).onDecorationsChanged();
 			}
 		}
-		return shouldRender || true;
+		return true;
 	}
 	public onFlushed(e: viewEvents.ViewFlushedEvent): boolean {
-		let shouldRender = super.onFlushed(e);
+		let shouldRender = this._visibleLines.onFlushed(e);
 		this._maxLineWidth = 0;
 		return shouldRender;
 	}
+	public onLinesChanged(e: viewEvents.ViewLinesChangedEvent): boolean {
+		return this._visibleLines.onLinesChanged(e);
+	}
+	public onLinesDeleted(e: viewEvents.ViewLinesDeletedEvent): boolean {
+		return this._visibleLines.onLinesDeleted(e);
+	}
+	public onLinesInserted(e: viewEvents.ViewLinesInsertedEvent): boolean {
+		return this._visibleLines.onLinesInserted(e);
+	}
 	public onRevealRangeRequest(e: viewEvents.ViewRevealRangeRequestEvent): boolean {
 		let newScrollTop = this._computeScrollTopToRevealRange(this._viewLayout.getCurrentViewport(), e.range, e.verticalType);
 
@@ -186,7 +195,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 	}
 	public onScrollChanged(e: viewEvents.ViewScrollChangedEvent): boolean {
 		this.domNode.setWidth(e.scrollWidth);
-		return super.onScrollChanged(e) || true;
+		return this._visibleLines.onScrollChanged(e) || true;
 	}
 	public onScrollRequest(e: viewEvents.ViewScrollRequestEvent): boolean {
 		let currentScrollTop = this._viewLayout.getScrollTop();
@@ -196,6 +205,12 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		});
 		return true;
 	}
+	public onTokensChanged(e: viewEvents.ViewTokensChangedEvent): boolean {
+		return this._visibleLines.onTokensChanged(e);
+	}
+	public onZonesChanged(e: viewEvents.ViewZonesChangedEvent): boolean {
+		return this._visibleLines.onZonesChanged(e);
+	}
 
 	// ---- end view event handlers
 
@@ -224,14 +239,14 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 			return new Position(lineNumber, 1);
 		}
 
-		let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-		let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+		let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 		if (lineNumber < rendStartLineNumber || lineNumber > rendEndLineNumber) {
 			// Couldn't find line
 			return null;
 		}
 
-		let column = this._linesCollection.getLine(lineNumber).getColumnOfNodeOffset(lineNumber, spanNode, offset);
+		let column = this._visibleLines.getVisibleLine(lineNumber).getColumnOfNodeOffset(lineNumber, spanNode, offset);
 		let minColumn = this._context.model.getLineMinColumn(lineNumber);
 		if (column < minColumn) {
 			column = minColumn;
@@ -253,28 +268,26 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 	 * @returns the line number of this view line dom node.
 	 */
 	private _getLineNumberFor(domNode: HTMLElement): number {
-		const inp = this._linesCollection._get();
-		const rendLineNumberStart = inp.rendLineNumberStart;
-		const lines = inp.lines;
-
-		for (let i = 0; i < lines.length; i++) {
-			let lineDomNode = lines[i].getDomNode();
-			if (domNode === lineDomNode) {
-				return rendLineNumberStart + i;
+		let startLineNumber = this._visibleLines.getStartLineNumber();
+		let endLineNumber = this._visibleLines.getEndLineNumber();
+		for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
+			let line = this._visibleLines.getVisibleLine(lineNumber);
+			if (domNode === line.getDomNode()) {
+				return lineNumber;
 			}
 		}
 		return -1;
 	}
 
 	public getLineWidth(lineNumber: number): number {
-		let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-		let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+		let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 		if (lineNumber < rendStartLineNumber || lineNumber > rendEndLineNumber) {
 			// Couldn't find line
 			return -1;
 		}
 
-		return this._linesCollection.getLine(lineNumber).getWidth();
+		return this._visibleLines.getVisibleLine(lineNumber).getWidth();
 	}
 
 	public linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] {
@@ -298,8 +311,8 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 			nextLineModelLineNumber = this._context.model.coordinatesConverter.convertViewPositionToModelPosition(new Position(range.startLineNumber, 1)).lineNumber;
 		}
 
-		let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-		let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+		let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 		for (let lineNumber = range.startLineNumber; lineNumber <= range.endLineNumber; lineNumber++) {
 
 			if (lineNumber < rendStartLineNumber || lineNumber > rendEndLineNumber) {
@@ -308,7 +321,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 
 			let startColumn = lineNumber === range.startLineNumber ? range.startColumn : 1;
 			let endColumn = lineNumber === range.endLineNumber ? range.endColumn : this._context.model.getLineMaxColumn(lineNumber);
-			let visibleRangesForLine = this._linesCollection.getLine(lineNumber).getVisibleRangesForRange(startColumn, endColumn, domReadingContext);
+			let visibleRangesForLine = this._visibleLines.getVisibleLine(lineNumber).getVisibleRangesForRange(startColumn, endColumn, domReadingContext);
 
 			if (!visibleRangesForLine || visibleRangesForLine.length === 0) {
 				continue;
@@ -333,7 +346,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		return visibleRanges;
 	}
 
-	public visibleRangesForRange2(range: Range, deltaTop: number): VisibleRange[] {
+	public visibleRangesForRange2(range: Range): HorizontalRange[] {
 
 		if (this.shouldRender()) {
 			// Cannot read from the DOM because it is dirty
@@ -346,12 +359,11 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 			return null;
 		}
 
-		let result: VisibleRange[] = [];
+		let result: HorizontalRange[] = [];
 		let domReadingContext = new DomReadingContext(this.domNode.domNode, this._textRangeRestingSpot);
-		let bigNumbersDelta = this._lastRenderedData.getBigNumbersDelta();
 
-		let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-		let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+		let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 		for (let lineNumber = range.startLineNumber; lineNumber <= range.endLineNumber; lineNumber++) {
 
 			if (lineNumber < rendStartLineNumber || lineNumber > rendEndLineNumber) {
@@ -360,16 +372,13 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 
 			let startColumn = lineNumber === range.startLineNumber ? range.startColumn : 1;
 			let endColumn = lineNumber === range.endLineNumber ? range.endColumn : this._context.model.getLineMaxColumn(lineNumber);
-			let visibleRangesForLine = this._linesCollection.getLine(lineNumber).getVisibleRangesForRange(startColumn, endColumn, domReadingContext);
+			let visibleRangesForLine = this._visibleLines.getVisibleLine(lineNumber).getVisibleRangesForRange(startColumn, endColumn, domReadingContext);
 
 			if (!visibleRangesForLine || visibleRangesForLine.length === 0) {
 				continue;
 			}
 
-			let adjustedLineNumberVerticalOffset = this._viewLayout.getVerticalOffsetForLineNumber(lineNumber) - bigNumbersDelta + deltaTop;
-			for (let i = 0, len = visibleRangesForLine.length; i < len; i++) {
-				result.push(new VisibleRange(adjustedLineNumberVerticalOffset, visibleRangesForLine[i].left, visibleRangesForLine[i].width));
-			}
+			result = result.concat(visibleRangesForLine);
 		}
 
 		if (result.length === 0) {
@@ -381,17 +390,13 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 
 	// --- implementation
 
-	protected _createLine(): ViewLine {
-		return new ViewLine(this._viewLineOptions);
-	}
-
 	private _updateLineWidths(): void {
-		let rendStartLineNumber = this._linesCollection.getStartLineNumber();
-		let rendEndLineNumber = this._linesCollection.getEndLineNumber();
+		let rendStartLineNumber = this._visibleLines.getStartLineNumber();
+		let rendEndLineNumber = this._visibleLines.getEndLineNumber();
 
 		let localMaxLineWidth = 1;
 		for (let lineNumber = rendStartLineNumber; lineNumber <= rendEndLineNumber; lineNumber++) {
-			let widthInPx = this._linesCollection.getLine(lineNumber).getWidth();
+			let widthInPx = this._visibleLines.getVisibleLine(lineNumber).getWidth();
 			localMaxLineWidth = Math.max(localMaxLineWidth, widthInPx);
 		}
 
@@ -413,8 +418,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 
 	public renderText(viewportData: ViewportData, onAfterLinesRendered: () => void): void {
 		// (1) render lines - ensures lines are in the DOM
-		super._renderLines(viewportData);
-		this._lastRenderedData.setBigNumbersDelta(viewportData.bigNumbersDelta);
+		this._visibleLines.renderLines(viewportData);
 		this._lastRenderedData.setCurrentVisibleRange(viewportData.visibleRange);
 		this.domNode.setWidth(this._viewLayout.getScrollWidth());
 		this.domNode.setHeight(Math.min(this._viewLayout.getScrollHeight(), 1000000));
@@ -448,14 +452,15 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		}
 
 		// (4) handle scrolling
+		const adjustedScrollTop = this._viewLayout.getScrollTop() - viewportData.bigNumbersDelta;
 		if (this._canUseTranslate3d) {
-			let transform = 'translate3d(' + -this._viewLayout.getScrollLeft() + 'px, ' + viewportData.visibleRangesDeltaTop + 'px, 0px)';
+			let transform = 'translate3d(' + -this._viewLayout.getScrollLeft() + 'px, ' + -adjustedScrollTop + 'px, 0px)';
 			this._linesContent.setTransform(transform);
 			this._linesContent.setTop(0);
 			this._linesContent.setLeft(0);
 		} else {
 			this._linesContent.setTransform('');
-			this._linesContent.setTop(viewportData.visibleRangesDeltaTop);
+			this._linesContent.setTop(-adjustedScrollTop);
 			this._linesContent.setLeft(-this._viewLayout.getScrollLeft());
 		}
 
@@ -522,7 +527,7 @@ export class ViewLines extends ViewLayer<ViewLine> implements IViewLines {
 		let viewportStartX = viewport.left;
 		let viewportEndX = viewportStartX + viewport.width;
 
-		let visibleRanges = this.visibleRangesForRange2(range, 0);
+		let visibleRanges = this.visibleRangesForRange2(range);
 		let boxStartX = Number.MAX_VALUE;
 		let boxEndX = 0;
 
diff --git a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
index ac085645d12..fde8b9c35f9 100644
--- a/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
+++ b/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./linesDecorations';
 import { DecorationToRender, DedupOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class LinesDecorationsOverlay extends DedupOverlay {
@@ -76,7 +76,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 
 	// --- end event handlers
 
-	protected _getDecorations(ctx: IRenderingContext): DecorationToRender[] {
+	protected _getDecorations(ctx: RenderingContext): DecorationToRender[] {
 		let decorations = ctx.getDecorationsInViewport();
 		let r: DecorationToRender[] = [];
 		for (let i = 0, len = decorations.length; i < len; i++) {
@@ -89,7 +89,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
 		return r;
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
 		let visibleEndLineNumber = ctx.visibleRange.endLineNumber;
 		let toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx));
diff --git a/src/vs/editor/browser/viewParts/margin/margin.ts b/src/vs/editor/browser/viewParts/margin/margin.ts
index c257b3f3d69..6df70992127 100644
--- a/src/vs/editor/browser/viewParts/margin/margin.ts
+++ b/src/vs/editor/browser/viewParts/margin/margin.ts
@@ -9,7 +9,7 @@ import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { ClassNames } from 'vs/editor/browser/editorBrowser';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class Margin extends ViewPart {
@@ -73,18 +73,19 @@ export class Margin extends ViewPart {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
+		const adjustedScrollTop = ctx.scrollTop - ctx.bigNumbersDelta;
 		if (this._canUseTranslate3d) {
-			let transform = 'translate3d(0px, ' + ctx.viewportData.visibleRangesDeltaTop + 'px, 0px)';
+			let transform = 'translate3d(0px, ' + -adjustedScrollTop + 'px, 0px)';
 			this._domNode.setTransform(transform);
 			this._domNode.setTop(0);
 		} else {
 			this._domNode.setTransform('');
-			this._domNode.setTop(ctx.viewportData.visibleRangesDeltaTop);
+			this._domNode.setTop(-adjustedScrollTop);
 		}
 
 		let height = Math.min(ctx.scrollHeight, 1000000);
diff --git a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
index 40e052a75ef..0d23343ce16 100644
--- a/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
+++ b/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./marginDecorations';
 import { DecorationToRender, DedupOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class MarginViewLineDecorationsOverlay extends DedupOverlay {
@@ -66,7 +66,7 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 
 	// --- end event handlers
 
-	protected _getDecorations(ctx: IRenderingContext): DecorationToRender[] {
+	protected _getDecorations(ctx: RenderingContext): DecorationToRender[] {
 		let decorations = ctx.getDecorationsInViewport();
 		let r: DecorationToRender[] = [];
 		for (let i = 0, len = decorations.length; i < len; i++) {
@@ -79,7 +79,7 @@ export class MarginViewLineDecorationsOverlay extends DedupOverlay {
 		return r;
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
 		let visibleEndLineNumber = ctx.visibleRange.endLineNumber;
 		let toRender = this._render(visibleStartLineNumber, visibleEndLineNumber, this._getDecorations(ctx));
diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts
index 353fa64d8af..f8ce4c5d8a4 100644
--- a/src/vs/editor/browser/viewParts/minimap/minimap.ts
+++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./minimap';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { getOrCreateMinimapCharRenderer } from 'vs/editor/common/view/runtimeMinimapCharRenderer';
 import * as browser from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
@@ -635,17 +635,17 @@ export class Minimap extends ViewPart {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(renderingCtx: IRestrictedRenderingContext): void {
+	public render(renderingCtx: RestrictedRenderingContext): void {
 		const renderMinimap = this._options.renderMinimap;
 		if (renderMinimap === RenderMinimap.None) {
 			this._shadow.setClassName('minimap-shadow-hidden');
 			return;
 		}
-		if (renderingCtx.viewportLeft + renderingCtx.viewportWidth >= renderingCtx.scrollWidth) {
+		if (renderingCtx.scrollLeft + renderingCtx.viewportWidth >= renderingCtx.scrollWidth) {
 			this._shadow.setClassName('minimap-shadow-hidden');
 		} else {
 			this._shadow.setClassName('minimap-shadow-visible');
diff --git a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
index f2945fb7eef..bd027f2a292 100644
--- a/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
+++ b/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.ts
@@ -10,7 +10,7 @@ import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { ClassNames, IOverlayWidget, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
 import { ViewPart, PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 interface IWidgetData {
@@ -136,11 +136,11 @@ export class ViewOverlayWidgets extends ViewPart {
 		}
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		this._domNode.setWidth(this._editorWidth);
 
 		let keys = Object.keys(this._widgets);
diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
index 78dc8b94828..e4bffde1dfe 100644
--- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
+++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts
@@ -9,7 +9,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { OverviewRulerImpl } from 'vs/editor/browser/viewParts/overviewRuler/overviewRulerImpl';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { Position } from 'vs/editor/common/core/position';
 import { TokenizationRegistry } from 'vs/editor/common/modes';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -201,11 +201,11 @@ export class DecorationsOverviewRuler extends ViewPart {
 		return zones;
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		if (this._shouldUpdateDecorations || this._shouldUpdateCursorPosition) {
 
 			if (this._shouldUpdateDecorations) {
diff --git a/src/vs/editor/browser/viewParts/rulers/rulers.ts b/src/vs/editor/browser/viewParts/rulers/rulers.ts
index 6c749b9dba7..4138a4fbe4c 100644
--- a/src/vs/editor/browser/viewParts/rulers/rulers.ts
+++ b/src/vs/editor/browser/viewParts/rulers/rulers.ts
@@ -9,7 +9,7 @@ import 'vs/css!./rulers';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class Rulers extends ViewPart {
@@ -51,7 +51,7 @@ export class Rulers extends ViewPart {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
@@ -85,7 +85,7 @@ export class Rulers extends ViewPart {
 		}
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 
 		this._ensureRulersCount();
 
diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
index 6ee02a0a96c..d545f1581a7 100644
--- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
+++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
@@ -10,7 +10,7 @@ import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { ClassNames } from 'vs/editor/browser/editorBrowser';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export class ScrollDecorationViewPart extends ViewPart {
@@ -74,11 +74,11 @@ export class ScrollDecorationViewPart extends ViewPart {
 
 	// --- end event handlers
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		this._domNode.setWidth(this._width);
 		this._domNode.setClassName(this._shouldShow ? ClassNames.SCROLL_DECORATION : '');
 	}
diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts
index 8cbdf933fdb..0b6d414c483 100644
--- a/src/vs/editor/browser/viewParts/selections/selections.ts
+++ b/src/vs/editor/browser/viewParts/selections/selections.ts
@@ -8,7 +8,7 @@
 import 'vs/css!./selections';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { HorizontalRange, LineVisibleRanges, IRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { HorizontalRange, LineVisibleRanges, RenderingContext } from 'vs/editor/common/view/renderingContext';
 import { Range } from 'vs/editor/common/core/range';
 import * as browser from 'vs/base/browser/browser';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
@@ -250,7 +250,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 		}
 	}
 
-	private _getVisibleRangesWithStyle(selection: Range, ctx: IRenderingContext, previousFrame: LineVisibleRangesWithStyle[]): LineVisibleRangesWithStyle[] {
+	private _getVisibleRangesWithStyle(selection: Range, ctx: RenderingContext, previousFrame: LineVisibleRangesWithStyle[]): LineVisibleRangesWithStyle[] {
 		let _linesVisibleRanges = ctx.linesVisibleRangesForRange(selection, true) || [];
 		let linesVisibleRanges = _linesVisibleRanges.map(toStyled);
 		let visibleRangesHaveGaps = this._visibleRangesHaveGaps(linesVisibleRanges);
@@ -358,7 +358,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
 	}
 
 	private _previousFrameVisibleRangesWithStyle: LineVisibleRangesWithStyle[][] = [];
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 
 		let output: string[] = [];
 		let visibleStartLineNumber = ctx.visibleRange.startLineNumber;
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
index 6f886d10ec4..4aa77865ae1 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
@@ -10,19 +10,18 @@ import { Range } from 'vs/editor/common/core/range';
 import { TextEditorCursorStyle } from 'vs/editor/common/editorCommon';
 import { Configuration } from 'vs/editor/browser/config/configuration';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
 export interface IViewCursorRenderData {
 	domNode: HTMLElement;
 	position: Position;
-	contentTop: number;
 	contentLeft: number;
 	width: number;
 	height: number;
 }
 
-export class ViewCursorRenderData {
+class ViewCursorRenderData {
 	public readonly top: number;
 	public readonly left: number;
 	public readonly width: number;
@@ -137,9 +136,9 @@ export class ViewCursor {
 		return true;
 	}
 
-	private _prepareRender(ctx: IRenderingContext): ViewCursorRenderData {
+	private _prepareRender(ctx: RenderingContext): ViewCursorRenderData {
 		if (this._cursorStyle === TextEditorCursorStyle.Line || this._cursorStyle === TextEditorCursorStyle.LineThin) {
-			let visibleRange = ctx.visibleRangeForPosition(this._position);
+			const visibleRange = ctx.visibleRangeForPosition(this._position);
 			if (!visibleRange) {
 				// Outside viewport
 				return null;
@@ -150,34 +149,35 @@ export class ViewCursor {
 			} else {
 				width = 1;
 			}
-			return new ViewCursorRenderData(visibleRange.top, visibleRange.left, width, '');
+			const top = ctx.getVerticalOffsetForLineNumber(this._position.lineNumber) - ctx.bigNumbersDelta;
+			return new ViewCursorRenderData(top, visibleRange.left, width, '');
 		}
 
-		let visibleRangeForCharacter = ctx.linesVisibleRangesForRange(new Range(this._position.lineNumber, this._position.column, this._position.lineNumber, this._position.column + 1), false);
+		const visibleRangeForCharacter = ctx.linesVisibleRangesForRange(new Range(this._position.lineNumber, this._position.column, this._position.lineNumber, this._position.column + 1), false);
 
 		if (!visibleRangeForCharacter || visibleRangeForCharacter.length === 0 || visibleRangeForCharacter[0].ranges.length === 0) {
 			// Outside viewport
 			return null;
 		}
 
-		let range = visibleRangeForCharacter[0].ranges[0];
-		let top = ctx.getViewportVerticalOffsetForLineNumber(this._position.lineNumber);
-		let width = range.width < 1 ? this._typicalHalfwidthCharacterWidth : range.width;
+		const range = visibleRangeForCharacter[0].ranges[0];
+		const width = range.width < 1 ? this._typicalHalfwidthCharacterWidth : range.width;
 
 		let textContent = '';
 		if (this._cursorStyle === TextEditorCursorStyle.Block) {
-			let lineContent = this._context.model.getLineContent(this._position.lineNumber);
+			const lineContent = this._context.model.getLineContent(this._position.lineNumber);
 			textContent = lineContent.charAt(this._position.column - 1);
 		}
 
+		const top = ctx.getVerticalOffsetForLineNumber(this._position.lineNumber) - ctx.bigNumbersDelta;
 		return new ViewCursorRenderData(top, range.left, width, textContent);
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		this._renderData = this._prepareRender(ctx);
 	}
 
-	public render(ctx: IRestrictedRenderingContext): IViewCursorRenderData {
+	public render(ctx: RestrictedRenderingContext): IViewCursorRenderData {
 		if (!this._renderData) {
 			this._domNode.setDisplay('none');
 			return null;
@@ -188,9 +188,8 @@ export class ViewCursor {
 			this._domNode.domNode.textContent = this._lastRenderedContent;
 		}
 
-		let top = this._renderData.top + ctx.viewportTop - ctx.bigNumbersDelta;
 		this._domNode.setDisplay('block');
-		this._domNode.setTop(top);
+		this._domNode.setTop(this._renderData.top);
 		this._domNode.setLeft(this._renderData.left);
 		this._domNode.setWidth(this._renderData.width);
 		this._domNode.setLineHeight(this._lineHeight);
@@ -199,7 +198,6 @@ export class ViewCursor {
 		return {
 			domNode: this._domNode.domNode,
 			position: this._position,
-			contentTop: top,
 			contentLeft: this._renderData.left,
 			height: this._lineHeight,
 			width: 2
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
index 5e7986590fd..cea3167fb06 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
@@ -12,7 +12,7 @@ import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { Position } from 'vs/editor/common/core/position';
 import { IViewCursorRenderData, ViewCursor } from 'vs/editor/browser/viewParts/viewCursors/viewCursor';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { TimeoutTimer } from 'vs/base/common/async';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
@@ -304,14 +304,14 @@ export class ViewCursors extends ViewPart {
 
 	// ---- IViewPart implementation
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		this._primaryCursor.prepareRender(ctx);
 		for (let i = 0, len = this._secondaryCursors.length; i < len; i++) {
 			this._secondaryCursors[i].prepareRender(ctx);
 		}
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		this._renderData = [];
 		this._renderData.push(this._primaryCursor.render(ctx));
 		for (let i = 0, len = this._secondaryCursors.length; i < len; i++) {
diff --git a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
index 03227ded71e..c97cf31a622 100644
--- a/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
+++ b/src/vs/editor/browser/viewParts/viewZones/viewZones.ts
@@ -11,7 +11,7 @@ import { ClassNames, IViewZone } from 'vs/editor/browser/editorBrowser';
 import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { ViewContext } from 'vs/editor/common/view/viewContext';
 import { Position } from 'vs/editor/common/core/position';
-import { IRenderingContext, IRestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
+import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
 import { IViewLayout } from 'vs/editor/common/viewModel/viewModel';
 import * as viewEvents from 'vs/editor/common/view/viewEvents';
 
@@ -299,11 +299,11 @@ export class ViewZones extends ViewPart {
 		}
 	}
 
-	public prepareRender(ctx: IRenderingContext): void {
+	public prepareRender(ctx: RenderingContext): void {
 		// Nothing to read
 	}
 
-	public render(ctx: IRestrictedRenderingContext): void {
+	public render(ctx: RestrictedRenderingContext): void {
 		let visibleWhitespaces = this._viewLayout.getWhitespaceViewportData();
 		let visibleZones: { [id: string]: editorCommon.IViewWhitespaceViewportData; } = {};
 
diff --git a/src/vs/editor/common/view/renderingContext.ts b/src/vs/editor/common/view/renderingContext.ts
index 18e48e07744..7cf5fb63924 100644
--- a/src/vs/editor/common/view/renderingContext.ts
+++ b/src/vs/editor/common/view/renderingContext.ts
@@ -11,12 +11,11 @@ import { Position } from 'vs/editor/common/core/position';
 
 export interface IViewLines {
 	linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[];
-	visibleRangesForRange2(range: Range, deltaTop: number): VisibleRange[];
+	visibleRangesForRange2(range: Range): HorizontalRange[];
 }
 
-export class RenderingContext implements IRenderingContext {
-
-	_renderingContextBrand: void;
+export abstract class RestrictedRenderingContext {
+	_restrictedRenderingContextBrand: void;
 
 	public readonly viewportData: ViewportData;
 
@@ -26,16 +25,15 @@ export class RenderingContext implements IRenderingContext {
 	public readonly visibleRange: Range;
 	public readonly bigNumbersDelta: number;
 
-	public readonly viewportTop: number;
+	public readonly scrollTop: number;
+	public readonly scrollLeft: number;
+
 	public readonly viewportWidth: number;
 	public readonly viewportHeight: number;
-	public readonly viewportLeft: number;
 
 	private readonly _viewLayout: IViewLayout;
-	private readonly _viewLines: IViewLines;
 
-	constructor(viewLines: IViewLines, viewLayout: IViewLayout, viewportData: ViewportData) {
-		this._viewLines = viewLines;
+	constructor(viewLayout: IViewLayout, viewportData: ViewportData) {
 		this._viewLayout = viewLayout;
 		this.viewportData = viewportData;
 
@@ -46,26 +44,24 @@ export class RenderingContext implements IRenderingContext {
 		this.bigNumbersDelta = this.viewportData.bigNumbersDelta;
 
 		const vInfo = this._viewLayout.getCurrentViewport();
+		this.scrollTop = vInfo.top;
+		this.scrollLeft = vInfo.left;
 		this.viewportWidth = vInfo.width;
 		this.viewportHeight = vInfo.height;
-		this.viewportLeft = vInfo.left;
-		this.viewportTop = vInfo.top;
 	}
 
 	public getScrolledTopFromAbsoluteTop(absoluteTop: number): number {
-		return this._viewLayout.getScrolledTopFromAbsoluteTop(absoluteTop);
+		return absoluteTop - this.scrollTop;
 	}
 
-	public getViewportVerticalOffsetForLineNumber(lineNumber: number): number {
-		const verticalOffset = this._viewLayout.getVerticalOffsetForLineNumber(lineNumber);
-		const scrolledTop = this._viewLayout.getScrolledTopFromAbsoluteTop(verticalOffset);
-		return scrolledTop;
+	public getVerticalOffsetForLineNumber(lineNumber: number): number {
+		return this._viewLayout.getVerticalOffsetForLineNumber(lineNumber);
 	}
 
 	public lineIsVisible(lineNumber: number): boolean {
 		return (
-			this.viewportData.visibleRange.startLineNumber <= lineNumber
-			&& lineNumber <= this.viewportData.visibleRange.endLineNumber
+			this.visibleRange.startLineNumber <= lineNumber
+			&& lineNumber <= this.visibleRange.endLineNumber
 		);
 	}
 
@@ -73,15 +69,25 @@ export class RenderingContext implements IRenderingContext {
 		return this.viewportData.getDecorationsInViewport();
 	}
 
+}
+
+export class RenderingContext extends RestrictedRenderingContext {
+	_renderingContextBrand: void;
+
+	private readonly _viewLines: IViewLines;
+
+	constructor(viewLayout: IViewLayout, viewportData: ViewportData, viewLines: IViewLines) {
+		super(viewLayout, viewportData);
+		this._viewLines = viewLines;
+	}
+
 	public linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[] {
 		return this._viewLines.linesVisibleRangesForRange(range, includeNewLines);
 	}
 
-	public visibleRangeForPosition(position: Position): VisibleRange {
-		const deltaTop = this.viewportData.visibleRangesDeltaTop;
+	public visibleRangeForPosition(position: Position): HorizontalRange {
 		const visibleRanges = this._viewLines.visibleRangesForRange2(
-			new Range(position.lineNumber, position.column, position.lineNumber, position.column),
-			deltaTop
+			new Range(position.lineNumber, position.column, position.lineNumber, position.column)
 		);
 		if (!visibleRanges) {
 			return null;
@@ -90,34 +96,6 @@ export class RenderingContext implements IRenderingContext {
 	}
 }
 
-export interface IRestrictedRenderingContext {
-	readonly viewportData: ViewportData;
-
-	readonly scrollWidth: number;
-	readonly scrollHeight: number;
-
-	readonly visibleRange: Range;
-	readonly bigNumbersDelta: number;
-
-	readonly viewportTop: number;
-	readonly viewportWidth: number;
-	readonly viewportHeight: number;
-	readonly viewportLeft: number;
-
-	getScrolledTopFromAbsoluteTop(absoluteTop: number): number;
-	getViewportVerticalOffsetForLineNumber(lineNumber: number): number;
-	lineIsVisible(lineNumber: number): boolean;
-
-	getDecorationsInViewport(): ViewModelDecoration[];
-}
-
-export interface IRenderingContext extends IRestrictedRenderingContext {
-
-	linesVisibleRangesForRange(range: Range, includeNewLines: boolean): LineVisibleRanges[];
-
-	visibleRangeForPosition(position: Position): VisibleRange;
-}
-
 export class LineVisibleRanges {
 	_lineVisibleRangesBrand: void;
 
@@ -130,20 +108,6 @@ export class LineVisibleRanges {
 	}
 }
 
-export class VisibleRange {
-	_visibleRangeBrand: void;
-
-	public top: number;
-	public left: number;
-	public width: number;
-
-	constructor(top: number, left: number, width: number) {
-		this.top = top | 0;
-		this.left = left | 0;
-		this.width = width | 0;
-	}
-}
-
 export class HorizontalRange {
 	_horizontalRangeBrand: void;
 
diff --git a/src/vs/editor/common/viewLayout/linesLayout.ts b/src/vs/editor/common/viewLayout/linesLayout.ts
index a980a45ef1a..9a159bdcd5b 100644
--- a/src/vs/editor/common/viewLayout/linesLayout.ts
+++ b/src/vs/editor/common/viewLayout/linesLayout.ts
@@ -221,14 +221,14 @@ export class LinesLayout {
 
 		// Find first line number
 		// We don't live in a perfect world, so the line number might start before or after verticalOffset1
-		let startLineNumber = this.getLineNumberAtOrAfterVerticalOffset(verticalOffset1) | 0;
+		const startLineNumber = this.getLineNumberAtOrAfterVerticalOffset(verticalOffset1) | 0;
+		const startLineNumberVerticalOffset = this.getVerticalOffsetForLineNumber(startLineNumber) | 0;
 
 		let endLineNumber = this._lineCount | 0;
-		let startLineNumberVerticalOffset = this.getVerticalOffsetForLineNumber(startLineNumber) | 0;
 
 		// Also keep track of what whitespace we've got
 		let whitespaceIndex = this._whitespaces.getFirstWhitespaceIndexAfterLineNumber(startLineNumber) | 0;
-		let whitespaceCount = this._whitespaces.getCount() | 0;
+		const whitespaceCount = this._whitespaces.getCount() | 0;
 		let currentWhitespaceHeight: number;
 		let currentWhitespaceAfterLineNumber: number;
 
@@ -257,7 +257,7 @@ export class LinesLayout {
 
 		let linesOffsets: number[] = [];
 
-		let verticalCenter = verticalOffset1 + (verticalOffset2 - verticalOffset1) / 2;
+		const verticalCenter = verticalOffset1 + (verticalOffset2 - verticalOffset1) / 2;
 		let centeredLineNumber = -1;
 
 		// Figure out how far the lines go
@@ -304,15 +304,30 @@ export class LinesLayout {
 			centeredLineNumber = endLineNumber;
 		}
 
+		const endLineNumberVerticalOffset = this.getVerticalOffsetForLineNumber(endLineNumber) | 0;
+
+		let completelyVisibleStartLineNumber = startLineNumber;
+		let completelyVisibleEndLineNumber = endLineNumber;
+
+		if (completelyVisibleStartLineNumber < completelyVisibleEndLineNumber) {
+			if (startLineNumberVerticalOffset < verticalOffset1) {
+				completelyVisibleStartLineNumber++;
+			}
+		}
+		if (completelyVisibleStartLineNumber < completelyVisibleEndLineNumber) {
+			if (endLineNumberVerticalOffset + lineHeight > verticalOffset2) {
+				completelyVisibleEndLineNumber--;
+			}
+		}
+
 		return {
-			viewportTop: verticalOffset1 - bigNumbersDelta,
-			viewportHeight: verticalOffset2 - verticalOffset1,
 			bigNumbersDelta: bigNumbersDelta,
 			startLineNumber: startLineNumber,
 			endLineNumber: endLineNumber,
-			visibleRangesDeltaTop: -(verticalOffset1 - bigNumbersDelta),
 			relativeVerticalOffset: linesOffsets,
-			centeredLineNumber: centeredLineNumber
+			centeredLineNumber: centeredLineNumber,
+			completelyVisibleStartLineNumber: completelyVisibleStartLineNumber,
+			completelyVisibleEndLineNumber: completelyVisibleEndLineNumber
 		};
 	}
 
diff --git a/src/vs/editor/browser/viewLayout/layoutProvider.ts b/src/vs/editor/common/viewLayout/viewLayout.ts
similarity index 98%
rename from src/vs/editor/browser/viewLayout/layoutProvider.ts
rename to src/vs/editor/common/viewLayout/viewLayout.ts
index 58098c3cc13..c2a2ff9b525 100644
--- a/src/vs/editor/browser/viewLayout/layoutProvider.ts
+++ b/src/vs/editor/common/viewLayout/viewLayout.ts
@@ -227,8 +227,4 @@ export class LayoutProvider extends Disposable implements IViewLayout {
 	public setScrollPosition(position: editorCommon.INewScrollPosition): void {
 		this._scrollable.updateState(position);
 	}
-	public getScrolledTopFromAbsoluteTop(top: number): number {
-		const scrollState = this._scrollable.getState();
-		return top - scrollState.scrollTop;
-	}
 }
diff --git a/src/vs/editor/common/viewLayout/viewLinesViewportData.ts b/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
index 47481717fd9..6d8a2ec910d 100644
--- a/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
+++ b/src/vs/editor/common/viewLayout/viewLinesViewportData.ts
@@ -8,17 +8,35 @@ import { ViewLineRenderingData, IViewModel, ViewModelDecoration } from 'vs/edito
 import { Range } from 'vs/editor/common/core/range';
 
 export interface IPartialViewLinesViewportData {
-	viewportTop: number;
-	viewportHeight: number;
-	bigNumbersDelta: number;
-	visibleRangesDeltaTop: number;
-	startLineNumber: number;
-	endLineNumber: number;
-	relativeVerticalOffset: number[];
+	/**
+	 * Value to be substracted from `scrollTop` (in order to vertical offset numbers < 1MM)
+	 */
+	readonly bigNumbersDelta: number;
+	/**
+	 * The first (partially) visible line number.
+	 */
+	readonly startLineNumber: number;
+	/**
+	 * The last (partially) visible line number.
+	 */
+	readonly endLineNumber: number;
+	/**
+	 * relativeVerticalOffset[i] is the gap that must be left between line at
+	 * i - 1 + `startLineNumber` and i + `startLineNumber`.
+	 */
+	readonly relativeVerticalOffset: number[];
 	/**
 	 * The centered line in the viewport.
 	 */
-	centeredLineNumber: number;
+	readonly centeredLineNumber: number;
+	/**
+	 * The first completely visible line number.
+	 */
+	readonly completelyVisibleStartLineNumber: number;
+	/**
+	 * The last completely visible line number.
+	 */
+	readonly completelyVisibleEndLineNumber: number;
 }
 
 /**
@@ -26,16 +44,6 @@ export interface IPartialViewLinesViewportData {
  */
 export class ViewportData {
 
-	/**
-	 * The absolute top offset of the viewport in px.
-	 */
-	public readonly viewportTop: number;
-
-	/**
-	 * The height of the viewport in px.
-	 */
-	public readonly viewportHeight: number;
-
 	/**
 	 * The line number at which to start rendering (inclusive).
 	 */
@@ -57,8 +65,10 @@ export class ViewportData {
 	 */
 	public readonly visibleRange: Range;
 
+	/**
+	 * Value to be substracted from `scrollTop` (in order to vertical offset numbers < 1MM)
+	 */
 	public readonly bigNumbersDelta: number;
-	public readonly visibleRangesDeltaTop: number;
 
 	private readonly _model: IViewModel;
 
@@ -66,13 +76,10 @@ export class ViewportData {
 		partialData: IPartialViewLinesViewportData,
 		model: IViewModel
 	) {
-		this.viewportTop = partialData.viewportTop | 0;
-		this.viewportHeight = partialData.viewportHeight | 0;
 		this.startLineNumber = partialData.startLineNumber | 0;
 		this.endLineNumber = partialData.endLineNumber | 0;
 		this.relativeVerticalOffset = partialData.relativeVerticalOffset;
 		this.bigNumbersDelta = partialData.bigNumbersDelta | 0;
-		this.visibleRangesDeltaTop = partialData.visibleRangesDeltaTop | 0;
 
 		this._model = model;
 
diff --git a/src/vs/editor/common/viewModel/viewModel.ts b/src/vs/editor/common/viewModel/viewModel.ts
index e6aa52c8d69..6407ba63932 100644
--- a/src/vs/editor/common/viewModel/viewModel.ts
+++ b/src/vs/editor/common/viewModel/viewModel.ts
@@ -21,7 +21,6 @@ export interface IViewLayout {
 	getScrollHeight(): number;
 	getScrollTop(): number;
 	getCurrentViewport(): Viewport;
-	getScrolledTopFromAbsoluteTop(top: number): number;
 	getVerticalOffsetForLineNumber(lineNumber: number): number;
 	setScrollPosition(position: INewScrollPosition): void;
 
diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/browser/codelens.ts
index 2990bb89e06..2007a539c82 100644
--- a/src/vs/editor/contrib/codelens/browser/codelens.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelens.ts
@@ -49,6 +49,9 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 
 	private static ID: number = 0;
 
+	// Editor.IContentWidget.allowEditorOverflow
+	readonly allowEditorOverflow = false;
+
 	public suppressMouseDown: boolean;
 
 	private _id: string;
diff --git a/src/vs/editor/contrib/goToDeclaration/browser/messageController.ts b/src/vs/editor/contrib/goToDeclaration/browser/messageController.ts
index 80ea6d4b404..c0a0da70f32 100644
--- a/src/vs/editor/contrib/goToDeclaration/browser/messageController.ts
+++ b/src/vs/editor/contrib/goToDeclaration/browser/messageController.ts
@@ -106,6 +106,7 @@ CommonEditorRegistry.registerEditorCommand(new MessageCommand({
 
 class MessageWidget implements IContentWidget {
 
+	// Editor.IContentWidget.allowEditorOverflow
 	readonly allowEditorOverflow = true;
 	readonly suppressMouseDown = false;
 
diff --git a/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.ts b/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.ts
index f9b8ec0e848..1e52c5331ea 100644
--- a/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.ts
+++ b/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.ts
@@ -163,6 +163,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
 
 	private static _ID = 'editor.contrib.inspectTMScopesWidget';
 
+	// Editor.IContentWidget.allowEditorOverflow
 	public readonly allowEditorOverflow = true;
 
 	private _isDisposed: boolean;
diff --git a/src/vs/editor/contrib/inspectTokens/browser/inspectTokens.ts b/src/vs/editor/contrib/inspectTokens/browser/inspectTokens.ts
index f2bc88e242c..7a49c678b79 100644
--- a/src/vs/editor/contrib/inspectTokens/browser/inspectTokens.ts
+++ b/src/vs/editor/contrib/inspectTokens/browser/inspectTokens.ts
@@ -162,6 +162,7 @@ class InspectTokensWidget extends Disposable implements IContentWidget {
 
 	private static _ID = 'editor.contrib.inspectTokensWidget';
 
+	// Editor.IContentWidget.allowEditorOverflow
 	public allowEditorOverflow = true;
 
 	private _editor: ICodeEditor;
diff --git a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
index 4dbdd65a516..bfa6699d0bf 100644
--- a/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
+++ b/src/vs/editor/test/common/viewLayout/linesLayout.test.ts
@@ -370,101 +370,115 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		var viewportData = linesLayout.getLinesViewportData(0, 50);
 		assert.equal(viewportData.startLineNumber, 1);
 		assert.equal(viewportData.endLineNumber, 5);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 1);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40]);
-		assert.equal(viewportData.visibleRangesDeltaTop, 0);
 
 		// viewport 1->51
 		viewportData = linesLayout.getLinesViewportData(1, 51);
 		assert.equal(viewportData.startLineNumber, 1);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -1);
 
 		// viewport 5->55
 		viewportData = linesLayout.getLinesViewportData(5, 55);
 		assert.equal(viewportData.startLineNumber, 1);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 5);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [0, 10, 20, 30, 40, 50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -5);
 
 		// viewport 10->60
 		viewportData = linesLayout.getLinesViewportData(10, 60);
 		assert.equal(viewportData.startLineNumber, 2);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 2);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [10, 20, 30, 40, 50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -10);
 
 		// viewport 50->100
 		viewportData = linesLayout.getLinesViewportData(50, 100);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 60->110
 		viewportData = linesLayout.getLinesViewportData(60, 110);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -60);
 
 		// viewport 65->115
 		viewportData = linesLayout.getLinesViewportData(65, 115);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -65);
 
 		// viewport 50->159
 		viewportData = linesLayout.getLinesViewportData(50, 159);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 50->160
 		viewportData = linesLayout.getLinesViewportData(50, 160);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 51->161
 		viewportData = linesLayout.getLinesViewportData(51, 161);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -51);
 
 
 		// viewport 150->169
 		viewportData = linesLayout.getLinesViewportData(150, 169);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -150);
 
 		// viewport 159->169
 		viewportData = linesLayout.getLinesViewportData(159, 169);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -159);
 
 		// viewport 160->169
 		viewportData = linesLayout.getLinesViewportData(160, 169);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -160);
 
 
 		// viewport 160->1000
 		viewportData = linesLayout.getLinesViewportData(160, 1000);
 		assert.equal(viewportData.startLineNumber, 7);
 		assert.equal(viewportData.endLineNumber, 10);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 10);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [160, 170, 180, 190]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -160);
 	});
 
 
@@ -491,8 +505,9 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		var viewportData = linesLayout.getLinesViewportData(50, 160);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 6);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 		var whitespaceData = linesLayout.getWhitespaceViewportData(50, 160);
 		assert.deepEqual(whitespaceData, [{
 			id: a,
@@ -505,8 +520,9 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		viewportData = linesLayout.getLinesViewportData(50, 219);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 		whitespaceData = linesLayout.getWhitespaceViewportData(50, 219);
 		assert.deepEqual(whitespaceData, [{
 			id: a,
@@ -524,15 +540,17 @@ suite('Editor ViewLayout - LinesLayout', () => {
 		viewportData = linesLayout.getLinesViewportData(50, 220);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 7);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 7);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 
 		// viewport 50->250
 		viewportData = linesLayout.getLinesViewportData(50, 250);
 		assert.equal(viewportData.startLineNumber, 6);
 		assert.equal(viewportData.endLineNumber, 10);
+		assert.equal(viewportData.completelyVisibleStartLineNumber, 6);
+		assert.equal(viewportData.completelyVisibleEndLineNumber, 10);
 		assert.deepEqual(viewportData.relativeVerticalOffset, [50, 160, 220, 230, 240]);
-		assert.equal(viewportData.visibleRangesDeltaTop, -50);
 	});
 
 	test('LinesLayout getWhitespaceAtVerticalOffset', () => {
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 590fd423b9e..d6d653568ff 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -17,6 +17,7 @@ import Event from 'vs/base/common/event';
 export interface ICommandAction {
 	id: string;
 	title: string;
+	alias?: string;
 	category?: string;
 	iconClass?: string;
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 5ea917e4f8b..4d5e0588994 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -7,6 +7,13 @@
 
 import { ILocalExtension, IGalleryExtension, IExtensionManifest, EXTENSION_IDENTIFIER_REGEX } from 'vs/platform/extensionManagement/common/extensionManagement';
 
+export function areSameExtensions(a: { id: string }, b: { id: string }): boolean {
+	if (a.id === b.id) {
+		return true;
+	}
+	return adoptToGalleryExtensionId(a.id) === adoptToGalleryExtensionId(b.id);
+}
+
 export function getGalleryExtensionId(publisher: string, name: string): string {
 	return `${publisher}.${name.toLocaleLowerCase()}`;
 }
@@ -20,7 +27,7 @@ export function getLocalExtensionIdFromManifest(manifest: IExtensionManifest): s
 }
 
 export function getGalleryExtensionIdFromLocal(local: ILocalExtension): string {
-	return getIdAndVersionFromLocalExtensionId(local.id).id;
+	return getGalleryExtensionId(local.manifest.publisher, local.manifest.name);
 }
 
 export function getIdAndVersionFromLocalExtensionId(localExtensionId: string): { id: string, version: string } {
diff --git a/src/vs/platform/extensions/common/abstractExtensionService.ts b/src/vs/platform/extensions/common/abstractExtensionService.ts
index 1da3c2ea22c..25ae438be94 100644
--- a/src/vs/platform/extensions/common/abstractExtensionService.ts
+++ b/src/vs/platform/extensions/common/abstractExtensionService.ts
@@ -9,7 +9,6 @@ import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IExtensionDescription, IExtensionService, IExtensionsStatus, ExtensionPointContribution } from 'vs/platform/extensions/common/extensions';
 import { IExtensionPoint } from 'vs/platform/extensions/common/extensionsRegistry';
-import { adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 const hasOwnProperty = Object.hasOwnProperty;
 
@@ -293,7 +292,6 @@ export class ExtensionDescriptionRegistry {
 	}
 
 	public getExtensionDescription(extensionId: string): IExtensionDescription {
-		extensionId = adoptToGalleryExtensionId(extensionId);
 		if (!hasOwnProperty.call(this._extensionsMap, extensionId)) {
 			return null;
 		}
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 7136f40f9e4..71d1e0cb2d0 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -308,6 +308,15 @@ export function isParent(path: string, candidate: string): boolean {
 	return path.indexOf(candidate + paths.nativeSep) === 0;
 }
 
+export function indexOf(path: string, candidate: string): number {
+	if (!isLinux) {
+		path = path.toLowerCase();
+		candidate = candidate.toLowerCase();
+	}
+
+	return path.indexOf(candidate);
+}
+
 export interface IBaseStat {
 
 	/**
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index f1af73f02ad..f9d1a620d9b 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -7,6 +7,7 @@
 import URI from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import paths = require('vs/base/common/paths');
+import { isEqual, isParent } from 'vs/platform/files/common/files';
 
 export const IWorkspaceContextService = createDecorator<IWorkspaceContextService>('contextService');
 
@@ -83,7 +84,7 @@ export class WorkspaceContextService implements IWorkspaceContextService {
 
 	public isInsideWorkspace(resource: URI): boolean {
 		if (resource && this.workspace) {
-			return paths.isEqualOrParent(resource.fsPath, this.workspace.resource.fsPath);
+			return isEqual(resource.fsPath, this.workspace.resource.fsPath) || isParent(resource.fsPath, this.workspace.resource.fsPath);
 		}
 
 		return false;
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 0d69b51aad9..5568004e938 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -13,6 +13,7 @@ import * as errors from 'vs/base/common/errors';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
 import { ExtHostFileSystemEventService } from 'vs/workbench/api/node/extHostFileSystemEventService';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/node/extHostDocumentSaveParticipant';
 import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
@@ -28,7 +29,7 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { ExtHostOutputService } from 'vs/workbench/api/node/extHostOutputService';
 import { ExtHostTerminalService } from 'vs/workbench/api/node/extHostTerminalService';
 import { ExtHostMessageService } from 'vs/workbench/api/node/extHostMessageService';
-import { ExtHostEditors } from 'vs/workbench/api/node/extHostEditors';
+import { ExtHostEditors } from 'vs/workbench/api/node/extHostTextEditors';
 import { ExtHostLanguages } from 'vs/workbench/api/node/extHostLanguages';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
 import { ExtHostApiCommands } from 'vs/workbench/api/node/extHostApiCommands';
@@ -97,9 +98,10 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
 	// Addressable instances
 	const col = new InstanceCollection();
 	const extHostHeapService = col.define(ExtHostContext.ExtHostHeapService).set<ExtHostHeapService>(new ExtHostHeapService());
-	const extHostDocuments = col.define(ExtHostContext.ExtHostDocuments).set<ExtHostDocuments>(new ExtHostDocuments(threadService));
+	const extHostDocumentsAndEditors = col.define(ExtHostContext.ExtHostDocumentsAndEditors).set<ExtHostDocumentsAndEditors>(new ExtHostDocumentsAndEditors(threadService));
+	const extHostDocuments = col.define(ExtHostContext.ExtHostDocuments).set<ExtHostDocuments>(new ExtHostDocuments(threadService, extHostDocumentsAndEditors));
 	const extHostDocumentSaveParticipant = col.define(ExtHostContext.ExtHostDocumentSaveParticipant).set<ExtHostDocumentSaveParticipant>(new ExtHostDocumentSaveParticipant(extHostDocuments, threadService.get(MainContext.MainThreadWorkspace)));
-	const extHostEditors = col.define(ExtHostContext.ExtHostEditors).set<ExtHostEditors>(new ExtHostEditors(threadService, extHostDocuments));
+	const extHostEditors = col.define(ExtHostContext.ExtHostEditors).set<ExtHostEditors>(new ExtHostEditors(threadService, extHostDocumentsAndEditors));
 	const extHostCommands = col.define(ExtHostContext.ExtHostCommands).set<ExtHostCommands>(new ExtHostCommands(threadService, extHostEditors, extHostHeapService));
 	const extHostExplorers = col.define(ExtHostContext.ExtHostExplorers).set<ExtHostTreeExplorers>(new ExtHostTreeExplorers(threadService, extHostCommands));
 	const extHostConfiguration = col.define(ExtHostContext.ExtHostConfiguration).set<ExtHostConfiguration>(new ExtHostConfiguration(threadService.get(MainContext.MainThreadConfiguration), initData.configuration));
diff --git a/src/vs/workbench/api/node/extHost.contribution.ts b/src/vs/workbench/api/node/extHost.contribution.ts
index 2f4695163cf..c73cce87b51 100644
--- a/src/vs/workbench/api/node/extHost.contribution.ts
+++ b/src/vs/workbench/api/node/extHost.contribution.ts
@@ -36,6 +36,7 @@ import { MainThreadFileSystemEventService } from './mainThreadFileSystemEventSer
 import { MainThreadSCM } from './mainThreadSCM';
 
 // --- other interested parties
+import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 import { JSONValidationExtensionPoint } from 'vs/platform/jsonschemas/common/jsonValidationExtensionPoint';
 import { LanguageConfigurationFileHandler } from 'vs/editor/node/languageConfigurationExtensionPoint';
 import { SaveParticipant } from './mainThreadSaveParticipant';
@@ -62,13 +63,15 @@ export class ExtHostContribution implements IWorkbenchContribution {
 			return this.instantiationService.createInstance(ctor);
 		};
 
+		const documentsAndEditors = this.instantiationService.createInstance(MainThreadDocumentsAndEditors);
+
 		// Addressable instances
 		const col = new InstanceCollection();
 		col.define(MainContext.MainThreadCommands).set(create(MainThreadCommands));
 		col.define(MainContext.MainThreadConfiguration).set(create(MainThreadConfiguration));
 		col.define(MainContext.MainThreadDiagnostics).set(create(MainThreadDiagnostics));
-		col.define(MainContext.MainThreadDocuments).set(create(MainThreadDocuments));
-		col.define(MainContext.MainThreadEditors).set(create(MainThreadEditors));
+		col.define(MainContext.MainThreadDocuments).set(this.instantiationService.createInstance(MainThreadDocuments, documentsAndEditors));
+		col.define(MainContext.MainThreadEditors).set(this.instantiationService.createInstance(MainThreadEditors, documentsAndEditors));
 		col.define(MainContext.MainThreadErrors).set(create(MainThreadErrors));
 		col.define(MainContext.MainThreadExplorers).set(create(MainThreadTreeExplorers));
 		col.define(MainContext.MainThreadLanguageFeatures).set(create(MainThreadLanguageFeatures));
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index f0fdb9bdfb0..57607bb3608 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -35,7 +35,7 @@ import { IWorkspaceConfigurationValues } from 'vs/workbench/services/configurati
 import { IPickOpenEntry, IPickOptions } from 'vs/platform/quickOpen/common/quickOpen';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkspaceSymbol } from 'vs/workbench/parts/search/common/search';
-import { IApplyEditsOptions, IUndoStopOptions, TextEditorRevealType, ITextEditorConfigurationUpdate, IResolvedTextEditorConfiguration, ISelectionChangeEvent } from './mainThreadEditorsTracker';
+import { IApplyEditsOptions, IUndoStopOptions, TextEditorRevealType, ITextEditorConfigurationUpdate, IResolvedTextEditorConfiguration, ISelectionChangeEvent } from './mainThreadEditor';
 
 import { InternalTreeExplorerNodeContent } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
 
@@ -290,12 +290,10 @@ export interface IModelAddedData {
 }
 export abstract class ExtHostDocumentsShape {
 	$provideTextDocumentContent(handle: number, uri: URI): TPromise<string> { throw ni(); }
-	$acceptModelAdd(initData: IModelAddedData): void { throw ni(); }
 	$acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void { throw ni(); }
 	$acceptModelSaved(strURL: string): void { throw ni(); }
 	$acceptModelDirty(strURL: string): void { throw ni(); }
 	$acceptModelReverted(strURL: string): void { throw ni(); }
-	$acceptModelRemoved(strURL: string): void { throw ni(); }
 	$acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[], isDirty: boolean): void { throw ni(); }
 }
 
@@ -314,14 +312,24 @@ export interface ITextEditorPositionData {
 	[id: string]: EditorPosition;
 }
 export abstract class ExtHostEditorsShape {
-	$acceptTextEditorAdd(data: ITextEditorAddData): void { throw ni(); }
 	$acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void { throw ni(); }
 	$acceptSelectionsChanged(id: string, event: ISelectionChangeEvent): void { throw ni(); }
-	$acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void { throw ni(); }
 	$acceptEditorPositionData(data: ITextEditorPositionData): void { throw ni(); }
-	$acceptTextEditorRemove(id: string): void { throw ni(); }
 }
 
+export interface IDocumentsAndEditorsDelta {
+	removedDocuments?: string[];
+	addedDocuments?: IModelAddedData[];
+	removedEditors?: string[];
+	addedEditors?: ITextEditorAddData[];
+	newActiveEditor?: string;
+}
+
+export abstract class ExtHostDocumentsAndEditorsShape {
+	$acceptDocumentsAndEditorsDelta(delta: IDocumentsAndEditorsDelta): void { throw ni(); }
+}
+
+
 export abstract class ExtHostTreeExplorersShape {
 	$provideRootNode(providerId: string): TPromise<InternalTreeExplorerNodeContent> { throw ni(); };
 	$resolveChildren(providerId: string, node: InternalTreeExplorerNodeContent): TPromise<InternalTreeExplorerNodeContent[]> { throw ni(); }
@@ -432,6 +440,7 @@ export const ExtHostContext = {
 	ExtHostCommands: createExtId<ExtHostCommandsShape>('ExtHostCommands', ExtHostCommandsShape),
 	ExtHostConfiguration: createExtId<ExtHostConfigurationShape>('ExtHostConfiguration', ExtHostConfigurationShape),
 	ExtHostDiagnostics: createExtId<ExtHostDiagnosticsShape>('ExtHostDiagnostics', ExtHostDiagnosticsShape),
+	ExtHostDocumentsAndEditors: createExtId<ExtHostDocumentsAndEditorsShape>('ExtHostDocumentsAndEditors', ExtHostDocumentsAndEditorsShape),
 	ExtHostDocuments: createExtId<ExtHostDocumentsShape>('ExtHostDocuments', ExtHostDocumentsShape),
 	ExtHostDocumentSaveParticipant: createExtId<ExtHostDocumentSaveParticipantShape>('ExtHostDocumentSaveParticipant', ExtHostDocumentSaveParticipantShape),
 	ExtHostEditors: createExtId<ExtHostEditorsShape>('ExtHostEditors', ExtHostEditorsShape),
diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts
index 816442d5cdb..1552104b3ea 100644
--- a/src/vs/workbench/api/node/extHostCommands.ts
+++ b/src/vs/workbench/api/node/extHostCommands.ts
@@ -8,7 +8,7 @@ import { IThreadService } from 'vs/workbench/services/thread/common/threadServic
 import { validateConstraint } from 'vs/base/common/types';
 import { ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { ExtHostEditors } from 'vs/workbench/api/node/extHostEditors';
+import { ExtHostEditors } from 'vs/workbench/api/node/extHostTextEditors';
 import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
 import * as extHostTypeConverter from 'vs/workbench/api/node/extHostTypeConverters';
 import { cloneAndChange } from 'vs/base/common/objects';
@@ -102,7 +102,7 @@ export class ExtHostCommands extends ExtHostCommandsShape {
 			return TPromise.wrapError<T>(`Contributed command '${id}' does not exist.`);
 		}
 
-		let {callback, thisArg, description} = command;
+		let { callback, thisArg, description } = command;
 
 		if (description) {
 			for (let i = 0; i < description.args.length; i++) {
@@ -140,7 +140,7 @@ export class ExtHostCommands extends ExtHostCommandsShape {
 	$getContributedCommandHandlerDescriptions(): TPromise<{ [id: string]: string | ICommandHandlerDescription }> {
 		const result: { [id: string]: string | ICommandHandlerDescription } = Object.create(null);
 		this._commands.forEach((command, id) => {
-			let {description} = command;
+			let { description } = command;
 			if (description) {
 				result[id] = description;
 			}
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
new file mode 100644
index 00000000000..29735c3ac8f
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -0,0 +1,244 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
+import { MirrorModel2 } from 'vs/editor/common/model/mirrorModel2';
+import URI from 'vs/base/common/uri';
+import { Range, Position } from 'vs/workbench/api/node/extHostTypes';
+import * as vscode from 'vscode';
+import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
+import { MainThreadDocumentsShape } from './extHost.protocol';
+import { ITextSource } from 'vs/editor/common/model/textSource';
+
+const _modeId2WordDefinition = new Map<string, RegExp>();
+export function setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
+	_modeId2WordDefinition.set(modeId, wordDefinition);
+}
+export function getWordDefinitionFor(modeId: string): RegExp {
+	return _modeId2WordDefinition.get(modeId);
+}
+
+export class ExtHostDocumentData extends MirrorModel2 {
+
+	private _proxy: MainThreadDocumentsShape;
+	private _languageId: string;
+	private _isDirty: boolean;
+	private _textLines: vscode.TextLine[];
+	private _document: vscode.TextDocument;
+
+	constructor(proxy: MainThreadDocumentsShape, uri: URI, lines: string[], eol: string,
+		languageId: string, versionId: number, isDirty: boolean) {
+
+		super(uri, lines, eol, versionId);
+		this._proxy = proxy;
+		this._languageId = languageId;
+		this._isDirty = isDirty;
+		this._textLines = [];
+	}
+
+	dispose(): void {
+		this._textLines.length = 0;
+		this._isDirty = false;
+		super.dispose();
+	}
+
+	equalLines({ lines }: ITextSource): boolean {
+		const len = lines.length;
+		if (len !== this._lines.length) {
+			return false;
+		}
+		for (let i = 0; i < len; i++) {
+			if (lines[i] !== this._lines[i]) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	get document(): vscode.TextDocument {
+		if (!this._document) {
+			const data = this;
+			this._document = {
+				get uri() { return data._uri; },
+				get fileName() { return data._uri.fsPath; },
+				get isUntitled() { return data._uri.scheme !== 'file'; },
+				get languageId() { return data._languageId; },
+				get version() { return data._versionId; },
+				get isDirty() { return data._isDirty; },
+				save() { return data._proxy.$trySaveDocument(data._uri); },
+				getText(range?) { return range ? data._getTextInRange(range) : data.getText(); },
+				get lineCount() { return data._lines.length; },
+				lineAt(lineOrPos) { return data.lineAt(lineOrPos); },
+				offsetAt(pos) { return data.offsetAt(pos); },
+				positionAt(offset) { return data.positionAt(offset); },
+				validateRange(ran) { return data.validateRange(ran); },
+				validatePosition(pos) { return data.validatePosition(pos); },
+				getWordRangeAtPosition(pos, regexp?) { return data.getWordRangeAtPosition(pos, regexp); }
+			};
+		}
+		return this._document;
+	}
+
+	_acceptLanguageId(newLanguageId: string): void {
+		this._languageId = newLanguageId;
+	}
+
+	_acceptIsDirty(isDirty: boolean): void {
+		this._isDirty = isDirty;
+	}
+
+	private _getTextInRange(_range: vscode.Range): string {
+		let range = this.validateRange(_range);
+
+		if (range.isEmpty) {
+			return '';
+		}
+
+		if (range.isSingleLine) {
+			return this._lines[range.start.line].substring(range.start.character, range.end.character);
+		}
+
+		let lineEnding = this._eol,
+			startLineIndex = range.start.line,
+			endLineIndex = range.end.line,
+			resultLines: string[] = [];
+
+		resultLines.push(this._lines[startLineIndex].substring(range.start.character));
+		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
+			resultLines.push(this._lines[i]);
+		}
+		resultLines.push(this._lines[endLineIndex].substring(0, range.end.character));
+
+		return resultLines.join(lineEnding);
+	}
+
+	lineAt(lineOrPosition: number | vscode.Position): vscode.TextLine {
+
+		let line: number;
+		if (lineOrPosition instanceof Position) {
+			line = lineOrPosition.line;
+		} else if (typeof lineOrPosition === 'number') {
+			line = lineOrPosition;
+		}
+
+		if (line < 0 || line >= this._lines.length) {
+			throw new Error('Illegal value for `line`');
+		}
+
+		let result = this._textLines[line];
+		if (!result || result.lineNumber !== line || result.text !== this._lines[line]) {
+
+			const text = this._lines[line];
+			const firstNonWhitespaceCharacterIndex = /^(\s*)/.exec(text)[1].length;
+			const range = new Range(line, 0, line, text.length);
+			const rangeIncludingLineBreak = line < this._lines.length - 1
+				? new Range(line, 0, line + 1, 0)
+				: range;
+
+			result = Object.freeze({
+				lineNumber: line,
+				range,
+				rangeIncludingLineBreak,
+				text,
+				firstNonWhitespaceCharacterIndex, //TODO@api, rename to 'leadingWhitespaceLength'
+				isEmptyOrWhitespace: firstNonWhitespaceCharacterIndex === text.length
+			});
+
+			this._textLines[line] = result;
+		}
+
+		return result;
+	}
+
+	offsetAt(position: vscode.Position): number {
+		position = this.validatePosition(position);
+		this._ensureLineStarts();
+		return this._lineStarts.getAccumulatedValue(position.line - 1) + position.character;
+	}
+
+	positionAt(offset: number): vscode.Position {
+		offset = Math.floor(offset);
+		offset = Math.max(0, offset);
+
+		this._ensureLineStarts();
+		let out = this._lineStarts.getIndexOf(offset);
+
+		let lineLength = this._lines[out.index].length;
+
+		// Ensure we return a valid position
+		return new Position(out.index, Math.min(out.remainder, lineLength));
+	}
+
+	// ---- range math
+
+	validateRange(range: vscode.Range): vscode.Range {
+		if (!(range instanceof Range)) {
+			throw new Error('Invalid argument');
+		}
+
+		let start = this.validatePosition(range.start);
+		let end = this.validatePosition(range.end);
+
+		if (start === range.start && end === range.end) {
+			return range;
+		}
+		return new Range(start.line, start.character, end.line, end.character);
+	}
+
+	validatePosition(position: vscode.Position): vscode.Position {
+		if (!(position instanceof Position)) {
+			throw new Error('Invalid argument');
+		}
+
+		let { line, character } = position;
+		let hasChanged = false;
+
+		if (line < 0) {
+			line = 0;
+			character = 0;
+			hasChanged = true;
+		}
+		else if (line >= this._lines.length) {
+			line = this._lines.length - 1;
+			character = this._lines[line].length;
+			hasChanged = true;
+		}
+		else {
+			let maxCharacter = this._lines[line].length;
+			if (character < 0) {
+				character = 0;
+				hasChanged = true;
+			}
+			else if (character > maxCharacter) {
+				character = maxCharacter;
+				hasChanged = true;
+			}
+		}
+
+		if (!hasChanged) {
+			return position;
+		}
+		return new Position(line, character);
+	}
+
+	getWordRangeAtPosition(_position: vscode.Position, regexp?: RegExp): vscode.Range {
+		let position = this.validatePosition(_position);
+		if (!regexp || regExpLeadsToEndlessLoop(regexp)) {
+			regexp = getWordDefinitionFor(this._languageId);
+		}
+		let wordAtText = getWordAtText(
+			position.character + 1,
+			ensureValidWordDefinition(regexp),
+			this._lines[position.line],
+			0
+		);
+
+		if (wordAtText) {
+			return new Range(position.line, wordAtText.startColumn - 1, position.line, wordAtText.endColumn - 1);
+		}
+		return undefined;
+	}
+}
diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts
index 3169769d16a..eaf14c3356f 100644
--- a/src/vs/workbench/api/node/extHostDocuments.ts
+++ b/src/vs/workbench/api/node/extHostDocuments.ts
@@ -5,82 +5,74 @@
 'use strict';
 
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import * as editorCommon from 'vs/editor/common/editorCommon';
-import { MirrorModel2 } from 'vs/editor/common/model/mirrorModel2';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
 import Event, { Emitter } from 'vs/base/common/event';
 import URI from 'vs/base/common/uri';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { Range, Position, Disposable } from 'vs/workbench/api/node/extHostTypes';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/workbench/api/node/extHostTypes';
 import * as TypeConverters from './extHostTypeConverters';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as vscode from 'vscode';
 import { asWinJsPromise } from 'vs/base/common/async';
-import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
-import { MainContext, MainThreadDocumentsShape, ExtHostDocumentsShape, IModelAddedData } from './extHost.protocol';
-import { ITextSource, TextSource } from 'vs/editor/common/model/textSource';
-
-const _modeId2WordDefinition = new Map<string, RegExp>();
-
-function setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
-	_modeId2WordDefinition.set(modeId, wordDefinition);
-}
-
-function getWordDefinitionFor(modeId: string): RegExp {
-	return _modeId2WordDefinition.get(modeId);
-}
+import { TextSource } from 'vs/editor/common/model/textSource';
+import { MainContext, MainThreadDocumentsShape, ExtHostDocumentsShape } from './extHost.protocol';
+import { ExtHostDocumentData, setWordDefinitionFor } from './extHostDocumentData';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
 
 export class ExtHostDocuments extends ExtHostDocumentsShape {
 
 	private static _handlePool: number = 0;
 
-	private _onDidAddDocumentEventEmitter: Emitter<vscode.TextDocument>;
-	public onDidAddDocument: Event<vscode.TextDocument>;
+	private _onDidAddDocument = new Emitter<vscode.TextDocument>();
+	private _onDidRemoveDocument = new Emitter<vscode.TextDocument>();
+	private _onDidChangeDocument = new Emitter<vscode.TextDocumentChangeEvent>();
+	private _onDidSaveDocument = new Emitter<vscode.TextDocument>();
 
-	private _onDidRemoveDocumentEventEmitter: Emitter<vscode.TextDocument>;
-	public onDidRemoveDocument: Event<vscode.TextDocument>;
+	readonly onDidAddDocument: Event<vscode.TextDocument> = this._onDidAddDocument.event;
+	readonly onDidRemoveDocument: Event<vscode.TextDocument> = this._onDidRemoveDocument.event;
+	readonly onDidChangeDocument: Event<vscode.TextDocumentChangeEvent> = this._onDidChangeDocument.event;
+	readonly onDidSaveDocument: Event<vscode.TextDocument> = this._onDidSaveDocument.event;
 
-	private _onDidChangeDocumentEventEmitter: Emitter<vscode.TextDocumentChangeEvent>;
-	public onDidChangeDocument: Event<vscode.TextDocumentChangeEvent>;
-
-	private _onDidSaveDocumentEventEmitter: Emitter<vscode.TextDocument>;
-	public onDidSaveDocument: Event<vscode.TextDocument>;
-
-	private _documentData = new Map<string, ExtHostDocumentData>();
+	private _toDispose: IDisposable[];
+	private _proxy: MainThreadDocumentsShape;
+	private _documentsAndEditors: ExtHostDocumentsAndEditors;
 	private _documentLoader = new Map<string, TPromise<ExtHostDocumentData>>();
 	private _documentContentProviders = new Map<number, vscode.TextDocumentContentProvider>();
 
-	private _proxy: MainThreadDocumentsShape;
 
-	constructor(threadService: IThreadService) {
+	constructor(threadService: IThreadService, documentsAndEditors: ExtHostDocumentsAndEditors) {
 		super();
 		this._proxy = threadService.get(MainContext.MainThreadDocuments);
+		this._documentsAndEditors = documentsAndEditors;
 
-		this._onDidAddDocumentEventEmitter = new Emitter<vscode.TextDocument>();
-		this.onDidAddDocument = this._onDidAddDocumentEventEmitter.event;
+		this._toDispose = [
+			this._documentsAndEditors.onDidRemoveDocuments(documents => {
+				for (const data of documents) {
+					this._onDidRemoveDocument.fire(data.document);
+				}
+			}),
+			this._documentsAndEditors.onDidAddDocuments(documents => {
+				for (const data of documents) {
+					this._onDidAddDocument.fire(data.document);
+				}
+			})
+		];
+	}
 
-		this._onDidRemoveDocumentEventEmitter = new Emitter<vscode.TextDocument>();
-		this.onDidRemoveDocument = this._onDidRemoveDocumentEventEmitter.event;
-
-		this._onDidChangeDocumentEventEmitter = new Emitter<vscode.TextDocumentChangeEvent>();
-		this.onDidChangeDocument = this._onDidChangeDocumentEventEmitter.event;
-
-		this._onDidSaveDocumentEventEmitter = new Emitter<vscode.TextDocument>();
-		this.onDidSaveDocument = this._onDidSaveDocumentEventEmitter.event;
+	public dispose(): void {
+		dispose(this._toDispose);
 	}
 
 	public getAllDocumentData(): ExtHostDocumentData[] {
-		const result: ExtHostDocumentData[] = [];
-		this._documentData.forEach(data => result.push(data));
-		return result;
+		return this._documentsAndEditors.allDocuments();
 	}
 
 	public getDocumentData(resource: vscode.Uri): ExtHostDocumentData {
 		if (!resource) {
 			return undefined;
 		}
-		const data = this._documentData.get(resource.toString());
+		const data = this._documentsAndEditors.getDocument(resource.toString());
 		if (data) {
 			return data;
 		}
@@ -89,7 +81,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 
 	public ensureDocumentData(uri: URI): TPromise<ExtHostDocumentData> {
 
-		let cached = this._documentData.get(uri.toString());
+		let cached = this._documentsAndEditors.getDocument(uri.toString());
 		if (cached) {
 			return TPromise.as(cached);
 		}
@@ -98,7 +90,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		if (!promise) {
 			promise = this._proxy.$tryOpenDocument(uri).then(() => {
 				this._documentLoader.delete(uri.toString());
-				return this._documentData.get(uri.toString());
+				return this._documentsAndEditors.getDocument(uri.toString());
 			}, err => {
 				this._documentLoader.delete(uri.toString());
 				return TPromise.wrapError(err);
@@ -126,10 +118,10 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		let subscription: IDisposable;
 		if (typeof provider.onDidChange === 'function') {
 			subscription = provider.onDidChange(uri => {
-				if (this._documentData.has(uri.toString())) {
+				if (this._documentsAndEditors.getDocument(uri.toString())) {
 					this.$provideTextDocumentContent(handle, <URI>uri).then(value => {
 
-						const document = this._documentData.get(uri.toString());
+						const document = this._documentsAndEditors.getDocument(uri.toString());
 						if (!document) {
 							// disposed in the meantime
 							return;
@@ -158,7 +150,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		});
 	}
 
-	$provideTextDocumentContent(handle: number, uri: URI): TPromise<string> {
+	public $provideTextDocumentContent(handle: number, uri: URI): TPromise<string> {
 		const provider = this._documentContentProviders.get(handle);
 		if (!provider) {
 			return TPromise.wrapError<string>(`unsupported uri-scheme: ${uri.scheme}`);
@@ -166,57 +158,37 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		return asWinJsPromise(token => provider.provideTextDocumentContent(uri, token));
 	}
 
-	public $acceptModelAdd(initData: IModelAddedData): void {
-		let data = new ExtHostDocumentData(this._proxy, initData.url, initData.lines, initData.EOL, initData.modeId, initData.versionId, initData.isDirty);
-		let key = data.document.uri.toString();
-		if (this._documentData.has(key)) {
-			throw new Error('Document `' + key + '` already exists.');
-		}
-		this._documentData.set(key, data);
-		this._onDidAddDocumentEventEmitter.fire(data.document);
-	}
-
 	public $acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void {
-		let data = this._documentData.get(strURL);
+		let data = this._documentsAndEditors.getDocument(strURL);
 
 		// Treat a mode change as a remove + add
 
-		this._onDidRemoveDocumentEventEmitter.fire(data.document);
+		this._onDidRemoveDocument.fire(data.document);
 		data._acceptLanguageId(newModeId);
-		this._onDidAddDocumentEventEmitter.fire(data.document);
+		this._onDidAddDocument.fire(data.document);
 	}
 
 	public $acceptModelSaved(strURL: string): void {
-		let data = this._documentData.get(strURL);
+		let data = this._documentsAndEditors.getDocument(strURL);
 		data._acceptIsDirty(false);
-		this._onDidSaveDocumentEventEmitter.fire(data.document);
+		this._onDidSaveDocument.fire(data.document);
 	}
 
 	public $acceptModelDirty(strURL: string): void {
-		let document = this._documentData.get(strURL);
+		let document = this._documentsAndEditors.getDocument(strURL);
 		document._acceptIsDirty(true);
 	}
 
 	public $acceptModelReverted(strURL: string): void {
-		let document = this._documentData.get(strURL);
+		let document = this._documentsAndEditors.getDocument(strURL);
 		document._acceptIsDirty(false);
 	}
 
-	public $acceptModelRemoved(strURL: string): void {
-		if (!this._documentData.has(strURL)) {
-			throw new Error('Document `' + strURL + '` does not exist.');
-		}
-		let data = this._documentData.get(strURL);
-		this._documentData.delete(strURL);
-		this._onDidRemoveDocumentEventEmitter.fire(data.document);
-		data.dispose();
-	}
-
 	public $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[], isDirty: boolean): void {
-		let data = this._documentData.get(strURL);
+		let data = this._documentsAndEditors.getDocument(strURL);
 		data._acceptIsDirty(isDirty);
 		data.onEvents(events);
-		this._onDidChangeDocumentEventEmitter.fire({
+		this._onDidChangeDocument.fire({
 			document: data.document,
 			contentChanges: events.map((e) => {
 				return {
@@ -228,229 +200,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
 		});
 	}
 
-	setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
+	public setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
 		setWordDefinitionFor(modeId, wordDefinition);
 	}
 }
-
-export class ExtHostDocumentData extends MirrorModel2 {
-
-	private _proxy: MainThreadDocumentsShape;
-	private _languageId: string;
-	private _isDirty: boolean;
-	private _textLines: vscode.TextLine[];
-	private _document: vscode.TextDocument;
-
-	constructor(proxy: MainThreadDocumentsShape, uri: URI, lines: string[], eol: string,
-		languageId: string, versionId: number, isDirty: boolean) {
-
-		super(uri, lines, eol, versionId);
-		this._proxy = proxy;
-		this._languageId = languageId;
-		this._isDirty = isDirty;
-		this._textLines = [];
-	}
-
-	dispose(): void {
-		this._textLines.length = 0;
-		this._isDirty = false;
-		super.dispose();
-	}
-
-	equalLines({lines}: ITextSource): boolean {
-		const len = lines.length;
-		if (len !== this._lines.length) {
-			return false;
-		}
-		for (let i = 0; i < len; i++) {
-			if (lines[i] !== this._lines[i]) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	get document(): vscode.TextDocument {
-		if (!this._document) {
-			const data = this;
-			this._document = {
-				get uri() { return data._uri; },
-				get fileName() { return data._uri.fsPath; },
-				get isUntitled() { return data._uri.scheme !== 'file'; },
-				get languageId() { return data._languageId; },
-				get version() { return data._versionId; },
-				get isDirty() { return data._isDirty; },
-				save() { return data._proxy.$trySaveDocument(data._uri); },
-				getText(range?) { return range ? data._getTextInRange(range) : data.getText(); },
-				get lineCount() { return data._lines.length; },
-				lineAt(lineOrPos) { return data.lineAt(lineOrPos); },
-				offsetAt(pos) { return data.offsetAt(pos); },
-				positionAt(offset) { return data.positionAt(offset); },
-				validateRange(ran) { return data.validateRange(ran); },
-				validatePosition(pos) { return data.validatePosition(pos); },
-				getWordRangeAtPosition(pos, regexp?) { return data.getWordRangeAtPosition(pos, regexp); }
-			};
-		}
-		return this._document;
-	}
-
-	_acceptLanguageId(newLanguageId: string): void {
-		this._languageId = newLanguageId;
-	}
-
-	_acceptIsDirty(isDirty: boolean): void {
-		this._isDirty = isDirty;
-	}
-
-	private _getTextInRange(_range: vscode.Range): string {
-		let range = this.validateRange(_range);
-
-		if (range.isEmpty) {
-			return '';
-		}
-
-		if (range.isSingleLine) {
-			return this._lines[range.start.line].substring(range.start.character, range.end.character);
-		}
-
-		let lineEnding = this._eol,
-			startLineIndex = range.start.line,
-			endLineIndex = range.end.line,
-			resultLines: string[] = [];
-
-		resultLines.push(this._lines[startLineIndex].substring(range.start.character));
-		for (let i = startLineIndex + 1; i < endLineIndex; i++) {
-			resultLines.push(this._lines[i]);
-		}
-		resultLines.push(this._lines[endLineIndex].substring(0, range.end.character));
-
-		return resultLines.join(lineEnding);
-	}
-
-	lineAt(lineOrPosition: number | vscode.Position): vscode.TextLine {
-
-		let line: number;
-		if (lineOrPosition instanceof Position) {
-			line = lineOrPosition.line;
-		} else if (typeof lineOrPosition === 'number') {
-			line = lineOrPosition;
-		}
-
-		if (line < 0 || line >= this._lines.length) {
-			throw new Error('Illegal value for `line`');
-		}
-
-		let result = this._textLines[line];
-		if (!result || result.lineNumber !== line || result.text !== this._lines[line]) {
-
-			const text = this._lines[line];
-			const firstNonWhitespaceCharacterIndex = /^(\s*)/.exec(text)[1].length;
-			const range = new Range(line, 0, line, text.length);
-			const rangeIncludingLineBreak = line < this._lines.length - 1
-				? new Range(line, 0, line + 1, 0)
-				: range;
-
-			result = Object.freeze({
-				lineNumber: line,
-				range,
-				rangeIncludingLineBreak,
-				text,
-				firstNonWhitespaceCharacterIndex, //TODO@api, rename to 'leadingWhitespaceLength'
-				isEmptyOrWhitespace: firstNonWhitespaceCharacterIndex === text.length
-			});
-
-			this._textLines[line] = result;
-		}
-
-		return result;
-	}
-
-	offsetAt(position: vscode.Position): number {
-		position = this.validatePosition(position);
-		this._ensureLineStarts();
-		return this._lineStarts.getAccumulatedValue(position.line - 1) + position.character;
-	}
-
-	positionAt(offset: number): vscode.Position {
-		offset = Math.floor(offset);
-		offset = Math.max(0, offset);
-
-		this._ensureLineStarts();
-		let out = this._lineStarts.getIndexOf(offset);
-
-		let lineLength = this._lines[out.index].length;
-
-		// Ensure we return a valid position
-		return new Position(out.index, Math.min(out.remainder, lineLength));
-	}
-
-	// ---- range math
-
-	validateRange(range: vscode.Range): vscode.Range {
-		if (!(range instanceof Range)) {
-			throw new Error('Invalid argument');
-		}
-
-		let start = this.validatePosition(range.start);
-		let end = this.validatePosition(range.end);
-
-		if (start === range.start && end === range.end) {
-			return range;
-		}
-		return new Range(start.line, start.character, end.line, end.character);
-	}
-
-	validatePosition(position: vscode.Position): vscode.Position {
-		if (!(position instanceof Position)) {
-			throw new Error('Invalid argument');
-		}
-
-		let {line, character} = position;
-		let hasChanged = false;
-
-		if (line < 0) {
-			line = 0;
-			character = 0;
-			hasChanged = true;
-		}
-		else if (line >= this._lines.length) {
-			line = this._lines.length - 1;
-			character = this._lines[line].length;
-			hasChanged = true;
-		}
-		else {
-			let maxCharacter = this._lines[line].length;
-			if (character < 0) {
-				character = 0;
-				hasChanged = true;
-			}
-			else if (character > maxCharacter) {
-				character = maxCharacter;
-				hasChanged = true;
-			}
-		}
-
-		if (!hasChanged) {
-			return position;
-		}
-		return new Position(line, character);
-	}
-
-	getWordRangeAtPosition(_position: vscode.Position, regexp?: RegExp): vscode.Range {
-		let position = this.validatePosition(_position);
-		if (!regexp || regExpLeadsToEndlessLoop(regexp)) {
-			regexp = getWordDefinitionFor(this._languageId);
-		}
-		let wordAtText = getWordAtText(
-			position.character + 1,
-			ensureValidWordDefinition(regexp),
-			this._lines[position.line],
-			0
-		);
-
-		if (wordAtText) {
-			return new Range(position.line, wordAtText.startColumn - 1, position.line, wordAtText.endColumn - 1);
-		}
-		return undefined;
-	}
-}
diff --git a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
new file mode 100644
index 00000000000..ee5180971b2
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostDocumentsAndEditors.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 Event, { Emitter } from 'vs/base/common/event';
+import { dispose } from 'vs/base/common/lifecycle';
+import { MainContext, ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from './extHost.protocol';
+import { ExtHostDocumentData } from './extHostDocumentData';
+import { ExtHostTextEditor } from './extHostTextEditor';
+import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
+import * as assert from 'assert';
+import * as typeConverters from './extHostTypeConverters';
+
+export class ExtHostDocumentsAndEditors extends ExtHostDocumentsAndEditorsShape {
+
+	private _activeEditorId: string;
+	private readonly _editors = new Map<string, ExtHostTextEditor>();
+	private readonly _documents = new Map<string, ExtHostDocumentData>();
+
+	private readonly _onDidAddDocuments = new Emitter<ExtHostDocumentData[]>();
+	private readonly _onDidRemoveDocuments = new Emitter<ExtHostDocumentData[]>();
+	private readonly _onDidChangeVisibleTextEditors = new Emitter<ExtHostTextEditor[]>();
+	private readonly _onDidChangeActiveTextEditor = new Emitter<ExtHostTextEditor>();
+
+	readonly onDidAddDocuments: Event<ExtHostDocumentData[]> = this._onDidAddDocuments.event;
+	readonly onDidRemoveDocuments: Event<ExtHostDocumentData[]> = this._onDidRemoveDocuments.event;
+	readonly onDidChangeVisibleTextEditors: Event<ExtHostTextEditor[]> = this._onDidChangeVisibleTextEditors.event;
+	readonly onDidChangeActiveTextEditor: Event<ExtHostTextEditor> = this._onDidChangeActiveTextEditor.event;
+
+	constructor(
+		@IThreadService private _threadService: IThreadService
+	) {
+		super();
+	}
+
+	$acceptDocumentsAndEditorsDelta(delta: IDocumentsAndEditorsDelta): void {
+
+		const removedDocuments: ExtHostDocumentData[] = [];
+		const addedDocuments: ExtHostDocumentData[] = [];
+		const removedEditors: ExtHostTextEditor[] = [];
+
+		if (delta.removedDocuments) {
+			for (const id of delta.removedDocuments) {
+				const data = this._documents.get(id);
+				this._documents.delete(id);
+				removedDocuments.push(data);
+			}
+		}
+
+		if (delta.addedDocuments) {
+			for (const data of delta.addedDocuments) {
+				assert.ok(!this._documents.has(data.url.toString()), `document '${data.url} already exists!'`);
+
+				const documentData = new ExtHostDocumentData(
+					this._threadService.get(MainContext.MainThreadDocuments),
+					data.url,
+					data.lines,
+					data.EOL,
+					data.modeId,
+					data.versionId,
+					data.isDirty
+				);
+				this._documents.set(data.url.toString(), documentData);
+				addedDocuments.push(documentData);
+			}
+		}
+
+		if (delta.removedEditors) {
+			for (const id of delta.removedEditors) {
+				const editor = this._editors.get(id);
+				this._editors.delete(id);
+				removedEditors.push(editor);
+			}
+		}
+
+		if (delta.addedEditors) {
+			for (const data of delta.addedEditors) {
+				assert.ok(this._documents.has(data.document.toString()), `document '${data.document}' does not exist`);
+				assert.ok(!this._editors.has(data.id), `editor '${data.id}' already exists!`);
+
+				const documentData = this._documents.get(data.document.toString());
+				const editor = new ExtHostTextEditor(
+					this._threadService.get(MainContext.MainThreadEditors),
+					data.id,
+					documentData,
+					data.selections.map(typeConverters.toSelection),
+					data.options,
+					typeConverters.toViewColumn(data.editorPosition)
+				);
+				this._editors.set(data.id, editor);
+			}
+		}
+
+		if (delta.newActiveEditor !== undefined) {
+			assert.ok(delta.newActiveEditor === null || this._editors.has(delta.newActiveEditor), `active editor '${delta.newActiveEditor}' does not exist`);
+			this._activeEditorId = delta.newActiveEditor;
+		}
+
+		// now that the internal state is complete, fire events
+		if (delta.removedDocuments) {
+			this._onDidRemoveDocuments.fire(removedDocuments);
+		}
+		if (delta.addedDocuments) {
+			this._onDidAddDocuments.fire(addedDocuments);
+		}
+
+		if (delta.removedEditors || delta.addedEditors) {
+			this._onDidChangeVisibleTextEditors.fire(this.allEditors());
+		}
+		if (delta.newActiveEditor) {
+			this._onDidChangeActiveTextEditor.fire(this.activeEditor());
+		}
+
+		// now that the events are out, dispose removed documents and editors
+		dispose(removedDocuments);
+		dispose(removedEditors);
+	}
+
+	getDocument(strUrl: string): ExtHostDocumentData {
+		return this._documents.get(strUrl);
+	}
+
+	allDocuments(): ExtHostDocumentData[] {
+		const result: ExtHostDocumentData[] = [];
+		this._documents.forEach(data => result.push(data));
+		return result;
+	}
+
+	getEditor(id: string): ExtHostTextEditor {
+		return this._editors.get(id);
+	}
+
+	activeEditor(): ExtHostTextEditor | undefined {
+		if (!this._activeEditorId) {
+			return undefined;
+		} else {
+			return this._editors.get(this._activeEditorId);
+		}
+	}
+
+	allEditors(): ExtHostTextEditor[] {
+		const result: ExtHostTextEditor[] = [];
+		this._editors.forEach(data => result.push(data));
+		return result;
+	}
+}
diff --git a/src/vs/workbench/api/node/extHostEditors.ts b/src/vs/workbench/api/node/extHostTextEditor.ts
similarity index 67%
rename from src/vs/workbench/api/node/extHostEditors.ts
rename to src/vs/workbench/api/node/extHostTextEditor.ts
index 2b948c2700d..b4e4488fa83 100644
--- a/src/vs/workbench/api/node/extHostEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditor.ts
@@ -4,174 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import URI from 'vs/base/common/uri';
+
 import { readonly, illegalArgument } from 'vs/base/common/errors';
-import { equals as arrayEquals } from 'vs/base/common/arrays';
 import { IdGenerator } from 'vs/base/common/idGenerator';
-import Event, { Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
-import { ExtHostDocuments, ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocuments';
-import { Selection, Range, Position, EndOfLine, TextEditorRevealType, TextEditorSelectionChangeKind, TextEditorLineNumbersStyle, SnippetString } from './extHostTypes';
+import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
+import { Selection, Range, Position, EndOfLine, TextEditorRevealType, TextEditorLineNumbersStyle, SnippetString } from './extHostTypes';
 import { ISingleEditOperation, TextEditorCursorStyle, IRange } from 'vs/editor/common/editorCommon';
-import { IResolvedTextEditorConfiguration, ISelectionChangeEvent, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditorsTracker';
+import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditor';
 import * as TypeConverters from './extHostTypeConverters';
-import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextEditorAddData, ITextEditorPositionData } from './extHost.protocol';
+import { MainThreadEditorsShape } from './extHost.protocol';
 import * as vscode from 'vscode';
 
-export class ExtHostEditors extends ExtHostEditorsShape {
-
-	public onDidChangeTextEditorSelection: Event<vscode.TextEditorSelectionChangeEvent>;
-	private _onDidChangeTextEditorSelection: Emitter<vscode.TextEditorSelectionChangeEvent>;
-
-	public onDidChangeTextEditorOptions: Event<vscode.TextEditorOptionsChangeEvent>;
-	private _onDidChangeTextEditorOptions: Emitter<vscode.TextEditorOptionsChangeEvent>;
-
-	public onDidChangeTextEditorViewColumn: Event<vscode.TextEditorViewColumnChangeEvent>;
-	private _onDidChangeTextEditorViewColumn: Emitter<vscode.TextEditorViewColumnChangeEvent>;
-
-	private _editors: Map<string, ExtHostTextEditor>;
-	private _proxy: MainThreadEditorsShape;
-	private _onDidChangeActiveTextEditor: Emitter<vscode.TextEditor>;
-	private _onDidChangeVisibleTextEditors: Emitter<vscode.TextEditor[]>;
-	private _extHostDocuments: ExtHostDocuments;
-	private _activeEditorId: string;
-	private _visibleEditorIds: string[];
-
-	constructor(
-		threadService: IThreadService,
-		extHostDocuments: ExtHostDocuments
-	) {
-		super();
-		this._onDidChangeTextEditorSelection = new Emitter<vscode.TextEditorSelectionChangeEvent>();
-		this.onDidChangeTextEditorSelection = this._onDidChangeTextEditorSelection.event;
-
-		this._onDidChangeTextEditorOptions = new Emitter<vscode.TextEditorOptionsChangeEvent>();
-		this.onDidChangeTextEditorOptions = this._onDidChangeTextEditorOptions.event;
-
-		this._onDidChangeTextEditorViewColumn = new Emitter<vscode.TextEditorViewColumnChangeEvent>();
-		this.onDidChangeTextEditorViewColumn = this._onDidChangeTextEditorViewColumn.event;
-
-		this._extHostDocuments = extHostDocuments;
-		this._proxy = threadService.get(MainContext.MainThreadEditors);
-		this._onDidChangeActiveTextEditor = new Emitter<vscode.TextEditor>();
-		this._onDidChangeVisibleTextEditors = new Emitter<vscode.TextEditor[]>();
-		this._editors = new Map<string, ExtHostTextEditor>();
-
-		this._visibleEditorIds = [];
-	}
-
-	getActiveTextEditor(): vscode.TextEditor {
-		return this._editors.get(this._activeEditorId);
-	}
-
-	getVisibleTextEditors(): vscode.TextEditor[] {
-		return this._visibleEditorIds.map(id => this._editors.get(id));
-	}
-
-	get onDidChangeActiveTextEditor(): Event<vscode.TextEditor> {
-		return this._onDidChangeActiveTextEditor && this._onDidChangeActiveTextEditor.event;
-	}
-
-	get onDidChangeVisibleTextEditors(): Event<vscode.TextEditor[]> {
-		return this._onDidChangeVisibleTextEditors && this._onDidChangeVisibleTextEditors.event;
-	}
-
-	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): TPromise<vscode.TextEditor> {
-		return this._proxy.$tryShowTextDocument(<URI>document.uri, TypeConverters.fromViewColumn(column), preserveFocus).then(id => {
-			let editor = this._editors.get(id);
-			if (editor) {
-				return editor;
-			} else {
-				throw new Error(`Failed to show text document ${document.uri.toString()}, should show in editor #${id}`);
-			}
-		});
-	}
-
-	createTextEditorDecorationType(options: vscode.DecorationRenderOptions): vscode.TextEditorDecorationType {
-		return new TextEditorDecorationType(this._proxy, options);
-	}
-
-	// --- called from main thread
-
-	$acceptTextEditorAdd(data: ITextEditorAddData): void {
-		let document = this._extHostDocuments.getDocumentData(data.document);
-		let newEditor = new ExtHostTextEditor(this._proxy, data.id, document, data.selections.map(TypeConverters.toSelection), data.options, TypeConverters.toViewColumn(data.editorPosition));
-		this._editors.set(data.id, newEditor);
-	}
-
-	$acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void {
-		let editor = this._editors.get(id);
-		editor._acceptOptions(opts);
-		this._onDidChangeTextEditorOptions.fire({
-			textEditor: editor,
-			options: opts
-		});
-	}
-
-	$acceptSelectionsChanged(id: string, event: ISelectionChangeEvent): void {
-		const kind = TextEditorSelectionChangeKind.fromValue(event.source);
-		const selections = event.selections.map(TypeConverters.toSelection);
-		const textEditor = this._editors.get(id);
-		textEditor._acceptSelections(selections);
-		this._onDidChangeTextEditorSelection.fire({
-			textEditor,
-			selections,
-			kind
-		});
-	}
-
-	$acceptActiveEditorAndVisibleEditors(id: string, visibleIds: string[]): void {
-		let visibleChanged = false;
-		let activeChanged = false;
-
-		if (!arrayEquals(this._visibleEditorIds, visibleIds)) {
-			this._visibleEditorIds = visibleIds;
-			visibleChanged = true;
-		}
-
-		if (this._activeEditorId !== id) {
-			this._activeEditorId = id;
-			activeChanged = true;
-		}
-
-		if (visibleChanged) {
-			this._onDidChangeVisibleTextEditors.fire(this.getVisibleTextEditors());
-		}
-		if (activeChanged) {
-			this._onDidChangeActiveTextEditor.fire(this.getActiveTextEditor());
-		}
-	}
-
-	$acceptEditorPositionData(data: ITextEditorPositionData): void {
-		for (let id in data) {
-			let textEditor = this._editors.get(id);
-			let viewColumn = TypeConverters.toViewColumn(data[id]);
-			if (textEditor.viewColumn !== viewColumn) {
-				textEditor._acceptViewColumn(viewColumn);
-				this._onDidChangeTextEditorViewColumn.fire({ textEditor, viewColumn });
-			}
-		}
-	}
-
-	$acceptTextEditorRemove(id: string): void {
-		// make sure the removed editor is not visible
-		let newVisibleEditors = this._visibleEditorIds.filter(visibleEditorId => visibleEditorId !== id);
-
-		if (this._activeEditorId === id) {
-			// removing the current active editor
-			this.$acceptActiveEditorAndVisibleEditors(undefined, newVisibleEditors);
-		} else {
-			this.$acceptActiveEditorAndVisibleEditors(this._activeEditorId, newVisibleEditors);
-		}
-
-		let editor = this._editors.get(id);
-		editor.dispose();
-		this._editors.delete(id);
-	}
-}
-
-class TextEditorDecorationType implements vscode.TextEditorDecorationType {
+export class TextEditorDecorationType implements vscode.TextEditorDecorationType {
 
 	private static _Keys = new IdGenerator('TextEditorDecorationType');
 
@@ -467,7 +312,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
 
 }
 
-class ExtHostTextEditor implements vscode.TextEditor {
+export class ExtHostTextEditor implements vscode.TextEditor {
 
 	private _proxy: MainThreadEditorsShape;
 	private _id: string;
@@ -630,7 +475,7 @@ class ExtHostTextEditor implements vscode.TextEditor {
 			ranges = this._selections.map(TypeConverters.fromRange);
 
 		} else if (where instanceof Position) {
-			const {lineNumber, column} = TypeConverters.fromPosition(where);
+			const { lineNumber, column } = TypeConverters.fromPosition(where);
 			ranges = [{ startLineNumber: lineNumber, startColumn: column, endLineNumber: lineNumber, endColumn: column }];
 
 		} else if (where instanceof Range) {
@@ -641,7 +486,7 @@ class ExtHostTextEditor implements vscode.TextEditor {
 				if (posOrRange instanceof Range) {
 					ranges.push(TypeConverters.fromRange(posOrRange));
 				} else {
-					const {lineNumber, column} = TypeConverters.fromPosition(posOrRange);
+					const { lineNumber, column } = TypeConverters.fromPosition(posOrRange);
 					ranges.push({ startLineNumber: lineNumber, startColumn: column, endLineNumber: lineNumber, endColumn: column });
 				}
 			}
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
new file mode 100644
index 00000000000..fb4fd75dfd3
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 Event, { Emitter } from 'vs/base/common/event';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
+import { TextEditorSelectionChangeKind } from './extHostTypes';
+import { IResolvedTextEditorConfiguration, ISelectionChangeEvent } from 'vs/workbench/api/node/mainThreadEditor';
+import * as TypeConverters from './extHostTypeConverters';
+import { TextEditorDecorationType } from './extHostTextEditor';
+import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
+import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextEditorPositionData } from './extHost.protocol';
+import * as vscode from 'vscode';
+
+export class ExtHostEditors extends ExtHostEditorsShape {
+
+	private readonly _onDidChangeTextEditorSelection = new Emitter<vscode.TextEditorSelectionChangeEvent>();
+	private readonly _onDidChangeTextEditorOptions = new Emitter<vscode.TextEditorOptionsChangeEvent>();
+	private readonly _onDidChangeTextEditorViewColumn = new Emitter<vscode.TextEditorViewColumnChangeEvent>();
+	private readonly _onDidChangeActiveTextEditor = new Emitter<vscode.TextEditor>();
+	private readonly _onDidChangeVisibleTextEditors = new Emitter<vscode.TextEditor[]>();
+
+	readonly onDidChangeTextEditorSelection: Event<vscode.TextEditorSelectionChangeEvent> = this._onDidChangeTextEditorSelection.event;
+	readonly onDidChangeTextEditorOptions: Event<vscode.TextEditorOptionsChangeEvent> = this._onDidChangeTextEditorOptions.event;
+	readonly onDidChangeTextEditorViewColumn: Event<vscode.TextEditorViewColumnChangeEvent> = this._onDidChangeTextEditorViewColumn.event;
+	readonly onDidChangeActiveTextEditor: Event<vscode.TextEditor> = this._onDidChangeActiveTextEditor.event;
+	readonly onDidChangeVisibleTextEditors: Event<vscode.TextEditor[]> = this._onDidChangeVisibleTextEditors.event;
+
+
+	private _proxy: MainThreadEditorsShape;
+	private _extHostDocumentsAndEditors: ExtHostDocumentsAndEditors;
+
+	constructor(
+		threadService: IThreadService,
+		extHostDocumentsAndEditors: ExtHostDocumentsAndEditors,
+	) {
+		super();
+		this._proxy = threadService.get(MainContext.MainThreadEditors);
+		this._extHostDocumentsAndEditors = extHostDocumentsAndEditors;
+
+		this._extHostDocumentsAndEditors.onDidChangeVisibleTextEditors(e => this._onDidChangeVisibleTextEditors.fire(e));
+		this._extHostDocumentsAndEditors.onDidChangeActiveTextEditor(e => this._onDidChangeActiveTextEditor.fire(e));
+	}
+
+	getActiveTextEditor(): vscode.TextEditor {
+		return this._extHostDocumentsAndEditors.activeEditor();
+	}
+
+	getVisibleTextEditors(): vscode.TextEditor[] {
+		return this._extHostDocumentsAndEditors.allEditors();
+	}
+
+	showTextDocument(document: vscode.TextDocument, column: vscode.ViewColumn, preserveFocus: boolean): TPromise<vscode.TextEditor> {
+		return this._proxy.$tryShowTextDocument(<URI>document.uri, TypeConverters.fromViewColumn(column), preserveFocus).then(id => {
+			let editor = this._extHostDocumentsAndEditors.getEditor(id);
+			if (editor) {
+				return editor;
+			} else {
+				throw new Error(`Failed to show text document ${document.uri.toString()}, should show in editor #${id}`);
+			}
+		});
+	}
+
+	createTextEditorDecorationType(options: vscode.DecorationRenderOptions): vscode.TextEditorDecorationType {
+		return new TextEditorDecorationType(this._proxy, options);
+	}
+
+	// --- called from main thread
+
+	$acceptOptionsChanged(id: string, opts: IResolvedTextEditorConfiguration): void {
+		let editor = this._extHostDocumentsAndEditors.getEditor(id);
+		editor._acceptOptions(opts);
+		this._onDidChangeTextEditorOptions.fire({
+			textEditor: editor,
+			options: opts
+		});
+	}
+
+	$acceptSelectionsChanged(id: string, event: ISelectionChangeEvent): void {
+		const kind = TextEditorSelectionChangeKind.fromValue(event.source);
+		const selections = event.selections.map(TypeConverters.toSelection);
+		const textEditor = this._extHostDocumentsAndEditors.getEditor(id);
+		textEditor._acceptSelections(selections);
+		this._onDidChangeTextEditorSelection.fire({
+			textEditor,
+			selections,
+			kind
+		});
+	}
+
+	$acceptEditorPositionData(data: ITextEditorPositionData): void {
+		for (let id in data) {
+			let textEditor = this._extHostDocumentsAndEditors.getEditor(id);
+			let viewColumn = TypeConverters.toViewColumn(data[id]);
+			if (textEditor.viewColumn !== viewColumn) {
+				textEditor._acceptViewColumn(viewColumn);
+				this._onDidChangeTextEditorViewColumn.fire({ textEditor, viewColumn });
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/api/node/mainThreadDocuments.ts b/src/vs/workbench/api/node/mainThreadDocuments.ts
index aabb858100d..e464aeb0720 100644
--- a/src/vs/workbench/api/node/mainThreadDocuments.ts
+++ b/src/vs/workbench/api/node/mainThreadDocuments.ts
@@ -20,8 +20,10 @@ import { ExtHostContext, MainThreadDocumentsShape, ExtHostDocumentsShape } from
 import { ITextModelResolverService } from 'vs/editor/common/services/resolverService';
 import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
 import { ITextSource } from 'vs/editor/common/model/textSource';
+import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 
 export class MainThreadDocuments extends MainThreadDocumentsShape {
+
 	private _modelService: IModelService;
 	private _modeService: IModeService;
 	private _textModelResolverService: ITextModelResolverService;
@@ -36,6 +38,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 	private _resourceContentProvider: { [handle: number]: IDisposable };
 
 	constructor(
+		documentsAndEditors: MainThreadDocumentsAndEditors,
 		@IThreadService threadService: IThreadService,
 		@IModelService modelService: IModelService,
 		@IModeService modeService: IModeService,
@@ -57,8 +60,8 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 		this._modelIsSynced = {};
 
 		this._toDispose = [];
-		modelService.onModelAdded(this._onModelAdded, this, this._toDispose);
-		modelService.onModelRemoved(this._onModelRemoved, this, this._toDispose);
+		this._toDispose.push(documentsAndEditors.onDocumentAdd(models => models.forEach(this._onModelAdded, this)));
+		this._toDispose.push(documentsAndEditors.onDocumentRemove(urls => urls.forEach(this._onModelRemoved, this)));
 		modelService.onModelModeChanged(this._onModelModeChanged, this, this._toDispose);
 
 		this._toDispose.push(textFileService.models.onModelSaved(e => {
@@ -103,14 +106,6 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 		let modelUrl = model.uri;
 		this._modelIsSynced[modelUrl.toString()] = true;
 		this._modelToDisposeMap[modelUrl.toString()] = model.addBulkListener((events) => this._onModelEvents(modelUrl, events));
-		this._proxy.$acceptModelAdd({
-			url: model.uri,
-			versionId: model.getVersionId(),
-			lines: model.getLinesContent(),
-			EOL: model.getEOL(),
-			modeId: model.getLanguageIdentifier().language,
-			isDirty: this._textFileService.isDirty(modelUrl)
-		});
 	}
 
 	private _onModelModeChanged(event: { model: editorCommon.IModel; oldModeId: string; }): void {
@@ -122,15 +117,14 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 		this._proxy.$acceptModelModeChanged(model.uri.toString(), oldModeId, model.getLanguageIdentifier().language);
 	}
 
-	private _onModelRemoved(model: editorCommon.IModel): void {
-		let modelUrl = model.uri;
-		if (!this._modelIsSynced[modelUrl.toString()]) {
+	private _onModelRemoved(modelUrl: string): void {
+
+		if (!this._modelIsSynced[modelUrl]) {
 			return;
 		}
-		delete this._modelIsSynced[modelUrl.toString()];
-		this._modelToDisposeMap[modelUrl.toString()].dispose();
-		delete this._modelToDisposeMap[modelUrl.toString()];
-		this._proxy.$acceptModelRemoved(modelUrl.toString());
+		delete this._modelIsSynced[modelUrl];
+		this._modelToDisposeMap[modelUrl].dispose();
+		delete this._modelToDisposeMap[modelUrl];
 	}
 
 	private _onModelEvents(modelUrl: URI, events: EmitterEvent[]): void {
@@ -246,6 +240,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
 		if (!model) {
 			return;
 		}
+
 		const raw: ITextSource = {
 			lines: value.lines,
 			length: value.length,
diff --git a/src/vs/workbench/api/node/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/node/mainThreadDocumentsAndEditors.ts
new file mode 100644
index 00000000000..8d710b5eceb
--- /dev/null
+++ b/src/vs/workbench/api/node/mainThreadDocumentsAndEditors.ts
@@ -0,0 +1,351 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IModelService } from 'vs/editor/common/services/modelService';
+import { IModel, ICommonCodeEditor, isCommonCodeEditor, isCommonDiffEditor } from 'vs/editor/common/editorCommon';
+import { compare } from 'vs/base/common/strings';
+import { delta } from 'vs/base/common/arrays';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
+import Event, { Emitter, any } from 'vs/base/common/event';
+import { ExtHostContext, ExtHostDocumentsAndEditorsShape, IModelAddedData, ITextEditorAddData, IDocumentsAndEditorsDelta } from './extHost.protocol';
+import { MainThreadTextEditor } from 'vs/workbench/api/node/mainThreadEditor';
+import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { Position as EditorPosition, IEditor } from 'vs/platform/editor/common/editor';
+
+namespace cmp {
+	export function compareModels(a: IModel, b: IModel): number {
+		return compare(a.uri.toString(), b.uri.toString());
+	}
+	export function compareEditors(a: EditorAndModel, b: EditorAndModel): number {
+		let ret = compare(a.editor.getId(), b.editor.getId());
+		if (ret === 0) {
+			ret = compare(a.document.uri.toString(), b.document.uri.toString());
+		}
+		return ret;
+	}
+}
+
+class EditorAndModel {
+
+	readonly id: string;
+
+	constructor(
+		readonly editor: ICommonCodeEditor,
+		readonly document: IModel,
+	) {
+		this.id = `${editor.getId()},${document.uri.toString()}`;
+	}
+}
+
+class DocumentAndEditorStateDelta {
+
+	readonly isEmpty: boolean;
+
+	constructor(
+		readonly removedDocuments: IModel[],
+		readonly addedDocuments: IModel[],
+		readonly removedEditors: EditorAndModel[],
+		readonly addedEditors: EditorAndModel[],
+		readonly oldActiveEditor: string,
+		readonly newActiveEditor: string,
+	) {
+		this.isEmpty = this.removedDocuments.length === 0
+			&& this.addedDocuments.length === 0
+			&& this.removedEditors.length === 0
+			&& this.addedEditors.length === 0
+			&& oldActiveEditor === newActiveEditor;
+	}
+
+	toString(): string {
+		let ret = 'DocumentAndEditorStateDelta\n';
+		ret += `\tRemoved Documents: [${this.removedDocuments.map(d => d.uri.toString(true)).join(', ')}]\n`;
+		ret += `\tAdded Documents: [${this.addedDocuments.map(d => d.uri.toString(true)).join(', ')}]\n`;
+		ret += `\tRemoved Editors: [${this.removedEditors.map(e => e.id).join(', ')}]\n`;
+		ret += `\tAdded Editors: [${this.addedEditors.map(e => e.id).join(', ')}]\n`;
+		ret += `\tNew Active Editor: ${this.newActiveEditor}\n`;
+		return ret;
+	}
+}
+
+class DocumentAndEditorState {
+
+	static compute(before: DocumentAndEditorState, after: DocumentAndEditorState): DocumentAndEditorStateDelta {
+		if (!before) {
+			return new DocumentAndEditorStateDelta([], after.documents, [], after.editors, undefined, after.activeEditor);
+		}
+		const documentDelta = delta(before.documents, after.documents, cmp.compareModels);
+		const editorDelta = delta(before.editors, after.editors, cmp.compareEditors);
+		const oldActiveEditor = before.activeEditor !== after.activeEditor ? before.activeEditor : undefined;
+		const newActiveEditor = before.activeEditor !== after.activeEditor ? after.activeEditor : undefined;
+
+		return new DocumentAndEditorStateDelta(
+			documentDelta.removed, documentDelta.added,
+			editorDelta.removed, editorDelta.added,
+			oldActiveEditor, newActiveEditor
+		);
+	}
+
+	constructor(
+		readonly documents: IModel[],
+		readonly editors: EditorAndModel[],
+		readonly activeEditor: string,
+	) {
+		this.documents = documents.sort(cmp.compareModels);
+		this.editors = editors.sort(cmp.compareEditors);
+	}
+}
+
+class MainThreadDocumentAndEditorStateComputer {
+
+	private _toDispose: IDisposable[] = [];
+	private _toDisposeOnEditorRemove = new Map<string, IDisposable>();
+	private _onDidChangeState = new Emitter<DocumentAndEditorStateDelta>();
+	private _currentState: DocumentAndEditorState;
+
+	readonly onDidChangeState: Event<DocumentAndEditorStateDelta> = this._onDidChangeState.event;
+
+	constructor(
+		@IModelService private _modelService: IModelService,
+		@ICodeEditorService private _codeEditorService: ICodeEditorService,
+		@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService
+	) {
+		this._modelService.onModelAdded(this._updateState, this, this._toDispose);
+		this._modelService.onModelRemoved(this._updateState, this, this._toDispose);
+		this._codeEditorService.onCodeEditorAdd(this._onDidAddEditor, this, this._toDispose);
+		this._codeEditorService.onCodeEditorRemove(this._onDidRemoveEditor, this, this._toDispose);
+		// this._updateState();
+	}
+
+	dispose(): void {
+		this._toDispose = dispose(this._toDispose);
+	}
+
+	private _onDidAddEditor(e: ICommonCodeEditor): void {
+		const listener = any<any>(
+			e.onDidChangeModel,
+			e.onDidFocusEditor,
+			e.onDidBlurEditor
+		)(this._updateState, this);
+		this._toDisposeOnEditorRemove.set(e.getId(), listener);
+		this._updateState();
+	}
+
+	private _onDidRemoveEditor(e: ICommonCodeEditor): void {
+		const sub = this._toDisposeOnEditorRemove.get(e.getId());
+		if (sub) {
+			this._toDisposeOnEditorRemove.delete(e.getId());
+			sub.dispose();
+			this._updateState();
+		}
+	}
+
+	private _updateState(): void {
+
+		// models: ignore too large models
+		const models = this._modelService.getModels();
+		for (let i = 0; i < models.length; i++) {
+			if (models[i].isTooLargeForHavingARichMode()) {
+				models.splice(i, 1);
+				i--;
+			}
+		}
+
+		// editor: only take those that have a not too large model
+		const editors: EditorAndModel[] = [];
+		let activeEditor: string = null;
+
+		for (const editor of this._codeEditorService.listCodeEditors()) {
+			const model = editor.getModel();
+			if (model && !model.isTooLargeForHavingARichMode()
+				&& !model.isDisposed() // model disposed
+				&& Boolean(this._modelService.getModel(model.uri)) // model disposing, the flag didn't flip yet but the model service already removed it
+			) {
+				const apiEditor = new EditorAndModel(editor, model);
+				editors.push(apiEditor);
+				if (editor.isFocused()) {
+					activeEditor = apiEditor.id;
+				}
+			}
+		}
+
+		// active editor: if none of the previous editors had focus we try
+		// to match the action workbench editor with one of editor we have
+		// just computed
+		if (!activeEditor) {
+			const workbenchEditor = this._workbenchEditorService.getActiveEditor();
+			if (workbenchEditor) {
+				const workbenchEditorControl = workbenchEditor.getControl();
+				let candidate: ICommonCodeEditor;
+				if (isCommonCodeEditor(workbenchEditorControl)) {
+					candidate = workbenchEditorControl;
+				} else if (isCommonDiffEditor(workbenchEditorControl)) {
+					candidate = workbenchEditorControl.getModifiedEditor();
+				}
+				if (candidate) {
+					for (const { editor, id } of editors) {
+						if (candidate === editor) {
+							activeEditor = id;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		// compute new state and compare against old
+		const newState = new DocumentAndEditorState(models, editors, activeEditor);
+		const delta = DocumentAndEditorState.compute(this._currentState, newState);
+		if (!delta.isEmpty) {
+			this._currentState = newState;
+			this._onDidChangeState.fire(delta);
+		}
+	}
+}
+
+export class MainThreadDocumentsAndEditors {
+
+	private _toDispose: IDisposable[];
+	private _proxy: ExtHostDocumentsAndEditorsShape;
+	private _stateComputer: MainThreadDocumentAndEditorStateComputer;
+	private _editors = <{ [id: string]: MainThreadTextEditor }>Object.create(null);
+
+	private _onTextEditorAdd = new Emitter<MainThreadTextEditor[]>();
+	private _onTextEditorRemove = new Emitter<string[]>();
+	private _onDocumentAdd = new Emitter<IModel[]>();
+	private _onDocumentRemove = new Emitter<string[]>();
+
+	readonly onTextEditorAdd: Event<MainThreadTextEditor[]> = this._onTextEditorAdd.event;
+	readonly onTextEditorRemove: Event<string[]> = this._onTextEditorRemove.event;
+	readonly onDocumentAdd: Event<IModel[]> = this._onDocumentAdd.event;
+	readonly onDocumentRemove: Event<string[]> = this._onDocumentRemove.event;
+
+	constructor(
+		@IModelService private _modelService: IModelService,
+		@ITextFileService private _textFileService: ITextFileService,
+		@IWorkbenchEditorService private _workbenchEditorService: IWorkbenchEditorService,
+		@IThreadService threadService: IThreadService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
+	) {
+		this._proxy = threadService.get(ExtHostContext.ExtHostDocumentsAndEditors);
+		this._stateComputer = new MainThreadDocumentAndEditorStateComputer(_modelService, codeEditorService, _workbenchEditorService);
+		this._toDispose = [
+			this._stateComputer,
+			this._stateComputer.onDidChangeState(this._onDelta, this)
+		];
+	}
+
+	dispose(): void {
+		this._toDispose = dispose(this._toDispose);
+	}
+
+	private _onDelta(delta: DocumentAndEditorStateDelta): void {
+
+		let removedDocuments: string[];
+		let removedEditors: string[] = [];
+		let addedEditors: MainThreadTextEditor[] = [];
+
+		// removed models
+		removedDocuments = delta.removedDocuments.map(m => m.uri.toString());
+
+		// added editors
+		for (const apiEditor of delta.addedEditors) {
+			const mainThreadEditor = new MainThreadTextEditor(apiEditor.id, apiEditor.document,
+				apiEditor.editor, { onGainedFocus() { }, onLostFocus() { } }, this._modelService);
+
+			this._editors[apiEditor.id] = mainThreadEditor;
+			addedEditors.push(mainThreadEditor);
+		}
+
+		// removed editors
+		for (const { id } of delta.removedEditors) {
+			const mainThreadEditor = this._editors[id];
+			if (mainThreadEditor) {
+				mainThreadEditor.dispose();
+				delete this._editors[id];
+				removedEditors.push(id);
+			}
+		}
+
+		let extHostDelta: IDocumentsAndEditorsDelta = Object.create(null);
+		let empty = true;
+		if (delta.newActiveEditor !== undefined) {
+			empty = false;
+			extHostDelta.newActiveEditor = delta.newActiveEditor;
+		}
+		if (removedDocuments.length > 0) {
+			empty = false;
+			extHostDelta.removedDocuments = removedDocuments;
+		}
+		if (removedEditors.length > 0) {
+			empty = false;
+			extHostDelta.removedEditors = removedEditors;
+		}
+		if (delta.addedDocuments.length > 0) {
+			empty = false;
+			extHostDelta.addedDocuments = delta.addedDocuments.map(m => this._toModelAddData(m));
+		}
+		if (delta.addedEditors.length > 0) {
+			empty = false;
+			extHostDelta.addedEditors = addedEditors.map(e => this._toTextEditorAddData(e));
+		}
+
+		if (!empty) {
+			// first update ext host
+			this._proxy.$acceptDocumentsAndEditorsDelta(extHostDelta);
+			// second update dependent state listener
+			this._onDocumentRemove.fire(removedDocuments);
+			this._onDocumentAdd.fire(delta.addedDocuments);
+			this._onTextEditorRemove.fire(removedEditors);
+			this._onTextEditorAdd.fire(addedEditors);
+		}
+	}
+
+	private _toModelAddData(model: IModel): IModelAddedData {
+		return {
+			url: model.uri,
+			versionId: model.getVersionId(),
+			lines: model.getLinesContent(),
+			EOL: model.getEOL(),
+			modeId: model.getLanguageIdentifier().language,
+			isDirty: this._textFileService.isDirty(model.uri)
+		};
+	}
+
+	private _toTextEditorAddData(textEditor: MainThreadTextEditor): ITextEditorAddData {
+		return {
+			id: textEditor.getId(),
+			document: textEditor.getModel().uri,
+			options: textEditor.getConfiguration(),
+			selections: textEditor.getSelections(),
+			editorPosition: this._findEditorPosition(textEditor)
+		};
+	}
+
+	private _findEditorPosition(editor: MainThreadTextEditor): EditorPosition {
+		for (let workbenchEditor of this._workbenchEditorService.getVisibleEditors()) {
+			if (editor.matches(workbenchEditor)) {
+				return workbenchEditor.position;
+			}
+		}
+		return undefined;
+	}
+
+	findTextEditorIdFor(editor: IEditor): string {
+		for (let id in this._editors) {
+			if (this._editors[id].matches(editor)) {
+				return id;
+			}
+		}
+		return undefined;
+	}
+
+	getEditor(id: string): MainThreadTextEditor {
+		return this._editors[id];
+	}
+}
diff --git a/src/vs/workbench/api/node/mainThreadEditorsTracker.ts b/src/vs/workbench/api/node/mainThreadEditor.ts
similarity index 55%
rename from src/vs/workbench/api/node/mainThreadEditorsTracker.ts
rename to src/vs/workbench/api/node/mainThreadEditor.ts
index cd4fef572a6..7d1548572bf 100644
--- a/src/vs/workbench/api/node/mainThreadEditorsTracker.ts
+++ b/src/vs/workbench/api/node/mainThreadEditor.ts
@@ -7,11 +7,8 @@
 import EditorCommon = require('vs/editor/common/editorCommon');
 import Event, { Emitter } from 'vs/base/common/event';
 import { IEditor } from 'vs/platform/editor/common/editor';
-import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { IdGenerator } from 'vs/base/common/idGenerator';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { SnippetController } from 'vs/editor/contrib/snippet/common/snippetController';
@@ -131,6 +128,10 @@ export class MainThreadTextEditor {
 		return this._model;
 	}
 
+	public getCodeEditor(): EditorCommon.ICommonCodeEditor {
+		return this._codeEditor;
+	}
+
 	public hasCodeEditor(codeEditor: EditorCommon.ICommonCodeEditor): boolean {
 		return (this._codeEditor === codeEditor);
 	}
@@ -413,324 +414,3 @@ export class MainThreadTextEditor {
 		return true;
 	}
 }
-
-/**
- * Keeps track of what goes on in the main thread and maps models => text editors
- */
-export class MainThreadEditorsTracker {
-
-	private static _Ids = new IdGenerator('');
-
-	private _toDispose: IDisposable[];
-	private _codeEditorService: ICodeEditorService;
-	private _modelService: IModelService;
-	private _updateMapping: RunOnceScheduler;
-	private _editorModelChangeListeners: { [editorId: string]: IDisposable; };
-
-	private _model2TextEditors: {
-		[modelUri: string]: MainThreadTextEditor[];
-	};
-	private _focusedTextEditorId: string;
-	private _visibleTextEditorIds: string[];
-	private _onTextEditorAdd: Emitter<MainThreadTextEditor>;
-	private _onTextEditorRemove: Emitter<MainThreadTextEditor>;
-	private _onDidChangeFocusedTextEditor: Emitter<string>;
-	private _onDidUpdateTextEditors: Emitter<void>;
-
-	private _focusTracker: IFocusTracker;
-
-	constructor(
-		editorService: ICodeEditorService,
-		modelService: IModelService
-	) {
-		this._codeEditorService = editorService;
-		this._modelService = modelService;
-		this._toDispose = [];
-		this._focusedTextEditorId = null;
-		this._visibleTextEditorIds = [];
-		this._editorModelChangeListeners = Object.create(null);
-		this._model2TextEditors = Object.create(null);
-		this._onTextEditorAdd = new Emitter<MainThreadTextEditor>();
-		this._onTextEditorRemove = new Emitter<MainThreadTextEditor>();
-		this._onDidUpdateTextEditors = new Emitter<void>();
-		this._onDidChangeFocusedTextEditor = new Emitter<string>();
-		this._focusTracker = {
-			onGainedFocus: () => this._updateFocusedTextEditor(),
-			onLostFocus: () => this._updateFocusedTextEditor()
-		};
-
-		this._modelService.onModelAdded(this._onModelAdded, this, this._toDispose);
-		this._modelService.onModelRemoved(this._onModelRemoved, this, this._toDispose);
-
-		this._codeEditorService.onCodeEditorAdd(this._onCodeEditorAdd, this, this._toDispose);
-		this._codeEditorService.onCodeEditorRemove(this._onCodeEditorRemove, this, this._toDispose);
-
-		this._updateMapping = new RunOnceScheduler(() => this._doUpdateMapping(), 0);
-		this._toDispose.push(this._updateMapping);
-	}
-
-	public dispose(): void {
-		this._toDispose = dispose(this._toDispose);
-	}
-
-	private _onModelAdded(model: EditorCommon.IModel): void {
-		this._updateMapping.schedule();
-	}
-
-	private _onModelRemoved(model: EditorCommon.IModel): void {
-		this._updateMapping.schedule();
-	}
-
-	private _onCodeEditorAdd(codeEditor: EditorCommon.ICommonCodeEditor): void {
-		this._editorModelChangeListeners[codeEditor.getId()] = codeEditor.onDidChangeModel(_ => this._updateMapping.schedule());
-		this._updateMapping.schedule();
-	}
-
-	private _onCodeEditorRemove(codeEditor: EditorCommon.ICommonCodeEditor): void {
-		this._editorModelChangeListeners[codeEditor.getId()].dispose();
-		delete this._editorModelChangeListeners[codeEditor.getId()];
-		this._updateMapping.schedule();
-	}
-
-	private _doUpdateMapping(): void {
-		let allModels = this._modelService.getModels();
-		// Same filter as in extHostDocuments
-		allModels = allModels.filter((model) => !model.isTooLargeForHavingARichMode());
-		let allModelsMap: { [modelUri: string]: EditorCommon.IModel; } = Object.create(null);
-		allModels.forEach((model) => {
-			allModelsMap[model.uri.toString()] = model;
-		});
-
-		// Remove text editors for models that no longer exist
-		Object.keys(this._model2TextEditors).forEach((modelUri) => {
-			if (allModelsMap[modelUri]) {
-				// model still exists, will be updated below
-				return;
-			}
-
-			let textEditorsToRemove = this._model2TextEditors[modelUri];
-			delete this._model2TextEditors[modelUri];
-
-			for (let i = 0; i < textEditorsToRemove.length; i++) {
-				this._onTextEditorRemove.fire(textEditorsToRemove[i]);
-				textEditorsToRemove[i].dispose();
-			}
-		});
-
-		// Handle all visible models
-		let visibleModels = this._getVisibleModels();
-		Object.keys(visibleModels).forEach((modelUri) => {
-			let model = visibleModels[modelUri].model;
-			let codeEditors = visibleModels[modelUri].codeEditors;
-
-			if (!this._model2TextEditors[modelUri]) {
-				this._model2TextEditors[modelUri] = [];
-			}
-			let existingTextEditors = this._model2TextEditors[modelUri];
-
-			// Remove text editors if more exist
-			while (existingTextEditors.length > codeEditors.length) {
-				let removedTextEditor = existingTextEditors.pop();
-				this._onTextEditorRemove.fire(removedTextEditor);
-				removedTextEditor.dispose();
-			}
-
-			// Adjust remaining text editors
-			for (let i = 0; i < existingTextEditors.length; i++) {
-				existingTextEditors[i].setCodeEditor(codeEditors[i]);
-			}
-
-			// Create new editors as needed
-			for (let i = existingTextEditors.length; i < codeEditors.length; i++) {
-				let newTextEditor = new MainThreadTextEditor(MainThreadEditorsTracker._Ids.nextId(), model, codeEditors[i], this._focusTracker, this._modelService);
-				existingTextEditors.push(newTextEditor);
-				this._onTextEditorAdd.fire(newTextEditor);
-			}
-		});
-
-		// Handle all not visible models
-		allModels.forEach((model) => {
-			let modelUri = model.uri.toString();
-
-			if (visibleModels[modelUri]) {
-				// model is visible, already handled above
-				return;
-			}
-
-			if (!this._model2TextEditors[modelUri]) {
-				this._model2TextEditors[modelUri] = [];
-			}
-			let existingTextEditors = this._model2TextEditors[modelUri];
-
-			// Remove extra text editors
-			while (existingTextEditors.length > 1) {
-				let removedTextEditor = existingTextEditors.pop();
-				this._onTextEditorRemove.fire(removedTextEditor);
-				removedTextEditor.dispose();
-			}
-
-			// Create new editor if needed or adjust it
-			if (existingTextEditors.length === 0) {
-				let newTextEditor = new MainThreadTextEditor(MainThreadEditorsTracker._Ids.nextId(), model, null, this._focusTracker, this._modelService);
-				existingTextEditors.push(newTextEditor);
-				this._onTextEditorAdd.fire(newTextEditor);
-			} else {
-				existingTextEditors[0].setCodeEditor(null);
-			}
-		});
-
-		this._printState();
-
-		this._visibleTextEditorIds = this._findVisibleTextEditorIds();
-
-		this._updateFocusedTextEditor();
-
-		// this is a sync event
-		this._onDidUpdateTextEditors.fire(undefined);
-	}
-
-	private _updateFocusedTextEditor(): void {
-		this._setFocusedTextEditorId(this._findFocusedTextEditorId());
-	}
-
-	private _findFocusedTextEditorId(): string {
-		let modelUris = Object.keys(this._model2TextEditors);
-		for (let i = 0, len = modelUris.length; i < len; i++) {
-			let editors = this._model2TextEditors[modelUris[i]];
-			for (let j = 0, lenJ = editors.length; j < lenJ; j++) {
-				if (editors[j].isFocused()) {
-					return editors[j].getId();
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private _findVisibleTextEditorIds(): string[] {
-		let result: string[] = [];
-		let modelUris = Object.keys(this._model2TextEditors);
-		for (let i = 0, len = modelUris.length; i < len; i++) {
-			let editors = this._model2TextEditors[modelUris[i]];
-			for (let j = 0, lenJ = editors.length; j < lenJ; j++) {
-				if (editors[j].isVisible()) {
-					result.push(editors[j].getId());
-				}
-			}
-		}
-		result.sort();
-		return result;
-	}
-
-	private _setFocusedTextEditorId(focusedTextEditorId: string): void {
-		if (this._focusedTextEditorId === focusedTextEditorId) {
-			// no change
-			return;
-		}
-
-		this._focusedTextEditorId = focusedTextEditorId;
-		this._printState();
-		this._onDidChangeFocusedTextEditor.fire(this._focusedTextEditorId);
-	}
-
-
-	private _printState(): void {
-		// console.log('----------------------');
-		// Object.keys(this._model2TextEditors).forEach((modelUri) => {
-		// 	let editors = this._model2TextEditors[modelUri];
-
-		// 	console.log(editors.map((e) => {
-		// 		return e.getId() + " (" + (e.getId() === this._focusedTextEditorId ? 'FOCUSED, ': '') + modelUri + ")";
-		// 	}).join('\n'));
-		// });
-	}
-
-	private _getVisibleModels(): IVisibleModels {
-		let r: IVisibleModels = {};
-
-		let allCodeEditors = this._codeEditorService.listCodeEditors();
-
-		// Maintain a certain sorting such that the mapping doesn't change too much all the time
-		allCodeEditors.sort((a, b) => strcmp(a.getId(), b.getId()));
-
-		allCodeEditors.forEach((codeEditor) => {
-			let model = codeEditor.getModel();
-			if (!model || model.isTooLargeForHavingARichMode() || !this._modelService.getModel(model.uri)) {
-				return;
-			}
-
-			let modelUri = model.uri.toString();
-			r[modelUri] = r[modelUri] || {
-				model: model,
-				codeEditors: []
-			};
-			r[modelUri].codeEditors.push(codeEditor);
-		});
-
-		return r;
-	}
-
-	public getFocusedTextEditorId(): string {
-		return this._focusedTextEditorId;
-	}
-
-	public getVisibleTextEditorIds(): string[] {
-		return this._visibleTextEditorIds;
-	}
-
-	public get onTextEditorAdd(): Event<MainThreadTextEditor> {
-		return this._onTextEditorAdd.event;
-	}
-
-	public get onTextEditorRemove(): Event<MainThreadTextEditor> {
-		return this._onTextEditorRemove.event;
-	}
-
-	public get onDidUpdateTextEditors(): Event<void> {
-		return this._onDidUpdateTextEditors.event;
-	}
-
-	public get onChangedFocusedTextEditor(): Event<string> {
-		return this._onDidChangeFocusedTextEditor.event;
-	}
-
-	public findTextEditorIdFor(codeEditor: EditorCommon.ICommonCodeEditor): string {
-		let modelUris = Object.keys(this._model2TextEditors);
-		for (let i = 0, len = modelUris.length; i < len; i++) {
-			let editors = this._model2TextEditors[modelUris[i]];
-			for (let j = 0, lenJ = editors.length; j < lenJ; j++) {
-				if (editors[j].hasCodeEditor(codeEditor)) {
-					return editors[j].getId();
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public registerTextEditorDecorationType(key: string, options: EditorCommon.IDecorationRenderOptions): void {
-		this._codeEditorService.registerDecorationType(key, options);
-	}
-
-	public removeTextEditorDecorationType(key: string): void {
-		this._codeEditorService.removeDecorationType(key);
-	}
-}
-
-interface IVisibleModels {
-	[modelUri: string]: {
-		model: EditorCommon.IModel;
-		codeEditors: EditorCommon.ICommonCodeEditor[];
-	};
-}
-
-function strcmp(a: string, b: string): number {
-	if (a < b) {
-		return -1;
-	}
-	if (a > b) {
-		return 1;
-	}
-	return 0;
-}
-
diff --git a/src/vs/workbench/api/node/mainThreadEditors.ts b/src/vs/workbench/api/node/mainThreadEditors.ts
index 789d3056447..9c3833207dd 100644
--- a/src/vs/workbench/api/node/mainThreadEditors.ts
+++ b/src/vs/workbench/api/node/mainThreadEditors.ts
@@ -8,58 +8,47 @@ import URI from 'vs/base/common/uri';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
-import { ISingleEditOperation, ISelection, IRange, IEditor, EditorType, ICommonCodeEditor, ICommonDiffEditor, IDecorationRenderOptions, IDecorationOptions } from 'vs/editor/common/editorCommon';
+import { ISingleEditOperation, ISelection, IRange, IDecorationRenderOptions, IDecorationOptions } from 'vs/editor/common/editorCommon';
 import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { MainThreadEditorsTracker, TextEditorRevealType, MainThreadTextEditor, IApplyEditsOptions, IUndoStopOptions, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditorsTracker';
+import { TextEditorRevealType, MainThreadTextEditor, IApplyEditsOptions, IUndoStopOptions, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditor';
+import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { equals as arrayEquals } from 'vs/base/common/arrays';
 import { equals as objectEquals } from 'vs/base/common/objects';
 import { ExtHostContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextEditorPositionData } from './extHost.protocol';
 
 export class MainThreadEditors extends MainThreadEditorsShape {
 
 	private _proxy: ExtHostEditorsShape;
+	private _documentsAndEditors: MainThreadDocumentsAndEditors;
 	private _workbenchEditorService: IWorkbenchEditorService;
 	private _telemetryService: ITelemetryService;
-	private _editorTracker: MainThreadEditorsTracker;
 	private _toDispose: IDisposable[];
 	private _textEditorsListenersMap: { [editorId: string]: IDisposable[]; };
-	private _textEditorsMap: { [editorId: string]: MainThreadTextEditor; };
-	private _activeTextEditor: string;
-	private _visibleEditors: string[];
 	private _editorPositionData: ITextEditorPositionData;
 
 	constructor(
+		documentsAndEditors: MainThreadDocumentsAndEditors,
+		@ICodeEditorService private _codeEditorService: ICodeEditorService,
 		@IThreadService threadService: IThreadService,
 		@IWorkbenchEditorService workbenchEditorService: IWorkbenchEditorService,
 		@IEditorGroupService editorGroupService: IEditorGroupService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@ICodeEditorService editorService: ICodeEditorService,
-		@IModelService modelService: IModelService
+		@ITelemetryService telemetryService: ITelemetryService
 	) {
 		super();
 		this._proxy = threadService.get(ExtHostContext.ExtHostEditors);
+		this._documentsAndEditors = documentsAndEditors;
 		this._workbenchEditorService = workbenchEditorService;
 		this._telemetryService = telemetryService;
 		this._toDispose = [];
 		this._textEditorsListenersMap = Object.create(null);
-		this._textEditorsMap = Object.create(null);
-		this._activeTextEditor = null;
-		this._visibleEditors = [];
 		this._editorPositionData = null;
 
-		this._editorTracker = new MainThreadEditorsTracker(editorService, modelService);
-		this._toDispose.push(this._editorTracker);
+		this._toDispose.push(documentsAndEditors.onTextEditorAdd(editors => editors.forEach(this._onTextEditorAdd, this)));
+		this._toDispose.push(documentsAndEditors.onTextEditorRemove(editors => editors.forEach(this._onTextEditorRemove, this)));
 
-		this._toDispose.push(this._editorTracker.onTextEditorAdd((textEditor) => this._onTextEditorAdd(textEditor)));
-		this._toDispose.push(this._editorTracker.onTextEditorRemove((textEditor) => this._onTextEditorRemove(textEditor)));
-
-		this._toDispose.push(this._editorTracker.onDidUpdateTextEditors(() => this._updateActiveAndVisibleTextEditors()));
-		this._toDispose.push(this._editorTracker.onChangedFocusedTextEditor((focusedTextEditorId) => this._updateActiveAndVisibleTextEditors()));
 		this._toDispose.push(editorGroupService.onEditorsChanged(() => this._updateActiveAndVisibleTextEditors()));
 		this._toDispose.push(editorGroupService.onEditorsMoved(() => this._updateActiveAndVisibleTextEditors()));
 	}
@@ -81,37 +70,17 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 		toDispose.push(textEditor.onSelectionChanged((event) => {
 			this._proxy.$acceptSelectionsChanged(id, event);
 		}));
-		this._proxy.$acceptTextEditorAdd({
-			id: id,
-			document: textEditor.getModel().uri,
-			options: textEditor.getConfiguration(),
-			selections: textEditor.getSelections(),
-			editorPosition: this._findEditorPosition(textEditor)
-		});
 
 		this._textEditorsListenersMap[id] = toDispose;
-		this._textEditorsMap[id] = textEditor;
 	}
 
-	private _onTextEditorRemove(textEditor: MainThreadTextEditor): void {
-		let id = textEditor.getId();
+	private _onTextEditorRemove(id: string): void {
 		dispose(this._textEditorsListenersMap[id]);
 		delete this._textEditorsListenersMap[id];
-		delete this._textEditorsMap[id];
-		this._proxy.$acceptTextEditorRemove(id);
 	}
 
 	private _updateActiveAndVisibleTextEditors(): void {
 
-		// active and visible editors
-		let visibleEditors = this._editorTracker.getVisibleTextEditorIds();
-		let activeEditor = this._findActiveTextEditorId();
-		if (activeEditor !== this._activeTextEditor || !arrayEquals(this._visibleEditors, visibleEditors, (a, b) => a === b)) {
-			this._activeTextEditor = activeEditor;
-			this._visibleEditors = visibleEditors;
-			this._proxy.$acceptActiveEditorAndVisibleEditors(this._activeTextEditor, this._visibleEditors);
-		}
-
 		// editor columns
 		let editorPositionData = this._getTextEditorPositionData();
 		if (!objectEquals(this._editorPositionData, editorPositionData)) {
@@ -120,55 +89,12 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 		}
 	}
 
-	private _findActiveTextEditorId(): string {
-		let focusedTextEditorId = this._editorTracker.getFocusedTextEditorId();
-		if (focusedTextEditorId) {
-			return focusedTextEditorId;
-		}
-
-		let activeEditor = this._workbenchEditorService.getActiveEditor();
-		if (!activeEditor) {
-			return null;
-		}
-
-		let editor = <IEditor>activeEditor.getControl();
-		// Substitute for (editor instanceof ICodeEditor)
-		if (!editor || typeof editor.getEditorType !== 'function') {
-			// Not a text editor...
-			return null;
-		}
-
-		if (editor.getEditorType() === EditorType.ICodeEditor) {
-			return this._editorTracker.findTextEditorIdFor(<ICommonCodeEditor>editor);
-		}
-
-		// Must be a diff editor => use the modified side
-		return this._editorTracker.findTextEditorIdFor((<ICommonDiffEditor>editor).getModifiedEditor());
-	}
-
-	private _findEditorPosition(editor: MainThreadTextEditor): EditorPosition {
-		for (let workbenchEditor of this._workbenchEditorService.getVisibleEditors()) {
-			if (editor.matches(workbenchEditor)) {
-				return workbenchEditor.position;
-			}
-		}
-		return undefined;
-	}
-
 	private _getTextEditorPositionData(): ITextEditorPositionData {
 		let result: ITextEditorPositionData = Object.create(null);
 		for (let workbenchEditor of this._workbenchEditorService.getVisibleEditors()) {
-			let editor = <IEditor>workbenchEditor.getControl();
-			// Substitute for (editor instanceof ICodeEditor)
-			if (!editor || typeof editor.getEditorType !== 'function') {
-				// Not a text editor...
-				continue;
-			}
-			if (editor.getEditorType() === EditorType.ICodeEditor) {
-				let id = this._editorTracker.findTextEditorIdFor(<ICommonCodeEditor>editor);
-				if (id) {
-					result[id] = workbenchEditor.position;
-				}
+			const id = this._documentsAndEditors.findTextEditorIdFor(workbenchEditor);
+			if (id) {
+				result[id] = workbenchEditor.position;
 			}
 		}
 		return result;
@@ -187,43 +113,7 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 			if (!editor) {
 				return undefined;
 			}
-
-			const findEditor = (): string => {
-				// find the editor we have just opened and return the
-				// id we have assigned to it.
-				for (let id in this._textEditorsMap) {
-					if (this._textEditorsMap[id].matches(editor)) {
-						return id;
-					}
-				}
-				return undefined;
-			};
-
-			const syncEditorId = findEditor();
-			if (syncEditorId) {
-				return TPromise.as(syncEditorId);
-			}
-
-			return new TPromise<void>(resolve => {
-				// not very nice but the way it is: changes to the editor state aren't
-				// send to the ext host as they happen but stuff is delayed a little. in
-				// order to provide the real editor on #openTextEditor we need to sync on
-				// that update
-				let subscription: IDisposable;
-				let handle: number;
-				function contd() {
-					subscription.dispose();
-					clearTimeout(handle);
-					resolve(undefined);
-				}
-				subscription = this._editorTracker.onDidUpdateTextEditors(() => {
-					contd();
-				});
-				handle = setTimeout(() => {
-					contd();
-				}, 1000);
-
-			}).then(findEditor);
+			return this._documentsAndEditors.findTextEditorIdFor(editor);
 		});
 	}
 
@@ -231,7 +121,7 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 		// check how often this is used
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.show' });
 
-		let mainThreadEditor = this._textEditorsMap[id];
+		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let model = mainThreadEditor.getModel();
 			return this._workbenchEditorService.openEditor({
@@ -246,7 +136,7 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 		// check how often this is used
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.hide' });
 
-		let mainThreadEditor = this._textEditorsMap[id];
+		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
 		if (mainThreadEditor) {
 			let editors = this._workbenchEditorService.getVisibleEditors();
 			for (let editor of editors) {
@@ -259,56 +149,57 @@ export class MainThreadEditors extends MainThreadEditorsShape {
 	}
 
 	$trySetSelections(id: string, selections: ISelection[]): TPromise<any> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		this._textEditorsMap[id].setSelections(selections);
+		this._documentsAndEditors.getEditor(id).setSelections(selections);
 		return TPromise.as(null);
 	}
 
 	$trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): TPromise<any> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		this._textEditorsMap[id].setDecorations(key, ranges);
+		this._documentsAndEditors.getEditor(id).setDecorations(key, ranges);
 		return TPromise.as(null);
 	}
 
 	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise<any> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		this._textEditorsMap[id].revealRange(range, revealType);
+		this._documentsAndEditors.getEditor(id).revealRange(range, revealType);
 		return undefined;
 	}
 
 	$trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise<any> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		this._textEditorsMap[id].setConfiguration(options);
+		this._documentsAndEditors.getEditor(id).setConfiguration(options);
 		return TPromise.as(null);
 	}
 
 	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): TPromise<boolean> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		return TPromise.as(this._textEditorsMap[id].applyEdits(modelVersionId, edits, opts));
+		return TPromise.as(this._documentsAndEditors.getEditor(id).applyEdits(modelVersionId, edits, opts));
 	}
 
 	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): TPromise<boolean> {
-		if (!this._textEditorsMap[id]) {
+		if (!this._documentsAndEditors.getEditor(id)) {
 			return TPromise.wrapError('TextEditor disposed');
 		}
-		return TPromise.as(this._textEditorsMap[id].insertSnippet(template, ranges, opts));
+		return TPromise.as(this._documentsAndEditors.getEditor(id).insertSnippet(template, ranges, opts));
 	}
 
 	$registerTextEditorDecorationType(key: string, options: IDecorationRenderOptions): void {
-		this._editorTracker.registerTextEditorDecorationType(key, options);
+		this._codeEditorService.registerDecorationType(key, options);
 	}
 
 	$removeTextEditorDecorationType(key: string): void {
-		this._editorTracker.removeTextEditorDecorationType(key);
+		this._codeEditorService.removeDecorationType(key);
+
 	}
 }
diff --git a/src/vs/workbench/api/node/mainThreadExtensionService.ts b/src/vs/workbench/api/node/mainThreadExtensionService.ts
index d8c3d825ec3..414cc32accf 100644
--- a/src/vs/workbench/api/node/mainThreadExtensionService.ts
+++ b/src/vs/workbench/api/node/mainThreadExtensionService.ts
@@ -13,6 +13,7 @@ import URI from 'vs/base/common/uri';
 import { AbstractExtensionService, ActivatedExtension } from 'vs/platform/extensions/common/abstractExtensionService';
 import { IMessage, IExtensionDescription, IExtensionsStatus } from 'vs/platform/extensions/common/extensions';
 import { IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionsRegistry, ExtensionPoint, IExtensionPointUser, ExtensionMessageCollector } from 'vs/platform/extensions/common/extensionsRegistry';
 import { ExtensionScanner, MessagesCollector } from 'vs/workbench/node/extensionPoints';
 import { IMessageService } from 'vs/platform/message/common/message';
@@ -81,7 +82,7 @@ export class MainProcessExtensionService extends AbstractExtensionService<Activa
 		];
 
 		this.scanExtensions().done(extensionDescriptions => {
-			this._onExtensionDescriptions(disabledExtensions.length ? extensionDescriptions.filter(e => disabledExtensions.indexOf(e.id) === -1) : extensionDescriptions);
+			this._onExtensionDescriptions(disabledExtensions.length ? extensionDescriptions.filter(e => disabledExtensions.every(id => !areSameExtensions({ id }, e))) : extensionDescriptions);
 		});
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 0b58b8a33fd..931f9749e70 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -86,6 +86,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	private memento: any;
 	private stacks: EditorStacksModel;
 	private tabOptions: ITabOptions;
+	private showTabs: boolean;
 	private doNotFireTabOptionsChanged: boolean;
 
 	private _onEditorsChanged: Emitter<void>;
@@ -191,7 +192,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 				previewEditors: newPreviewEditors,
 				showIcons: editorConfig.showIcons,
 				tabCloseButton: editorConfig.tabCloseButton,
-				showTabs: editorConfig.showTabs
+				showTabs: this.showTabs === undefined ? editorConfig.showTabs : this.showTabs
 			};
 
 			if (!this.doNotFireTabOptionsChanged && !objects.equals(oldTabOptions, this.tabOptions)) {
@@ -220,12 +221,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	}
 
 	public hideTabs(hidden: boolean): void {
-		this.doNotFireTabOptionsChanged = hidden;
-		if (hidden) {
-			this._onTabOptionsChanged.fire({ showTabs: false });
-		} else {
-			this._onTabOptionsChanged.fire(this.tabOptions);
-		}
+		this.showTabs = !hidden;
+		this.tabOptions.showTabs = !hidden;
+		this._onTabOptionsChanged.fire(this.tabOptions);
 	}
 
 	public get onEditorsChanged(): Event<void> {
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index a6c54f90a83..dd89b79dfed 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -216,8 +216,9 @@ export class TabsTitleControl extends TitleControl {
 				// Container
 				tabContainer.setAttribute('aria-label', `${name}, tab`);
 				tabContainer.title = title;
+				const tabOptions = this.editorGroupService.getTabOptions();
 				['off', 'left'].forEach(option => {
-					const domAction = this.tabOptions.tabCloseButton === option ? DOM.addClass : DOM.removeClass;
+					const domAction = tabOptions.tabCloseButton === option ? DOM.addClass : DOM.removeClass;
 					domAction(tabContainer, `close-button-${option}`);
 				});
 
diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts
index 835091782c7..41e4ab176e0 100644
--- a/src/vs/workbench/browser/parts/editor/textEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditor.ts
@@ -50,7 +50,6 @@ export abstract class BaseTextEditor extends BaseEditor {
 	private editorControl: IEditor;
 	private _editorContainer: Builder;
 	private hasPendingConfigurationChange: boolean;
-	private pendingAutoSaveAll: TPromise<void>;
 	private lastAppliedEditorOptions: IEditorOptions;
 
 	constructor(
@@ -155,36 +154,26 @@ export abstract class BaseTextEditor extends BaseEditor {
 	}
 
 	private onEditorFocusLost(): void {
-		if (this.pendingAutoSaveAll) {
-			return; // save is already triggered
-		}
-
-		if (this.textFileService.getAutoSaveMode() === AutoSaveMode.ON_FOCUS_CHANGE && this.textFileService.isDirty()) {
-			this.saveAll(SaveReason.FOCUS_CHANGE);
-		}
+		this.maybeTriggerSaveAll(SaveReason.FOCUS_CHANGE);
 	}
 
 	private onWindowFocusLost(): void {
-		if (this.pendingAutoSaveAll) {
-			return; // save is already triggered
-		}
-
-		if (this.textFileService.getAutoSaveMode() === AutoSaveMode.ON_WINDOW_CHANGE && this.textFileService.isDirty()) {
-			this.saveAll(SaveReason.WINDOW_CHANGE);
-		}
+		this.maybeTriggerSaveAll(SaveReason.WINDOW_CHANGE);
 	}
 
-	private saveAll(reason: SaveReason): void {
-		this.pendingAutoSaveAll = this.textFileService.saveAll(void 0, reason).then(() => {
-			this.pendingAutoSaveAll = void 0;
+	private maybeTriggerSaveAll(reason: SaveReason): void {
+		const mode = this.textFileService.getAutoSaveMode();
 
-			return void 0;
-		}, error => {
-			this.pendingAutoSaveAll = void 0;
-			errors.onUnexpectedError(error);
-
-			return void 0;
-		});
+		// Determine if we need to save all. In case of a window focus change we also save if auto save mode
+		// is configured to be ON_FOCUS_CHANGE (editor focus change)
+		if (
+			(reason === SaveReason.WINDOW_CHANGE && (mode === AutoSaveMode.ON_FOCUS_CHANGE || mode === AutoSaveMode.ON_WINDOW_CHANGE)) ||
+			(reason === SaveReason.FOCUS_CHANGE && mode === AutoSaveMode.ON_FOCUS_CHANGE)
+		) {
+			if (this.textFileService.isDirty()) {
+				this.textFileService.saveAll(void 0, reason).done(null, errors.onUnexpectedError);
+			}
+		}
 	}
 
 	/**
@@ -343,4 +332,4 @@ export abstract class BaseTextEditor extends BaseEditor {
 
 		super.dispose();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 871cbb1d9df..49f23caf5c2 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -23,7 +23,7 @@ import { IActionItem, ActionsOrientation, Separator } from 'vs/base/browser/ui/a
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IEditorGroupService, ITabOptions } from 'vs/workbench/services/group/common/groupService';
+import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -76,7 +76,6 @@ export abstract class TitleControl implements ITitleAreaControl {
 
 	private parent: HTMLElement;
 
-	protected tabOptions: ITabOptions;
 	private currentPrimaryEditorActionIds: string[] = [];
 	private currentSecondaryEditorActionIds: string[] = [];
 	protected editorActionsToolbar: ToolBar;
@@ -106,8 +105,6 @@ export abstract class TitleControl implements ITitleAreaControl {
 		this.stacks = editorGroupService.getStacksModel();
 		this.mapActionsToEditors = Object.create(null);
 
-		this.tabOptions = this.editorGroupService.getTabOptions();
-
 		this.scheduler = new RunOnceScheduler(() => this.onSchedule(), 0);
 		this.toDispose.push(this.scheduler);
 
@@ -137,7 +134,6 @@ export abstract class TitleControl implements ITitleAreaControl {
 	}
 
 	private registerListeners(): void {
-		this.toDispose.push(this.editorGroupService.onTabOptionsChanged(options => this.tabOptions = options));
 		this.toDispose.push(this.stacks.onModelChanged(e => this.onStacksChanged(e)));
 	}
 
@@ -372,7 +368,8 @@ export abstract class TitleControl implements ITitleAreaControl {
 			secondaryEditorActions = prepareActions(editorActions.secondary);
 		}
 
-		if (this.tabOptions.showTabs) {
+		const tabOptions = this.editorGroupService.getTabOptions();
+		if (tabOptions.showTabs) {
 			if (secondaryEditorActions.length > 0) {
 				secondaryEditorActions.push(new Separator());
 			}
@@ -382,7 +379,7 @@ export abstract class TitleControl implements ITitleAreaControl {
 		}
 
 		const primaryEditorActionIds = primaryEditorActions.map(a => a.id);
-		if (!this.tabOptions.showTabs) {
+		if (!tabOptions.showTabs) {
 			primaryEditorActionIds.push(this.closeEditorAction.id); // always show "Close" when tabs are disabled
 		}
 
@@ -396,7 +393,7 @@ export abstract class TitleControl implements ITitleAreaControl {
 		) {
 			this.editorActionsToolbar.setActions(primaryEditorActions, secondaryEditorActions)();
 
-			if (!this.tabOptions.showTabs) {
+			if (!tabOptions.showTabs) {
 				this.editorActionsToolbar.addPrimaryAction(this.closeEditorAction)();
 			}
 
@@ -459,14 +456,15 @@ export abstract class TitleControl implements ITitleAreaControl {
 			this.closeEditorAction,
 			this.closeOtherEditorsAction
 		];
+		const tabOptions = this.editorGroupService.getTabOptions();
 
-		if (this.tabOptions.showTabs) {
+		if (tabOptions.showTabs) {
 			actions.push(this.closeRightEditorsAction);
 		}
 
 		actions.push(this.closeEditorsInGroupAction);
 
-		if (this.tabOptions.previewEditors) {
+		if (tabOptions.previewEditors) {
 			actions.push(new Separator(), this.pinEditorAction);
 		}
 
diff --git a/src/vs/workbench/browser/parts/panel/media/panelpart.css b/src/vs/workbench/browser/parts/panel/media/panelpart.css
index 8a8a6b7d6b5..fe425de87f1 100644
--- a/src/vs/workbench/browser/parts/panel/media/panelpart.css
+++ b/src/vs/workbench/browser/parts/panel/media/panelpart.css
@@ -25,13 +25,17 @@
 /** Panel Switcher */
 
 .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar {
-	padding-left: 12px;
 	line-height: 35px;
 }
 
+.monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item:first-child .action-label {
+	margin-left: 12px;
+}
+
 .monaco-workbench > .part.panel > .title > .panel-switcher-container > .monaco-action-bar .action-item .action-label {
 	text-transform: uppercase;
-	margin-right: 33px;
+	margin-left: 16px;
+	margin-right: 16px;
 	font-size: 11px;
 	padding-bottom: 4px; /* puts the bottom border down */
 }
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index ca97f0cb802..97a4bf15d39 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -905,6 +905,7 @@ export interface IWorkbenchEditorConfiguration {
 			showIcons: boolean;
 			enablePreview: boolean;
 			enablePreviewFromQuickOpen: boolean;
+			closeOnExternalFileDelete: boolean;
 			openPositioning: 'left' | 'right' | 'first' | 'last';
 		}
 	};
diff --git a/src/vs/workbench/common/editor/rangeDecorations.ts b/src/vs/workbench/common/editor/rangeDecorations.ts
index 6a15a6e4988..02115c9e6c5 100644
--- a/src/vs/workbench/common/editor/rangeDecorations.ts
+++ b/src/vs/workbench/common/editor/rangeDecorations.ts
@@ -9,6 +9,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { toResource } from 'vs/workbench/common/editor';
+import { isEqual } from 'vs/platform/files/common/files';
 
 export interface IRangeHighlightDecoration {
 	resource: URI;
@@ -54,7 +55,7 @@ export class RangeHighlightDecorations implements IDisposable {
 	private getEditor(resourceRange: IRangeHighlightDecoration): editorCommon.ICommonCodeEditor {
 		const fileResource = toResource(this.editorService.getActiveEditorInput(), { filter: 'file' });
 		if (fileResource) {
-			if (fileResource.fsPath === resourceRange.resource.fsPath) {
+			if (isEqual(fileResource.fsPath, resourceRange.resource.fsPath)) {
 				return <editorCommon.ICommonCodeEditor>this.editorService.getActiveEditor().getControl();
 			}
 		}
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index bf875a64617..bd1840ff80b 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -132,6 +132,11 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'default': true,
 			'description': nls.localize('activityBarVisibility', "Controls the visibility of the activity bar in the workbench.")
+		},
+		'workbench.editor.closeOnExternalFileDelete': {
+			'type': 'boolean',
+			'description': nls.localize('closeOnExternalFileDelete', "Controls if editors showing a file should close automatically when the file is deleted or renamed by some other process. Disabling this will keep the editor open as dirty on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data."),
+			'default': true
 		}
 	}
 });
diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts
index 0a1ee4ff355..806aaa4df82 100644
--- a/src/vs/workbench/node/extensionPoints.ts
+++ b/src/vs/workbench/node/extensionPoints.ts
@@ -17,7 +17,7 @@ import json = require('vs/base/common/json');
 import Types = require('vs/base/common/types');
 import { isValidExtensionDescription } from 'vs/platform/extensions/node/extensionValidator';
 import * as semver from 'semver';
-import { getIdAndVersionFromLocalExtensionId, getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
+import { getIdAndVersionFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 const MANIFEST_FILE = 'package.json';
 
@@ -237,7 +237,7 @@ class ExtensionManifestValidator extends ExtensionManifestHandler {
 		});
 
 		// id := `publisher.name`
-		extensionDescription.id = getGalleryExtensionId(extensionDescription.publisher, extensionDescription.name);
+		extensionDescription.id = `${extensionDescription.publisher}.${extensionDescription.name}`;
 
 		// main := absolutePath(`main`)
 		if (extensionDescription.main) {
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index ad577cf792b..a633748147a 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -127,7 +127,7 @@ export class StartAction extends AbstractDebugAction {
 	}
 
 	public run(): TPromise<any> {
-		return this.commandService.executeCommand('workbench.action.files.saveIfDirty').then(() => {
+		return this.commandService.executeCommand('workbench.action.files.saveAll').then(() => {
 			if (this.debugService.getModel().getProcesses().length === 0) {
 				this.debugService.removeReplExpressions();
 			}
diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index e68c840a558..593531a3e3c 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -47,13 +47,15 @@ import { Position } from 'vs/platform/editor/common/editor';
 import { IListService } from 'vs/platform/list/browser/listService';
 
 function renderBody(body: string): string {
+	const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
 	return `<!DOCTYPE html>
 		<html>
 			<head>
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<link rel="stylesheet" type="text/css" href="${ require.toUrl('./media/markdown.css')}" >
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src http: https: data:; media-src http: https: data:; script-src 'none'; style-src 'nonce-${nonce}'; child-src 'none'; frame-src 'none';">
+				<link rel="stylesheet" type="text/css" href="${require.toUrl('./media/markdown.css')}" nonce="${nonce}" >
 			</head>
-			<body>${ body}</body>
+			<body>${body}</body>
 		</html>`;
 }
 
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index 8fd7cc59af4..653d94fae46 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -18,6 +18,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions';
 import { ExtensionsConfigurationInitialContent } from 'vs/workbench/parts/extensions/common/extensionsFileTemplate';
 import { LocalExtensionType, IExtensionEnablementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IMessageService } from 'vs/platform/message/common/message';
 import { ToggleViewletAction } from 'vs/workbench/browser/viewlet';
@@ -765,7 +766,7 @@ export class ReloadAction extends Action {
 		const isUninstalled = this.extension.state === ExtensionState.Uninstalled;
 		const isDisabled = this.extension.disabledForWorkspace || this.extension.disabledGlobally;
 
-		const filteredExtensions = runningExtensions.filter(e => e.id === this.extension.id);
+		const filteredExtensions = runningExtensions.filter(e => areSameExtensions(e, this.extension));
 		const isExtensionRunning = filteredExtensions.length > 0;
 		const isDifferentVersionRunning = filteredExtensions.length > 0 && this.extension.version !== filteredExtensions[0].version;
 
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
index ff4ad28b3fd..ed019084033 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
@@ -17,6 +17,7 @@ import { once } from 'vs/base/common/event';
 import { domEvent } from 'vs/base/browser/event';
 import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionAction, ReloadAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { Label, RatingsWidget, InstallWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { EventType } from 'vs/base/common/events';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -128,7 +129,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		data.extensionDisposables = dispose(data.extensionDisposables);
 
 		this.extensionService.getExtensions().then(enabledExtensions => {
-			const isExtensionRunning = enabledExtensions.some(e => e.id === extension.id);
+			const isExtensionRunning = enabledExtensions.some(e => areSameExtensions(e, extension));
 			const isInstalled = this.extensionsWorkbenchService.local.some(e => e.id === extension.id);
 			toggleClass(data.element, 'disabled', isInstalled && !isExtensionRunning);
 		});
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
index 6defca76917..273fc99330d 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
@@ -36,6 +36,7 @@ import {
 } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { InstallVSIXAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, SortBy, SortOrder, IQueryOptions, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { Query } from '../common/extensionQuery';
 import { OpenGlobalSettingsAction } from 'vs/workbench/parts/preferences/browser/preferencesActions';
@@ -259,7 +260,7 @@ export class ExtensionsViewlet extends Viewlet implements IExtensionsViewlet {
 			return this.extensionsWorkbenchService.queryLocal()
 				.then(result => result.sort((e1, e2) => e1.displayName.localeCompare(e2.displayName)))
 				.then(result => this.extensionService.getExtensions()
-					.then(runningExtensions => result.filter(e => runningExtensions.every(r => r.id !== e.id) && e.name.toLowerCase().indexOf(value) > -1)))
+					.then(runningExtensions => result.filter(e => runningExtensions.every(r => !areSameExtensions(r, e)) && e.name.toLowerCase().indexOf(value) > -1)))
 				.then(result => new PagedModel(result));
 		}
 
diff --git a/src/vs/workbench/parts/files/browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/browser/fileActions.contribution.ts
index e4083d93806..bc3c86d0e5b 100644
--- a/src/vs/workbench/parts/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/parts/files/browser/fileActions.contribution.ts
@@ -11,7 +11,7 @@ import { isMacintosh } from 'vs/base/common/platform';
 import { ActionItem, BaseActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Scope, IActionBarRegistry, Extensions as ActionBarExtensions, ActionBarContributor } from 'vs/workbench/browser/actionBarRegistry';
 import { IEditorInputActionContext, IEditorInputAction, EditorInputActionContributor } from 'vs/workbench/browser/parts/editor/baseEditor';
-import { GlobalNewUntitledFileAction, SaveFileAsAction, SaveIfDirtyFileAction, OpenFileAction, ShowOpenedFileInNewWindow, CopyPathAction, GlobalCopyPathAction, RevealInOSAction, GlobalRevealInOSAction, pasteIntoFocusedFilesExplorerViewItem, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, GlobalNewFileAction, GlobalNewFolderAction, RevertFileAction, SaveFilesAction, SaveAllAction, SaveFileAction, keybindingForAction, MoveFileToTrashAction, TriggerRenameFileAction, PasteFileAction, CopyFileAction, SelectResourceForCompareAction, CompareResourcesAction, NewFolderAction, NewFileAction, OpenToSideAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView } from 'vs/workbench/parts/files/browser/fileActions';
+import { GlobalNewUntitledFileAction, SaveFileAsAction, OpenFileAction, ShowOpenedFileInNewWindow, CopyPathAction, GlobalCopyPathAction, RevealInOSAction, GlobalRevealInOSAction, pasteIntoFocusedFilesExplorerViewItem, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, GlobalNewFileAction, GlobalNewFolderAction, RevertFileAction, SaveFilesAction, SaveAllAction, SaveFileAction, keybindingForAction, MoveFileToTrashAction, TriggerRenameFileAction, PasteFileAction, CopyFileAction, SelectResourceForCompareAction, CompareResourcesAction, NewFolderAction, NewFileAction, OpenToSideAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView } from 'vs/workbench/parts/files/browser/fileActions';
 import { RevertLocalChangesAction, AcceptLocalChangesAction, CONFLICT_RESOLUTION_SCHEME } from 'vs/workbench/parts/files/browser/saveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
@@ -223,7 +223,6 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(ShowActiveFileInExplor
 registry.registerWorkbenchAction(new SyncActionDescriptor(CollapseExplorerView, CollapseExplorerView.ID, CollapseExplorerView.LABEL), 'Files: Collapse Folders in Explorer', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(RefreshExplorerView, RefreshExplorerView.ID, RefreshExplorerView.LABEL), 'Files: Refresh Explorer', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(SaveFileAsAction, SaveFileAsAction.ID, SaveFileAsAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_S }), 'Files: Save As...', category);
-registry.registerWorkbenchAction(new SyncActionDescriptor(SaveIfDirtyFileAction, SaveIfDirtyFileAction.ID, SaveIfDirtyFileAction.LABEL), 'Files: Save If Dirty...', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalNewUntitledFileAction, GlobalNewUntitledFileAction.ID, GlobalNewUntitledFileAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.KEY_N }), 'Files: New Untitled File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalRevealInOSAction, GlobalRevealInOSAction.ID, GlobalRevealInOSAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_R) }), 'Files: Reveal Active File', category);
 registry.registerWorkbenchAction(new SyncActionDescriptor(ShowOpenedFileInNewWindow, ShowOpenedFileInNewWindow.ID, ShowOpenedFileInNewWindow.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_O) }), 'Files: Open Active File in New Window', category);
diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts
index 582ea725610..d4ede38c51e 100644
--- a/src/vs/workbench/parts/files/browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/browser/fileActions.ts
@@ -25,7 +25,7 @@ import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { VIEWLET_ID } from 'vs/workbench/parts/files/common/files';
 import labels = require('vs/base/common/labels');
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileService, IFileStat } from 'vs/platform/files/common/files';
+import { IFileService, IFileStat, isEqual } from 'vs/platform/files/common/files';
 import { toResource, IEditorIdentifier, EditorInput } from 'vs/workbench/common/editor';
 import { FileStat, NewStatPlaceholder } from 'vs/workbench/parts/files/common/explorerViewModel';
 import { ExplorerView } from 'vs/workbench/parts/files/browser/views/explorerView';
@@ -297,7 +297,7 @@ class RenameFileAction extends BaseRenameAction {
 			let renamed: URI;
 
 			// If the dirty file itself got moved, just reparent it to the target folder
-			if (this.element.resource.fsPath === d.fsPath) {
+			if (isEqual(this.element.resource.fsPath, d.fsPath)) {
 				renamed = URI.file(targetPath);
 			}
 
@@ -1423,26 +1423,11 @@ export abstract class BaseSaveFileAction extends BaseActionWithErrorReporting {
 			}
 
 			// Just save
-			return this.textFileService.save(source, { force: this.isForce() /* force a change to the file to trigger external watchers if any */ });
+			return this.textFileService.save(source, { force: true /* force a change to the file to trigger external watchers if any */ });
 		}
 
 		return TPromise.as(false);
 	}
-
-	protected abstract isForce(): boolean;
-}
-
-export class SaveIfDirtyFileAction extends BaseSaveFileAction {
-	public static ID = 'workbench.action.files.saveIfDirty';
-	public static LABEL = nls.localize('saveIfDirty', "Save If Dirty");
-
-	public isSaveAs(): boolean {
-		return false;
-	}
-
-	protected isForce(): boolean {
-		return false;
-	}
 }
 
 export class SaveFileAction extends BaseSaveFileAction {
@@ -1453,10 +1438,6 @@ export class SaveFileAction extends BaseSaveFileAction {
 	public isSaveAs(): boolean {
 		return false;
 	}
-
-	protected isForce(): boolean {
-		return true;
-	}
 }
 
 export class SaveFileAsAction extends BaseSaveFileAction {
@@ -1467,10 +1448,6 @@ export class SaveFileAsAction extends BaseSaveFileAction {
 	public isSaveAs(): boolean {
 		return true;
 	}
-
-	protected isForce(): boolean {
-		return true;
-	}
 }
 
 export abstract class BaseSaveAllAction extends BaseActionWithErrorReporting {
diff --git a/src/vs/workbench/parts/files/browser/files.contribution.ts b/src/vs/workbench/parts/files/browser/files.contribution.ts
index 112d5786fff..780971fc046 100644
--- a/src/vs/workbench/parts/files/browser/files.contribution.ts
+++ b/src/vs/workbench/parts/files/browser/files.contribution.ts
@@ -183,7 +183,7 @@ configurationRegistry.registerConfiguration({
 		'files.exclude': {
 			'type': 'object',
 			'description': nls.localize('exclude', "Configure glob patterns for excluding files and folders."),
-			'default': { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/.DS_Store': true },
+			'default': { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true },
 			'additionalProperties': {
 				'anyOf': [
 					{
diff --git a/src/vs/workbench/parts/files/browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/browser/saveErrorHandler.ts
index abab8cdb074..c10d04495c3 100644
--- a/src/vs/workbench/parts/files/browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/browser/saveErrorHandler.ts
@@ -212,9 +212,6 @@ class ResolveSaveConflictMessage implements IMessageWithAction {
 
 					return this.editorService.openEditor({ leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }), rightResource: resource, label: editorLabel, options: { pinned: true } }).then(() => {
 
-						// We have to bring the model into conflict resolution mode to prevent subsequent save erros when the user makes edits
-						this.model.setConflictResolutionMode();
-
 						// Inform user
 						pendingResolveSaveConflictMessages.push(this.messageService.show(Severity.Info, nls.localize('userGuide', "Use the actions in the editor tool bar to either **undo** your changes or **overwrite** the content on disk with your changes")));
 					});
diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts
index b42faf975cf..a6caf4f22af 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts
@@ -51,6 +51,8 @@ export class ExplorerView extends CollapsibleViewletView {
 	private static MEMENTO_LAST_ACTIVE_FILE_RESOURCE = 'explorer.memento.lastActiveFileResource';
 	private static MEMENTO_EXPANDED_FOLDER_RESOURCES = 'explorer.memento.expandedFolderResources';
 
+	private static COMMON_SCM_FOLDERS = ['.git', '.svn', '.hg'];
+
 	private explorerViewer: ITree;
 	private filter: FileFilter;
 	private viewletState: FileViewletState;
@@ -530,11 +532,15 @@ export class ExplorerView extends CollapsibleViewletView {
 
 		// Filter to the ones we care
 		e = this.filterToAddRemovedOnWorkspacePath(e, (event, segments) => {
-			if (segments[0] !== '.git') {
-				return true; // we like all things outside .git
+			if (
+				segments[0] !== ExplorerView.COMMON_SCM_FOLDERS[0] &&
+				segments[0] !== ExplorerView.COMMON_SCM_FOLDERS[1] &&
+				segments[0] !== ExplorerView.COMMON_SCM_FOLDERS[2]
+			) {
+				return true; // we like all things outside common SCM folders
 			}
 
-			return segments.length === 1; // we only care about the .git folder itself
+			return segments.length === 1; // otherwise we only care about the SCM folder itself
 		});
 
 		// We only ever refresh from files/folders that got added or deleted
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
index 4f4a29771fe..e71a368393c 100644
--- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -26,7 +26,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { ContributableActionProvider } from 'vs/workbench/browser/actionBarRegistry';
 import { IFilesConfiguration } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { IFileOperationResult, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
+import { IFileOperationResult, FileOperationResult, IFileService, isEqual } from 'vs/platform/files/common/files';
 import { DuplicateFileAction, ImportFileAction, keybindingForAction, IEditableData, IFileViewletState } from 'vs/workbench/parts/files/browser/fileActions';
 import { IDataSource, ITree, IElementCallback, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDrop, 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';
@@ -690,7 +690,7 @@ export class FileDragAndDrop implements IDragAndDrop {
 					return true; // Can not move anything onto itself
 				}
 
-				if (!isCopy && paths.dirname(source.resource.fsPath) === target.resource.fsPath) {
+				if (!isCopy && isEqual(paths.dirname(source.resource.fsPath), target.resource.fsPath)) {
 					return true; // Can not move a file to the same parent unless we copy
 				}
 
@@ -760,7 +760,7 @@ export class FileDragAndDrop implements IDragAndDrop {
 					let moved: URI;
 
 					// If the dirty file itself got moved, just reparent it to the target folder
-					if (source.resource.fsPath === d.fsPath) {
+					if (isEqual(source.resource.fsPath, d.fsPath)) {
 						moved = URI.file(paths.join(target.resource.fsPath, source.name));
 					}
 
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index e35c377f141..5647c3b64a8 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -159,8 +159,8 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		}
 
 		const state = model.getState();
-		if (state === ModelState.CONFLICT || state === ModelState.ERROR) {
-			return true; // always indicate dirty state if we are in conflict or error state
+		if (state === ModelState.CONFLICT || state === ModelState.ORPHAN || state === ModelState.ERROR) {
+			return true; // always indicate dirty state if we are in conflict, orphan or error state
 		}
 
 		if (this.textFileService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY) {
@@ -199,6 +199,10 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 		});
 	}
 
+	public isResolved(): boolean {
+		return !!this.textFileService.models.get(this.resource);
+	}
+
 	public getTelemetryDescriptor(): { [key: string]: any; } {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource());
@@ -209,7 +213,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
 	public dispose(): void {
 
 		// Listeners
-		dispose(this.toUnbind);
+		this.toUnbind = dispose(this.toUnbind);
 
 		super.dispose();
 	}
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorTracker.ts b/src/vs/workbench/parts/files/common/editors/fileEditorTracker.ts
index f501ed17bc9..bfa83affab2 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorTracker.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorTracker.ts
@@ -4,35 +4,46 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import { TPromise } from 'vs/base/common/winjs.base';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import errors = require('vs/base/common/errors');
 import URI from 'vs/base/common/uri';
 import paths = require('vs/base/common/paths');
 import { IEditor, IEditorViewState, isCommonCodeEditor } from 'vs/editor/common/editorCommon';
-import { toResource, IEditorStacksModel, SideBySideEditorInput, IEditorGroup } from 'vs/workbench/common/editor';
+import { toResource, IEditorStacksModel, SideBySideEditorInput, IEditorGroup, IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
 import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService, ModelState, ITextFileEditorModel } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files';
+import { FileOperationEvent, FileOperation, IFileService, FileChangeType, FileChangesEvent, isEqual, indexOf, isParent } 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';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { distinct } from 'vs/base/common/arrays';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { once } from 'vs/base/common/event';
 
 export class FileEditorTracker implements IWorkbenchContribution {
 	private stacks: IEditorStacksModel;
 	private toUnbind: IDisposable[];
+	protected closeOnExternalFileDelete: boolean;
+	private mapResourceToUndoDirtyFromExternalDelete: { [resource: string]: () => void };
 
 	constructor(
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@ITextFileService private textFileService: ITextFileService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
-		@IFileService private fileService: IFileService
+		@IFileService private fileService: IFileService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@IConfigurationService private configurationService: IConfigurationService
 	) {
 		this.toUnbind = [];
 		this.stacks = editorGroupService.getStacksModel();
+		this.mapResourceToUndoDirtyFromExternalDelete = Object.create(null);
+
+		this.onConfigurationUpdated(configurationService.getConfiguration<IWorkbenchEditorConfiguration>());
 
 		this.registerListeners();
 	}
@@ -51,6 +62,17 @@ export class FileEditorTracker implements IWorkbenchContribution {
 
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
+
+		// Configuration
+		this.toUnbind.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationUpdated(e.config)));
+	}
+
+	private onConfigurationUpdated(configuration: IWorkbenchEditorConfiguration): void {
+		if (configuration.workbench && configuration.workbench.editor && typeof configuration.workbench.editor.closeOnExternalFileDelete === 'boolean') {
+			this.closeOnExternalFileDelete = configuration.workbench.editor.closeOnExternalFileDelete;
+		} else {
+			this.closeOnExternalFileDelete = true; // default
+		}
 	}
 
 	// Note: there is some duplication with the other file event handler below. Since we cannot always rely on the disk events
@@ -66,72 +88,145 @@ export class FileEditorTracker implements IWorkbenchContribution {
 
 		// Handle deletes
 		if (e.operation === FileOperation.DELETE || e.operation === FileOperation.MOVE) {
-			this.handleDeletes(e.resource, e.target ? e.target.resource : void 0);
+			this.handleDeletes(e.resource, false, e.target ? e.target.resource : void 0);
 		}
 	}
 
 	private onFileChanges(e: FileChangesEvent): void {
 
+		// Handle added
+		if (e.gotAdded()) {
+			this.handleAdded(e);
+		}
+
 		// Handle updates
 		this.handleUpdates(e);
 
 		// Handle deletes
 		if (e.gotDeleted()) {
-			this.handleDeletes(e);
+			this.handleDeletes(e, true);
 		}
 	}
 
-	private handleDeletes(arg1: URI | FileChangesEvent, movedTo?: URI): void {
-		const fileInputs = this.getOpenedFileInputs();
-		fileInputs.forEach(input => {
-			if (input.isDirty()) {
-				return; // we never dispose dirty files
-			}
+	private handleAdded(e: FileChangesEvent): void {
+
+		// Flag models as saved that are identical to disk contents
+		// (only if we do not dispose from external deletes and caused them to be dirty)
+		if (!this.closeOnExternalFileDelete) {
+			const dirtyFileEditors = this.getOpenedFileEditors(true /* dirty only */);
+			dirtyFileEditors.forEach(editor => {
+				const resource = editor.getResource();
+
+				// See if we have a stored undo operation for this editor
+				const undo = this.mapResourceToUndoDirtyFromExternalDelete[resource.toString()];
+				if (undo) {
+
+					// file showing in editor was added
+					if (e.contains(resource, FileChangeType.ADDED)) {
+						undo();
+						this.mapResourceToUndoDirtyFromExternalDelete[resource.toString()] = void 0;
+					}
+				}
+			});
+		}
+	}
+
+	private handleDeletes(arg1: URI | FileChangesEvent, isExternal: boolean, movedTo?: URI): void {
+		const nonDirtyFileEditors = this.getOpenedFileEditors(false /* non dirty only */);
+		nonDirtyFileEditors.forEach(editor => {
+			const resource = editor.getResource();
 
 			// Special case: a resource was renamed to the same path with different casing. Since our paths
 			// API is treating the paths as equal (they are on disk), we end up disposing the input we just
 			// renamed. The workaround is to detect that we do not dispose any input we are moving the file to
-			if (movedTo && movedTo.fsPath === input.getResource().fsPath) {
+			if (movedTo && movedTo.fsPath === resource.fsPath) {
 				return;
 			}
 
 			let matches = false;
 			if (arg1 instanceof FileChangesEvent) {
-				matches = arg1.contains(input.getResource(), FileChangeType.DELETED);
+				matches = arg1.contains(resource, FileChangeType.DELETED);
 			} else {
-				matches = paths.isEqualOrParent(input.getResource().toString(), arg1.toString());
+				matches = isEqual(resource.fsPath, arg1.fsPath) || isParent(resource.fsPath, arg1.fsPath);
 			}
 
-			if (matches) {
-				input.dispose();
+			if (!matches) {
+				return;
+			}
+
+			// Handle deletes in opened editors depending on:
+			// - the user has not disabled the setting closeOnExternalFileDelete
+			// - the file change is local or external
+			// - the input is not resolved (we need to dispose because we cannot restore otherwise since we do not have the contents)
+			if (this.closeOnExternalFileDelete || !isExternal || !editor.isResolved()) {
+
+				// 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 close an editor without reason, we have to check if the
+				// file is really gone and not just a faulty file event (TODO@Ben revisit when we
+				// have a more stable file watcher in place for this scenario).
+				// This only applies to external file events, so we need to check for the isExternal
+				// flag.
+				let checkExists: TPromise<boolean>;
+				if (isExternal) {
+					checkExists = TPromise.timeout(100).then(() => this.fileService.existsFile(resource));
+				} else {
+					checkExists = TPromise.as(false);
+				}
+
+				checkExists.done(exists => {
+					if (!exists && !editor.isDisposed()) {
+						editor.dispose();
+					} else if (this.environmentService.verbose) {
+						console.warn(`File exists even though we received a delete event: ${resource.toString()}`);
+					}
+				});
+			}
+
+			// Otherwise we want to keep the editor open and mark it as dirty since its underlying resource was deleted
+			else {
+				const model = this.textFileService.models.get(resource);
+				if (model && model.getState() === ModelState.SAVED) {
+					const undo = model.setOrphaned();
+					this.mapResourceToUndoDirtyFromExternalDelete[resource.toString()] = undo;
+					once(model.onDispose)(() => {
+						this.mapResourceToUndoDirtyFromExternalDelete[resource.toString()] = void 0;
+					});
+				}
 			}
 		});
 	}
 
-	private getOpenedFileInputs(): FileEditorInput[] {
-		const inputs: FileEditorInput[] = [];
+	private getOpenedFileEditors(dirtyState: boolean): FileEditorInput[] {
+		const editors: FileEditorInput[] = [];
 
 		const stacks = this.editorGroupService.getStacksModel();
 		stacks.groups.forEach(group => {
-			group.getEditors().forEach(input => {
-				if (input instanceof FileEditorInput) {
-					inputs.push(input);
-				} else if (input instanceof SideBySideEditorInput) {
-					const master = input.master;
-					const details = input.details;
+			group.getEditors().forEach(editor => {
+				if (editor instanceof FileEditorInput) {
+					if (!!editor.isDirty() === dirtyState) {
+						editors.push(editor);
+					}
+				} else if (editor instanceof SideBySideEditorInput) {
+					const master = editor.master;
+					const details = editor.details;
 
 					if (master instanceof FileEditorInput) {
-						inputs.push(master);
+						if (!!master.isDirty() === dirtyState) {
+							editors.push(master);
+						}
 					}
 
 					if (details instanceof FileEditorInput) {
-						inputs.push(details);
+						if (!!details.isDirty() === dirtyState) {
+							editors.push(details);
+						}
 					}
 				}
 			});
 		});
 
-		return inputs;
+		return editors;
 	}
 
 	private handleMovedFileInOpenedEditors(oldResource: URI, newResource: URI): void {
@@ -142,12 +237,12 @@ export class FileEditorTracker implements IWorkbenchContribution {
 					const resource = input.getResource();
 
 					// Update Editor if file (or any parent of the input) got renamed or moved
-					if (paths.isEqualOrParent(resource.fsPath, oldResource.fsPath)) {
+					if (isEqual(resource.fsPath, oldResource.fsPath) || isParent(resource.fsPath, oldResource.fsPath)) {
 						let reopenFileResource: URI;
 						if (oldResource.toString() === resource.toString()) {
 							reopenFileResource = newResource; // file got moved
 						} else {
-							const index = resource.fsPath.indexOf(oldResource.fsPath);
+							const index = indexOf(resource.fsPath, oldResource.fsPath);
 							reopenFileResource = URI.file(paths.join(newResource.fsPath, resource.fsPath.substr(index + oldResource.fsPath.length + 1))); // parent folder got moved
 						}
 
@@ -176,7 +271,7 @@ export class FileEditorTracker implements IWorkbenchContribution {
 			const editor = editors[i];
 			if (editor && editor.position === stacks.positionOfGroup(group)) {
 				const resource = toResource(editor.input, { filter: 'file' });
-				if (resource && resource.fsPath === resource.fsPath) {
+				if (resource && isEqual(resource.fsPath, resource.fsPath)) {
 					const control = editor.getControl();
 					if (isCommonCodeEditor(control)) {
 						return control.saveViewState();
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 effd2d1f5f7..54d19b66fba 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorInput.test.ts
@@ -59,10 +59,12 @@ suite('Files - FileEditorInput', () => {
 
 		input = instantiationService.createInstance(FileEditorInput, toResource.call(this, '/foo/bar.html'), void 0);
 
-		const inputToResolve = instantiationService.createInstance(FileEditorInput, toResource.call(this, '/foo/bar/file.js'), void 0);
-		const sameOtherInput = instantiationService.createInstance(FileEditorInput, toResource.call(this, '/foo/bar/file.js'), void 0);
+		const inputToResolve: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource.call(this, '/foo/bar/file.js'), void 0);
+		const sameOtherInput: FileEditorInput = instantiationService.createInstance(FileEditorInput, toResource.call(this, '/foo/bar/file.js'), void 0);
 
 		return inputToResolve.resolve(true).then(resolved => {
+			assert.ok(inputToResolve.isResolved());
+
 			const resolvedModelA = resolved;
 			return inputToResolve.resolve(true).then(resolved => {
 				assert(resolvedModelA === resolved); // OK: Resolved Model cached globally per input
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
index e12cb168e0c..10b378fcf79 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
@@ -18,6 +18,14 @@ import { EditorStacksModel } from 'vs/workbench/common/editor/editorStacksModel'
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { FileOperation, FileOperationEvent, FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
+import { once } from 'vs/base/common/event';
+
+class TestFileEditorTracker extends FileEditorTracker {
+
+	setCloseOnExternalFileDelete(value: boolean): void {
+		this.closeOnExternalFileDelete = value;
+	}
+}
 
 function toResource(path) {
 	return URI.file(join('C:\\', new Buffer(this.test.fullTitle()).toString('base64'), path));
@@ -80,7 +88,7 @@ suite('Files - FileEditorTracker', () => {
 		tracker.dispose();
 	});
 
-	test('disposes when resource gets deleted - remote file changes', function () {
+	test('disposes when resource gets deleted - remote file changes', function (done) {
 		const stacks = accessor.editorGroupService.getStacksModel() as EditorStacksModel;
 		const group = stacks.openGroup('first', true);
 
@@ -95,21 +103,76 @@ suite('Files - FileEditorTracker', () => {
 		assert.ok(!input.isDisposed());
 
 		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.DELETED }]));
-		assert.ok(input.isDisposed());
-		group.closeEditor(input);
 
-		input = instantiationService.createInstance(FileEditorInput, resource, void 0);
+		once(input.onDispose)(() => {
+			assert.ok(input.isDisposed());
+			group.closeEditor(input);
+
+			input = instantiationService.createInstance(FileEditorInput, resource, void 0);
+			group.openEditor(input);
+
+			const other = toResource.call(this, '/foo/barfoo');
+
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: other, type: FileChangeType.DELETED }]));
+			assert.ok(!input.isDisposed());
+
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: parent, type: FileChangeType.DELETED }]));
+
+			once(input.onDispose)(() => {
+				assert.ok(input.isDisposed());
+
+				tracker.dispose();
+				done();
+			});
+		});
+	});
+
+	test('marks dirty when resource gets deleted and undirty when added again - remote file changes - closeOnExternalFileDelete = false', function (done) {
+		const stacks = accessor.editorGroupService.getStacksModel() as EditorStacksModel;
+		const group = stacks.openGroup('first', true);
+
+		const tracker = instantiationService.createInstance(TestFileEditorTracker);
+		tracker.setCloseOnExternalFileDelete(false);
+		assert.ok(tracker);
+
+		const resource = toResource.call(this, '/foo/bar/updatefile.js');
+		let input = instantiationService.createInstance(FileEditorInput, resource, void 0);
 		group.openEditor(input);
 
-		const other = toResource.call(this, '/foo/barfoo');
+		input.resolve().then(() => {
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.DELETED }]));
+			assert.equal(input.isDirty(), true);
 
-		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: other, type: FileChangeType.DELETED }]));
-		assert.ok(!input.isDisposed());
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.ADDED }]));
+			assert.equal(input.isDirty(), false);
 
-		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource: parent, type: FileChangeType.DELETED }]));
-		assert.ok(input.isDisposed());
+			done();
+		});
+	});
 
-		tracker.dispose();
+	test('marks dirty when resource gets deleted and undirty when added again unless model changed meanwhile - remote file changes - closeOnExternalFileDelete = false', function (done) {
+		const stacks = accessor.editorGroupService.getStacksModel() as EditorStacksModel;
+		const group = stacks.openGroup('first', true);
+
+		const tracker = instantiationService.createInstance(TestFileEditorTracker);
+		tracker.setCloseOnExternalFileDelete(false);
+		assert.ok(tracker);
+
+		const resource = toResource.call(this, '/foo/bar/updatefile.js');
+		let input = instantiationService.createInstance(FileEditorInput, resource, void 0);
+		group.openEditor(input);
+
+		input.resolve().then(model => {
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.DELETED }]));
+			assert.equal(input.isDirty(), true);
+
+			model.textEditorModel.setValue('This is cool');
+
+			accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.ADDED }]));
+			assert.equal(input.isDirty(), true);
+
+			done();
+		});
 	});
 
 	test('file change event updates model', function (done) {
diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js
index 67d3c7871b7..0b2de2940cc 100644
--- a/src/vs/workbench/parts/html/browser/webview-pre.js
+++ b/src/vs/workbench/parts/html/browser/webview-pre.js
@@ -4,6 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+const ipcRenderer = require('electron').ipcRenderer;
+
+
 var initData = {};
 
 function styleBody(body) {
@@ -12,13 +15,37 @@ function styleBody(body) {
 	}
 	body.classList.remove('vscode-light', 'vscode-dark', 'vscode-high-contrast');
 	body.classList.add(initData.activeTheme);
-};
+}
 
 function getTarget() {
 	return document.getElementById('_target');
-};
+}
+
+function handleInnerClick(event) {
+	if (!event || !event.view || !event.view.document) {
+		return;
+	}
+	var node = event.target;
+	while (node) {
+		if (node.tagName === "A" && node.href) {
+			var baseElement = event.view.document.getElementsByTagName("base")[0];
+			if (node.getAttribute("href") === "#") {
+				event.view.scrollTo(0, 0);
+			} else if (node.hash && (node.getAttribute("href") === node.hash || (baseElement && node.href.indexOf(baseElement.href) >= 0))) {
+				var scrollTarget = event.view.document.getElementById(node.hash.substr(1, node.hash.length - 1));
+				if (scrollTarget) {
+					scrollTarget.scrollIntoView();
+				}
+			} else {
+				ipcRenderer.sendToHost("did-click-link", node.href);
+			}
+			event.preventDefault();
+			break;
+		}
+		node = node.parentNode;
+	}
+}
 
-const ipcRenderer = require('electron').ipcRenderer;
 
 document.addEventListener("DOMContentLoaded", function (event) {
 	ipcRenderer.on('baseUrl', function (event, value) {
@@ -86,33 +113,6 @@ document.addEventListener("DOMContentLoaded", function (event) {
 			newDocument.head.appendChild(defaultStyles);
 		}
 
-		// script to bubble out link-clicks
-		const defaultScripts = newDocument.createElement('script');
-		defaultScripts.innerHTML = [
-			'document.body.addEventListener("click", function(event) {',
-			'	let node = event.target;',
-			'	while (node) {',
-			'		if (node.tagName === "A" && node.href) {',
-			'			let baseElement = window.document.getElementsByTagName("base")[0];',
-			'			if (node.getAttribute("href") === "#") {',
-			'				window.scrollTo(0, 0);',
-			'			} else if (node.hash && (node.getAttribute("href") === node.hash || (baseElement && node.href.indexOf(baseElement.href) >= 0))) {',
-			'				let scrollTarget = window.document.getElementById(node.hash.substr(1, node.hash.length - 1));',
-			'				if (scrollTarget) {',
-			'					scrollTarget.scrollIntoView();',
-			'				}',
-			'			} else {',
-			'				window.parent.postMessage({ command: "did-click-link", data: node.href }, "*");',
-			'			}',
-			'			event.preventDefault();',
-			'			break;',
-			'		}',
-			'		node = node.parentNode;',
-			'	}',
-			'});'].join('\n')
-
-
-		newDocument.body.appendChild(defaultScripts);
 		styleBody(newDocument.body);
 
 		const frame = getTarget();
@@ -140,6 +140,11 @@ document.addEventListener("DOMContentLoaded", function (event) {
 				newFrame.contentDocument.body.scrollTop = scrollTop;
 			}
 
+			// bubble out link-clicks
+			if (newFrame.contentDocument.body) {
+				newFrame.contentDocument.body.addEventListener('click', handleInnerClick);
+			}
+
 			if (frame) {
 				document.body.removeChild(frame);
 			}
@@ -152,6 +157,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
 		newFrame.contentDocument.write(newDocument.documentElement.innerHTML);
 		newFrame.contentDocument.close();
 
+
 		ipcRenderer.sendToHost('did-set-content', stats);
 	});
 
@@ -170,4 +176,4 @@ document.addEventListener("DOMContentLoaded", function (event) {
 
 	// signal ready
 	ipcRenderer.sendToHost('webview-ready', process.pid);
-});
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 3751d41f728..51d233189b9 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -26,6 +26,7 @@ import { SettingsGroupTitleWidget, EditPreferenceWidget } from 'vs/workbench/par
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { RangeHighlightDecorations } from 'vs/workbench/common/editor/rangeDecorations';
 import { IConfigurationEditingService } from 'vs/workbench/services/configuration/common/configurationEditing';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { overrideIdentifierFromKey } from 'vs/platform/configuration/common/model';
 import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
@@ -70,6 +71,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	constructor(protected editor: ICodeEditor, public readonly preferencesModel: SettingsEditorModel, public readonly associatedPreferencesModel: IPreferencesEditorModel<ISetting>,
 		@IPreferencesService protected preferencesService: IPreferencesService,
 		@ITelemetryService private telemetryService: ITelemetryService,
+		@ITextFileService private textFileService: ITextFileService,
 		@IConfigurationEditingService private configurationEditingService: IConfigurationEditingService,
 		@IMessageService private messageService: IMessageService,
 		@IInstantiationService protected instantiationService: IInstantiationService
@@ -98,7 +100,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	public updatePreference(key: string, value: any, source: ISetting): void {
 		this.telemetryService.publicLog('defaultSettingsActions.copySetting', { userConfigurationKeys: [key] });
 		const overrideIdentifier = source.overrideOf ? overrideIdentifierFromKey(source.overrideOf.key) : null;
-		this.configurationEditingService.writeConfiguration(this.preferencesModel.configurationTarget, { key, value, overrideIdentifier }, { writeToBuffer: true, autoSave: true })
+		this.configurationEditingService.writeConfiguration(this.preferencesModel.configurationTarget, { key, value, overrideIdentifier }, !this.textFileService.isDirty(this.preferencesModel.uri))
 			.then(() => this.onSettingUpdated(source), error => this.messageService.show(Severity.Error, error));
 	}
 
@@ -175,11 +177,12 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 	constructor(editor: ICodeEditor, preferencesModel: SettingsEditorModel, associatedPreferencesModel: IPreferencesEditorModel<ISetting>,
 		@IPreferencesService preferencesService: IPreferencesService,
 		@ITelemetryService telemetryService: ITelemetryService,
+		@ITextFileService textFileService: ITextFileService,
 		@IConfigurationEditingService configurationEditingService: IConfigurationEditingService,
 		@IMessageService messageService: IMessageService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
-		super(editor, preferencesModel, associatedPreferencesModel, preferencesService, telemetryService, configurationEditingService, messageService, instantiationService);
+		super(editor, preferencesModel, associatedPreferencesModel, preferencesService, telemetryService, textFileService, configurationEditingService, messageService, instantiationService);
 		this.untrustedSettingRenderer = this._register(instantiationService.createInstance(UnsupportedWorkspaceSettingsRenderer, editor, preferencesModel));
 	}
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
index 1a2c5e33e02..1a415662dda 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts
@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  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';
@@ -303,7 +304,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 					}
 					return { lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 };
 				}
-				return this.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: languageKey, value: {} }, { autoSave: false, writeToBuffer: true })
+				return this.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: languageKey, value: {} }, false)
 					.then(() => {
 						setting = settingsModel.getPreference(languageKey);
 						let content = eol + this.spaces(2, configuration) + eol + this.spaces(1, configuration);
diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
index afac30c7013..461c11e7c3b 100644
--- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
+++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts
@@ -356,14 +356,17 @@ export class CommandsHandler extends QuickOpenHandler {
 			const label = action.item.category
 				? nls.localize('cat.title', "{0}: {1}", action.item.category, action.item.title)
 				: action.item.title;
-			const highlights = wordFilter(searchValue, label);
-			if (!highlights) {
-				continue;
+			if (label) {
+				const labelHighlights = wordFilter(searchValue, label);
+				const [keybind] = this.keybindingService.lookupKeybindings(action.item.id);
+				const keyLabel = keybind ? this.keybindingService.getLabelFor(keybind) : '';
+				const keyAriaLabel = keybind ? this.keybindingService.getAriaLabelFor(keybind) : '';
+				const alias = action.item.alias ? action.item.alias : null;
+				const aliasHighlights = alias ? wordFilter(searchValue, alias) : null;
+				if (labelHighlights || aliasHighlights) {
+					entries.push(this.instantiationService.createInstance(ActionCommandEntry, keyLabel, keyAriaLabel, label, alias, labelHighlights, aliasHighlights, action));
+				}
 			}
-			const [keybind] = this.keybindingService.lookupKeybindings(action.item.id);
-			const keyLabel = keybind ? this.keybindingService.getLabelFor(keybind) : '';
-			const keyAriaLabel = keybind ? this.keybindingService.getAriaLabelFor(keybind) : '';
-			entries.push(this.instantiationService.createInstance(ActionCommandEntry, keyLabel, keyAriaLabel, label, null, highlights, null, action));
 		}
 
 		return entries;
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
index bb3c2a2cfc8..30d79541bd5 100644
--- a/src/vs/workbench/parts/search/browser/searchActions.ts
+++ b/src/vs/workbench/parts/search/browser/searchActions.ts
@@ -29,6 +29,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import { IListService } from 'vs/platform/list/browser/listService';
 import { explorerItemToFileResource } from 'vs/workbench/parts/files/common/files';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { isEqual } from 'vs/platform/files/common/files';
 
 export function isSearchViewletFocussed(viewletService: IViewletService): boolean {
 	let activeViewlet = viewletService.getActiveViewlet();
@@ -525,7 +526,7 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
 	private hasToOpenFile(): boolean {
 		const file = toResource(this.editorService.getActiveEditorInput(), { filter: 'file' });
 		if (file) {
-			return file.fsPath === this.element.parent().resource().fsPath;
+			return isEqual(file.fsPath, this.element.parent().resource().fsPath);
 		}
 		return false;
 	}
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 46d8f367015..4f6449dd66d 100644
--- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
@@ -1060,11 +1060,11 @@ class TaskService extends EventEmitter implements ITaskService {
 let workbenchActionsRegistry = <IWorkbenchActionRegistry>Registry.as(WorkbenchActionExtensions.WorkbenchActions);
 workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureTaskRunnerAction, ConfigureTaskRunnerAction.ID, ConfigureTaskRunnerAction.TEXT), 'Tasks: Configure Task Runner', tasksCategory);
 
-MenuRegistry.addCommand({ id: 'workbench.action.tasks.showLog', title: nls.localize('ShowLogAction.label', "Show Task Log"), category: tasksCategory });
-MenuRegistry.addCommand({ id: 'workbench.action.tasks.runTask', title: nls.localize('RunTaskAction.label', "Run Task"), category: tasksCategory });
-MenuRegistry.addCommand({ id: 'workbench.action.tasks.terminate', title: nls.localize('TerminateAction.label', "Terminate Running Task"), category: tasksCategory });
-MenuRegistry.addCommand({ id: 'workbench.action.tasks.build', title: nls.localize('BuildAction.label', "Run Build Task"), category: tasksCategory });
-MenuRegistry.addCommand({ id: 'workbench.action.tasks.test', title: nls.localize('TestAction.label', "Run Test Task"), category: tasksCategory });
+MenuRegistry.addCommand({ id: 'workbench.action.tasks.showLog', title: nls.localize('ShowLogAction.label', "Show Task Log"), alias: 'Tasks: Show Task Log', category: tasksCategory });
+MenuRegistry.addCommand({ id: 'workbench.action.tasks.runTask', title: nls.localize('RunTaskAction.label', "Run Task"), alias: 'Tasks: Run Task', category: tasksCategory });
+MenuRegistry.addCommand({ id: 'workbench.action.tasks.terminate', title: nls.localize('TerminateAction.label', "Terminate Running Task"), alias: 'Tasks: Terminate Running Task', category: tasksCategory });
+MenuRegistry.addCommand({ id: 'workbench.action.tasks.build', title: nls.localize('BuildAction.label', "Run Build Task"), alias: 'Tasks: Run Build Task', category: tasksCategory });
+MenuRegistry.addCommand({ id: 'workbench.action.tasks.test', title: nls.localize('TestAction.label', "Run Test Task"), alias: 'Tasks: Run Test Task', category: tasksCategory });
 // MenuRegistry.addCommand( { id: 'workbench.action.tasks.rebuild', title: nls.localize('RebuildAction.label', 'Run Rebuild Task'), category: tasksCategory });
 // MenuRegistry.addCommand( { id: 'workbench.action.tasks.clean', title: nls.localize('CleanAction.label', 'Run Clean Task'), category: tasksCategory });
 
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index e013fcce343..0090d0d8213 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -196,6 +196,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._xtermElement = document.createElement('div');
 
 		this._xterm.open(this._xtermElement);
+		this._linkHandler.initialize(this._xterm);
 		this._linkHandler.registerLocalLinkHandler(this._xterm);
 		this._xterm.attachCustomKeydownHandler((event: KeyboardEvent) => {
 			// Disable all input if the terminal is exiting
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
index 498928a6bd4..910569d0bd0 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -29,6 +29,9 @@ const CUSTOM_LINK_PRIORITY = -1;
 /** Lowest */
 const LOCAL_LINK_PRIORITY = -2;
 
+export type XtermLinkMatcherHandler = (event: MouseEvent, uri: string) => boolean | void;
+export type XtermLinkMatcherValidationCallback = (uri: string, callback: (isValid: boolean) => void) => void;
+
 export class TerminalLinkHandler {
 	constructor(
 		private _platform: Platform,
@@ -37,8 +40,12 @@ export class TerminalLinkHandler {
 	) {
 	}
 
-	public registerCustomLinkHandler(xterm: any, regex: RegExp, handler: (string) => void, matchIndex?: number, validationCallback?: (uri: string, callback: (isValid: boolean) => void) => void): number {
-		return xterm.registerLinkMatcher(regex, handler, {
+	public initialize(xterm: any) {
+		xterm.attachHypertextLinkHandler(this._wrapLinkHandler(() => true));
+	}
+
+	public registerCustomLinkHandler(xterm: any, regex: RegExp, handler: (uri: string) => void, matchIndex?: number, validationCallback?: XtermLinkMatcherValidationCallback): number {
+		return xterm.registerLinkMatcher(regex, this._wrapLinkHandler(handler), {
 			matchIndex,
 			validationCallback,
 			priority: CUSTOM_LINK_PRIORITY
@@ -46,13 +53,29 @@ export class TerminalLinkHandler {
 	}
 
 	public registerLocalLinkHandler(xterm: any): number {
-		return xterm.registerLinkMatcher(this._localLinkRegex, (url) => this._handleLocalLink(url), {
+		const wrappedHandler = this._wrapLinkHandler(url => {
+			this._handleLocalLink(url);
+			return;
+		});
+		return xterm.registerLinkMatcher(this._localLinkRegex, wrappedHandler, {
 			matchIndex: 1,
 			validationCallback: (link: string, callback: (isValid: boolean) => void) => this._validateLocalLink(link, callback),
 			priority: LOCAL_LINK_PRIORITY
 		});
 	}
 
+	private _wrapLinkHandler(handler: (uri: string) => boolean | void): XtermLinkMatcherHandler {
+		return (event: MouseEvent, uri: string) => {
+			// Require ctrl/cmd on click
+			if (this._platform === Platform.Mac ? !event.metaKey : !event.ctrlKey) {
+				// TODO: Show hint on fail
+				event.preventDefault();
+				return false;
+			}
+			return handler(uri);
+		};
+	}
+
 	protected get _localLinkRegex(): RegExp {
 		if (this._platform === Platform.Windows) {
 			return WINDOWS_LOCAL_LINK_REGEX;
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index d75515f89af..e3074b02d34 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -21,13 +21,15 @@ import { IModeService } from 'vs/editor/common/services/modeService';
 import { tokenizeToString } from 'vs/editor/common/modes/textToHtmlTokenizer';
 
 function renderBody(body: string): string {
+	const nonce = new Date().getTime() + '' + new Date().getMilliseconds();
 	return `<!DOCTYPE html>
 		<html>
 			<head>
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<link rel="stylesheet" type="text/css" href="${ require.toUrl('./media/markdown.css')}" >
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src http: https: data:; media-src http: https: data:; script-src 'none'; style-src 'nonce-${nonce}'; child-src 'none'; frame-src 'none';">
+				<link rel="stylesheet" type="text/css" href="${require.toUrl('./media/markdown.css')}" nonce="${nonce}" >
 			</head>
-			<body>${ body}</body>
+			<body>${body}</body>
 		</html>`;
 }
 
diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index 5708cbd1ad9..0ba753cef21 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -27,7 +27,7 @@ export enum ConfigurationEditingErrorCode {
 	ERROR_NO_WORKSPACE_OPENED,
 
 	/**
-	 * Error when trying to write to the configuration file while it is dirty in the editor.
+	 * Error when trying to write and save to the configuration file while it is dirty in the editor.
 	 */
 	ERROR_CONFIGURATION_FILE_DIRTY,
 
@@ -61,18 +61,13 @@ export interface IConfigurationValue {
 	overrideIdentifier?: string;
 }
 
-export interface IConfigurationEditingOptions {
-	writeToBuffer: boolean;
-	autoSave: boolean;
-}
-
 export interface IConfigurationEditingService {
 
 	_serviceBrand: ServiceIdentifier<any>;
 
 	/**
-	 * Allows to write to either the user or workspace configuration file. The returned promise will be
-	 * in error state in any of the error cases from [ConfigurationEditingErrorCode](#ConfigurationEditingErrorCode)
+	 * Allows to write the configuration value to either the user or workspace configuration file and save it if asked to save.
+	 * The returned promise will be in error state in any of the error cases from [ConfigurationEditingErrorCode](#ConfigurationEditingErrorCode)
 	 */
-	writeConfiguration(target: ConfigurationTarget, value: IConfigurationValue, options?: IConfigurationEditingOptions): TPromise<void>;
+	writeConfiguration(target: ConfigurationTarget, value: IConfigurationValue, save?: boolean): TPromise<void>;
 }
\ 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 b9afff14b56..44c86583ceb 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -9,12 +9,12 @@ import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
 import * as json from 'vs/base/common/json';
-import { assign } from 'vs/base/common/objects';
 import * as encoding from 'vs/base/node/encoding';
 import strings = require('vs/base/common/strings');
 import { setProperty } from 'vs/base/common/jsonEdit';
 import { Queue } from 'vs/base/common/async';
-import { applyEdits, Edit } from 'vs/base/common/jsonFormatter';
+import { Edit } from 'vs/base/common/jsonFormatter';
+import { IReference } from 'vs/base/common/lifecycle';
 import * as editorCommon from 'vs/editor/common/editorCommon';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
@@ -26,19 +26,18 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { keyFromOverrideIdentifier } from 'vs/platform/configuration/common/model';
 import { WORKSPACE_CONFIG_DEFAULT_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IConfigurationEditingService, ConfigurationEditingErrorCode, IConfigurationEditingError, ConfigurationTarget, IConfigurationValue, IConfigurationEditingOptions } from 'vs/workbench/services/configuration/common/configurationEditing';
-import { ITextModelResolverService } from 'vs/editor/common/services/resolverService';
+import { IConfigurationEditingService, ConfigurationEditingErrorCode, IConfigurationEditingError, ConfigurationTarget, IConfigurationValue } from 'vs/workbench/services/configuration/common/configurationEditing';
+import { ITextModelResolverService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 
 interface IConfigurationEditOperation extends IConfigurationValue {
-	target: URI;
+	resource: URI;
 	isWorkspaceStandalone?: boolean;
 }
 
 interface IValidationResult {
 	error?: ConfigurationEditingErrorCode;
 	exists?: boolean;
-	contents?: string;
 }
 
 export class ConfigurationEditingService implements IConfigurationEditingService {
@@ -54,60 +53,28 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 		@IFileService private fileService: IFileService,
 		@ITextModelResolverService private textModelResolverService: ITextModelResolverService,
 		@ITextFileService private textFileService: ITextFileService
-
 	) {
 		this.queue = new Queue<void>();
 	}
 
-	public writeConfiguration(target: ConfigurationTarget, value: IConfigurationValue, options: IConfigurationEditingOptions = null): TPromise<void> {
-		const defaultOptions: IConfigurationEditingOptions = { writeToBuffer: false, autoSave: false };
-		options = assign(defaultOptions, options || {});
-		return this.queue.queue(() => this.doWriteConfiguration(target, value, options)); // queue up writes to prevent race conditions
+	writeConfiguration(target: ConfigurationTarget, value: IConfigurationValue, save: boolean = true): TPromise<void> {
+		return this.queue.queue(() => this.doWriteConfiguration(target, value, save)); // queue up writes to prevent race conditions
 	}
 
-	private doWriteConfiguration(target: ConfigurationTarget, value: IConfigurationValue, options: IConfigurationEditingOptions): TPromise<void> {
+	private doWriteConfiguration(target: ConfigurationTarget, value: IConfigurationValue, save: boolean): TPromise<void> {
 		const operation = this.getConfigurationEditOperation(target, value);
 
-		// First validate before making any edits
-		return this.validate(target, operation, options).then(validation => {
-			if (typeof validation.error === 'number') {
-				// Target cannot contain JSON errors if writing to disk
-				return this.wrapError(validation.error, target);
-			}
-
-			// Create configuration file if missing
-			const resource = operation.target;
-			let ensureConfigurationFile = TPromise.as(null);
-			let contents: string;
-			if (!validation.exists) {
-				contents = '{}';
-				ensureConfigurationFile = this.fileService.updateContent(resource, contents, { encoding: encoding.UTF8 });
-			} else {
-				contents = validation.contents;
-			}
-
-			return ensureConfigurationFile.then(() => {
-				if (options.writeToBuffer) {
-					return this.writeToBuffer(contents, operation, resource, options);
-				} else {
-					return this.writeToDisk(contents, operation, resource);
-				}
-			});
-		});
+		return this.resolveAndValidate(target, operation, save)
+			.then(reference => this.writeToBuffer(reference.object.textEditorModel, operation, save)
+				.then(() => reference.dispose()));
 	}
 
-	private writeToBuffer(contents: string, operation: IConfigurationEditOperation, resource: URI, options: IConfigurationEditingOptions): TPromise<void> {
-		const isDirtyBefore = this.textFileService.isDirty(resource);
-		const edit = this.getEdits(contents, operation)[0];
-		return this.textModelResolverService.createModelReference(resource).
-			then(reference => {
-				if (this.applyEditsToBuffer(edit, reference.object.textEditorModel)) {
-					if (options.autoSave && !isDirtyBefore) {
-						this.textFileService.save(resource);
-					}
-				}
-				reference.dispose();
-			});
+	private writeToBuffer(model: editorCommon.IModel, operation: IConfigurationEditOperation, save: boolean): TPromise<any> {
+		const edit = this.getEdits(model, operation)[0];
+		if (this.applyEditsToBuffer(edit, model) && save) {
+			return this.textFileService.save(operation.resource);
+		}
+		return TPromise.as(null);
 	}
 
 	private applyEditsToBuffer(edit: Edit, model: editorCommon.IModel): boolean {
@@ -123,17 +90,6 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 		return false;
 	}
 
-	private writeToDisk(contents: string, operation: IConfigurationEditOperation, resource: URI): TPromise<void> {
-		// Apply all edits to the configuration file
-		const result = this.applyEdits(contents, operation);
-
-		return this.fileService.updateContent(resource, result, { encoding: encoding.UTF8 }).then(() => {
-
-			// Reload the configuration so that we make sure all parties are updated
-			return this.configurationService.reloadConfiguration().then(() => void 0);
-		});
-	}
-
 	private wrapError(code: ConfigurationEditingErrorCode, target: ConfigurationTarget): TPromise<any> {
 		const message = this.toErrorMessage(code, target);
 
@@ -170,90 +126,77 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 		}
 	}
 
-	private applyEdits(content: string, edit: IConfigurationEditOperation): string {
-		const {tabSize, insertSpaces} = this.configurationService.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
-		const {key, value} = edit;
+	private getEdits(model: editorCommon.IModel, edit: IConfigurationEditOperation): Edit[] {
+		const {tabSize, insertSpaces} = model.getOptions();
+		const eol = model.getEOL();
+		const {key, value, overrideIdentifier} = edit;
+
 		// Without key, the entire settings file is being replaced, so we just use JSON.stringify
 		if (!key) {
-			return JSON.stringify(value, null, insertSpaces ? strings.repeat(' ', tabSize) : '\t');
+			const content = JSON.stringify(value, null, insertSpaces ? strings.repeat(' ', tabSize) : '\t');
+			return [{
+				content,
+				length: content.length,
+				offset: 0
+			}];
 		}
 
-		const edits = this.getEdits(content, edit);
-		content = applyEdits(content, edits);
-
-		return content;
+		return setProperty(model.getValue(), overrideIdentifier ? [keyFromOverrideIdentifier(overrideIdentifier), key] : [key], value, { tabSize, insertSpaces, eol });
 	}
 
-	private getEdits(content: string, edit: IConfigurationEditOperation): Edit[] {
-		const {tabSize, insertSpaces} = this.configurationService.getConfiguration<{ tabSize: number; insertSpaces: boolean }>('editor');
-		const {eol} = this.configurationService.getConfiguration<{ eol: string }>('files');
-
-		const {key, value, overrideIdentifier} = edit;
-		return setProperty(content, overrideIdentifier ? [keyFromOverrideIdentifier(overrideIdentifier), key] : [key], value, { tabSize, insertSpaces, eol });
+	private resolveModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
+		return this.fileService.existsFile(resource)
+			.then(exists => {
+				const result = exists ? TPromise.as(null) : this.fileService.updateContent(resource, '{}', { encoding: encoding.UTF8 });
+				return result.then(() => this.textModelResolverService.createModelReference(resource));
+			});
 	}
 
-	private validate(target: ConfigurationTarget, operation: IConfigurationEditOperation, options: IConfigurationEditingOptions): TPromise<IValidationResult> {
+	private hasParseErrors(model: editorCommon.IModel, operation: IConfigurationEditOperation): boolean {
+		// If we write to a workspace standalone file and replace the entire contents (no key provided)
+		// we can return here because any parse errors can safely be ignored since all contents are replaced
+		if (operation.isWorkspaceStandalone && !operation.key) {
+			return false;
+		}
+		const parseErrors: json.ParseError[] = [];
+		json.parse(model.getValue(), parseErrors, { allowTrailingComma: true });
+		return parseErrors.length > 0;
+	}
+
+	private resolveAndValidate(target: ConfigurationTarget, operation: IConfigurationEditOperation, save: boolean): TPromise<IReference<ITextEditorModel>> {
 
 		// Any key must be a known setting from the registry (unless this is a standalone config)
 		if (!operation.isWorkspaceStandalone) {
 			const validKeys = this.configurationService.keys().default;
 			if (validKeys.indexOf(operation.key) < 0 && !OVERRIDE_PROPERTY_PATTERN.test(operation.key)) {
-				return TPromise.as({ error: ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY });
+				return this.wrapError(ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY, target);
 			}
 		}
 
 		// Target cannot be user if is standalone
 		if (operation.isWorkspaceStandalone && target === ConfigurationTarget.USER) {
-			return TPromise.as({ error: ConfigurationEditingErrorCode.ERROR_INVALID_TARGET });
+			return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_TARGET, target);
 		}
 
 		// Target cannot be workspace if no workspace opened
 		if (target === ConfigurationTarget.WORKSPACE && !this.contextService.hasWorkspace()) {
-			return TPromise.as({ error: ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED });
+			return this.wrapError(ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED, target);
 		}
 
 		// Target cannot be dirty if not writing into buffer
-		const resource = operation.target;
-		if (!options.writeToBuffer && this.textFileService.isDirty(resource)) {
-			return TPromise.as({ error: ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY });
+		const resource = operation.resource;
+		if (save && this.textFileService.isDirty(resource)) {
+			return this.wrapError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY, target);
 		}
 
-		return this.fileService.existsFile(resource).then(exists => {
-			if (!exists) {
-				return { exists };
-			}
-
-			return this.resolveContent(resource, options).then(content => {
-
-				// If we write to a workspace standalone file and replace the entire contents (no key provided)
-				// we can return here because any parse errors can safely be ignored since all contents are replaced
-				if (operation.isWorkspaceStandalone && !operation.key) {
-					return { exists, contents: content };
+		return this.resolveModelReference(operation.resource)
+			.then(reference => {
+				const model = reference.object.textEditorModel;
+				if (this.hasParseErrors(model, operation)) {
+					return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION, target);
 				}
-
-				let error = void 0;
-				const parseErrors: json.ParseError[] = [];
-				json.parse(content, parseErrors, { allowTrailingComma: true });
-				if (!options.writeToBuffer && parseErrors.length > 0) {
-					error = ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION;
-				}
-
-				return { exists, contents: content, error };
+				return reference;
 			});
-		});
-	}
-
-	private resolveContent(resource: URI, options: IConfigurationEditingOptions): TPromise<string> {
-		if (options.writeToBuffer) {
-			return this.textModelResolverService.createModelReference(resource).then(reference => {
-				const value = reference.object.textEditorModel.getValue();
-
-				reference.dispose();
-
-				return value;
-			});
-		}
-		return this.fileService.resolveContent(resource, { acceptTextOnly: true, encoding: encoding.UTF8 }).then(content => content.value);
 	}
 
 	private getConfigurationEditOperation(target: ConfigurationTarget, config: IConfigurationValue): IConfigurationEditOperation {
@@ -263,25 +206,25 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 			const standaloneConfigurationKeys = Object.keys(WORKSPACE_STANDALONE_CONFIGURATIONS);
 			for (let i = 0; i < standaloneConfigurationKeys.length; i++) {
 				const key = standaloneConfigurationKeys[i];
-				const target = this.contextService.toResource(WORKSPACE_STANDALONE_CONFIGURATIONS[key]);
+				const resource = this.contextService.toResource(WORKSPACE_STANDALONE_CONFIGURATIONS[key]);
 
 				// Check for prefix
 				if (config.key === key) {
-					return { key: '', value: config.value, target, isWorkspaceStandalone: true };
+					return { key: '', value: config.value, resource, isWorkspaceStandalone: true };
 				}
 
 				// Check for prefix.<setting>
 				const keyPrefix = `${key}.`;
 				if (config.key.indexOf(keyPrefix) === 0) {
-					return { key: config.key.substr(keyPrefix.length), value: config.value, target, isWorkspaceStandalone: true };
+					return { key: config.key.substr(keyPrefix.length), value: config.value, resource, isWorkspaceStandalone: true };
 				}
 			}
 		}
 
 		if (target === ConfigurationTarget.USER) {
-			return { key: config.key, value: config.value, overrideIdentifier: config.overrideIdentifier, target: URI.file(this.environmentService.appSettingsPath) };
+			return { key: config.key, value: config.value, overrideIdentifier: config.overrideIdentifier, resource: URI.file(this.environmentService.appSettingsPath) };
 		}
 
-		return { key: config.key, value: config.value, overrideIdentifier: config.overrideIdentifier, target: this.contextService.toResource(WORKSPACE_CONFIG_DEFAULT_PATH) };
+		return { key: config.key, value: config.value, overrideIdentifier: config.overrideIdentifier, resource: this.contextService.toResource(WORKSPACE_CONFIG_DEFAULT_PATH) };
 	}
 }
\ 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/node/configurationEditingService.test.ts
index 2d45970844f..8204f47c428 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationEditingService.test.ts
@@ -12,12 +12,12 @@ import fs = require('fs');
 import * as json from 'vs/base/common/json';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Registry } from 'vs/platform/platform';
-import { ParsedArgs } from 'vs/platform/environment/common/environment';
+import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { parseArgs } from 'vs/platform/environment/node/argv';
 import { WorkspaceContextService, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import extfs = require('vs/base/node/extfs');
-import { workbenchInstantiationService, TestTextFileService } from 'vs/workbench/test/workbenchTestServices';
+import { TestTextFileService, TestEditorGroupService, TestLifecycleService, TestBackupFileService } from 'vs/workbench/test/workbenchTestServices';
 import uuid = require('vs/base/common/uuid');
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { WorkspaceConfigurationService } from 'vs/workbench/services/configuration/node/configurationService';
@@ -26,17 +26,23 @@ import { FileService } from 'vs/workbench/services/files/node/fileService';
 import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService';
 import { ConfigurationTarget, IConfigurationEditingError, ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/common/configurationEditing';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
+import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IMessageService } from 'vs/platform/message/common/message';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { ITextModelResolverService } from 'vs/editor/common/services/resolverService';
+import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+
 
 class SettingsTestEnvironmentService extends EnvironmentService {
 
@@ -47,339 +53,227 @@ class SettingsTestEnvironmentService extends EnvironmentService {
 	get appSettingsPath(): string { return this.customAppSettingsHome; }
 }
 
-class TestDirtyTextFileService extends TestTextFileService {
+suite('ConfigurationEditingService', () => {
 
-	constructor(
-		private dirty: boolean,
-		@ILifecycleService lifecycleService: ILifecycleService,
-		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@ITelemetryService telemetryService: ITelemetryService,
-		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
-		@IFileService fileService: IFileService,
-		@IUntitledEditorService untitledEditorService: IUntitledEditorService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IMessageService messageService: IMessageService,
-		@IBackupFileService backupFileService: IBackupFileService,
-		@IWindowsService windowsService: IWindowsService,
-		@IEditorGroupService editorGroupService: IEditorGroupService
-	) {
-		super(lifecycleService, contextService, configurationService, telemetryService, editorService, fileService, untitledEditorService, instantiationService, messageService, backupFileService, windowsService, editorGroupService);
+	let instantiationService;
+	let testObject: ConfigurationEditingService;
+	let parentDir;
+	let workspaceDir;
+	let globalSettingsFile;
+	let workspaceSettingsDir;
+
+	suiteSetup(() => {
+		const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationExtensions.Configuration);
+		configurationRegistry.registerConfiguration({
+			'id': '_test',
+			'type': 'object',
+			'properties': {
+				'configurationEditing.service.testSetting': {
+					'type': 'string',
+					'default': 'isSet'
+				},
+				'configurationEditing.service.testSettingTwo': {
+					'type': 'string',
+					'default': 'isSet'
+				},
+				'configurationEditing.service.testSettingThree': {
+					'type': 'string',
+					'default': 'isSet'
+				}
+			}
+		});
+	});
+
+	setup(() => {
+		return setUpWorkspace()
+			.then(() => setUpServices());
+	});
+
+	function setUpWorkspace(): TPromise<void> {
+		return new TPromise<void>((c, e) => {
+			const id = uuid.generateUuid();
+			parentDir = path.join(os.tmpdir(), 'vsctests', id);
+			workspaceDir = path.join(parentDir, 'workspaceconfig', id);
+			globalSettingsFile = path.join(workspaceDir, 'config.json');
+			workspaceSettingsDir = path.join(workspaceDir, '.vscode');
+			extfs.mkdirp(workspaceSettingsDir, 493, (error) => {
+				if (error) {
+					e(error);
+				} else {
+					c(null);
+				}
+			});
+		});
 	}
 
-	public isDirty(resource?: URI): boolean {
-		return this.dirty;
+	function setUpServices(noWorkspace: boolean = false): TPromise<void> {
+		instantiationService = new TestInstantiationService();
+		instantiationService.stub(IEnvironmentService, new SettingsTestEnvironmentService(parseArgs(process.argv), process.execPath, globalSettingsFile));
+		instantiationService.stub(IWorkspaceContextService, new WorkspaceContextService(noWorkspace ? null : { resource: URI.file(workspaceDir) }));
+		const configurationService = instantiationService.createInstance(WorkspaceConfigurationService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
+		instantiationService.stub(IEditorGroupService, new TestEditorGroupService());
+		instantiationService.stub(ITelemetryService, NullTelemetryService);
+		instantiationService.stub(IModeService, ModeServiceImpl);
+		instantiationService.stub(IModelService, instantiationService.createInstance(ModelServiceImpl));
+		instantiationService.stub(IFileService, new FileService(workspaceDir, { disableWatcher: true }));
+		instantiationService.stub(IUntitledEditorService, instantiationService.createInstance(UntitledEditorService));
+
+		instantiationService.stub(ITextFileService, instantiationService.createInstance(TestTextFileService));
+		instantiationService.stub(ITextModelResolverService, <ITextModelResolverService>instantiationService.createInstance(TextModelResolverService));
+		instantiationService.stub(IBackupFileService, new TestBackupFileService());
+
+		testObject = instantiationService.createInstance(ConfigurationEditingService);
+		return configurationService.initialize();
 	}
-}
 
-suite('WorkspaceConfigurationEditingService - Node', () => {
+	teardown(() => {
+		(<WorkspaceConfigurationService>instantiationService.get(IConfigurationService)).dispose();
+		return clearWorkspace();
+	});
 
-	function createWorkspace(callback: (workspaceDir: string, globalSettingsFile: string, cleanUp: (done: () => void, error?: Error) => void, error: Error) => void): void {
-		const id = uuid.generateUuid();
-		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
-		const workspaceDir = path.join(parentDir, 'workspaceconfig', id);
-		const workspaceSettingsDir = path.join(workspaceDir, '.vscode');
-		const globalSettingsFile = path.join(workspaceDir, 'config.json');
-
-		extfs.mkdirp(workspaceSettingsDir, 493, (error) => {
-			callback(workspaceDir, globalSettingsFile, (done, error) => {
+	function clearWorkspace(): TPromise<void> {
+		return new TPromise<void>((c, e) => {
+			if (parentDir) {
 				extfs.del(parentDir, os.tmpdir(), () => { }, () => {
-					if (error) {
-						assert.fail(error);
-					}
-
-					done();
+					parentDir = null;
+					c(null);
 				});
-			}, error);
+			} else {
+				c(null);
+			}
 		});
 	}
 
-	function createServices(workspaceDir: string, globalSettingsFile: string, dirty?: boolean, noWorkspace?: boolean): TPromise<{ configurationService: WorkspaceConfigurationService, configurationEditingService: ConfigurationEditingService }> {
-		const workspaceContextService = new WorkspaceContextService(noWorkspace ? null : { resource: URI.file(workspaceDir) });
-		const environmentService = new SettingsTestEnvironmentService(parseArgs(process.argv), process.execPath, globalSettingsFile);
-		const fileService = new FileService(noWorkspace ? null : workspaceDir, { disableWatcher: true });
-		const configurationService = new WorkspaceConfigurationService(workspaceContextService, environmentService);
-		const textFileService = workbenchInstantiationService().createInstance(TestDirtyTextFileService, dirty);
-
-		return configurationService.initialize().then(() => {
-			return {
-				configurationEditingService: new ConfigurationEditingService(configurationService, workspaceContextService, environmentService, fileService, null, textFileService),
-				configurationService
-			};
-		});
-	}
-
-	const configurationRegistry = <IConfigurationRegistry>Registry.as(ConfigurationExtensions.Configuration);
-	configurationRegistry.registerConfiguration({
-		'id': '_test',
-		'type': 'object',
-		'properties': {
-			'configurationEditing.service.testSetting': {
-				'type': 'string',
-				'default': 'isSet'
-			},
-			'configurationEditing.service.testSettingTwo': {
-				'type': 'string',
-				'default': 'isSet'
-			},
-			'configurationEditing.service.testSettingThree': {
-				'type': 'string',
-				'default': 'isSet'
-			}
-		}
+	test('errors cases - invalid key', () => {
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'unknown.key', value: 'value' })
+			.then(() => assert.fail('Should fail with ERROR_UNKNOWN_KEY'),
+			(error: IConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY));
 	});
 
-	test('errors cases - invalid key', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile, false, true /* no workspace */).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'unknown.key', value: 'value' }).then(res => {
-				}, (error: IConfigurationEditingError) => {
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_UNKNOWN_KEY);
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('errors cases - invalid target', () => {
+		return testObject.writeConfiguration(ConfigurationTarget.USER, { key: 'tasks.something', value: 'value' })
+			.then(() => assert.fail('Should fail with ERROR_INVALID_TARGET'),
+			(error: IConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_TARGET));
 	});
 
-	test('errors cases - invalid target', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'tasks.something', value: 'value' }).then(res => {
-				}, (error: IConfigurationEditingError) => {
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_TARGET);
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('errors cases - no workspace', () => {
+		return setUpServices(true)
+			.then(() => testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'configurationEditing.service.testSetting', value: 'value' }))
+			.then(() => assert.fail('Should fail with ERROR_NO_WORKSPACE_OPENED'),
+			(error: IConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED));
 	});
 
-	test('errors cases - no workspace', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile, false, true /* no workspace */).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'configurationEditing.service.testSetting', value: 'value' }).then(res => {
-				}, (error: IConfigurationEditingError) => {
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_NO_WORKSPACE_OPENED);
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('errors cases - invalid configuration', () => {
+		fs.writeFileSync(globalSettingsFile, ',,,,,,,,,,,,,,');
+		return testObject.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' })
+			.then(() => assert.fail('Should fail with ERROR_INVALID_CONFIGURATION'),
+			(error: IConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION));
 	});
 
-	test('errors cases - invalid configuration', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				fs.writeFileSync(globalSettingsFile, ',,,,,,,,,,,,,,');
-
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' }).then(res => {
-				}, (error: IConfigurationEditingError) => {
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_INVALID_CONFIGURATION);
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('errors cases - dirty', () => {
+		instantiationService.stub(ITextFileService, 'isDirty', true);
+		return testObject.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' })
+			.then(() => assert.fail('Should fail with ERROR_CONFIGURATION_FILE_DIRTY error.'),
+			(error: IConfigurationEditingError) => assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY));
 	});
 
-	test('errors cases - dirty', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile, true).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' }).then(res => {
-				}, (error: IConfigurationEditingError) => {
-					assert.equal(error.code, ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY);
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('write one setting - empty file', () => {
+		return testObject.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' })
+			.then(() => instantiationService.get(IConfigurationService).reloadConfiguration())
+			.then(() => {
+				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
+				const parsed = json.parse(contents);
+				assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
+				assert.equal(instantiationService.get(IConfigurationService).lookup('configurationEditing.service.testSetting').value, 'value');
+			});
 	});
 
-	test('write one setting - empty file', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
+	test('write one setting - existing file', () => {
+		fs.writeFileSync(globalSettingsFile, '{ "my.super.setting": "my.super.value" }');
+		return testObject.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' })
+			.then(() => instantiationService.get(IConfigurationService).reloadConfiguration())
+			.then(() => {
+				const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
+				const parsed = json.parse(contents);
+				assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
+				assert.equal(parsed['my.super.setting'], 'my.super.value');
 
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' }).then(res => {
-					const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-					const parsed = json.parse(contents);
-					assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
-					assert.equal(services.configurationService.lookup('configurationEditing.service.testSetting').value, 'value');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+				const configurationService = instantiationService.get(IConfigurationService);
+				assert.equal(configurationService.lookup('configurationEditing.service.testSetting').value, 'value');
+				assert.equal(configurationService.lookup('my.super.setting').value, 'my.super.value');
+			});
 	});
 
-	test('write one setting - existing file', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				fs.writeFileSync(globalSettingsFile, '{ "my.super.setting": "my.super.value" }');
-
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.USER, { key: 'configurationEditing.service.testSetting', value: 'value' }).then(res => {
-					const contents = fs.readFileSync(globalSettingsFile).toString('utf8');
-					const parsed = json.parse(contents);
-					assert.equal(parsed['configurationEditing.service.testSetting'], 'value');
-					assert.equal(parsed['my.super.setting'], 'my.super.value');
-
-					assert.equal(services.configurationService.lookup('configurationEditing.service.testSetting').value, 'value');
-					assert.equal(services.configurationService.lookup('my.super.setting').value, 'my.super.value');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+	test('write workspace standalone setting - empty file', () => {
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks.service.testSetting', value: 'value' })
+			.then(() => instantiationService.get(IConfigurationService).reloadConfiguration())
+			.then(() => {
+				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+				const contents = fs.readFileSync(target).toString('utf8');
+				const parsed = json.parse(contents);
+				assert.equal(parsed['service.testSetting'], 'value');
+				const configurationService = instantiationService.get(IConfigurationService);
+				assert.equal(configurationService.lookup('tasks.service.testSetting').value, 'value');
+			});
 	});
 
-	test('write workspace standalone setting - empty file', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
+	test('write workspace standalone setting - existing file', () => {
+		const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
+		fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'launch.service.testSetting', value: 'value' })
+			.then(() => instantiationService.get(IConfigurationService).reloadConfiguration())
+			.then(() => {
+				const contents = fs.readFileSync(target).toString('utf8');
+				const parsed = json.parse(contents);
+				assert.equal(parsed['service.testSetting'], 'value');
+				assert.equal(parsed['my.super.setting'], 'my.super.value');
 
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks.service.testSetting', value: 'value' }).then(res => {
-					const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
-					const contents = fs.readFileSync(target).toString('utf8');
-					const parsed = json.parse(contents);
-					assert.equal(parsed['service.testSetting'], 'value');
-					assert.equal(services.configurationService.lookup('tasks.service.testSetting').value, 'value');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+				const configurationService = instantiationService.get(IConfigurationService);
+				assert.equal(configurationService.lookup('launch.service.testSetting').value, 'value');
+				assert.equal(configurationService.lookup('launch.my.super.setting').value, 'my.super.value');
+			});
 	});
 
-	test('write workspace standalone setting - existing file', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
+	test('write workspace standalone setting - empty file - full JSON', () => {
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
+			.then(() => instantiationService.get(IConfigurationService).reloadConfiguration())
+			.then(() => {
+				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+				const contents = fs.readFileSync(target).toString('utf8');
+				const parsed = json.parse(contents);
 
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
-
-				fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
-
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'launch.service.testSetting', value: 'value' }).then(res => {
-					const contents = fs.readFileSync(target).toString('utf8');
-					const parsed = json.parse(contents);
-					assert.equal(parsed['service.testSetting'], 'value');
-					assert.equal(parsed['my.super.setting'], 'my.super.value');
-
-					assert.equal(services.configurationService.lookup('launch.service.testSetting').value, 'value');
-					assert.equal(services.configurationService.lookup('launch.my.super.setting').value, 'my.super.value');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+				assert.equal(parsed['version'], '1.0.0');
+				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+			});
 	});
 
-	test('write workspace standalone setting - empty file - full JSON', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
+	test('write workspace standalone setting - existing file - full JSON', () => {
+		const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
+		fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
+			.then(() => {
+				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+				const contents = fs.readFileSync(target).toString('utf8');
+				const parsed = json.parse(contents);
 
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } }).then(res => {
-					const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
-					const contents = fs.readFileSync(target).toString('utf8');
-					const parsed = json.parse(contents);
-
-					assert.equal(parsed['version'], '1.0.0');
-					assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+				assert.equal(parsed['version'], '1.0.0');
+				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+			});
 	});
 
-	test('write workspace standalone setting - existing file - full JSON', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
+	test('write workspace standalone setting - existing file with JSON errors - full JSON', () => {
+		const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
+		fs.writeFileSync(target, '{ "my.super.setting": '); // invalid JSON
+		return testObject.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } })
+			.then(() => {
+				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
+				const contents = fs.readFileSync(target).toString('utf8');
+				const parsed = json.parse(contents);
 
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
-
-				fs.writeFileSync(target, '{ "my.super.setting": "my.super.value" }');
-
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } }).then(res => {
-					const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
-					const contents = fs.readFileSync(target).toString('utf8');
-					const parsed = json.parse(contents);
-
-					assert.equal(parsed['version'], '1.0.0');
-					assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
-	});
-
-	test('write workspace standalone setting - existing file with JSON errors - full JSON', (done: () => void) => {
-		createWorkspace((workspaceDir, globalSettingsFile, cleanUp, error) => {
-			if (error) {
-				return cleanUp(done, error);
-			}
-
-			createServices(workspaceDir, globalSettingsFile).done(services => {
-				const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['launch']);
-
-				fs.writeFileSync(target, '{ "my.super.setting": '); // invalid JSON
-
-				return services.configurationEditingService.writeConfiguration(ConfigurationTarget.WORKSPACE, { key: 'tasks', value: { 'version': '1.0.0', tasks: [{ 'taskName': 'myTask' }] } }).then(res => {
-					const target = path.join(workspaceDir, WORKSPACE_STANDALONE_CONFIGURATIONS['tasks']);
-					const contents = fs.readFileSync(target).toString('utf8');
-					const parsed = json.parse(contents);
-
-					assert.equal(parsed['version'], '1.0.0');
-					assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
-
-					services.configurationService.dispose();
-					cleanUp(done);
-				});
-			}, error => cleanUp(done, error));
-		});
+				assert.equal(parsed['version'], '1.0.0');
+				assert.equal(parsed['tasks'][0]['taskName'], 'myTask');
+			});
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
index 88cb19b2cc8..b156102bfa4 100644
--- a/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
@@ -248,9 +248,13 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
 
 				return this.commandService.executeCommand<string>(commandId, configuration).then(result => {
 					if (result) {
-						interactiveVariablesToSubstitutes[interactiveVariable].forEach(substitute =>
-							substitute.object[substitute.key] = substitute.object[substitute.key].replace(`\${command:${interactiveVariable}}`, result)
-						);
+						interactiveVariablesToSubstitutes[interactiveVariable].forEach(substitute => {
+							if (substitute.object[substitute.key].indexOf(`\${command:${interactiveVariable}}`) >= 0) {
+								substitute.object[substitute.key] = substitute.object[substitute.key].replace(`\${command:${interactiveVariable}}`, result);
+							} else if (substitute.object[substitute.key].indexOf(`\${command.${interactiveVariable}}`) >= 0) {
+								substitute.object[substitute.key] = substitute.object[substitute.key].replace(`\${command.${interactiveVariable}}`, result);
+							}
+						});
 					} else {
 						substitionCanceled = true;
 					}
diff --git a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
index 14f5f9c37fa..88b205a9d3c 100644
--- a/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
+++ b/src/vs/workbench/services/contextview/electron-browser/contextmenuService.ts
@@ -94,7 +94,7 @@ export class ContextMenuService implements IContextMenuService {
 					} else {
 						const label = this.keybindingService.getLabelFor(keybinding);
 						if (label) {
-							options.label = `${options.label} 〔${label}〕`;
+							options.label = `${options.label} (${label})`;
 						}
 					}
 				}
diff --git a/src/vs/workbench/services/group/common/groupService.ts b/src/vs/workbench/services/group/common/groupService.ts
index 241f16b5089..e9a31519307 100644
--- a/src/vs/workbench/services/group/common/groupService.ts
+++ b/src/vs/workbench/services/group/common/groupService.ts
@@ -116,7 +116,7 @@ export interface IEditorGroupService {
 	getStacksModel(): IEditorStacksModel;
 
 	/**
-	 * Returns true if tabs are shown, false otherwise.
+	 * Returns tab options.
 	 */
 	getTabOptions(): ITabOptions;
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts
index 430fe246d70..47074728c5d 100644
--- a/src/vs/workbench/services/history/browser/history.ts
+++ b/src/vs/workbench/services/history/browser/history.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import errors = require('vs/base/common/errors');
 import objects = require('vs/base/common/objects');
 import URI from 'vs/base/common/uri';
-import * as editorCommon from 'vs/editor/common/editorCommon';
+import { ICursorPositionChangedEvent, IEditor } from 'vs/editor/common/editorCommon';
 import { IEditor as IBaseEditor, IEditorInput, ITextEditorOptions, IResourceInput } from 'vs/platform/editor/common/editor';
 import { EditorInput, IGroupEvent, IEditorRegistry, Extensions, toResource, IEditorGroup } from 'vs/workbench/common/editor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -47,7 +47,7 @@ export class EditorState {
 		return this._selection;
 	}
 
-	public justifiesNewPushState(other: EditorState): boolean {
+	public justifiesNewPushState(other: EditorState, event?: ICursorPositionChangedEvent): boolean {
 		if (!this._editorInput.matches(other._editorInput)) {
 			return true; // push different editor inputs
 		}
@@ -56,6 +56,10 @@ export class EditorState {
 			return true; // unknown selections
 		}
 
+		if (event && event.source === 'api') {
+			return true; // always let API source win (e.g. "Go to definition" should add a history entry)
+		}
+
 		const liftedSelection = Selection.liftSelection(this._selection);
 		const liftedOtherSelection = Selection.liftSelection(other._selection);
 
@@ -126,14 +130,14 @@ export abstract class BaseHistoryService {
 		const control = getCodeEditor(activeEditor);
 		if (control) {
 			this.activeEditorListeners.push(control.onDidChangeCursorPosition(event => {
-				this.handleEditorSelectionChangeEvent(activeEditor);
+				this.handleEditorSelectionChangeEvent(activeEditor, event);
 			}));
 		}
 	}
 
 	protected abstract handleExcludesChange(): void;
 
-	protected abstract handleEditorSelectionChangeEvent(editor?: IBaseEditor): void;
+	protected abstract handleEditorSelectionChangeEvent(editor?: IBaseEditor, event?: ICursorPositionChangedEvent): void;
 
 	protected abstract handleActiveEditorChange(editor?: IBaseEditor): void;
 
@@ -293,8 +297,8 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 		});
 	}
 
-	protected handleEditorSelectionChangeEvent(editor?: IBaseEditor): void {
-		this.handleEditorEventInStack(editor);
+	protected handleEditorSelectionChangeEvent(editor?: IBaseEditor, event?: ICursorPositionChangedEvent): void {
+		this.handleEditorEventInStack(editor, event);
 	}
 
 	protected handleActiveEditorChange(editor?: IBaseEditor): void {
@@ -369,7 +373,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 		this.history = this.history.filter(e => !this.matches(arg1, e));
 	}
 
-	private handleEditorEventInStack(editor: IBaseEditor): void {
+	private handleEditorEventInStack(editor: IBaseEditor, event?: ICursorPositionChangedEvent): void {
 		const control = getCodeEditor(editor);
 
 		// treat editor changes that happen as part of stack navigation specially
@@ -387,7 +391,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 		}
 
 		if (control && editor.input) {
-			this.handleTextEditorEvent(editor, control);
+			this.handleTextEditorEvent(editor, control, event);
 
 			return;
 		}
@@ -399,9 +403,9 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 		}
 	}
 
-	private handleTextEditorEvent(editor: IBaseEditor, editorControl: editorCommon.IEditor): void {
+	private handleTextEditorEvent(editor: IBaseEditor, editorControl: IEditor, event?: ICursorPositionChangedEvent): void {
 		const stateCandidate = new EditorState(editor.input, editorControl.getSelection());
-		if (!this.currentFileEditorState || this.currentFileEditorState.justifiesNewPushState(stateCandidate)) {
+		if (!this.currentFileEditorState || this.currentFileEditorState.justifiesNewPushState(stateCandidate, event)) {
 			this.currentFileEditorState = stateCandidate;
 
 			let options: ITextEditorOptions;
@@ -641,4 +645,4 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
 			return void 0;
 		}).filter(input => !!input);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/vs/workbench/services/keybinding/electron-browser/nativeKeymap.ts b/src/vs/workbench/services/keybinding/electron-browser/nativeKeymap.ts
index 643cc6a157a..89a71f1c411 100644
--- a/src/vs/workbench/services/keybinding/electron-browser/nativeKeymap.ts
+++ b/src/vs/workbench/services/keybinding/electron-browser/nativeKeymap.ts
@@ -317,17 +317,12 @@ setExtractKeyCode((e: KeyboardEvent) => {
 		return KeyCodeUtils.fromString(char);
 	}
 
-	if (Platform.isMacintosh && _b24_interestingVirtualKeyCodes[e.keyCode] && typeof (<any>e).keyIdentifier === 'string') {
-		let keyIdentifier: string = (<any>e).keyIdentifier;
-		let strCharCode = keyIdentifier.substr(2);
+	if (Platform.isMacintosh && _b24_interestingVirtualKeyCodes[e.keyCode] && typeof e.key === 'string') {
 		try {
-			let charCode = parseInt(strCharCode, 16);
-			let char = String.fromCharCode(charCode);
 			let unfixMap = _b24_getActualKeyCodeMap();
-			if (unfixMap[char]) {
-				return unfixMap[char];
+			if (unfixMap[e.key]) {
+				return unfixMap[e.key];
 			}
-			// console.log(keyIdentifier + ' => ' + char);
 		} catch (err) {
 		}
 	}
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 3a3addbb418..74386591935 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -60,13 +60,15 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private contentChangeEventScheduler: RunOnceScheduler;
 	private saveSequentializer: SaveSequentializer;
 	private disposed: boolean;
-	private inConflictResolutionMode: boolean;
-	private inErrorMode: boolean;
 	private lastSaveAttemptTime: number;
 	private createTextEditorModelPromise: TPromise<TextFileEditorModel>;
 	private _onDidContentChange: Emitter<StateChange>;
 	private _onDidStateChange: Emitter<StateChange>;
 
+	private inConflictMode: boolean;
+	private inOrphanMode: boolean;
+	private inErrorMode: boolean;
+
 	constructor(
 		resource: URI,
 		preferredEncoding: string,
@@ -173,23 +175,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		TextFileEditorModel.saveParticipant = handler;
 	}
 
-	/**
-	 * When set, will disable any saving (including auto save) until the model is loaded again. This allows to resolve save conflicts
-	 * without running into subsequent save errors when editing the model.
-	 */
-	public setConflictResolutionMode(): void {
-		diag('setConflictResolutionMode() - enabled conflict resolution mode', this.resource, new Date());
-
-		this.inConflictResolutionMode = true;
-	}
-
-	/**
-	 * Answers if this model is currently in conflic resolution mode or not.
-	 */
-	public isInConflictResolutionMode(): boolean {
-		return this.inConflictResolutionMode;
-	}
-
 	/**
 	 * Discards any local changes and replaces the model with the contents of the version on disk.
 	 *
@@ -438,7 +423,9 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// In this case we clear the dirty flag and emit a SAVED event to indicate this state.
 		// Note: we currently only do this check when auto-save is turned off because there you see
 		// a dirty indicator that you want to get rid of when undoing to the saved version.
-		if (!this.autoSaveAfterMilliesEnabled && this.textEditorModel.getAlternativeVersionId() === this.bufferSavedVersionId) {
+		// Note: if the model is in orphan mode, we cannot clear the dirty indicator because there
+		// is no version on disk after all.
+		if (!this.autoSaveAfterMilliesEnabled && !this.inOrphanMode && this.textEditorModel.getAlternativeVersionId() === this.bufferSavedVersionId) {
 			diag('onModelContentChanged() - model content changed back to last saved version', this.resource, new Date());
 
 			// Clear flags
@@ -460,7 +447,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 		// Start auto save process unless we are in conflict resolution mode and unless it is disabled
 		if (this.autoSaveAfterMilliesEnabled) {
-			if (!this.inConflictResolutionMode) {
+			if (!this.inConflictMode && !this.inOrphanMode) {
 				this.doAutoSave(this.versionId);
 			} else {
 				diag('makeDirty() - prevented save because we are in conflict resolution mode', this.resource, new Date());
@@ -649,9 +636,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			}, error => {
 				diag(`doSave(${versionId}) - exit - resulted in a save error: ${error.toString()}`, this.resource, new Date());
 
-				// Flag as error state
+				// Flag as error state in the model
 				this.inErrorMode = true;
 
+				// Look out for a save conflict
+				if ((<IFileOperationResult>error).fileOperationResult === FileOperationResult.FILE_MODIFIED_SINCE) {
+					this.inConflictMode = true;
+				}
+
 				// Show to user
 				this.onSaveError(error);
 
@@ -663,13 +655,15 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 	private setDirty(dirty: boolean): () => void {
 		const wasDirty = this.dirty;
-		const wasInConflictResolutionMode = this.inConflictResolutionMode;
+		const wasInConflictMode = this.inConflictMode;
+		const wasInOrphanMode = this.inOrphanMode;
 		const wasInErrorMode = this.inErrorMode;
 		const oldBufferSavedVersionId = this.bufferSavedVersionId;
 
 		if (!dirty) {
 			this.dirty = false;
-			this.inConflictResolutionMode = false;
+			this.inConflictMode = false;
+			this.inOrphanMode = false;
 			this.inErrorMode = false;
 
 			// we remember the models alternate version id to remember when the version
@@ -687,7 +681,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		// Return function to revert this call
 		return () => {
 			this.dirty = wasDirty;
-			this.inConflictResolutionMode = wasInConflictResolutionMode;
+			this.inConflictMode = wasInConflictMode;
+			this.inOrphanMode = wasInOrphanMode;
 			this.inErrorMode = wasInErrorMode;
 			this.bufferSavedVersionId = oldBufferSavedVersionId;
 		};
@@ -744,10 +739,14 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	 * Returns the state this text text file editor model is in with regards to changes and saving.
 	 */
 	public getState(): ModelState {
-		if (this.inConflictResolutionMode) {
+		if (this.inConflictMode) {
 			return ModelState.CONFLICT;
 		}
 
+		if (this.inOrphanMode) {
+			return ModelState.ORPHAN;
+		}
+
 		if (this.inErrorMode) {
 			return ModelState.ERROR;
 		}
@@ -785,7 +784,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 				this.makeDirty();
 			}
 
-			if (!this.inConflictResolutionMode) {
+			if (!this.inConflictMode) {
 				this.save({ overwriteEncoding: true }).done(null, onUnexpectedError);
 			}
 		}
@@ -853,9 +852,49 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		return this.lastResolvedDiskStat;
 	}
 
+	/**
+	 * Makes this model an orphan, indicating that the file on disk no longer exists. Returns
+	 * a function to undo this and go back to the previous state.
+	 */
+	public setOrphaned(): () => void {
+
+		// Only saved models can turn into orphans
+		if (this.getState() !== ModelState.SAVED) {
+			return () => { };
+		}
+
+		// Mark as dirty
+		const undo = this.setDirty(true);
+
+		// Mark as oprhaned
+		this.inOrphanMode = true;
+
+		// Emit as Event if we turned dirty
+		this._onDidStateChange.fire(StateChange.DIRTY);
+
+		// Return undo function
+		const currentVersionId = this.versionId;
+		return () => {
+
+			// Leave orphan mode
+			this.inOrphanMode = false;
+
+			// Undo is only valid if version is the one we left with
+			if (this.versionId === currentVersionId) {
+
+				// Revert
+				undo();
+
+				// Events
+				this._onDidStateChange.fire(StateChange.SAVED);
+			}
+		};
+	}
+
 	public dispose(): void {
 		this.disposed = true;
-		this.inConflictResolutionMode = false;
+		this.inConflictMode = false;
+		this.inOrphanMode = false;
 		this.inErrorMode = false;
 
 		this.toDispose = dispose(this.toDispose);
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index 5121ccc14f0..7728a0c64e0 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -13,10 +13,8 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
 import { ModelState, ITextFileEditorModel, ITextFileEditorModelManager, TextFileModelChangeEvent, StateChange } from 'vs/workbench/services/textfile/common/textfiles';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { FileOperation, FileOperationEvent, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 
 export class TextFileEditorModelManager implements ITextFileEditorModelManager {
-
 	private toUnbind: IDisposable[];
 
 	private _onModelDisposed: Emitter<URI>;
@@ -41,8 +39,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 	constructor(
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IEditorGroupService private editorGroupService: IEditorGroupService,
-		@IFileService private fileService: IFileService
+		@IEditorGroupService private editorGroupService: IEditorGroupService
 	) {
 		this.toUnbind = [];
 
@@ -77,10 +74,6 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.toUnbind.push(this.editorGroupService.onEditorsChanged(() => this.onEditorsChanged()));
 		this.toUnbind.push(this.editorGroupService.getStacksModel().onEditorClosed(() => this.onEditorClosed()));
 
-		// File changes
-		this.toUnbind.push(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
-		this.toUnbind.push(this.fileService.onFileChanges(e => this.onFileChanges(e)));
-
 		// Lifecycle
 		this.lifecycleService.onShutdown(this.dispose, this);
 	}
@@ -93,46 +86,41 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.disposeUnusedModels();
 	}
 
-	private disposeModelIfPossible(resource: URI): void {
-		const model = this.get(resource);
-		if (this.canDispose(model)) {
+	private disposeUnusedModels(): void {
+
+		// To not grow our text file model cache infinitly, we dispose models that
+		// are not showing up in any opened editor.
+		// TODO@Ben this is a workaround until we have adopted model references from
+		// the resolver service (https://github.com/Microsoft/vscode/issues/17888)
+
+		this.getAll(void 0, model => this.canDispose(model)).forEach(model => {
 			model.dispose();
-		}
-	}
-
-	private onFileOperation(e: FileOperationEvent): void {
-		if (e.operation === FileOperation.MOVE || e.operation === FileOperation.DELETE) {
-			this.disposeModelIfPossible(e.resource); // dispose models of moved or deleted files
-		}
-	}
-
-	private onFileChanges(e: FileChangesEvent): void {
-
-		// Dispose inputs that got deleted
-		e.getDeleted().forEach(deleted => {
-			this.disposeModelIfPossible(deleted.resource);
 		});
 	}
 
-	private canDispose(textModel: ITextFileEditorModel): boolean {
-		if (!textModel) {
+	private canDispose(model: ITextFileEditorModel): boolean {
+		if (!model) {
 			return false; // we need data!
 		}
 
-		if (textModel.isDisposed()) {
+		if (model.isDisposed()) {
 			return false; // already disposed
 		}
 
-		if (textModel.textEditorModel && textModel.textEditorModel.isAttachedToEditor()) {
-			return false; // never dispose when attached to editor
+		if (this.mapResourceToPendingModelLoaders[model.getResource().toString()]) {
+			return false; // not yet loaded
 		}
 
-		if (textModel.getState() !== ModelState.SAVED) {
-			return false; // never dispose unsaved models
+		if (model.getState() !== ModelState.SAVED) {
+			return false; // not saved
 		}
 
-		if (this.mapResourceToPendingModelLoaders[textModel.getResource().toString()]) {
-			return false; // never dispose models that we are about to load at the same time
+		if (model.textEditorModel && model.textEditorModel.isAttachedToEditor()) {
+			return false; // never dispose when attached to editor (e.g. viewzones)
+		}
+
+		if (this.editorGroupService.getStacksModel().isOpen(model.getResource())) {
+			return false; // never dispose when opened inside an editor (e.g. tabs)
 		}
 
 		return true;
@@ -299,7 +287,7 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		});
 	}
 
-	public getAll(resource?: URI): ITextFileEditorModel[] {
+	public getAll(resource?: URI, filter?: (model: ITextFileEditorModel) => boolean): ITextFileEditorModel[] {
 		if (resource) {
 			const res = this.mapResourceToModel[resource.toString()];
 
@@ -309,7 +297,10 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		const keys = Object.keys(this.mapResourceToModel);
 		const res: ITextFileEditorModel[] = [];
 		for (let i = 0; i < keys.length; i++) {
-			res.push(this.mapResourceToModel[keys[i]]);
+			const model = this.mapResourceToModel[keys[i]];
+			if (!filter || filter(model)) {
+				res.push(model);
+			}
 		}
 
 		return res;
@@ -378,21 +369,6 @@ export class TextFileEditorModelManager implements ITextFileEditorModelManager {
 		this.mapResourceToModelContentChangeListener = Object.create(null);
 	}
 
-	private disposeUnusedModels(): void {
-
-		// To not grow our text file model cache infinitly, we dispose models that
-		// are not showing up in any opened editor.
-
-		// Get all cached file models
-		this.getAll()
-
-			// Only models that are not open inside the editor area
-			.filter(model => !this.editorGroupService.getStacksModel().isOpen(model.getResource()))
-
-			// Dispose
-			.forEach(model => this.disposeModelIfPossible(model.getResource()));
-	}
-
 	public dispose(): void {
 		this.toUnbind = dispose(this.toUnbind);
 	}
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index b7e80391922..2382c21d2c1 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -14,7 +14,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import platform = require('vs/base/common/platform');
 import { IWindowsService } from 'vs/platform/windows/common/windows';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { IRevertOptions, IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode, SaveReason, ITextFileEditorModelManager, ITextFileEditorModel, ISaveOptions } from 'vs/workbench/services/textfile/common/textfiles';
+import { IRevertOptions, IResult, ITextFileOperationResult, ITextFileService, IRawTextContent, IAutoSaveConfiguration, AutoSaveMode, SaveReason, ITextFileEditorModelManager, ITextFileEditorModel, ISaveOptions, ModelState } from 'vs/workbench/services/textfile/common/textfiles';
 import { ConfirmResult } from 'vs/workbench/common/editor';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { ILifecycleService, ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle';
@@ -477,7 +477,14 @@ export abstract class TextFileService implements ITextFileService {
 	}
 
 	private doSaveAllFiles(arg1?: any /* URI[] */, reason?: SaveReason): TPromise<ITextFileOperationResult> {
-		const dirtyFileModels = this.getDirtyFileModels(Array.isArray(arg1) ? arg1 : void 0 /* Save All */);
+		const dirtyFileModels = this.getDirtyFileModels(Array.isArray(arg1) ? arg1 : void 0 /* Save All */)
+			.filter(model => {
+				if ((model.getState() === ModelState.CONFLICT || model.getState() === ModelState.ORPHAN) && (reason === SaveReason.AUTO || reason === SaveReason.FOCUS_CHANGE || reason === SaveReason.WINDOW_CHANGE)) {
+					return false; // if model is in an orphan or in save conflict, do not save unless save reason is explicit or not provided at all
+				}
+
+				return true;
+			});
 
 		const mapResourceToResult: { [resource: string]: IResult } = Object.create(null);
 		dirtyFileModels.forEach(m => {
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index eb3b1a1b1c9..f72726b80d1 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -40,7 +40,23 @@ export enum ModelState {
 	SAVED,
 	DIRTY,
 	PENDING_SAVE,
+
+	/**
+	 * A model is in conflict mode when changes cannot be saved because the
+	 * underlying file has changed. Models in conflict mode are always dirty.
+	 */
 	CONFLICT,
+
+	/**
+	 * A model is in orphan state when the underlying file has been deleted.
+	 * Models in orphan mode are always dirty.
+	 */
+	ORPHAN,
+
+	/**
+	 * Any error that happens during a save that is not causing the CONFLICT state.
+	 * Models in error mode are always diry.
+	 */
 	ERROR
 }
 
@@ -176,10 +192,10 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	revert(soft?: boolean): TPromise<void>;
 
-	setConflictResolutionMode(): void;
-
 	getValue(): string;
 
+	setOrphaned(): () => void;
+
 	isDirty(): boolean;
 
 	isResolved(): boolean;
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
index 00411c57c3a..e6ad8a47794 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
@@ -210,32 +210,6 @@ suite('Files - TextFileEditorModel', () => {
 		}, error => onError(error, done));
 	});
 
-	test('Conflict Resolution Mode', function (done) {
-		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8');
-
-		model.load().done(() => {
-			model.setConflictResolutionMode();
-			model.textEditorModel.setValue('foo');
-
-			assert.ok(model.isDirty());
-			assert.equal(model.getState(), ModelState.CONFLICT);
-			assert.ok(model.isInConflictResolutionMode());
-
-			return model.revert().then(() => {
-				model.textEditorModel.setValue('bar');
-				assert.ok(model.isDirty());
-
-				return model.save().then(() => {
-					assert.ok(!model.isDirty());
-
-					model.dispose();
-
-					done();
-				});
-			});
-		}, error => onError(error, done));
-	});
-
 	test('Auto Save triggered when model changes', function (done) {
 		let eventCounter = 0;
 		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index.txt'), 'utf8');
@@ -383,6 +357,25 @@ suite('Files - TextFileEditorModel', () => {
 		}, error => onError(error, done));
 	});
 
+	test('setOrphaned basics', function (done) {
+		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/index_async.txt'), 'utf8');
+
+		return model.load().then(() => {
+			let undo = model.setOrphaned();
+			assert.equal(model.isDirty(), true);
+			undo();
+			assert.equal(model.isDirty(), false);
+
+			// can not undo when model changed meanwhile
+			undo = model.setOrphaned();
+			model.textEditorModel.setValue('foo');
+			undo();
+			assert.equal(model.isDirty(), true);
+
+			done();
+		}, error => onError(error, done));
+	});
+
 	test('SaveSequentializer - pending basics', function (done) {
 		const sequentializer = new SaveSequentializer();
 
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
index 0e10b09c068..ce952789502 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModelManager.test.ts
@@ -10,12 +10,12 @@ import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { join, basename } from 'vs/base/common/paths';
+import { join } from 'vs/base/common/paths';
 import { workbenchInstantiationService, TestEditorGroupService, createFileInput, TestFileService } from 'vs/workbench/test/workbenchTestServices';
 import { onError } from 'vs/base/test/common/utils';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
-import { FileOperation, FileOperationEvent, FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
 export class TestTextFileEditorModelManager extends TextFileEditorModelManager {
@@ -25,17 +25,6 @@ export class TestTextFileEditorModelManager extends TextFileEditorModelManager {
 	}
 }
 
-function toStat(resource: URI) {
-	return {
-		resource,
-		isDirectory: false,
-		hasChildren: false,
-		name: basename(resource.fsPath),
-		mtime: Date.now(),
-		etag: 'etag'
-	};
-}
-
 class ServiceAccessor {
 	constructor(
 		@IEditorGroupService public editorGroupService: TestEditorGroupService,
@@ -179,93 +168,6 @@ suite('Files - TextFileEditorModelManager', () => {
 		manager.dispose();
 	});
 
-	test('local file changes dispose model - delete', function () {
-		const manager: TestTextFileEditorModelManager = instantiationService.createInstance(TestTextFileEditorModelManager);
-
-		const resource = toResource('/path/index.txt');
-
-		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, resource, 'utf8');
-		manager.add(resource, model);
-
-		assert.ok(!model.isDisposed());
-
-		// delete operation
-		accessor.fileService.fireAfterOperation(new FileOperationEvent(resource, FileOperation.DELETE));
-
-		assert.ok(model.isDisposed());
-
-		model.dispose();
-		assert.ok(!accessor.modelService.getModel(model.getResource()));
-
-		manager.dispose();
-	});
-
-	test('local file changes dispose model - move', function () {
-		const manager: TestTextFileEditorModelManager = instantiationService.createInstance(TestTextFileEditorModelManager);
-
-		const resource = toResource('/path/index.txt');
-
-		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, resource, 'utf8');
-		manager.add(resource, model);
-
-		assert.ok(!model.isDisposed());
-
-		// move operation
-		accessor.fileService.fireAfterOperation(new FileOperationEvent(resource, FileOperation.MOVE, toStat(toResource('/path/index_moved.txt'))));
-
-		assert.ok(model.isDisposed());
-		assert.ok(!accessor.modelService.getModel(model.getResource()));
-
-		manager.dispose();
-	});
-
-	test('file event delete dispose model', function () {
-		const manager: TestTextFileEditorModelManager = instantiationService.createInstance(TestTextFileEditorModelManager);
-
-		const resource = toResource('/path/index.txt');
-
-		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, resource, 'utf8');
-		manager.add(resource, model);
-
-		assert.ok(!model.isDisposed());
-
-		// delete event (watcher)
-		accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.DELETED }]));
-
-		assert.ok(model.isDisposed());
-		assert.ok(!accessor.modelService.getModel(model.getResource()));
-
-		manager.dispose();
-	});
-
-	test('file change event does NOT dispose model if happening < 2 second after last save', function (done) {
-		const manager: TestTextFileEditorModelManager = instantiationService.createInstance(TestTextFileEditorModelManager);
-
-		const resource = toResource('/path/index.txt');
-
-		const model: TextFileEditorModel = instantiationService.createInstance(TextFileEditorModel, resource, 'utf8');
-		manager.add(resource, model);
-
-		assert.ok(!model.isDisposed());
-
-		model.load().done(resolved => {
-			model.textEditorModel.setValue('changed');
-			return model.save().then(() => {
-
-				// change event (watcher)
-				accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.UPDATED }]));
-
-				assert.ok(!model.isDisposed());
-
-				model.dispose();
-				assert.ok(!accessor.modelService.getModel(model.getResource()));
-
-				manager.dispose();
-				done();
-			});
-		}, error => onError(error, done));
-	});
-
 	test('events', function (done) {
 		const manager: TestTextFileEditorModelManager = instantiationService.createInstance(TestTextFileEditorModelManager);
 
diff --git a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
index eba5220e13d..a6850938582 100644
--- a/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
+++ b/src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
@@ -73,8 +73,8 @@ class ResourceModelCollection extends ReferenceCollection<TPromise<ITextEditorMo
 
 		return first(factories).then(model => {
 			if (!model) {
-				console.error(`Could not resolve any model with uri '${resource}'.`); // TODO PII
-				return TPromise.wrapError('Could not resolve any model with provided uri.');
+				console.error(`Unable to open '${resource}' resource is not available.`); // TODO PII
+				return TPromise.wrapError('resource is not available');
 			}
 
 			return model;
diff --git a/src/vs/workbench/test/node/api/extHostApiCommands.test.ts b/src/vs/workbench/test/node/api/extHostApiCommands.test.ts
index 59333a5e5e5..78be2e46df9 100644
--- a/src/vs/workbench/test/node/api/extHostApiCommands.test.ts
+++ b/src/vs/workbench/test/node/api/extHostApiCommands.test.ts
@@ -27,6 +27,7 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
 import { MainThreadCommands } from 'vs/workbench/api/node/mainThreadCommands';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { MainContext, ExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostDiagnostics } from 'vs/workbench/api/node/extHostDiagnostics';
 import * as vscode from 'vscode';
@@ -68,7 +69,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
 		instantiationService.stub(ICommandService, {
 			_serviceBrand: undefined,
 			executeCommand(id, args): any {
-				let {handler} = CommandsRegistry.getCommands()[id];
+				let { handler } = CommandsRegistry.getCommands()[id];
 				return TPromise.as(instantiationService.invokeFunction(handler, args));
 			}
 		});
@@ -88,16 +89,19 @@ suite('ExtHostLanguageFeatureCommands', function () {
 			getCreationOptions(): any { throw new Error(); }
 		});
 
-		const extHostDocuments = new ExtHostDocuments(threadService);
-		threadService.set(ExtHostContext.ExtHostDocuments, extHostDocuments);
-		extHostDocuments.$acceptModelAdd({
-			isDirty: false,
-			versionId: model.getVersionId(),
-			modeId: model.getLanguageIdentifier().language,
-			url: model.uri,
-			lines: model.getValue().split(model.getEOL()),
-			EOL: model.getEOL(),
+		const extHostDocumentsAndEditors = new ExtHostDocumentsAndEditors(threadService);
+		extHostDocumentsAndEditors.$acceptDocumentsAndEditorsDelta({
+			addedDocuments: [{
+				isDirty: false,
+				versionId: model.getVersionId(),
+				modeId: model.getLanguageIdentifier().language,
+				url: model.uri,
+				lines: model.getValue().split(model.getEOL()),
+				EOL: model.getEOL(),
+			}]
 		});
+		const extHostDocuments = new ExtHostDocuments(threadService, extHostDocumentsAndEditors);
+		threadService.set(ExtHostContext.ExtHostDocuments, extHostDocuments);
 
 		const heapService = new ExtHostHeapService();
 
diff --git a/src/vs/workbench/test/node/api/extHostDocuments.test.ts b/src/vs/workbench/test/node/api/extHostDocumentData.test.ts
similarity index 98%
rename from src/vs/workbench/test/node/api/extHostDocuments.test.ts
rename to src/vs/workbench/test/node/api/extHostDocumentData.test.ts
index 06ca8634be7..4ddad3fdace 100644
--- a/src/vs/workbench/test/node/api/extHostDocuments.test.ts
+++ b/src/vs/workbench/test/node/api/extHostDocumentData.test.ts
@@ -7,13 +7,13 @@
 
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
-import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocuments';
+import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData';
 import { Position } from 'vs/workbench/api/node/extHostTypes';
 import { Range as CodeEditorRange } from 'vs/editor/common/core/range';
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 
 
-suite('ExtHostDocument', () => {
+suite('ExtHostDocumentData', () => {
 
 	let data: ExtHostDocumentData;
 
@@ -87,7 +87,7 @@ suite('ExtHostDocument', () => {
 	test('line, issue #5704', function () {
 
 		let line = data.document.lineAt(0);
-		let {range, rangeIncludingLineBreak} = line;
+		let { range, rangeIncludingLineBreak } = line;
 		assert.equal(range.end.line, 0);
 		assert.equal(range.end.character, 16);
 		assert.equal(rangeIncludingLineBreak.end.line, 1);
@@ -243,7 +243,7 @@ enum AssertDocumentLineMappingDirection {
 	PositionToOffset
 }
 
-suite('ExtHostDocument updates line mapping', () => {
+suite('ExtHostDocumentData updates line mapping', () => {
 
 	function positionToStr(position: { line: number; character: number; }): string {
 		return '(' + position.line + ',' + position.character + ')';
diff --git a/src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts
index 97eb4431fef..81aef369d84 100644
--- a/src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts
@@ -8,6 +8,7 @@ import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { TextDocumentSaveReason, TextEdit, Position } from 'vs/workbench/api/node/extHostTypes';
 import { MainThreadWorkspaceShape } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/node/extHostDocumentSaveParticipant';
@@ -23,16 +24,18 @@ suite('ExtHostDocumentSaveParticipant', () => {
 	let documents: ExtHostDocuments;
 
 	setup(() => {
-
-		documents = new ExtHostDocuments(OneGetThreadService(null));
-		documents.$acceptModelAdd({
-			isDirty: false,
-			modeId: 'foo',
-			url: resource,
-			versionId: 1,
-			lines: ['foo'],
-			EOL: '\n',
+		const documentsAndEditors = new ExtHostDocumentsAndEditors(OneGetThreadService(null));
+		documentsAndEditors.$acceptDocumentsAndEditorsDelta({
+			addedDocuments: [{
+				isDirty: false,
+				modeId: 'foo',
+				url: resource,
+				versionId: 1,
+				lines: ['foo'],
+				EOL: '\n',
+			}]
 		});
+		documents = new ExtHostDocuments(OneGetThreadService(null), documentsAndEditors);
 	});
 
 	test('no listeners, no problem', () => {
@@ -305,7 +308,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		const participant = new ExtHostDocumentSaveParticipant(documents, new class extends MainThreadWorkspaceShape {
 			$applyWorkspaceEdit(_edits: IResourceEdit[]) {
 
-				for (const {resource, newText, range} of _edits) {
+				for (const { resource, newText, range } of _edits) {
 					documents.$acceptModelChanged(resource.toString(), [{
 						range,
 						text: newText,
diff --git a/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts
index f7cb6557aab..6f0040b2457 100644
--- a/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/node/api/extHostLanguageFeatures.test.ts
@@ -24,6 +24,7 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
 import { MainThreadCommands } from 'vs/workbench/api/node/mainThreadCommands';
 import { IHeapService } from 'vs/workbench/api/node/mainThreadHeapService';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
+import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/common/quickOpen';
 import { DocumentSymbolProviderRegistry, DocumentHighlightKind } from 'vs/editor/common/modes';
 import { getCodeLensData } from 'vs/editor/contrib/codelens/common/codelens';
@@ -80,16 +81,19 @@ suite('ExtHostLanguageFeatures', function () {
 		originalErrorHandler = errorHandler.getUnexpectedErrorHandler();
 		setUnexpectedErrorHandler(() => { });
 
-		const extHostDocuments = new ExtHostDocuments(threadService);
-		threadService.set(ExtHostContext.ExtHostDocuments, extHostDocuments);
-		extHostDocuments.$acceptModelAdd({
-			isDirty: false,
-			versionId: model.getVersionId(),
-			modeId: model.getLanguageIdentifier().language,
-			url: model.uri,
-			lines: model.getValue().split(model.getEOL()),
-			EOL: model.getEOL(),
+		const extHostDocumentsAndEditors = new ExtHostDocumentsAndEditors(threadService);
+		extHostDocumentsAndEditors.$acceptDocumentsAndEditorsDelta({
+			addedDocuments: [{
+				isDirty: false,
+				versionId: model.getVersionId(),
+				modeId: model.getLanguageIdentifier().language,
+				url: model.uri,
+				lines: model.getValue().split(model.getEOL()),
+				EOL: model.getEOL(),
+			}]
 		});
+		const extHostDocuments = new ExtHostDocuments(threadService, extHostDocumentsAndEditors);
+		threadService.set(ExtHostContext.ExtHostDocuments, extHostDocuments);
 
 		const heapService = new ExtHostHeapService();
 
diff --git a/src/vs/workbench/test/node/api/extHostEditors.test.ts b/src/vs/workbench/test/node/api/extHostTextEditor.test.ts
similarity index 99%
rename from src/vs/workbench/test/node/api/extHostEditors.test.ts
rename to src/vs/workbench/test/node/api/extHostTextEditor.test.ts
index 05490a666f9..8e2148999b5 100644
--- a/src/vs/workbench/test/node/api/extHostEditors.test.ts
+++ b/src/vs/workbench/test/node/api/extHostTextEditor.test.ts
@@ -8,9 +8,9 @@ import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes';
 import { TextEditorCursorStyle } from 'vs/editor/common/editorCommon';
-import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditorsTracker';
+import { IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/mainThreadEditor';
 import { MainThreadEditorsShape } from 'vs/workbench/api/node/extHost.protocol';
-import { ExtHostTextEditorOptions } from 'vs/workbench/api/node/extHostEditors';
+import { ExtHostTextEditorOptions } from 'vs/workbench/api/node/extHostTextEditor';
 
 suite('ExtHostTextEditorOptions', () => {
 
diff --git a/src/vs/workbench/test/node/api/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/test/node/api/mainThreadDocumentsAndEditors.test.ts
new file mode 100644
index 00000000000..8e73484f08e
--- /dev/null
+++ b/src/vs/workbench/test/node/api/mainThreadDocumentsAndEditors.test.ts
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { MainThreadDocumentsAndEditors } from 'vs/workbench/api/node/mainThreadDocumentsAndEditors';
+import { OneGetThreadService } from './testThreadService';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+import { MockCodeEditorService } from 'vs/editor/test/common/mocks/mockCodeEditorService';
+import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
+import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { ExtHostDocumentsAndEditorsShape, IDocumentsAndEditorsDelta } from 'vs/workbench/api/node/extHost.protocol';
+import { mockCodeEditor } from 'vs/editor/test/common/mocks/mockCodeEditor';
+
+suite('MainThreadDocumentsAndEditors', () => {
+
+	let modelService: ModelServiceImpl;
+	let codeEditorService: MockCodeEditorService;
+	let textFileService: ITextFileService;
+	let workbenchEditorService: IWorkbenchEditorService;
+	let documentAndEditor: MainThreadDocumentsAndEditors;
+	let deltas: IDocumentsAndEditorsDelta[] = [];
+
+	setup(() => {
+		deltas.length = 0;
+		modelService = new ModelServiceImpl(null, new TestConfigurationService());
+		codeEditorService = new MockCodeEditorService();
+		textFileService = <ITextFileService>{ isDirty() { return false; } };
+		workbenchEditorService = <IWorkbenchEditorService>{
+			getVisibleEditors() { return []; },
+			getActiveEditor() { return undefined; }
+		};
+
+		documentAndEditor = new MainThreadDocumentsAndEditors(
+			modelService, textFileService, workbenchEditorService,
+			OneGetThreadService(new class extends ExtHostDocumentsAndEditorsShape {
+				$acceptDocumentsAndEditorsDelta(delta) { deltas.push(delta); }
+			}), codeEditorService
+		);
+	});
+
+
+	test('Model#add', () => {
+
+		modelService.createModel('farboo', null, null);
+
+		assert.equal(deltas.length, 1);
+		const [delta] = deltas;
+
+		assert.equal(delta.addedDocuments.length, 1);
+		assert.equal(delta.removedDocuments, undefined);
+		assert.equal(delta.addedEditors, undefined);
+		assert.equal(delta.removedEditors, undefined);
+		assert.equal(delta.newActiveEditor, null);
+	});
+
+	test('ignore huge model', () => {
+
+		const data = new Array(2 + (5 * 1024 * 1024)).join('!');
+		const model = modelService.createModel(data, null, null);
+		assert.ok(model.isTooLargeForHavingARichMode());
+
+		assert.equal(deltas.length, 1);
+		const [delta] = deltas;
+		assert.equal(delta.newActiveEditor, null);
+		assert.equal(delta.addedDocuments, undefined);
+		assert.equal(delta.removedDocuments, undefined);
+		assert.equal(delta.addedEditors, undefined);
+		assert.equal(delta.removedEditors, undefined);
+	});
+
+	test('ignore huge model from editor', () => {
+
+		const data = new Array(2 + (5 * 1024 * 1024)).join('!');
+		const model = modelService.createModel(data, null, null);
+		const editor = mockCodeEditor(null, { model });
+
+		assert.equal(deltas.length, 1);
+		deltas.length = 0;
+		codeEditorService.addCodeEditor(editor);
+		assert.equal(deltas.length, 0);
+	});
+
+	test('ignore editor w/o model', () => {
+		const editor = mockCodeEditor([], {});
+		editor.setModel(null);
+		codeEditorService.addCodeEditor(editor);
+		assert.equal(deltas.length, 1);
+		const [delta] = deltas;
+		assert.equal(delta.newActiveEditor, null);
+		assert.equal(delta.addedDocuments, undefined);
+		assert.equal(delta.removedDocuments, undefined);
+		assert.equal(delta.addedEditors, undefined);
+		assert.equal(delta.removedEditors, undefined);
+	});
+
+	test('editor with model', () => {
+		const model = modelService.createModel('farboo', null, null);
+		codeEditorService.addCodeEditor(mockCodeEditor(null, { model }));
+
+		assert.equal(deltas.length, 2);
+		const [first, second] = deltas;
+		assert.equal(first.addedDocuments.length, 1);
+		assert.equal(first.newActiveEditor, null);
+		assert.equal(first.removedDocuments, undefined);
+		assert.equal(first.addedEditors, undefined);
+		assert.equal(first.removedEditors, undefined);
+
+		assert.equal(second.addedEditors.length, 1);
+		assert.equal(second.addedDocuments, undefined);
+		assert.equal(second.removedDocuments, undefined);
+		assert.equal(second.removedEditors, undefined);
+		assert.equal(typeof second.newActiveEditor, 'string');
+	});
+
+	test('editor with dispos-ed/-ing model', () => {
+		modelService.createModel('foobar', null, null);
+		const model = modelService.createModel('farboo', null, null);
+		const editor = mockCodeEditor(null, { model });
+		codeEditorService.addCodeEditor(editor);
+
+		// ignore things until now
+		deltas.length = 0;
+
+		modelService.destroyModel(model.uri);
+		assert.equal(deltas.length, 1);
+		const [first] = deltas;
+		assert.equal(first.newActiveEditor, null);
+		assert.equal(first.removedEditors.length, 1);
+		assert.equal(first.removedDocuments.length, 1);
+		assert.equal(first.addedDocuments, undefined);
+		assert.equal(first.addedEditors, undefined);
+	});
+});
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 95e8330204c..224fb1f38a6 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -49,6 +49,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
 import { TestWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
 import { RawTextSource, IRawTextSource } from 'vs/editor/common/model/textSource';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, void 0);
@@ -203,6 +204,7 @@ export function workbenchInstantiationService(): IInstantiationService {
 	instantiationService.stub(IWindowsService, new TestWindowsService());
 	instantiationService.stub(ITextFileService, <ITextFileService>instantiationService.createInstance(TestTextFileService));
 	instantiationService.stub(ITextModelResolverService, <ITextModelResolverService>instantiationService.createInstance(TextModelResolverService));
+	instantiationService.stub(IEnvironmentService, TestEnvironmentService);
 
 	return instantiationService;
 }